From 4542ae06726b0b31bd673c4ab26c14909247141c Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Wed, 21 Aug 2024 18:21:29 +0200
Subject: [PATCH] feat: add YListItem to display common list fields

---
 app/src/components/globals/YListItem.vue | 40 ++++++++++++++++++++++++
 app/src/views/app/AppList.vue            | 20 +++---------
 app/src/views/backup/BackupInfo.vue      | 12 +++----
 app/src/views/backup/BackupList.vue      | 21 +++----------
 app/src/views/service/ServiceList.vue    | 30 ++++++------------
 app/src/views/user/UserList.vue          | 19 +++--------
 6 files changed, 70 insertions(+), 72 deletions(-)
 create mode 100644 app/src/components/globals/YListItem.vue

diff --git a/app/src/components/globals/YListItem.vue b/app/src/components/globals/YListItem.vue
new file mode 100644
index 00000000..768500c0
--- /dev/null
+++ b/app/src/components/globals/YListItem.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    label: string
+    sublabel?: string
+    description?: string
+  }>(),
+  {
+    sublabel: undefined,
+  },
+)
+
+const slots = defineSlots<{
+  default?: any
+}>()
+</script>
+
+<template>
+  <BListGroupItem
+    class="d-flex justify-content-between align-items-center pe-0"
+  >
+    <div>
+      <h5>
+        <strong class="fw-bold">{{ label }}</strong>
+        <small v-if="sublabel" class="ms-1 text-secondary">
+          {{ sublabel }}
+        </small>
+      </h5>
+      <p v-if="description || slots.default" class="m-0">
+        <slot name="default">
+          {{ description }}
+        </slot>
+      </p>
+    </div>
+
+    <YIcon iname="chevron-right" class="lg fs-sm ms-auto" />
+  </BListGroupItem>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/app/src/views/app/AppList.vue b/app/src/views/app/AppList.vue
index 6812bd58..8b7e68c7 100644
--- a/app/src/views/app/AppList.vue
+++ b/app/src/views/app/AppList.vue
@@ -34,24 +34,14 @@ const [search, filteredApps] = useSearch(apps, (s, app) =>
     </template>
 
     <BListGroup>
-      <BListGroupItem
+      <YListItem
         v-for="{ id, description, label } in filteredApps"
         :key="id"
         :to="{ name: 'app-info', params: { id } }"
-        class="d-flex justify-content-between align-items-center pe-0"
-      >
-        <div>
-          <h5>
-            <strong class="me-1 fw-bold">{{ label }}</strong>
-            <small class="text-secondary">{{ id }}</small>
-          </h5>
-          <p class="m-0">
-            {{ description }}
-          </p>
-        </div>
-
-        <YIcon iname="chevron-right" class="lg fs-sm ms-auto" />
-      </BListGroupItem>
+        :label="label"
+        :sublabel="id"
+        :description="description"
+      />
     </BListGroup>
   </ViewSearch>
 </template>
diff --git a/app/src/views/backup/BackupInfo.vue b/app/src/views/backup/BackupInfo.vue
index ea0b5b1d..a414bc45 100644
--- a/app/src/views/backup/BackupInfo.vue
+++ b/app/src/views/backup/BackupInfo.vue
@@ -168,9 +168,9 @@ function downloadBackup() {
             class="d-flex justify-content-between align-items-center pe-0"
           >
             <div class="me-2">
-              <h5 class="fw-bold">
-                {{ item.name }}
-                <small v-if="item.size" class="text-secondary">
+              <h5>
+                <span class="fw-bold">{{ item.name }}</span>
+                <small v-if="item.size" class="ms-1 text-secondary">
                   ({{ humanSize(item.size) }})
                 </small>
               </h5>
@@ -189,9 +189,9 @@ function downloadBackup() {
             class="d-flex justify-content-between align-items-center pe-0"
           >
             <div class="me-2">
-              <h5 class="fw-bold">
-                {{ item.name }}
-                <small class="text-secondary">
+              <h5>
+                <span  class="fw-bold">{{ item.name }}</span>
+                <small class="ms-1 text-secondary">
                   {{ appName }} ({{ humanSize(item.size) }})
                 </small>
               </h5>
diff --git a/app/src/views/backup/BackupList.vue b/app/src/views/backup/BackupList.vue
index 888d03b1..fd03a7cc 100644
--- a/app/src/views/backup/BackupList.vue
+++ b/app/src/views/backup/BackupList.vue
@@ -38,26 +38,15 @@ const archives = await api
     </YAlert>
 
     <BListGroup v-else>
-      <BListGroupItem
+      <YListItem
         v-for="{ name, created_at, path, size } in archives"
         :key="name"
         :to="{ name: 'backup-info', params: { name, id } }"
         :title="readableDate(created_at)"
-        class="d-flex justify-content-between align-items-center pe-0"
-      >
-        <div>
-          <h5 class="fw-bold">
-            {{ distanceToNow(created_at) }}
-            <small class="text-secondary"
-              >{{ name }} ({{ humanSize(size) }})</small
-            >
-          </h5>
-          <p class="mb-0">
-            {{ path }}
-          </p>
-        </div>
-        <YIcon iname="chevron-right" class="lg fs-sm ms-auto" />
-      </BListGroupItem>
+        :label="distanceToNow(created_at)"
+        :sublabel="`${name} (${humanSize(size)})`"
+        :description="path"
+      />
     </BListGroup>
   </div>
 </template>
diff --git a/app/src/views/service/ServiceList.vue b/app/src/views/service/ServiceList.vue
index 3a603b90..ac38c12b 100644
--- a/app/src/views/service/ServiceList.vue
+++ b/app/src/views/service/ServiceList.vue
@@ -39,7 +39,7 @@ const [search, filteredServices] = useSearch(services, (s, service) => {
     items-name="services"
   >
     <BListGroup>
-      <BListGroupItem
+      <YListItem
         v-for="{
           name,
           description,
@@ -48,27 +48,15 @@ const [search, filteredServices] = useSearch(services, (s, service) => {
         } in filteredServices"
         :key="name"
         :to="{ name: 'service-info', params: { name } }"
-        class="d-flex justify-content-between align-items-center pe-0"
+        :label="name"
+        :sublabel="description"
       >
-        <div>
-          <h5>
-            <span class="fw-bold me-1">{{ name }}</span>
-            <small class="text-secondary">{{ description }}</small>
-          </h5>
-          <p class="m-0">
-            <!-- FIXME +`-emphasis`? + rework emphasis color or text colors -->
-            <span
-              :class="`text-${status === 'running' ? 'success' : 'danger'}`"
-            >
-              <YIcon :iname="status === 'running' ? 'check-circle' : 'times'" />
-              {{ $t(status) }}
-            </span>
-            {{ $t('since') }} {{ last_state_change }}
-          </p>
-        </div>
-
-        <YIcon iname="chevron-right" class="lg fs-sm ms-auto" />
-      </BListGroupItem>
+        <span :class="`text-${status === 'running' ? 'success' : 'danger'}`">
+          <YIcon :iname="status === 'running' ? 'check-circle' : 'times'" />
+          {{ $t(status) }}
+        </span>
+        {{ $t('since') }} {{ last_state_change }}
+      </YListItem>
     </BListGroup>
   </ViewSearch>
 </template>
diff --git a/app/src/views/user/UserList.vue b/app/src/views/user/UserList.vue
index 40671766..40e7e5cf 100644
--- a/app/src/views/user/UserList.vue
+++ b/app/src/views/user/UserList.vue
@@ -49,23 +49,14 @@ function downloadExport() {
     </template>
 
     <BListGroup>
-      <BListGroupItem
+      <YListItem
         v-for="user in filteredUsers"
         :key="user.username"
         :to="{ name: 'user-info', params: { name: user.username } }"
-        class="d-flex justify-content-between align-items-center pe-0"
-      >
-        <div>
-          <h5 class="fw-bold">
-            {{ user.username }}
-            <small class="text-secondary">{{ user.fullname }}</small>
-          </h5>
-          <p class="m-0">
-            {{ user.mail }}
-          </p>
-        </div>
-        <YIcon iname="chevron-right" class="lg fs-sm ms-auto" />
-      </BListGroupItem>
+        :label="user.username"
+        :sublabel="user.fullname"
+        :description="user.mail"
+      />
     </BListGroup>
   </ViewSearch>
 </template>