You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by li...@apache.org on 2023/01/10 03:55:13 UTC

[incubator-devlake] branch main updated: feat(config-ui): support pipeline new status TASK_PARTIAL (#4170)

This is an automated email from the ASF dual-hosted git repository.

likyh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new f5e705618 feat(config-ui): support pipeline new status TASK_PARTIAL (#4170)
f5e705618 is described below

commit f5e7056184087dec6392c0f3311b7071d3a79eca
Author: 青湛 <0x...@gmail.com>
AuthorDate: Tue Jan 10 11:55:08 2023 +0800

    feat(config-ui): support pipeline new status TASK_PARTIAL (#4170)
---
 config-ui/src/pages/pipeline/components/historical/index.tsx | 4 +++-
 config-ui/src/pages/pipeline/detail/pipeline-detail.tsx      | 5 +++--
 config-ui/src/pages/pipeline/misc.ts                         | 4 +++-
 config-ui/src/pages/pipeline/types.ts                        | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/config-ui/src/pages/pipeline/components/historical/index.tsx b/config-ui/src/pages/pipeline/components/historical/index.tsx
index 22ebf2623..2a752ef15 100644
--- a/config-ui/src/pages/pipeline/components/historical/index.tsx
+++ b/config-ui/src/pages/pipeline/components/historical/index.tsx
@@ -54,7 +54,9 @@ export const PipelineHistorical = ({ blueprintId }: Props) => {
       cancel: (data) =>
         !!(
           data &&
-          data.every((it) => [StatusEnum.COMPLETED, StatusEnum.CANCELLED, StatusEnum.FAILED].includes(it.status))
+          data.every((it) =>
+            [StatusEnum.COMPLETED, StatusEnum.PARTIAL, StatusEnum.CANCELLED, StatusEnum.FAILED].includes(it.status),
+          )
         ),
     },
   );
diff --git a/config-ui/src/pages/pipeline/detail/pipeline-detail.tsx b/config-ui/src/pages/pipeline/detail/pipeline-detail.tsx
index c4c1ae858..8fccb546c 100644
--- a/config-ui/src/pages/pipeline/detail/pipeline-detail.tsx
+++ b/config-ui/src/pages/pipeline/detail/pipeline-detail.tsx
@@ -61,7 +61,8 @@ export const PipelineDetail = ({ id }: Props) => {
       cancel: (data) => {
         const { pipeline } = data ?? {};
         return !!(
-          pipeline && [StatusEnum.COMPLETED, StatusEnum.FAILED, StatusEnum.CANCELLED].includes(pipeline.status)
+          pipeline &&
+          [StatusEnum.COMPLETED, StatusEnum.PARTIAL, StatusEnum.FAILED, StatusEnum.CANCELLED].includes(pipeline.status)
         );
       },
     },
@@ -145,7 +146,7 @@ export const PipelineDetail = ({ id }: Props) => {
                 case !!stages[key].find((task) => [StatusEnum.ACTIVE, StatusEnum.RUNNING].includes(task.status)):
                   status = 'loading';
                   break;
-                case stages[key].every((task) => task.status === StatusEnum.COMPLETED):
+                case stages[key].every((task) => [StatusEnum.COMPLETED, StatusEnum.PARTIAL].includes(task.status)):
                   status = 'success';
                   break;
                 case !!stages[key].find((task) => task.status === StatusEnum.FAILED):
diff --git a/config-ui/src/pages/pipeline/misc.ts b/config-ui/src/pages/pipeline/misc.ts
index 5704af1dd..c4054aa00 100644
--- a/config-ui/src/pages/pipeline/misc.ts
+++ b/config-ui/src/pages/pipeline/misc.ts
@@ -27,6 +27,7 @@ export const STATUS_ICON = {
   [StatusEnum.RUNNING]: 'loading',
   [StatusEnum.RERUN]: 'loading',
   [StatusEnum.COMPLETED]: 'tick-circle',
+  [StatusEnum.PARTIAL]: 'tick-circle',
   [StatusEnum.FAILED]: 'delete',
   [StatusEnum.CANCELLED]: 'undo',
 };
@@ -38,6 +39,7 @@ export const STATUS_LABEL = {
   [StatusEnum.RUNNING]: 'In Progress',
   [StatusEnum.RERUN]: 'In Progress',
   [StatusEnum.COMPLETED]: 'Succeeded',
+  [StatusEnum.PARTIAL]: 'Partial Succeeded',
   [StatusEnum.FAILED]: 'Failed',
   [StatusEnum.CANCELLED]: 'Cancelled',
 };
@@ -46,7 +48,7 @@ export const STATUS_CLS = (status: StatusEnum) =>
   classNames({
     ready: [StatusEnum.CREATED, StatusEnum.PENDING].includes(status),
     loading: [StatusEnum.ACTIVE, StatusEnum.RUNNING, StatusEnum.RERUN].includes(status),
-    success: status === StatusEnum.COMPLETED,
+    success: [StatusEnum.COMPLETED, StatusEnum.PARTIAL].includes(status),
     error: status === StatusEnum.FAILED,
     cancel: status === StatusEnum.CANCELLED,
   });
diff --git a/config-ui/src/pages/pipeline/types.ts b/config-ui/src/pages/pipeline/types.ts
index 72860c3d6..4d35a1954 100644
--- a/config-ui/src/pages/pipeline/types.ts
+++ b/config-ui/src/pages/pipeline/types.ts
@@ -25,6 +25,7 @@ export enum StatusEnum {
   RUNNING = 'TASK_RUNNING',
   RERUN = 'TASK_RERUN',
   COMPLETED = 'TASK_COMPLETED',
+  PARTIAL = 'TASK_PARTIAL',
   FAILED = 'TASK_FAILED',
   CANCELLED = 'TASK_CANCELLED',
 }