From 445b1bdd21341be32687786c3e79c971eeb4b14a Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 13 Aug 2024 10:49:37 +0200
Subject: [PATCH] refactor: use YAlert everywhere

---
 app/src/components/globals/CardForm.vue            |  7 ++++---
 app/src/components/globals/ViewSearch.vue          | 14 ++++++++------
 app/src/components/globals/YAlert.vue              | 12 ++++++------
 .../globals/formItems/ReadOnlyAlertItem.vue        | 13 ++++---------
 app/src/views/app/AppInstall.vue                   | 10 +++++++---
 app/src/views/backup/BackupInfo.vue                |  4 ++--
 app/src/views/backup/BackupList.vue                | 10 +++++++---
 7 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/app/src/components/globals/CardForm.vue b/app/src/components/globals/CardForm.vue
index 2f91906d..ad5e2988 100644
--- a/app/src/components/globals/CardForm.vue
+++ b/app/src/components/globals/CardForm.vue
@@ -194,14 +194,15 @@ const Fields = createReusableTemplate<{
         </slot>
 
         <slot name="server-error">
-          <BAlert
+          <YAlert
+            v-if="globalErrorFeedback !== ''"
+            alert
             variant="danger"
             class="my-3"
             icon="ban"
-            :model-value="globalErrorFeedback !== ''"
           >
             <div v-html="globalErrorFeedback" />
-          </BAlert>
+          </YAlert>
         </slot>
       </BForm>
 
diff --git a/app/src/components/globals/ViewSearch.vue b/app/src/components/globals/ViewSearch.vue
index c3d2023a..0b7c03d4 100644
--- a/app/src/components/globals/ViewSearch.vue
+++ b/app/src/components/globals/ViewSearch.vue
@@ -73,12 +73,14 @@ const noItemsMessage = computed(() => {
     <slot name="top" />
 
     <slot name="forced-default">
-      <BAlert v-if="noItemsMessage" :model-value="true" variant="warning">
-        <slot name="alert-message">
-          <YIcon iname="exclamation-triangle" />
-          {{ noItemsMessage }}
-        </slot>
-      </BAlert>
+      <YAlert
+        v-if="noItemsMessage"
+        alert
+        icon="exclamation-triangle"
+        variant="warning"
+      >
+        {{ noItemsMessage }}
+      </YAlert>
       <slot v-else name="default" />
     </slot>
 
diff --git a/app/src/components/globals/YAlert.vue b/app/src/components/globals/YAlert.vue
index 885c7f44..88263328 100644
--- a/app/src/components/globals/YAlert.vue
+++ b/app/src/components/globals/YAlert.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { ColorVariant } from 'bootstrap-vue-next'
+import { BAlert } from 'bootstrap-vue-next'
 import { computed } from 'vue'
 
 import { DEFAULT_VARIANT_ICON } from '@/helpers/yunohostArguments'
@@ -7,13 +8,13 @@ import { DEFAULT_VARIANT_ICON } from '@/helpers/yunohostArguments'
 const props = withDefaults(
   defineProps<{
     alert?: boolean
-    variant?: ColorVariant
     icon?: string
+    variant?: ColorVariant
   }>(),
   {
     alert: false,
-    variant: 'info',
     icon: undefined,
+    variant: 'info' as const,
   },
 )
 
@@ -24,10 +25,9 @@ const icon = computed(() => {
 
 <template>
   <Component
-    v-bind="$attrs"
-    :is="alert ? 'BAlert' : 'div'"
-    :modelValue="alert ? true : null"
-    :variant="alert ? variant : null"
+    :is="alert ? BAlert : 'div'"
+    :model-value="alert ? true : undefined"
+    :variant="alert ? variant : undefined"
     :class="{ ['alert alert-' + variant]: !alert }"
     class="yuno-alert d-flex flex-column flex-md-row align-items-center"
   >
diff --git a/app/src/components/globals/formItems/ReadOnlyAlertItem.vue b/app/src/components/globals/formItems/ReadOnlyAlertItem.vue
index 8f90149e..dc6742a9 100644
--- a/app/src/components/globals/formItems/ReadOnlyAlertItem.vue
+++ b/app/src/components/globals/formItems/ReadOnlyAlertItem.vue
@@ -10,6 +10,7 @@ const props = withDefaults(defineProps<ReadOnlyAlertItemProps>(), {
 })
 
 const icon = computed(() => {
+  // TODO merge with `DEFAULT_VARIANT_ICON`
   const icons = {
     success: 'thumbs-up',
     info: 'info',
@@ -22,14 +23,8 @@ const icon = computed(() => {
 </script>
 
 <template>
-  <BAlert
-    :id="id"
-    :model-value="true"
-    :variant="type"
-    class="d-flex flex-column flex-md-row align-items-center"
-  >
-    <YIcon :iname="icon" :variant="type" class="me-md-3 mb-md-0 mb-2" />
-
+  <!-- TODO ally: do we set it as a true alert or is it cosmetic? -->
+  <YAlert :id="id" alert :icon="icon" :variant="type">
     <VueShowdown :markdown="label" tag="span" class="markdown" />
-  </BAlert>
+  </YAlert>
 </template>
diff --git a/app/src/views/app/AppInstall.vue b/app/src/views/app/AppInstall.vue
index 4344f708..38caf194 100644
--- a/app/src/views/app/AppInstall.vue
+++ b/app/src/views/app/AppInstall.vue
@@ -265,10 +265,14 @@ const performInstall = onSubmit(async (onError) => {
 
     <!-- FIXME hum not handled, is it still a thing? -->
     <!-- In case of a custom url with no manifest found -->
-    <BAlert :modelValue="app === null" variant="warning">
-      <YIcon iname="exclamation-triangle" />
+    <YAlert
+      v-if="app === null"
+      alert
+      icon="exclamation-triangle"
+      variant="warning"
+    >
       {{ $t('app_install_custom_no_manifest') }}
-    </BAlert>
+    </YAlert>
   </div>
 </template>
 
diff --git a/app/src/views/backup/BackupInfo.vue b/app/src/views/backup/BackupInfo.vue
index 41981df4..b921382d 100644
--- a/app/src/views/backup/BackupInfo.vue
+++ b/app/src/views/backup/BackupInfo.vue
@@ -203,9 +203,9 @@ function downloadBackup() {
         </BListGroup>
 
         <BFormInvalidFeedback id="backup-restore-feedback" :state="isValid">
-          <BAlert :modelValue="true" variant="danger" class="mb-0">
+          <YAlert alert variant="danger" class="mb-0">
             {{ serverError }}
-          </BAlert>
+          </YAlert>
         </BFormInvalidFeedback>
       </BFormCheckboxGroup>
 
diff --git a/app/src/views/backup/BackupList.vue b/app/src/views/backup/BackupList.vue
index b349e06d..888d03b1 100644
--- a/app/src/views/backup/BackupList.vue
+++ b/app/src/views/backup/BackupList.vue
@@ -28,10 +28,14 @@ const archives = await api
       }"
     />
 
-    <BAlert v-if="!archives.length" :model-value="true" variant="warning">
-      <YIcon iname="exclamation-triangle" />
+    <YAlert
+      v-if="!archives.length"
+      alert
+      icon="exclamation-triangle"
+      variant="warning"
+    >
       {{ $t('items_verbose_count', { items: $t('items.backups', 0) }, 0) }}
-    </BAlert>
+    </YAlert>
 
     <BListGroup v-else>
       <BListGroupItem