API: migrate machines delete and list to inventory

pkgs/webview-ui/app/src/components/MachineListItem.tsx

@@ -1,12 +1,14 @@
-import { For, Match, Show, Switch, createSignal } from "solid-js";
+import { Match, Show, Switch, createSignal } from "solid-js";
 import { ErrorData, SuccessData, pyApi } from "../api";
 import { currClanURI } from "../App";
 
+type MachineDetails = SuccessData<"list_machines">["data"][string];
+
 interface MachineListItemProps {
   name: string;
+  info: MachineDetails;
 }
 
-type MachineDetails = Record<string, SuccessData<"show_machine">["data"]>;
 type HWInfo = Record<string, SuccessData<"show_machine_hardware_info">["data"]>;
 type DeploymentInfo = Record<
   string,
@@ -15,26 +17,12 @@ type DeploymentInfo = Record<
 
 type MachineErrors = Record<string, ErrorData<"show_machine">["errors"]>;
 
-const [details, setDetails] = createSignal<MachineDetails>({});
 const [hwInfo, setHwInfo] = createSignal<HWInfo>({});
 
 const [deploymentInfo, setDeploymentInfo] = createSignal<DeploymentInfo>({});
 
 const [errors, setErrors] = createSignal<MachineErrors>({});
 
-pyApi.show_machine.receive((r) => {
-  if (r.status === "error") {
-    const { op_key } = r;
-    if (op_key) {
-      setErrors((e) => ({ ...e, [op_key]: r.errors }));
-    }
-    console.error(r.errors);
-  }
-  if (r.status === "success") {
-    setDetails((d) => ({ ...d, [r.data.machine_name]: r.data }));
-  }
-});
-
 pyApi.show_machine_hardware_info.receive((r) => {
   const { op_key } = r;
   if (r.status === "error") {
@@ -64,13 +52,7 @@ pyApi.show_machine_deployment_target.receive((r) => {
 });
 
 export const MachineListItem = (props: MachineListItemProps) => {
-  const { name } = props;
-
-  pyApi.show_machine.dispatch({
-    op_key: name,
-    machine_name: name,
-    flake_url: currClanURI(),
-  });
+  const { name, info } = props;
 
   pyApi.show_machine_hardware_info.dispatch({
     op_key: name,
@@ -97,16 +79,14 @@ export const MachineListItem = (props: MachineListItemProps) => {
             <h2 class="card-title">{name}</h2>
             <div class="text-slate-600">
               <Show
-                when={details()[name]}
+                when={info}
                 fallback={
                   <Switch fallback={<div class="skeleton h-8 w-full"></div>}>
-                    <Match when={!details()[name]?.machine_description}>
-                      No description
-                    </Match>
+                    <Match when={!info.description}>No description</Match>
                   </Switch>
                 }
               >
-                {(d) => d()?.machine_description}
+                {(d) => d()?.description}
               </Show>
             </div>
             <div class="flex flex-row flex-wrap gap-4 py-2">

pkgs/webview-ui/app/src/routes/machines/view.tsx

@@ -23,6 +23,11 @@ type ServiceModel = Extract<
   { status: "success" }
 >["data"]["services"];
 
+type MachinesModel = Extract<
+  OperationResponse<"list_machines">,
+  { status: "success" }
+>["data"];
+
 export const MachineListView: Component = () => {
   const [{ machines, loading }, { getMachines }] = useMachineContext();
 
@@ -44,11 +49,13 @@ export const MachineListView: Component = () => {
     console.log(files());
   });
 
-  const [data, setData] = createSignal<string[]>([]);
+  const [data, setData] = createSignal<MachinesModel>({});
   createEffect(() => {
     if (route() === "machines") getMachines();
   });
 
+  const unpackedMachines = () => Object.entries(data());
+
   createEffect(() => {
     const response = machines();
     if (response?.status === "success") {
@@ -57,7 +64,7 @@ export const MachineListView: Component = () => {
       toast.success("Machines loaded");
     }
     if (response?.status === "error") {
-      setData([]);
+      setData({});
       console.error(response.errors);
       toast.error("Error loading machines");
       response.errors.forEach((error) =>
@@ -162,13 +169,13 @@ export const MachineListView: Component = () => {
             </div>
           </div>
         </Match>
-        <Match when={!loading() && data().length === 0}>
+        <Match when={!loading() && unpackedMachines().length === 0}>
           No machines found
         </Match>
         <Match when={!loading()}>
           <ul>
-            <For each={data()}>
-              {(entry) => <MachineListItem name={entry} />}
+            <For each={unpackedMachines()}>
+              {([name, info]) => <MachineListItem name={name} info={info} />}
             </For>
           </ul>
         </Match>

pkgs/webview-ui/app/tests/types.test.ts

@@ -28,12 +28,13 @@ describe.concurrent("API types work properly", () => {
     >();
   });
 
-  it("Machine list receives a list of names/id string", async () => {
+  it("Machine list receives a records of names and machine info.", async () => {
     expectTypeOf(pyApi.list_machines.receive)
       .parameter(0)
       .parameter(0)
       .toMatchTypeOf<
-        { status: "success"; data: string[] } | { status: "error"; errors: any }
+        | { status: "success"; data: Record<string, object> }
+        | { status: "error"; errors: any }
       >();
   });