You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2022/07/18 09:50:52 UTC
[incubator-devlake] branch main updated: ci: fix for the linter of frontend (#2524)
This is an automated email from the ASF dual-hosted git repository.
klesh 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 e173b189 ci: fix for the linter of frontend (#2524)
e173b189 is described below
commit e173b18962de505c9464ef749de530737ae273ab
Author: likyh <l...@likyh.com>
AuthorDate: Mon Jul 18 17:50:48 2022 +0800
ci: fix for the linter of frontend (#2524)
Co-authored-by: linyh <ya...@meri.co>
---
config-ui/src/components/blueprints/WorkflowActions.jsx | 3 +--
config-ui/src/components/pipelines/StageTaskCaption.jsx | 11 ++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/config-ui/src/components/blueprints/WorkflowActions.jsx b/config-ui/src/components/blueprints/WorkflowActions.jsx
index 3efd97f7..d578dede 100644
--- a/config-ui/src/components/blueprints/WorkflowActions.jsx
+++ b/config-ui/src/components/blueprints/WorkflowActions.jsx
@@ -46,11 +46,10 @@ const WorkflowActions = (props) => {
<div className='workflow-actions'>
<Button
loading={isLoading}
- disabled={isLoading}
+ disabled={activeStep?.id === 1 || isLoading}
intent={Intent.PRIMARY}
text='Previous Step'
onClick={onPrev}
- disabled={activeStep?.id === 1}
/>
{activeStep?.id === blueprintSteps.length ? (
diff --git a/config-ui/src/components/pipelines/StageTaskCaption.jsx b/config-ui/src/components/pipelines/StageTaskCaption.jsx
index 6e0cfb0a..436d331d 100644
--- a/config-ui/src/components/pipelines/StageTaskCaption.jsx
+++ b/config-ui/src/components/pipelines/StageTaskCaption.jsx
@@ -36,11 +36,12 @@ const StageTaskCaption = (props) => {
textOverflow: 'ellipsis'
}}
>
- {(task.status === 'TASK_RUNNING' || task.status === 'TASK_COMPLETED') && (<span style={{ float: 'right' }}>
- {task.status === 'TASK_RUNNING'
- ? dayjs(task.beganAt).toNow(true)
- : dayjs(task.beganAt).from(task.finishedAt || task.updatedAt, true)}
- </span>)}
+ {(task.status === 'TASK_RUNNING' || task.status === 'TASK_COMPLETED') && (
+ <span style={{ float: 'right' }}>
+ {task.status === 'TASK_RUNNING'
+ ? dayjs(task.beganAt).toNow(true)
+ : dayjs(task.beganAt).from(task.finishedAt || task.updatedAt, true)}
+ </span>)}
{task.status === 'TASK_RUNNING' && <span>Subtask {task?.progressDetail?.finishedSubTasks} / {task?.progressDetail?.totalSubTasks}</span>}
{task.status === 'TASK_COMPLETED' && <span>{task?.progressDetail?.finishedSubTasks || 'All'} Subtasks completed</span>}
{task.status === 'TASK_COMPLETED' && <span>{task?.progressDetail?.finishedRecords}</span>}