[INLONG-9610][Dashboard] Cluster creation type optimization

bluewang · Jan 23, 2024 · c4cda30 · c4cda30
1 parent 0709547
commit c4cda30
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts b/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts
@@ -52,7 +52,7 @@ export class ClusterDefaultInfo implements DataWithBackend, RenderRow, RenderLis
     props: values => ({
       disabled: Boolean(values.id),
       options: clusters
-        .filter(item => item.value !== 'AGENT' && item.value !== 'DATAPROXY')
+        .filter(item => item.value !== 'DATAPROXY')
         .map(item => ({
           label: item.label,
           value: item.value,

diff --git a/inlong-dashboard/src/plugins/sources/defaults/Pulsar.ts b/inlong-dashboard/src/plugins/sources/defaults/Pulsar.ts
@@ -64,8 +64,8 @@ export default class PulsarSource
   })
   @SyncField()
   @IngestionField()
-  @I18n('Admin url')
-  adminUrl: string;
+  @I18n('Pulsar topic')
+  topic: string;
 
   @FieldDecorator({
     type: 'input',
@@ -76,8 +76,8 @@ export default class PulsarSource
   })
   @SyncField()
   @IngestionField()
-  @I18n('Service url')
-  serviceUrl: string;
+  @I18n('Admin url')
+  adminUrl: string;
 
   @FieldDecorator({
     type: 'input',
@@ -88,8 +88,8 @@ export default class PulsarSource
   })
   @SyncField()
   @IngestionField()
-  @I18n('Pulsar topic')
-  topic: string;
+  @I18n('Service url')
+  serviceUrl: string;
 
   @FieldDecorator({
     type: 'radio',

diff --git a/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx b/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx
@@ -65,7 +65,12 @@ const Comp: React.FC<Props> = ({ id, defaultType, ...modalProps }) => {
       inCharges: values.inCharges?.join(','),
       clusterTags: values.clusterTags?.join(','),
     };
-    if (values.type === 'SORT_CLS' || values.type === 'SORT_ES' || values.type === 'SORT_PULSAR') {
+    if (
+      values.type === 'AGENT' ||
+      values.type === 'SORT_CLS' ||
+      values.type === 'SORT_ES' ||
+      values.type === 'SORT_PULSAR'
+    ) {
       submitData.name = values.displayName;
     }
     if (isUpdate) {

diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/Audit/index.tsx b/inlong-dashboard/src/ui/pages/GroupDetail/Audit/index.tsx
@@ -121,7 +121,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId }) => {
             })
           }
         />
-        <Charts height={400} option={toChartData(sourceData, sourceDataMap)} />
+        <Charts height={400} option={toChartData(sourceData, sourceDataMap)} forceUpdate={true} />
       </div>
 
       <HighTable
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId }) => { @@
                 })
               }
             />
-            <Charts height={400} option={toChartData(sourceData, sourceDataMap)} />
+            <Charts height={400} option={toChartData(sourceData, sourceDataMap)} forceUpdate={true} />
           </div>
           <HighTable
@@ Expand Down @@