From 2478f53fc25741259aded1a85d8e936961195ee8 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Tue, 13 Aug 2024 00:15:59 +0200
Subject: [PATCH] refactor: rework async AppList

---
 app/src/types/core/api.ts     |  2 ++
 app/src/views/app/AppList.vue | 49 +++++++++++++----------------------
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/app/src/types/core/api.ts b/app/src/types/core/api.ts
index 0deea28a..7ba15ea0 100644
--- a/app/src/types/core/api.ts
+++ b/app/src/types/core/api.ts
@@ -148,3 +148,5 @@ export type AppInfo = {
   supports_config_panel: boolean
   supports_purge: boolean
 }
+
+export type AppList = { apps: AppInfo[] }
diff --git a/app/src/views/app/AppList.vue b/app/src/views/app/AppList.vue
index 36792d3f..6812bd58 100644
--- a/app/src/views/app/AppList.vue
+++ b/app/src/views/app/AppList.vue
@@ -1,35 +1,23 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-
-import { useInitialQueries } from '@/composables/useInitialQueries'
+import api from '@/api'
 import { useSearch } from '@/composables/useSearch'
-import type { Obj } from '@/types/commons'
+import type { AppList } from '@/types/core/api'
 
-const { loading } = useInitialQueries([{ uri: 'apps?full' }], {
-  onQueriesResponse,
-})
+const apps = await api
+  .get<AppList>({ uri: 'apps?full', initial: true })
+  .then(({ apps }) => {
+    return apps
+      .map(({ id, name, description, manifest }) => {
+        return { id, name: manifest.name, label: name, description }
+      })
+      .sort((prev, app) => {
+        return prev.label > app.label ? 1 : -1
+      })
+  })
 
-const apps = ref<Obj[] | undefined>()
-const [search, filteredApps] = useSearch(apps, (s, app) => {
-  return Object.values(app).some(
-    (value) => value && value.toLowerCase().includes(s),
-  )
-})
-
-function onQueriesResponse(data: any) {
-  if (data.apps.length === 0) {
-    apps.value = undefined
-    return
-  }
-
-  apps.value = data.apps
-    .map(({ id, name, description, manifest }) => {
-      return { id, name: manifest.name, label: name, description }
-    })
-    .sort((prev, app) => {
-      return prev.label > app.label ? 1 : -1
-    })
-}
+const [search, filteredApps] = useSearch(apps, (s, app) =>
+  Object.values(app).some((value) => value && value.toLowerCase().includes(s)),
+)
 </script>
 
 <template>
@@ -37,7 +25,6 @@ function onQueriesResponse(data: any) {
     v-model="search"
     items-name="installed_apps"
     :items="filteredApps"
-    :loading="loading"
   >
     <template #top-bar-buttons>
       <BButton variant="success" :to="{ name: 'app-catalog' }">
@@ -54,8 +41,8 @@ function onQueriesResponse(data: any) {
         class="d-flex justify-content-between align-items-center pe-0"
       >
         <div>
-          <h5 class="fw-bold">
-            {{ label }}
+          <h5>
+            <strong class="me-1 fw-bold">{{ label }}</strong>
             <small class="text-secondary">{{ id }}</small>
           </h5>
           <p class="m-0">