This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new cf12ea389 [INLONG-6542][Dashboard] Optimize stream execution workflow
and execution log (#6546)
cf12ea389 is described below
commit cf12ea389cddc955a8487cf83ab544be25e649c6
Author: Lizhen <[email protected]>
AuthorDate: Wed Nov 16 11:29:31 2022 +0800
[INLONG-6542][Dashboard] Optimize stream execution workflow and execution
log (#6546)
---
inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx | 2 +-
.../src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx | 2 +-
inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
b/inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
index 70009fb56..d26f2ad50 100644
--- a/inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx
@@ -47,7 +47,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId, ...modalProps
}) => {
params: {
...options,
inlongGroupId: inlongGroupId,
- processNames: 'CREATE_GROUP_RESOURCE,CREATE_STREAM_RESOURCE',
+ processNames: 'CREATE_GROUP_RESOURCE',
taskType: 'ServiceTask',
},
},
diff --git
a/inlong-dashboard/src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx
index 6445135c8..0c195c9c6 100644
--- a/inlong-dashboard/src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx
@@ -49,7 +49,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId,
inlongStreamId, ...modalProps })
...options,
inlongGroupId: inlongGroupId,
inlongStreamId: inlongStreamId,
- processNames: 'CREATE_GROUP_RESOURCE,CREATE_STREAM_RESOURCE',
+ processNames: 'CREATE_STREAM_RESOURCE',
taskType: 'ServiceTask',
},
},
diff --git a/inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
b/inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
index 065710d64..b6f499594 100644
--- a/inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx
@@ -54,6 +54,8 @@ const Comp = ({ inlongGroupId, readonly, mqType }: Props,
ref) => {
inlongStreamId: '',
});
+ const [groupStatus, setGroupStatus] = useState();
+
const {
data,
loading,
@@ -72,6 +74,10 @@ const Comp = ({ inlongGroupId, readonly, mqType }: Props,
ref) => {
},
);
+ useRequest(`/group/get/${inlongGroupId}`, {
+ onSuccess: result => setGroupStatus(result.status),
+ });
+
const onOk = () => {
return Promise.resolve();
};
@@ -178,7 +184,7 @@ const Comp = ({ inlongGroupId, readonly, mqType }: Props,
ref) => {
<Button type="link" onClick={() => onDelete(record)}>
{t('basic.Delete')}
</Button>
- {record?.status && (record?.status === 120 || record?.status ===
130) && (
+ {record?.status && (groupStatus === 120 || groupStatus === 130) &&
(
<Button type="link" onClick={() => onWorkflow(record)}>
{t('meta.Stream.ExecuteWorkflow')}
</Button>