[inlong] branch master updated: [INLONG-7162][Dashboard] Kafka MQ type details optimization (#7165)

[leezng]

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 ef3dc848b [INLONG-7162][Dashboard] Kafka MQ type details optimization 
(#7165)
ef3dc848b is described below

commit ef3dc848b42c10af764c870e3dbd029d493a581e
Author: Lizhen <88174078+bluew...@users.noreply.github.com>
AuthorDate: Thu Jan 5 18:43:23 2023 +0800

    [INLONG-7162][Dashboard] Kafka MQ type details optimization (#7165)
---
 .../src/components/NodeSelect/index.tsx            |  6 ++++-
 .../metas/consumes/defaults/{index.ts => Kafka.ts} | 26 ++++++----------------
 .../src/metas/consumes/defaults/index.ts           |  5 +++++
 .../src/metas/groups/defaults/Kafka.ts             |  1 +
 .../src/pages/GroupDetail/Audit/config.tsx         |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/inlong-dashboard/src/components/NodeSelect/index.tsx 
b/inlong-dashboard/src/components/NodeSelect/index.tsx
index 4e83225e7..5c89e7638 100644
--- a/inlong-dashboard/src/components/NodeSelect/index.tsx
+++ b/inlong-dashboard/src/components/NodeSelect/index.tsx
@@ -51,7 +51,11 @@ const NodeSelect: React.FC<NodeSelectProps> = _props => {
           })),
       },
     },
-    addonAfter: <Link 
to="/node">{i18n.t('components.NodeSelect.Create')}</Link>,
+    addonAfter: (
+      <Link to="/node" target="_blank">
+        {i18n.t('components.NodeSelect.Create')}
+      </Link>
+    ),
   };
   return <HighSelect {...props} />;
 };
diff --git a/inlong-dashboard/src/metas/consumes/defaults/index.ts 
b/inlong-dashboard/src/metas/consumes/defaults/Kafka.ts
similarity index 60%
copy from inlong-dashboard/src/metas/consumes/defaults/index.ts
copy to inlong-dashboard/src/metas/consumes/defaults/Kafka.ts
index 214cf092f..27392fcc2 100644
--- a/inlong-dashboard/src/metas/consumes/defaults/index.ts
+++ b/inlong-dashboard/src/metas/consumes/defaults/Kafka.ts
@@ -17,23 +17,11 @@
  * under the License.
  */
 
-import type { MetaExportWithBackendList } from '@/metas/types';
-import type { ConsumeMetaType } from '../types';
+import { DataWithBackend } from '@/metas/DataWithBackend';
+import { RenderRow } from '@/metas/RenderRow';
+import { RenderList } from '@/metas/RenderList';
+import { ConsumeInfo } from '../common/ConsumeInfo';
 
-export const allDefaultConsumes: MetaExportWithBackendList<ConsumeMetaType> = [
-  {
-    label: 'ALL',
-    value: '',
-    LoadEntity: () => import('../common/ConsumeInfo').then(r => ({ default: 
r.ConsumeInfo })),
-  },
-  {
-    label: 'Pulsar',
-    value: 'PULSAR',
-    LoadEntity: () => import('./Pulsar'),
-  },
-  {
-    label: 'TubeMq',
-    value: 'TUBEMQ',
-    LoadEntity: () => import('./TubeMq'),
-  },
-];
+export default class KafkaConsume
+  extends ConsumeInfo
+  implements DataWithBackend, RenderRow, RenderList {}
diff --git a/inlong-dashboard/src/metas/consumes/defaults/index.ts 
b/inlong-dashboard/src/metas/consumes/defaults/index.ts
index 214cf092f..0f3195d68 100644
--- a/inlong-dashboard/src/metas/consumes/defaults/index.ts
+++ b/inlong-dashboard/src/metas/consumes/defaults/index.ts
@@ -26,6 +26,11 @@ export const allDefaultConsumes: 
MetaExportWithBackendList<ConsumeMetaType> = [
     value: '',
     LoadEntity: () => import('../common/ConsumeInfo').then(r => ({ default: 
r.ConsumeInfo })),
   },
+  {
+    label: 'Kafka',
+    value: 'KAFKA',
+    LoadEntity: () => import('./Kafka'),
+  },
   {
     label: 'Pulsar',
     value: 'PULSAR',
diff --git a/inlong-dashboard/src/metas/groups/defaults/Kafka.ts 
b/inlong-dashboard/src/metas/groups/defaults/Kafka.ts
index 71fdf8bfa..2106269e3 100644
--- a/inlong-dashboard/src/metas/groups/defaults/Kafka.ts
+++ b/inlong-dashboard/src/metas/groups/defaults/Kafka.ts
@@ -33,6 +33,7 @@ export default class KafkaGroup
   @FieldDecorator({
     type: 'inputnumber',
     rules: [{ required: true }],
+    initialValue: 1,
     extra: i18n.t('meta.Group.Kafka.PartitionExtra'),
     props: {
       min: 1,
diff --git a/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx 
b/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
index 10fa221d6..8d6a8b41c 100644
--- a/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/Audit/config.tsx
@@ -152,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.nodeType || '') || 
item.auditId,
+    title: auditMap[item.auditId]?.label || item.auditId,
     dataIndex: item.auditId,
     render: text => text || 0,
   }));