From b9154908b44268d67031ba49bbd45b06745437ac Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 13 Aug 2024 00:28:35 +0200
Subject: [PATCH] refactor: rework async ServiceList

---
 app/src/types/core/api.ts             |  1 +
 app/src/views/service/ServiceList.vue | 51 ++++++++++++++-------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/src/types/core/api.ts b/app/src/types/core/api.ts
index 4e6e0365..adf5a229 100644
--- a/app/src/types/core/api.ts
+++ b/app/src/types/core/api.ts
@@ -208,6 +208,7 @@ export type ServiceInfo = {
   configuration: 'valid' | 'broken' | 'unknown'
 }
 export type ServiceLogs = Obj<string[]>
+export type ServiceList = Obj<ServiceInfo>
 
 // DIAGNOSIS
 
diff --git a/app/src/views/service/ServiceList.vue b/app/src/views/service/ServiceList.vue
index 3f1c2f32..3a603b90 100644
--- a/app/src/views/service/ServiceList.vue
+++ b/app/src/views/service/ServiceList.vue
@@ -1,31 +1,34 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
-import { useInitialQueries } from '@/composables/useInitialQueries'
+import api from '@/api'
 import { useSearch } from '@/composables/useSearch'
 import { distanceToNow } from '@/helpers/filters/date'
-import type { Obj } from '@/types/commons'
+import type { ServiceList } from '@/types/core/api'
 
-const { loading } = useInitialQueries([{ uri: 'services' }], {
-  onQueriesResponse,
-})
+const { t } = useI18n()
+
+const services = await api
+  .get<ServiceList>({ uri: 'services' })
+  .then((services) => {
+    return Object.keys(services)
+      .sort()
+      .map((name) => {
+        const service = services[name]
+        return {
+          ...service,
+          name,
+          last_state_change:
+            service.last_state_change === 'unknown'
+              ? t('unknown')
+              : distanceToNow(service.last_state_change, false),
+        }
+      })
+  })
 
-const services = ref<Obj[] | undefined>()
 const [search, filteredServices] = useSearch(services, (s, service) => {
   return service.name.toLowerCase().includes(s)
 })
-
-function onQueriesResponse(services_: any) {
-  services.value = Object.keys(services_)
-    .sort()
-    .map((name) => {
-      const service = services_[name]
-      if (service.last_state_change === 'unknown') {
-        service.last_state_change = 0
-      }
-      return { ...service, name }
-    })
-}
 </script>
 
 <template>
@@ -34,7 +37,6 @@ function onQueriesResponse(services_: any) {
     v-model="search"
     :items="filteredServices"
     items-name="services"
-    :loading="loading"
   >
     <BListGroup>
       <BListGroupItem
@@ -49,18 +51,19 @@ function onQueriesResponse(services_: any) {
         class="d-flex justify-content-between align-items-center pe-0"
       >
         <div>
-          <h5 class="fw-bold">
-            {{ name }}
+          <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="status === 'running' ? 'text-success' : 'text-danger'"
+              :class="`text-${status === 'running' ? 'success' : 'danger'}`"
             >
               <YIcon :iname="status === 'running' ? 'check-circle' : 'times'" />
               {{ $t(status) }}
             </span>
-            {{ $t('since') }} {{ distanceToNow(last_state_change) }}
+            {{ $t('since') }} {{ last_state_change }}
           </p>
         </div>