[inlong] branch master updated: [INLONG-5931][Dashboard] Support query audit data by role (#5932)

[le...@apache.org]

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

leezng 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 9ec281ce6 [INLONG-5931][Dashboard] Support query audit data by role (#5932)
9ec281ce6 is described below

commit 9ec281ce69083feac60fb441485e5f377cbb8f07
Author: Daniel <le...@apache.org>
AuthorDate: Tue Sep 20 10:45:29 2022 +0800

    [INLONG-5931][Dashboard] Support query audit data by role (#5932)
---
 inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx | 14 +-------------
 inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx  |  5 +----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx b/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
index bd131a89c..10fa221d6 100644
--- a/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
@@ -141,18 +141,6 @@ export const getFormContent = (inlongGroupId, initialValues, onSearch, onDataStr
       options: timeStaticsDimList,
     },
   },
-  {
-    type: 'select',
-    label: i18n.t('pages.GroupDetail.Audit.AuditIds'),
-    name: 'auditIds',
-    initialValue: initialValues.auditIds,
-    props: {
-      mode: 'multiple',
-      dropdownMatchSelectWidth: false,
-      options: auditList,
-    },
-    rules: [{ required: true }],
-  },
   {
     type: (
       <Button type="primary" onClick={onSearch}>
@@ -164,7 +152,7 @@ export const getFormContent = (inlongGroupId, initialValues, onSearch, onDataStr
 
 export const getTableColumns = source => {
   const data = source.map(item => ({
-    title: auditMap[item.auditId]?.label || item.auditId,
+    title: auditMap[item.auditId]?.label + (item.nodeType || '') || item.auditId,
     dataIndex: item.auditId,
     render: text => text || 0,
   }));
diff --git a/inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx b/inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx
index bed998044..b5c0ced97 100644
--- a/inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/Audit/index.tsx
@@ -29,7 +29,6 @@ import {
   toChartData,
   toTableData,
   getTableColumns,
-  auditList,
   timeStaticsDimList,
 } from './config';
 
@@ -40,7 +39,6 @@ const Comp: React.FC<Props> = ({ inlongGroupId }) => {
 
   const [query, setQuery] = useState({
     inlongStreamId: '',
-    auditIds: auditList.map(item => item.value),
     dt: +new Date(),
     timeStaticsDim: timeStaticsDimList[0].value,
   });
@@ -50,13 +48,12 @@ const Comp: React.FC<Props> = ({ inlongGroupId }) => {
       url: '/audit/list',
       params: {
         ...query,
-        auditIds: query.auditIds?.join(','),
         dt: timestampFormat(query.dt, 'yyyy-MM-dd'),
         inlongGroupId,
       },
     },
     {
-      ready: Boolean(query.inlongStreamId && query.auditIds?.length),
+      ready: Boolean(query.inlongStreamId),
     },
   );