[incubator-inlong] branch master updated: [INLONG-4577][Dashboard] Support TubeMQ cluster management (#4578)

[do...@apache.org]

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/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 1e4ac10ee [INLONG-4577][Dashboard] Support TubeMQ cluster management (#4578)
1e4ac10ee is described below

commit 1e4ac10eed8a0414fcb495e7e652880e06faea20
Author: healzhou <he...@gmail.com>
AuthorDate: Wed Jun 8 10:45:32 2022 +0800

    [INLONG-4577][Dashboard] Support TubeMQ cluster management (#4578)
---
 inlong-dashboard/src/pages/Clusters/NodeEditModal.tsx            | 2 +-
 inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx         | 9 +--------
 .../src/pages/Clusters/config/{DataProxy.tsx => TubeMQ.tsx}      | 9 +++++++--
 inlong-dashboard/src/pages/Clusters/config/index.tsx             | 8 +++++++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/inlong-dashboard/src/pages/Clusters/NodeEditModal.tsx b/inlong-dashboard/src/pages/Clusters/NodeEditModal.tsx
index b30a8114a..1916d05f9 100644
--- a/inlong-dashboard/src/pages/Clusters/NodeEditModal.tsx
+++ b/inlong-dashboard/src/pages/Clusters/NodeEditModal.tsx
@@ -56,7 +56,7 @@ const NodeEditModal: React.FC<NodeEditModalProps> = ({ id, type, clusterId, ...m
     const submitData = {
       ...values,
       type,
-      parentId: savedData.parentId || clusterId,
+      parentId: savedData?.parentId || clusterId,
       // inCharges: values.inCharges?.join(','),
     };
     if (isUpdate) {
diff --git a/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx b/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx
index eed61c25c..85c4a857c 100644
--- a/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx
+++ b/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx
@@ -19,11 +19,4 @@
 
 import type { ClsConfigItemType } from './types';
 
-export const DataProxy: ClsConfigItemType[] = [
-  {
-    type: 'input',
-    label: 'Url',
-    name: 'url',
-    rules: [{ required: true }],
-  },
-];
+export const DataProxy: ClsConfigItemType[] = [];
diff --git a/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx b/inlong-dashboard/src/pages/Clusters/config/TubeMQ.tsx
similarity index 87%
copy from inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx
copy to inlong-dashboard/src/pages/Clusters/config/TubeMQ.tsx
index eed61c25c..103d5adda 100644
--- a/inlong-dashboard/src/pages/Clusters/config/DataProxy.tsx
+++ b/inlong-dashboard/src/pages/Clusters/config/TubeMQ.tsx
@@ -19,11 +19,16 @@
 
 import type { ClsConfigItemType } from './types';
 
-export const DataProxy: ClsConfigItemType[] = [
+export const TubeMQ: ClsConfigItemType[] = [
   {
     type: 'input',
-    label: 'Url',
+    label: 'MasterUrl',
     name: 'url',
     rules: [{ required: true }],
   },
+  {
+    type: 'input',
+    label: 'Token',
+    name: 'token',
+  },
 ];
diff --git a/inlong-dashboard/src/pages/Clusters/config/index.tsx b/inlong-dashboard/src/pages/Clusters/config/index.tsx
index e1e7b0b1c..8f7e22628 100644
--- a/inlong-dashboard/src/pages/Clusters/config/index.tsx
+++ b/inlong-dashboard/src/pages/Clusters/config/index.tsx
@@ -21,8 +21,9 @@ import React from 'react';
 import i18n from '@/i18n';
 import StaffSelect from '@/components/StaffSelect';
 import type { ClsConfigItemType, ClsTableItemType } from './types';
-import { Pulsar } from './Pulsar';
 import { DataProxy } from './DataProxy';
+import { Pulsar } from './Pulsar';
+import { TubeMQ } from './TubeMQ';
 
 export interface ClusterItemType {
   label: string;
@@ -42,6 +43,11 @@ export const Clusters: ClusterItemType[] = [
     value: 'PULSAR',
     config: Pulsar,
   },
+  {
+    label: 'TubeMQ',
+    value: 'TUBE',
+    config: TubeMQ,
+  },
 ].map(item => {
   const defaultConfig: ClsConfigItemType[] = [
     {