feat(apps/spu-ui): refine its result schema and simplify history item…

… status handling
cnpem · Dec 18, 2024 · 98ad824 · 98ad824
1 parent ad9010a
commit 98ad824
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/apps/spu-ui/src/app/_components/history.tsx b/apps/spu-ui/src/app/_components/history.tsx
@@ -81,13 +81,10 @@ function UnknownItem({
 function HistoryItem({ props }: { props: HistoryItemProps }) {
   const { data: planParams } = schema.safeParse(props.kwargs);
   const status = function () {
-    if (!props.result) {
-      return "unknown";
-    }
     if (props.result.traceback) {
       return props.result.exitStatus ?? "failed";
     }
-    return props.result.exitStatus ?? "finished";
+    return props.result.exitStatus ?? "unknown";
   };
   if (!planParams) {
     return <UnknownItem props={props} status={status()} />;

diff --git a/packages/api/src/schemas/history.ts b/packages/api/src/schemas/history.ts
@@ -12,18 +12,15 @@ const getResponseSchema = z.object({
       user: z.string(),
       userGroup: z.string(),
       itemUid: z.string().uuid(),
-      result: z
-        .object({
-          exitStatus: z.string().optional(),
-          runUids: z.array(z.string()),
-          scanIds: z.array(z.string()),
-          timeStart: z.number(),
-          timeStop: z.number(),
-          msg: z.string().optional(),
-          traceback: z.string().optional(),
-        })
-        .optional()
-        .nullable(),
+      result: z.object({
+        exitStatus: z.string().optional(),
+        runUids: z.array(z.string()),
+        scanIds: z.array(z.string()),
+        timeStart: z.number(),
+        timeStop: z.number(),
+        msg: z.string().optional(),
+        traceback: z.string().optional(),
+      }),
     }),
   ),
   planHistoryUid: z.string().uuid(),