[incubator-inlong] branch master updated: [INLONG-4544][Dashboard] Pulsar cluster support tenant param (#4545)

[he...@apache.org]

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

healchow 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 5035ab0c9 [INLONG-4544][Dashboard] Pulsar cluster support tenant param (#4545)
5035ab0c9 is described below

commit 5035ab0c9d2dccaca790e045c84056a6e69fb4ed
Author: Daniel <le...@outlook.com>
AuthorDate: Tue Jun 7 10:59:43 2022 +0800

    [INLONG-4544][Dashboard] Pulsar cluster support tenant param (#4545)
---
 inlong-dashboard/src/i18n.ts                          |  2 ++
 inlong-dashboard/src/locales/cn.json                  |  1 +
 inlong-dashboard/src/locales/en.json                  |  1 +
 inlong-dashboard/src/pages/Clusters/CreateModal.tsx   |  2 +-
 inlong-dashboard/src/pages/Clusters/config/Pulsar.tsx | 10 +++++++++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/inlong-dashboard/src/i18n.ts b/inlong-dashboard/src/i18n.ts
index 458e97422..374184dd7 100644
--- a/inlong-dashboard/src/i18n.ts
+++ b/inlong-dashboard/src/i18n.ts
@@ -29,6 +29,7 @@ const resources = {
       'configs.menus.DataAccess': 'Data Group',
       'configs.menus.DataConsumption': 'Data Consumption',
       'configs.menus.Datasources': 'Data Sources',
+      'configs.menus.Clusters': 'Clusters',
       'configs.menus.SystemManagement': 'System',
     },
   },
@@ -38,6 +39,7 @@ const resources = {
       'configs.menus.DataAccess': '数据分组',
       'configs.menus.DataConsumption': '数据消费',
       'configs.menus.Datasources': '数据源服务器',
+      'configs.menus.Clusters': '集群管理',
       'configs.menus.SystemManagement': '系统管理',
     },
   },
diff --git a/inlong-dashboard/src/locales/cn.json b/inlong-dashboard/src/locales/cn.json
index 1a563ee78..a7e2bc7e0 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -348,6 +348,7 @@
   "pages.Clusters.Tag": "集群标签",
   "pages.Clusters.InCharges": "责任人",
   "pages.Clusters.Description": "集群描述",
+  "pages.Clusters.Pulsar.Tenant": "默认租户",
   "pages.Datasources.status.Success": "正常",
   "pages.Datasources.status.Error": "失败",
   "pages.Datasources.status.Deleted": "已删除",
diff --git a/inlong-dashboard/src/locales/en.json b/inlong-dashboard/src/locales/en.json
index 5d3f02ee4..4f97061bf 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -348,6 +348,7 @@
   "pages.Clusters.Tag": "Cluster Tag",
   "pages.Clusters.InCharges": "InCharges",
   "pages.Clusters.Description": "Description",
+  "pages.Clusters.Pulsar.Tenant": "Default Tenant",
   "pages.Datasources.status.Success": "Success",
   "pages.Datasources.status.Error": "Error",
   "pages.Datasources.status.Deleted": "Deleted",
diff --git a/inlong-dashboard/src/pages/Clusters/CreateModal.tsx b/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
index 6bf9ccb7e..8c549c324 100644
--- a/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
+++ b/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
@@ -54,7 +54,7 @@ const Comp: React.FC<Props> = ({ type, id, ...modalProps }) => {
     },
   );
 
-  const onOk = async e => {
+  const onOk = async () => {
     const values = await form.validateFields();
     const isUpdate = id;
     const submitData = {
diff --git a/inlong-dashboard/src/pages/Clusters/config/Pulsar.tsx b/inlong-dashboard/src/pages/Clusters/config/Pulsar.tsx
index 8660e7e16..f14230378 100644
--- a/inlong-dashboard/src/pages/Clusters/config/Pulsar.tsx
+++ b/inlong-dashboard/src/pages/Clusters/config/Pulsar.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import i18n from '@/i18n';
 import type { ClsConfigItemType } from './types';
 
 export const Pulsar: ClsConfigItemType[] = [
@@ -29,9 +30,16 @@ export const Pulsar: ClsConfigItemType[] = [
   {
     type: 'input',
     label: 'ServiceUrl',
-    name: 'serviceUrl',
+    name: 'url',
     rules: [{ required: true }],
   },
+  {
+    type: 'input',
+    label: i18n.t('pages.Clusters.Pulsar.Tenant'),
+    name: 'tenant',
+    rules: [{ required: true }],
+    initialValue: 'public',
+  },
   {
     type: 'input',
     label: 'Token',