This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 43e3960f35 [INLONG-9055][Dashboard] The approval management list
displays the name of the consumer group (#9065)
43e3960f35 is described below
commit 43e3960f3555607b00cafbac7b4f0cdd490e4e97
Author: Lizhen <[email protected]>
AuthorDate: Thu Oct 19 19:28:44 2023 +0800
[INLONG-9055][Dashboard] The approval management list displays the name of
the consumer group (#9065)
---
inlong-dashboard/src/ui/locales/cn.json | 3 +++
inlong-dashboard/src/ui/locales/en.json | 21 ++++++++++++---------
.../src/ui/pages/Process/Applies/config.tsx | 15 +++++++++++++++
.../src/ui/pages/Process/Approvals/config.tsx | 17 ++++++++++++++++-
4 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/inlong-dashboard/src/ui/locales/cn.json
b/inlong-dashboard/src/ui/locales/cn.json
index b379bff898..75259f825e 100644
--- a/inlong-dashboard/src/ui/locales/cn.json
+++ b/inlong-dashboard/src/ui/locales/cn.json
@@ -709,12 +709,15 @@
"pages.Approvals.status.Ok": "审批通过",
"pages.Approvals.ApplicationTime": "申请时间",
"pages.Approvals.ApplicationType": "申请类型",
+ "pages.Approvals.Approval": "审批",
"pages.Approvals.Approver": "审批人",
"pages.Approvals.Applicant": "申请人",
"pages.Approvals.ProcessID": "流程单 ID",
"pages.Approvals.GroupId": "数据流组 ID",
+ "pages.Approvals.ConsumeName": "消费组名",
"pages.Approvals.GroupMode": "数据流类型",
"pages.Approvals.GroupMode.Ingestion": "数据接入",
+ "pages.Approvals.GroupMode.Subscription": "数据订阅",
"pages.Approvals.GroupMode.DataSync": "数据同步",
"pages.Approvals.MyApplication": "我的申请",
"pages.Approvals.MyApproval": "我的审批",
diff --git a/inlong-dashboard/src/ui/locales/en.json
b/inlong-dashboard/src/ui/locales/en.json
index 1c13caf9c1..db750f2094 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -707,19 +707,22 @@
"pages.Approvals.status.Rejected": "Rejected",
"pages.Approvals.status.Canceled": "Canceled",
"pages.Approvals.status.Ok": "Approved",
- "pages.Approvals.ApplicationTime": "ApplicationTime",
- "pages.Approvals.ApplicationType": "ApplicationType",
+ "pages.Approvals.ApplicationTime": "Time",
+ "pages.Approvals.ApplicationType": "Type",
+ "pages.Approvals.Approval": "Approval",
"pages.Approvals.Approver": "Approver",
"pages.Approvals.Applicant": "Applicant",
- "pages.Approvals.ProcessID": "Process ID",
- "pages.Approvals.GroupId": "Inlong Group ID",
- "pages.Approvals.GroupMode": "Inlong Group Mode",
+ "pages.Approvals.ProcessID": "Id",
+ "pages.Approvals.GroupId": "Group id",
+ "pages.Approvals.ConsumeName": "Consume name",
+ "pages.Approvals.GroupMode": "Mode",
"pages.Approvals.GroupMode.Ingestion": "Ingestion",
+ "pages.Approvals.GroupMode.Subscription": "Subscription",
"pages.Approvals.GroupMode.DataSync": "Synchronization",
- "pages.Approvals.MyApplication": "My Application",
- "pages.Approvals.MyApproval": "My Approval",
- "pages.Approvals.Type.Group": "Apply Group",
- "pages.Approvals.Type.Consume": "Apply Subscription",
+ "pages.Approvals.MyApplication": "My application",
+ "pages.Approvals.MyApproval": "My approval",
+ "pages.Approvals.Type.Group": "Apply group",
+ "pages.Approvals.Type.Consume": "Apply subscription",
"pages.ConsumeCreate.SubscriptionInformation": "Subscription information",
"pages.ConsumeCreate.Prev": "Prev",
"pages.ConsumeCreate.Next": "Next",
diff --git a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
b/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
index b4cee460c1..f7491e9417 100644
--- a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
@@ -72,11 +72,26 @@ export const getColumns = activedName => [
width: 200,
render: (text, record) => record.showInList?.inlongGroupId,
},
+ {
+ title: i18n.t('pages.Approvals.ConsumeName'),
+ dataIndex: 'consumerGroup',
+ width: 200,
+ render: (text, record) => record.showInList?.consumerGroup,
+ },
{
title: i18n.t('pages.Approvals.GroupMode'),
dataIndex: 'inlongGroupMode',
width: 200,
render: (text, record) => {
+ if (record.type === 'Apply Subscription') {
+ return (
+ <StatusTag
+ type={'warning'}
+ icon={<span />}
+ title={i18n.t('pages.Approvals.GroupMode.Subscription')}
+ />
+ );
+ }
return record.showInList?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index 7b046f8498..99a235179f 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -78,10 +78,25 @@ export const getColumns = activedName => [
dataIndex: 'inlongGroupId',
render: (text, record) => record.showInList?.inlongGroupId,
},
+ {
+ title: i18n.t('pages.Approvals.ConsumeName'),
+ dataIndex: 'consumerGroup',
+ width: 200,
+ render: (text, record) => record.showInList?.consumerGroup,
+ },
{
title: i18n.t('pages.Approvals.GroupMode'),
dataIndex: 'inlongGroupMode',
render: (text, record) => {
+ if (record.processName === 'APPLY_CONSUME_PROCESS') {
+ return (
+ <StatusTag
+ type={'warning'}
+ icon={<span />}
+ title={i18n.t('pages.Approvals.GroupMode.Subscription')}
+ />
+ );
+ }
return record.showInList?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
@@ -114,7 +129,7 @@ export const getColumns = activedName => [
<Link
to={`/process/${activedName}/${record.processId}?taskId=${record.id}&inlongGroupMode=${record.showInList?.inlongGroupMode}`}
>
- {i18n.t('basic.Detail')}
+ {i18n.t('pages.Approvals.Approval')}
</Link>
),
},
