[inlong] branch master updated: [INLONG-8727][Dashboard] Approval management Application details optimization (#8737)

[dockerzhang]

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 13706ad70d [INLONG-8727][Dashboard] Approval management Application 
details optimization (#8737)
13706ad70d is described below

commit 13706ad70d2b19e2e871b8e7bca1d07a3bfc715b
Author: Lizhen <88174078+bluew...@users.noreply.github.com>
AuthorDate: Wed Aug 16 12:31:14 2023 +0800

    [INLONG-8727][Dashboard] Approval management Application details 
optimization (#8737)
---
 .../src/ui/pages/GroupDetail/index.tsx             |  2 +-
 .../src/ui/pages/Process/Applies/config.tsx        | 27 +++++++++++++++++++++-
 .../src/ui/pages/Process/Approvals/config.tsx      | 12 ++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/index.tsx 
b/inlong-dashboard/src/ui/pages/GroupDetail/index.tsx
index f42fc8d433..685fa025d7 100644
--- a/inlong-dashboard/src/ui/pages/GroupDetail/index.tsx
+++ b/inlong-dashboard/src/ui/pages/GroupDetail/index.tsx
@@ -192,7 +192,7 @@ const Comp: React.FC = () => {
         <Steps
           current={current}
           size="small"
-          style={{ marginBottom: 20, width: 600 }}
+          style={{ width: 900, margin: 'auto', marginBottom: 20 }}
           onChange={c => setCurrent(c)}
         >
           {list.map((item, index) => (
diff --git a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx 
b/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
index 59444e7792..1dfb15638d 100644
--- a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Applies/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 => [
   {
@@ -65,6 +66,26 @@ export const getColumns = activedName => [
     width: 200,
     render: (text, record) => record.showInList?.inlongGroupId,
   },
+  {
+    title: i18n.t('pages.Approvals.GroupMode'),
+    dataIndex: 'inlongGroupMode',
+    width: 200,
+    render: (text, record) => {
+      return record.showInList?.inlongGroupMode === 1 ? (
+        <StatusTag
+          type={'success'}
+          icon={<span />}
+          title={i18n.t('pages.Approvals.GroupMode.DataSync')}
+        />
+      ) : (
+        <StatusTag
+          type={'primary'}
+          icon={<span />}
+          title={i18n.t('pages.Approvals.GroupMode.Ingestion')}
+        />
+      );
+    },
+  },
   {
     title: i18n.t('pages.Approvals.ApplicationTime'),
     dataIndex: 'startTime',
@@ -88,7 +109,11 @@ export const getColumns = activedName => [
     dataIndex: 'action',
     width: 100,
     render: (text, record) => (
-      <Link 
to={`/process/${activedName}/${record.id}`}>{i18n.t('basic.Detail')}</Link>
+      <Link
+        
to={`/process/${activedName}/${record.id}?inlongGroupMode=${record.showInList?.inlongGroupMode}`}
+      >
+        {i18n.t('basic.Detail')}
+      </Link>
     ),
   },
 ];
diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx 
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index f4828109ba..881829e41b 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -79,9 +79,17 @@ export const getColumns = activedName => [
     dataIndex: 'inlongGroupMode',
     render: (text, record) => {
       return record.showInList?.inlongGroupMode === 1 ? (
-        <StatusTag type={'success'} 
title={i18n.t('pages.Approvals.GroupMode.DataSync')} />
+        <StatusTag
+          type={'success'}
+          icon={<span />}
+          title={i18n.t('pages.Approvals.GroupMode.DataSync')}
+        />
       ) : (
-        <StatusTag type={'primary'} 
title={i18n.t('pages.Approvals.GroupMode.Ingestion')} />
+        <StatusTag
+          type={'primary'}
+          icon={<span />}
+          title={i18n.t('pages.Approvals.GroupMode.Ingestion')}
+        />
       );
     },
   },