feat: adapt state of task api

AlistGo · Nov 21, 2023 · 2dde057 · 2dde057
1 parent ee1737a
commit 2dde057
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 17 deletions.
diff --git a/src/lang/en/tasks.json b/src/lang/en/tasks.json
@@ -5,12 +5,18 @@
   "copy": "Copy file from a storage to another storage",
   "done": "Completed",
   "undone": "Running",
-  "pending": "Pending",
-  "running": "Running",
-  "canceling": "Canceling",
-  "succeeded": "Succeeded",
-  "canceled": "Canceled",
-  "errored": "Errored",
   "clear_succeeded": "Clear Succeeded",
-  "retry": "Retry"
+  "retry": "Retry",
+  "state": {
+    "0": "Pending",
+    "1": "Running",
+    "2": "Succeeded",
+    "3": "Canceling",
+    "4": "Canceled",
+    "5": "Errored",
+    "6": "Failing",
+    "7": "Failed",
+    "8": "WaitingRetry",
+    "9": "BeforeRetry"
+  }
 }
diff --git a/src/pages/manage/tasks/Task.tsx b/src/pages/manage/tasks/Task.tsx
@@ -15,6 +15,19 @@ import { PEmptyResp, TaskInfo } from "~/types"
 import { handleResp, notify, r } from "~/utils"
 import { TasksProps } from "./Tasks"
 
+enum TaskStateEnum {
+  Pending,
+  Running,
+  Succeeded,
+  Canceling,
+  Canceled,
+  Errored,
+  Failing,
+  Failed,
+  WaitingRetry,
+  BeforeRetry,
+}
+
 const StateMap: Record<
   string,
   | "primary"
@@ -26,26 +39,23 @@ const StateMap: Record<
   | "danger"
   | undefined
 > = {
-  errored: "danger",
-  succeeded: "success",
-  canceled: "neutral",
+  [TaskStateEnum.Failed]: "danger",
+  [TaskStateEnum.Succeeded]: "success",
+  [TaskStateEnum.Canceled]: "neutral",
 }
-export const TaskState = (props: { state: string }) => {
+export const TaskState = (props: { state: number }) => {
   const t = useT()
   return (
     <Badge colorScheme={StateMap[props.state] ?? "info"}>
-      {t(`tasks.${props.state}`)}
+      {t(`tasks.state.${props.state}`)}
     </Badge>
   )
 }
 
-const DONE = ["succeeded", "canceled", "errored"]
-const UNDONE = ["pending", "running", "canceling"]
-
 export const Task = (props: TaskInfo & TasksProps) => {
   const t = useT()
   const operateName = props.done === "undone" ? "cancel" : "delete"
-  const canRetry = props.done === "done" && props.state === "errored"
+  const canRetry = props.done === "done" && props.state === TaskStateEnum.Failed
   const [operateLoading, operate] = useFetch(
     (): PEmptyResp =>
       r.post(`/admin/task/${props.type}/${operateName}?tid=${props.id}`),

diff --git a/src/types/task.ts b/src/types/task.ts
@@ -1,7 +1,7 @@
 export interface TaskInfo {
   id: string
   name: string
-  state: string
+  state: number
   status: string
   progress: number
   error: string