[inlong] branch master updated: [INLONG-8292][Manager][Dashboard] Add task types on the approval management page (#8293)

[lzwang]

This is an automated email from the ASF dual-hosted git repository.

lzwang 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 413417644e [INLONG-8292][Manager][Dashboard] Add task types on the 
approval management page (#8293)
413417644e is described below

commit 413417644e9e9fb34dd30ff458995b6b95d4c75d
Author: haifxu <xhf1208357...@gmail.com>
AuthorDate: Wed Jun 21 15:23:46 2023 +0800

    [INLONG-8292][Manager][Dashboard] Add task types on the approval management 
page (#8293)
---
 inlong-dashboard/src/ui/locales/cn.json                      |  3 +++
 inlong-dashboard/src/ui/locales/en.json                      |  3 +++
 inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx   | 12 ++++++++++++
 .../pojo/workflow/form/process/ApplyGroupProcessForm.java    |  1 +
 4 files changed, 19 insertions(+)

diff --git a/inlong-dashboard/src/ui/locales/cn.json 
b/inlong-dashboard/src/ui/locales/cn.json
index 8af06a85f2..e6da083a5e 100644
--- a/inlong-dashboard/src/ui/locales/cn.json
+++ b/inlong-dashboard/src/ui/locales/cn.json
@@ -664,6 +664,9 @@
   "pages.Approvals.Applicant": "申请人",
   "pages.Approvals.ProcessID": "流程单 ID",
   "pages.Approvals.GroupId": "数据流组 ID",
+  "pages.Approvals.GroupMode": "数据流类型",
+  "pages.Approvals.GroupMode.Integration": "数据集成",
+  "pages.Approvals.GroupMode.DataSync": "数据同步",
   "pages.Approvals.MyApplication": "我的申请",
   "pages.Approvals.MyApproval": "我的审批",
   "pages.Approvals.Type.Group": "申请数据流组",
diff --git a/inlong-dashboard/src/ui/locales/en.json 
b/inlong-dashboard/src/ui/locales/en.json
index f4198427f4..81fc188212 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -664,6 +664,9 @@
   "pages.Approvals.Applicant": "Applicant",
   "pages.Approvals.ProcessID": "Process ID",
   "pages.Approvals.GroupId": "Inlong Group ID",
+  "pages.Approvals.GroupMode": "Inlong Group Mode",
+  "pages.Approvals.GroupMode.Integration": "Integration",
+  "pages.Approvals.GroupMode.DataSync": "Synchronization",
   "pages.Approvals.MyApplication": "My Application",
   "pages.Approvals.MyApproval": "My Approval",
   "pages.Approvals.Type.Group": "Apply Group",
diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx 
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index 4d276725ff..224aae9b74 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -22,6 +22,7 @@ import { Link } from 'react-router-dom';
 import i18n from '@/i18n';
 import { statusList, genStatusTag } from './status';
 import { timestampFormat } from '@/core/utils';
+import StatusTag from '@/ui/components/StatusTag';
 
 export const getFilterFormContent = defaultValues => [
   {
@@ -73,6 +74,17 @@ export const getColumns = activedName => [
     dataIndex: 'inlongGroupId',
     render: (text, record) => record.showInList?.inlongGroupId,
   },
+  {
+    title: i18n.t('pages.Approvals.GroupMode'),
+    dataIndex: 'inlongGroupMode',
+    render: (text, record) => {
+      return record.showInList?.inlongGroupMode === 1 ? (
+        <StatusTag type={'success'} 
title={i18n.t('pages.Approvals.GroupMode.DataSync')} />
+      ) : (
+        <StatusTag type={'primary'} 
title={i18n.t('pages.Approvals.GroupMode.Integration')} />
+      );
+    },
+  },
   {
     title: i18n.t('pages.Approvals.ApplicationTime'),
     dataIndex: 'startTime',
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java
index f450516c60..c3b7005dd9 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/workflow/form/process/ApplyGroupProcessForm.java
@@ -64,6 +64,7 @@ public class ApplyGroupProcessForm extends BaseProcessForm {
     public Map<String, Object> showInList() {
         Map<String, Object> show = Maps.newHashMap();
         show.put("inlongGroupId", groupInfo.getInlongGroupId());
+        show.put("inlongGroupMode", groupInfo.getInlongGroupMode());
         return show;
     }
 }