feat(console): add job actions (#1220)

feat: add job actions 1. rm realtime log
star-whale · Sep 15, 2022 · a7d15e2 · a7d15e2
1 parent cf9caf7
commit a7d15e2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 13 deletions.
diff --git a/console/src/domain/job/schemas/task.tsx b/console/src/domain/job/schemas/task.tsx
@@ -3,7 +3,6 @@ import { IAgentSchema } from './agent'
 
 export enum TaskStatusType {
     CREATED = 'CREATED',
-    ASSIGNING = 'ASSIGNING',
     PAUSED = 'PAUSED',
     PREPARING = 'PREPARING',
     RUNNING = 'RUNNING',

diff --git a/console/src/pages/Evaluation/EvaluationOverviewLayout.tsx b/console/src/pages/Evaluation/EvaluationOverviewLayout.tsx
@@ -4,12 +4,15 @@ import React, { useEffect, useMemo } from 'react'
 import { useQuery } from 'react-query'
 import { useParams } from 'react-router-dom'
 import { INavItem } from '@/components/BaseSidebar'
-import { fetchJob } from '@job/services/job'
+import { doJobAction, fetchJob } from '@job/services/job'
 import BaseSubLayout from '@/pages/BaseSubLayout'
 import { durationToStr, formatTimestampDateTime } from '@/utils/datetime'
 import IconFont from '@/components/IconFont/index'
 import Accordion from '@/components/Accordion'
 import { Panel } from 'baseui/accordion'
+import { JobActionType, JobStatusType } from '@/domain/job/schemas/job'
+import { toaster } from 'baseui/toast'
+import Button from '@/components/Button'
 
 export interface IJobLayoutProps {
     children: React.ReactNode
@@ -24,16 +27,13 @@ function EvaluationOverviewLayout({ children }: IJobLayoutProps) {
     useEffect(() => {
         setJobLoading(jobInfo.isLoading)
         if (jobInfo.isSuccess) {
-            if (jobInfo.data?.id !== job?.id) {
-                setJob(jobInfo.data)
-            }
+            setJob(jobInfo.data)
         } else if (jobInfo.isLoading) {
             setJob(undefined)
         }
     }, [job?.id, jobInfo.data, jobInfo.isLoading, jobInfo.isSuccess, setJob, setJobLoading])
 
     const [t] = useTranslation()
-    const uuid = job?.uuid ?? '-'
 
     const breadcrumbItems: INavItem[] = useMemo(() => {
         const items = [
@@ -42,12 +42,12 @@ function EvaluationOverviewLayout({ children }: IJobLayoutProps) {
                 path: `/projects/${projectId}/evaluations`,
             },
             {
-                title: uuid,
+                title: job?.uuid ?? '-',
                 path: `/projects/${projectId}/evaluations/${jobId}`,
             },
         ]
         return items
-    }, [projectId, jobId, t, uuid])
+    }, [projectId, jobId, t, job])
 
     const navItems: INavItem[] = useMemo(() => {
         const items = [
@@ -157,9 +157,51 @@ function EvaluationOverviewLayout({ children }: IJobLayoutProps) {
         ),
         [job, info, t]
     )
+    const handleAction = React.useCallback(
+        async (jobIdArg, type: JobActionType) => {
+            await doJobAction(projectId, jobIdArg, type)
+            toaster.positive(t('job action done'), { autoHideDuration: 2000 })
+            await jobInfo.refetch()
+        },
+        [jobInfo, projectId, t]
+    )
+
+    const extra = React.useMemo(() => {
+        if (!job) return <></>
+
+        const actions: Partial<Record<JobStatusType, React.ReactNode>> = {
+            [JobStatusType.CREATED]: (
+                <>
+                    <Button onClick={() => handleAction(job.id, JobActionType.CANCEL)}>{t('Cancel')}</Button>
+                    &nbsp;&nbsp;
+                    <Button onClick={() => handleAction(job.id, JobActionType.PAUSE)}>{t('Pause')}</Button>
+                </>
+            ),
+            [JobStatusType.RUNNING]: (
+                <>
+                    <Button onClick={() => handleAction(job.id, JobActionType.CANCEL)}>{t('Cancel')}</Button>
+                    &nbsp;&nbsp;
+                    <Button onClick={() => handleAction(job.id, JobActionType.PAUSE)}>{t('Pause')}</Button>
+                </>
+            ),
+            [JobStatusType.PAUSED]: (
+                <>
+                    <Button onClick={() => handleAction(job.id, JobActionType.CANCEL)}>{t('Cancel')}</Button>
+                    &nbsp;&nbsp;
+                    <Button onClick={() => handleAction(job.id, JobActionType.RESUME)}>{t('Resume')}</Button>
+                </>
+            ),
+            [JobStatusType.FAIL]: (
+                <>
+                    <Button onClick={() => handleAction(job.id, JobActionType.RESUME)}>{t('Resume')}</Button>
+                </>
+            ),
+        }
+        return actions[job.jobStatus]
+    }, [job, info, t])
 
     return (
-        <BaseSubLayout header={header} breadcrumbItems={breadcrumbItems} navItems={navItems}>
+        <BaseSubLayout header={header} breadcrumbItems={breadcrumbItems} navItems={navItems} extra={extra}>
             <div style={{ paddingTop: '12px', flex: '1' }}>{children}</div>
         </BaseSubLayout>
     )

diff --git a/console/src/pages/Job/JobListCard.tsx b/console/src/pages/Job/JobListCard.tsx
@@ -108,6 +108,13 @@ export default function JobListCard() {
                                         </StyledLink>
                                     </>
                                 ),
+                                [JobStatusType.FAIL]: (
+                                    <>
+                                        <StyledLink onClick={() => handleAction(job.id, JobActionType.RESUME)}>
+                                            {t('Resume')}
+                                        </StyledLink>
+                                    </>
+                                ),
                                 [JobStatusType.SUCCESS]: (
                                     <TextLink to={`/projects/${projectId}/jobs/${job.id}/results`}>
                                         {t('View Results')}

diff --git a/console/src/pages/Job/JobTasks.tsx b/console/src/pages/Job/JobTasks.tsx
@@ -26,10 +26,10 @@ export default function JobTasks() {
     const onAction = useCallback(
         async (type, task: ITaskSchema) => {
             setCurrentTask(task)
-            if ([TaskStatusType.RUNNING, TaskStatusType.PREPARING].includes(task.taskStatus)) {
-                setCurrentLogFiles({
-                    [task?.uuid]: 'ws',
-                })
+            if ([TaskStatusType.RUNNING].includes(task.taskStatus)) {
+                // setCurrentLogFiles({
+                //     [task?.uuid]: 'ws',
+                // })
             } else {
                 const data = await fetchTaskOfflineLogFiles(task?.id)
                 if (_.isEmpty(data)) {