From ecf0c277f6505887a173e7a130a3b0f5ef8ea692 Mon Sep 17 00:00:00 2001
From: BennyKok <itechbenny@gmail.com>
Date: Mon, 25 Dec 2023 13:09:52 +0800
Subject: [PATCH] fix(web): token not being saved

---
 web/src/components/InsertModal.tsx |  8 ++++++++
 web/src/components/MachineList.tsx | 14 --------------
 web/src/server/createRun.ts        |  5 +++++
 web/src/server/curdMachine.ts      |  8 +++-----
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/web/src/components/InsertModal.tsx b/web/src/components/InsertModal.tsx
index cb6251e..3d0e2f0 100644
--- a/web/src/components/InsertModal.tsx
+++ b/web/src/components/InsertModal.tsx
@@ -14,6 +14,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import * as React from "react";
+import { useState } from "react";
 import type { UnknownKeysParam, ZodObject, ZodRawShape, z } from "zod";
 
 export function InsertModal<
@@ -83,8 +84,13 @@ export function UpdateModal<
   fieldConfig?: FieldConfig<z.infer<Z>>;
 }) {
   // const [open, setOpen] = React.useState(false);
+  const [values, setValues] = useState<Partial<z.infer<Z>>>({});
   const [isLoading, setIsLoading] = React.useState(false);
 
+  React.useEffect(() => {
+    setValues(props.data);
+  }, [props.data]);
+
   return (
     <Dialog open={props.open} onOpenChange={props.setOpen}>
       {/* <DialogTrigger asChild>
@@ -96,6 +102,8 @@ export function UpdateModal<
           <DialogDescription>{props.description}</DialogDescription>
         </DialogHeader>
         <AutoForm
+          values={values}
+          onValuesChange={setValues}
           fieldConfig={props.fieldConfig}
           formSchema={props.formSchema}
           onSubmit={async (data) => {
diff --git a/web/src/components/MachineList.tsx b/web/src/components/MachineList.tsx
index fdca613..cb396be 100644
--- a/web/src/components/MachineList.tsx
+++ b/web/src/components/MachineList.tsx
@@ -187,20 +187,6 @@ export const columns: ColumnDef<Machine>[] = [
             </DropdownMenuItem>
           </DropdownMenuContent>
           <UpdateModal
-            fieldConfig={{
-              name: {
-                inputProps: { defaultValue: machine.name },
-              },
-              endpoint: {
-                inputProps: { defaultValue: machine.endpoint },
-              },
-              type: {
-                inputProps: { defaultValue: machine.type },
-              },
-              auth_token: {
-                inputProps: { defaultValue: machine.auth_token ?? "" },
-              },
-            }}
             data={machine}
             open={open}
             setOpen={setOpen}
diff --git a/web/src/server/createRun.ts b/web/src/server/createRun.ts
index 7ba530a..2158054 100644
--- a/web/src/server/createRun.ts
+++ b/web/src/server/createRun.ts
@@ -68,6 +68,11 @@ export const createRun = withServerPromise(
           },
         };
         console.log(data);
+
+        if (!machine.auth_token) {
+          throw new Error("Machine auth token not found");
+        }
+
         const __result = await fetch(`${machine.endpoint}/run`, {
           method: "POST",
           headers: {
diff --git a/web/src/server/curdMachine.ts b/web/src/server/curdMachine.ts
index 11a89ea..09a3224 100644
--- a/web/src/server/curdMachine.ts
+++ b/web/src/server/curdMachine.ts
@@ -23,15 +23,13 @@ export async function getMachines() {
 }
 
 export const addMachine = withServerPromise(
-  async ({ name, endpoint, type }: z.infer<typeof addMachineSchema>) => {
+  async (data: z.infer<typeof addMachineSchema>) => {
     const { userId } = auth();
     if (!userId) return { error: "No user id" };
-    console.log(name, endpoint);
+    // console.log(name, endpoint);
     await db.insert(machinesTable).values({
+      ...data,
       user_id: userId,
-      name,
-      endpoint,
-      type,
     });
     revalidatePath("/machines");
     return { message: "Machine Added" };