You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/11/16 07:02:08 UTC
[inlong] branch branch-1.4 updated (543a4b7df -> a0af8571f)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/inlong.git
from 543a4b7df [INLONG-6552][Sort] Fix MicroTimestamp error in oracle connector (#6554)
new 8d6ae09d7 [INLONG-6555][CI] Update for set-output command is deprecated (#6556)
new a0af8571f [INLONG-6542][Dashboard] Optimize stream execution workflow and execution log (#6546)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci_docker.yml | 4 ++--
inlong-dashboard/src/pages/GroupDashboard/ExecutionLogModal.tsx | 2 +-
.../src/pages/GroupDetail/DataStream/ExecutionLogModal.tsx | 2 +-
inlong-dashboard/src/pages/GroupDetail/DataStream/index.tsx | 8 +++++++-
4 files changed, 11 insertions(+), 5 deletions(-)
[inlong] 01/02: [INLONG-6555][CI] Update for set-output command is deprecated (#6556)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 8d6ae09d712417e057a8a2ea9b5e3ac3fd978b0e
Author: Charles Zhang <do...@apache.org>
AuthorDate: Wed Nov 16 10:12:01 2022 +0800
[INLONG-6555][CI] Update for set-output command is deprecated (#6556)
---
.github/workflows/ci_docker.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml
index 98af35529..18e253581 100644
--- a/.github/workflows/ci_docker.yml
+++ b/.github/workflows/ci_docker.yml
@@ -94,9 +94,9 @@ jobs:
&& github.repository_owner == 'apache'
run: |
if [[ ${{ github.ref_name }} == ${{ github.event.repository.default_branch }} ]]; then
- echo "::set-output name=match_master::true"
+ echo "name=match_master::true" >> $GITHUB_OUTPUT
elif [[ ${{ github.ref_name }} =~ ^branch-[0-9]+\.[0-9]+$ ]]; then
- echo "::set-output name=match_release::true"
+ echo "name=match_release::true" >> $GITHUB_OUTPUT
fi
# Publish x86 Docker images when the changes are being pushed to the master branch or a release branch like 'branch-1.4'.
[inlong] 02/02: [INLONG-6542][Dashboard] Optimize stream execution workflow and execution log (#6546)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit a0af8571f3e67d80cb8f47a8d977a3c090017286
Author: Lizhen <88...@users.noreply.github.com>
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>