This is an automated email from the ASF dual-hosted git repository.
gallardot pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 9a58ecae99 [Improvement-16647][UI][Workflow Instance] Remove
deprecated workflow execution states (#16648)
9a58ecae99 is described below
commit 9a58ecae99e70321cdbb55850c6154da9ad0dc83
Author: 小可耐 <[email protected]>
AuthorDate: Fri Oct 4 12:37:18 2024 +0800
[Improvement-16647][UI][Workflow Instance] Remove deprecated workflow
execution states (#16648)
* improvement:remove deprecated workflow execution states
* fix:remove HistoryOutlined
* remove ready_to_block and block
---------
Co-authored-by: wuchao <[email protected]>
Co-authored-by: xiangzihao <[email protected]>
---
dolphinscheduler-ui/src/common/common.ts | 25 ------------------------
dolphinscheduler-ui/src/common/types.ts | 3 ---
dolphinscheduler-ui/src/locales/en_US/project.ts | 2 --
dolphinscheduler-ui/src/locales/zh_CN/project.ts | 2 --
4 files changed, 32 deletions(-)
diff --git a/dolphinscheduler-ui/src/common/common.ts
b/dolphinscheduler-ui/src/common/common.ts
index d0989d7260..7fb5ab6b24 100644
--- a/dolphinscheduler-ui/src/common/common.ts
+++ b/dolphinscheduler-ui/src/common/common.ts
@@ -30,7 +30,6 @@ import {
StopOutlined,
IssuesCloseOutlined,
SendOutlined,
- HistoryOutlined,
HourglassOutlined
} from '@vicons/antd'
import { format, parseISO } from 'date-fns'
@@ -361,14 +360,6 @@ export const workflowExecutionState = (
isSpin: false,
classNames: 'success'
},
- DELAY_EXECUTION: {
- id: 12,
- desc: `${t('project.workflow.delay_execution')}`,
- color: '#5102ce',
- icon: PauseCircleFilled,
- isSpin: false,
- classNames: 'delay_execution'
- },
SERIAL_WAIT: {
id: 14,
desc: `${t('project.workflow.serial_wait')}`,
@@ -377,22 +368,6 @@ export const workflowExecutionState = (
isSpin: true,
classNames: 'serial_wait'
},
- READY_BLOCK: {
- id: 15,
- desc: `${t('project.workflow.ready_to_block')}`,
- color: '#5101be',
- icon: SendOutlined,
- isSpin: false,
- classNames: 'pending'
- },
- BLOCK: {
- id: 16,
- desc: `${t('project.workflow.block')}`,
- color: '#5101be',
- icon: HistoryOutlined,
- isSpin: false,
- classNames: 'pending'
- },
WAIT_TO_RUN: {
id: 18,
desc: `${t('project.workflow.wait_to_run')}`,
diff --git a/dolphinscheduler-ui/src/common/types.ts
b/dolphinscheduler-ui/src/common/types.ts
index c6d9eecc07..ba80999ebd 100644
--- a/dolphinscheduler-ui/src/common/types.ts
+++ b/dolphinscheduler-ui/src/common/types.ts
@@ -38,10 +38,7 @@ export type IWorkflowExecutionState =
| 'STOP'
| 'FAILURE'
| 'SUCCESS'
- | 'DELAY_EXECUTION'
| 'SERIAL_WAIT'
- | 'READY_BLOCK'
- | 'BLOCK'
| 'WAIT_TO_RUN'
export type ITaskStateConfig = {
diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts
b/dolphinscheduler-ui/src/locales/en_US/project.ts
index a532d11992..eb44116f6d 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -231,8 +231,6 @@ export default {
'Can not find any relations of workflows.',
workflow_relation_no_data_result_desc:
'There is not any workflows. Please create a workflow, and then visit
this page again.',
- ready_to_block: 'Ready to block',
- block: 'Block',
wait_to_run: 'Wait to run',
want_to_set_timing: 'Would you like to set the workflow timing?',
confirm_to_online: 'Confirm to make the workflow online?',
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
index ba0ddd93e5..e1cfd541ad 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -229,8 +229,6 @@ export default {
workflow_relation_no_data_result_title: '工作流关系不存在',
workflow_relation_no_data_result_desc:
'目前没有任何工作流，请先创建工作流，再访问该页面',
- ready_to_block: '准备锁定',
- block: '锁定',
wait_to_run: '等待执行',
want_to_set_timing: '现在想去配置该工作流定时?',
confirm_to_online: '是否确定上线该工作流?',
