From b9573636d8e9c319f63be4b557c3286b07b12947 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 31 Aug 2025 15:58:26 +0200
Subject: [PATCH] ui/modules: simplify ui logic

---
 .../src/workflows/Service/Service.stories.tsx | 81 ++++++++-----------
 .../ui/src/workflows/Service/Service.tsx      | 29 +++----
 2 files changed, 43 insertions(+), 67 deletions(-)

diff --git a/pkgs/clan-app/ui/src/workflows/Service/Service.stories.tsx b/pkgs/clan-app/ui/src/workflows/Service/Service.stories.tsx
index ef0b5c04e..92359c054 100644
--- a/pkgs/clan-app/ui/src/workflows/Service/Service.stories.tsx
+++ b/pkgs/clan-app/ui/src/workflows/Service/Service.stories.tsx
@@ -24,59 +24,42 @@ const mockFetcher: Fetcher = <K extends OperationNames>(
 ): ApiCall<K> => {
   // TODO: Make this configurable for every story
   const resultData: Partial<ResultDataMap> = {
-    list_service_modules: [
-      {
-        module: { name: "Borgbackup", input: "clan-core" },
-        info: {
-          manifest: {
-            name: "Borgbackup",
-            description: "This is module A",
-          },
-          roles: {
-            client: null,
-            server: null,
+    list_service_modules: {
+      core_input_name: "clan-core",
+      modules: [
+        {
+          usage_ref: { name: "Borgbackup", input: null },
+          instance_refs: [],
+          native: true,
+          info: {
+            manifest: {
+              name: "Borgbackup",
+              description: "This is module A",
+            },
+            roles: {
+              client: null,
+              server: null,
+            },
           },
         },
-      },
-      {
-        module: { name: "Zerotier", input: "clan-core" },
-        info: {
-          manifest: {
-            name: "Zerotier",
-            description: "This is module B",
-          },
-          roles: {
-            peer: null,
-            moon: null,
-            controller: null,
+        {
+          usage_ref: { name: "Zerotier", input: "fublub" },
+          instance_refs: [],
+          native: false,
+          info: {
+            manifest: {
+              name: "Zerotier",
+              description: "This is module B",
+            },
+            roles: {
+              peer: null,
+              moon: null,
+              controller: null,
+            },
           },
         },
-      },
-      {
-        module: { name: "Admin", input: "clan-core" },
-        info: {
-          manifest: {
-            name: "Admin",
-            description: "This is module B",
-          },
-          roles: {
-            default: null,
-          },
-        },
-      },
-      {
-        module: { name: "Garage", input: "lo-l" },
-        info: {
-          manifest: {
-            name: "Garage",
-            description: "This is module B",
-          },
-          roles: {
-            default: null,
-          },
-        },
-      },
-    ],
+      ],
+    },
     list_machines: {
       jon: {
         name: "jon",
diff --git a/pkgs/clan-app/ui/src/workflows/Service/Service.tsx b/pkgs/clan-app/ui/src/workflows/Service/Service.tsx
index fc1311360..e2b74c714 100644
--- a/pkgs/clan-app/ui/src/workflows/Service/Service.tsx
+++ b/pkgs/clan-app/ui/src/workflows/Service/Service.tsx
@@ -45,7 +45,7 @@ import {
 } from "@/src/scene/highlightStore";
 import { useClickOutside } from "@/src/hooks/useClickOutside";
 
-type ModuleItem = ServiceModules[number];
+type ModuleItem = ServiceModules["modules"][number];
 
 interface Module {
   value: string;
@@ -74,16 +74,7 @@ const SelectService = () => {
           description: currService.info.manifest.description,
           input: currService.usage_ref.input,
           raw: currService,
-          // TODO: include the instances that use this module
-          instances: Object.entries(serviceInstancesQuery.data)
-            .filter(
-              ([name, instance]) =>
-                instance.resolved.usage_ref.name ===
-                  currService.usage_ref.name &&
-                instance.resolved.usage_ref.input ===
-                  currService.usage_ref.input,
-            )
-            .map(([name, _]) => name),
+          instances: currService.instance_refs,
         })),
       );
     }
@@ -98,8 +89,8 @@ const SelectService = () => {
         if (!module) return;
 
         set("module", {
-          name: module.raw.module.name,
-          input: module.raw.module.input,
+          name: module.raw.usage_ref.name,
+          input: module.raw.usage_ref.input,
           raw: module.raw,
         });
         // TODO: Ideally we need to ask
@@ -185,11 +176,13 @@ const SelectService = () => {
                 inverted
                 class="flex justify-between"
               >
-                <span class="inline-block max-w-32 truncate align-middle">
+                <span class="inline-block max-w-48 truncate align-middle">
                   {item.description}
                 </span>
-                <span class="inline-block max-w-8 truncate align-middle">
-                  by {item.input}
+                <span class="inline-block max-w-12 truncate align-middle">
+                  <Show when={!item.raw.native} fallback="by clan-core">
+                    by {item.input}
+                  </Show>
                 </span>
               </Typography>
             </div>
@@ -540,7 +533,7 @@ export interface InventoryInstance {
   name: string;
   module: {
     name: string;
-    input?: string;
+    input?: string | null;
   };
   roles: Record<string, RoleType>;
 }
@@ -553,7 +546,7 @@ interface RoleType {
 export interface ServiceStoreType {
   module: {
     name: string;
-    input: string;
+    input?: string | null;
     raw?: ModuleItem;
   };
   roles: Record<string, TagType[]>;