[INLONG-9055][Dashboard] The approval management list displays the na…

…me of the consumer group (#9065)
apache · Oct 19, 2023 · 43e3960 · 43e3960
1 parent 12e5fc9
commit 43e3960
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>
     ),
   },