Merge pull request 'UI: add open clan button' (#1590) from hsjobeki/clan-core:hsjobeki-main into main

pkgs/webview-ui/app/mock.ts

@@ -1,6 +1,6 @@
 import { JSONSchemaFaker } from "json-schema-faker";
 import { schema } from "./api/index";
-import { OperationNames } from "./src/message";
+import { OperationNames } from "./src/api";
 
 const faker = JSONSchemaFaker;
 

pkgs/webview-ui/app/src/App.tsx

@@ -1,5 +1,5 @@
 import { createSignal, type Component } from "solid-js";
-import { CountProvider } from "./Config";
+import { MachineProvider } from "./Config";
 import { Layout } from "./layout/layout";
 import { Route, Router } from "./Routes";
 
@@ -10,11 +10,11 @@ export { route, setRoute };
 
 const App: Component = () => {
   return (
-    <CountProvider>
+    <MachineProvider>
       <Layout>
         <Router route={route} />
       </Layout>
-    </CountProvider>
+    </MachineProvider>
   );
 };
 

pkgs/webview-ui/app/src/Config.tsx

@@ -5,9 +5,9 @@ import {
   JSXElement,
   createEffect,
 } from "solid-js";
-import { OperationResponse, pyApi } from "./message";
+import { OperationResponse, pyApi } from "./api";
 
-export const makeCountContext = () => {
+export const makeMachineContext = () => {
   const [machines, setMachines] =
     createSignal<OperationResponse<"list_machines">>();
   const [loading, setLoading] = createSignal(false);
@@ -18,7 +18,7 @@ export const makeCountContext = () => {
   });
 
   createEffect(() => {
-    console.log("The count is now", machines());
+    console.log("The state is now", machines());
   });
 
   return [
@@ -33,9 +33,9 @@ export const makeCountContext = () => {
   ] as const;
   // `as const` forces tuple type inference
 };
-type CountContextType = ReturnType<typeof makeCountContext>;
+type MachineContextType = ReturnType<typeof makeMachineContext>;
 
-export const CountContext = createContext<CountContextType>([
+export const MachineContext = createContext<MachineContextType>([
   {
     loading: () => false,
 
@@ -48,12 +48,12 @@ export const CountContext = createContext<CountContextType>([
   },
 ]);
 
-export const useCountContext = () => useContext(CountContext);
+export const useMachineContext = () => useContext(MachineContext);
 
-export function CountProvider(props: { children: JSXElement }) {
+export function MachineProvider(props: { children: JSXElement }) {
   return (
-    <CountContext.Provider value={makeCountContext()}>
+    <MachineContext.Provider value={makeMachineContext()}>
       {props.children}
-    </CountContext.Provider>
+    </MachineContext.Provider>
   );
 }

pkgs/webview-ui/app/src/api.ts

@@ -7,6 +7,11 @@ export type OperationNames = keyof API;
 export type OperationArgs<T extends OperationNames> = API[T]["arguments"];
 export type OperationResponse<T extends OperationNames> = API[T]["return"];
 
+export type SuccessData<T extends OperationNames> = Extract<
+  OperationResponse<T>,
+  { status: "success" }
+>;
+
 declare global {
   interface Window {
     clan: {

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

@@ -6,11 +6,28 @@ import {
   createSignal,
   type Component,
 } from "solid-js";
-import { useCountContext } from "../../Config";
+import { useMachineContext } from "../../Config";
 import { route } from "@/src/App";
+import { OperationResponse, pyApi } from "@/src/api";
+
+type FilesModel = Extract<
+  OperationResponse<"get_directory">,
+  { status: "success" }
+>["data"]["files"];
 
 export const MachineListView: Component = () => {
-  const [{ machines, loading }, { getMachines }] = useCountContext();
+  const [{ machines, loading }, { getMachines }] = useMachineContext();
+
+  const [files, setFiles] = createSignal<FilesModel>([]);
+  pyApi.get_directory.receive((r) => {
+    const { status } = r;
+    if (status === "error") return console.error(r.errors);
+    setFiles(r.data.files);
+  });
+
+  createEffect(() => {
+    console.log(files());
+  });
 
   const [data, setData] = createSignal<string[]>([]);
   createEffect(() => {
@@ -27,7 +44,17 @@ export const MachineListView: Component = () => {
 
   return (
     <div class="max-w-screen-lg">
-      <div class="tooltip" data-tip="Refresh ">
+      <div class="tooltip" data-tip="Open Clan">
+        <button
+          class="btn btn-ghost"
+          onClick={() =>
+            pyApi.get_directory.dispatch({ current_path: "/home/" })
+          }
+        >
+          <span class="material-icons ">folder_open</span>
+        </button>
+      </div>
+      <div class="tooltip" data-tip="Refresh">
         <button class="btn btn-ghost" onClick={() => getMachines()}>
           <span class="material-icons ">refresh</span>
         </button>

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

@@ -1,6 +1,6 @@
 import { describe, it, expectTypeOf } from "vitest";
 
-import { OperationNames, pyApi } from "@/src/message";
+import { OperationNames, pyApi } from "@/src/api";
 
 describe.concurrent("API types work properly", () => {
   // Test some basic types