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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 291dab6cd [INLONG-5122][Dashboard] The whitelist input format of
binlog source need to be optimized (#5838)
291dab6cd is described below
commit 291dab6cdae539c0a85895102dffd69c710c64d9
Author: Daniel <lee...@apache.org>
AuthorDate: Fri Sep 9 14:20:31 2022 +0800
[INLONG-5122][Dashboard] The whitelist input format of binlog source need
to be optimized (#5838)
---
inlong-dashboard/src/configs/menus/index.ts | 4 ++--
inlong-dashboard/src/i18n.ts | 10 +++++-----
inlong-dashboard/src/locales/cn.json | 3 +--
inlong-dashboard/src/locales/en.json | 29 ++++++++++++++--------------
inlong-dashboard/src/metas/sources/binLog.ts | 13 +------------
5 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/inlong-dashboard/src/configs/menus/index.ts
b/inlong-dashboard/src/configs/menus/index.ts
index 12d134f38..98b64ccdf 100644
--- a/inlong-dashboard/src/configs/menus/index.ts
+++ b/inlong-dashboard/src/configs/menus/index.ts
@@ -54,7 +54,7 @@ const menus: MenuItemType[] = [
},
{
path: '/process',
- name: i18n.t('configs.menus.ApprovalManagement'),
+ name: i18n.t('configs.menus.Process'),
},
{
name: i18n.t('configs.menus.SystemManagement'),
@@ -66,7 +66,7 @@ const menus: MenuItemType[] = [
},
{
path: '/approval',
- name: i18n.t('configs.menus.ResponsibleManagement'),
+ name: i18n.t('configs.menus.ApprovalManagement'),
},
],
},
diff --git a/inlong-dashboard/src/i18n.ts b/inlong-dashboard/src/i18n.ts
index 3c7e6a0fe..af4b6dd30 100644
--- a/inlong-dashboard/src/i18n.ts
+++ b/inlong-dashboard/src/i18n.ts
@@ -25,21 +25,21 @@ import { isDevelopEnv } from '@/utils';
const resources = {
en: {
translation: {
- 'configs.menus.ApprovalManagement': 'Approval',
+ 'configs.menus.Process': 'Approval',
'configs.menus.Groups': 'Data Group',
'configs.menus.DataConsumption': 'Data Consumption',
'configs.menus.Datasources': 'Data Sources',
'configs.menus.Clusters': 'Clusters',
'configs.menus.ClusterTags': 'ClusterTags',
'configs.menus.SystemManagement': 'System',
- 'configs.menus.UserManagement': 'User',
- 'configs.menus.ResponsibleManagement': 'ApprovalManagement',
+ 'configs.menus.UserManagement': 'User Management',
+ 'configs.menus.ApprovalManagement': 'Approval Management',
'configs.menus.Node': 'Nodes',
},
},
cn: {
translation: {
- 'configs.menus.ApprovalManagement': '审批管理',
+ 'configs.menus.Process': '审批管理',
'configs.menus.Groups': '数据分组',
'configs.menus.DataConsumption': '数据消费',
'configs.menus.Datasources': '数据源服务器',
@@ -47,7 +47,7 @@ const resources = {
'configs.menus.ClusterTags': '标签管理',
'configs.menus.SystemManagement': '系统管理',
'configs.menus.UserManagement': '用户管理',
- 'configs.menus.ResponsibleManagement': '审批责任人管理',
+ 'configs.menus.ApprovalManagement': '审批责任人管理',
'configs.menus.Node': '节点管理',
},
},
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 9f2c63506..4c95c3055 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -31,9 +31,8 @@
"meta.Sources.Db.Password": "密码",
"meta.Sources.Db.HistoryFilename": "历史文件名",
"meta.Sources.Db.AllMigration": "是否整库迁移",
- "meta.Sources.Db.DatabaseWhiteList": "库名白名单",
"meta.Sources.Db.TableWhiteList": "表名白名单",
- "meta.Sources.Db.WhiteListHelp": "多个白名单之间用英文逗号分隔，单个为正则表达式，比如：b1,b*",
+ "meta.Sources.Db.TableWhiteListHelp":
"白名单应该是一个以逗号分隔的正则表达式列表，与要监控的表的完全限定名称相匹配。表的完全限定名称的格式为 <dbName>.<tableName>，其中
dbName 和 tablename 都可以配置正则表达式。比如：test_db.table*,inlong_db*.user*，表示采集 test_db
库中以 table 开头的所有表 + 以 inlong_db 开头的所有库下的以 user 开头的所有表。",
"meta.Sinks.SinkName": "名称",
"meta.Sinks.SinkNameRule": "以英文字母开头，只能包含英文字母、数字、中划线、下划线",
"meta.Sinks.SinkType": "类型",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 04b80d59d..452dfd354 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -30,10 +30,9 @@
"meta.Sources.Db.User": "User",
"meta.Sources.Db.Password": "Password",
"meta.Sources.Db.HistoryFilename": "History Filename",
- "meta.Sources.Db.AllMigration": "Migration Total Database",
- "meta.Sources.Db.DatabaseWhiteList": "Database WhiteList",
+ "meta.Sources.Db.AllMigration": "AllMigration",
"meta.Sources.Db.TableWhiteList": "Table WhiteList",
- "meta.Sources.Db.WhiteListHelp": "Multiple whitelists are separated by
commas, each of which is a regular expression, for example b1,b*",
+ "meta.Sources.Db.TableWhiteListHelp": "The whitelist should be a
comma-separated list of regular expressions that match the fully-qualified
names of tables to be monitored. Fully-qualified names for tables are of the
form <databaseName>.<tableName>, the dbName and tableName can be configured
with regular expressions. For example: test_db.order*, inlong_db*.user*, means
to collect all tables starting with order in the test_db database + all tables
starting with user under all databases [...]
"meta.Sinks.SinkName": "Name",
"meta.Sinks.SinkNameRule": "At the beginning of English letters, only
English letters, numbers, minus, and underscores",
"meta.Sinks.SinkType": "Type",
@@ -254,12 +253,12 @@
"meta.Stream.Status.Pending": "Pending",
"meta.Stream.Status.Error": "Error",
"meta.Stream.Status.Success": "Success",
- "meta.Consumption.Owner": "Consumption",
- "meta.Consumption.ConsumerGroupName": "Consumer group name",
+ "meta.Consumption.Owner": "Owner",
+ "meta.Consumption.ConsumerGroupName": "Consumer Group Name",
"meta.Consumption.ConsumerGroupNameRules": "Only lowercase letters, numbers,
minus, and underscores",
"meta.Consumption.DataStreamIDsHelp": "Inlong stream IDs are divided by
commas;",
- "meta.Consumption.ConsumerDataStreamID": "Consumer data stream ID",
- "meta.Consumption.ConsumerTargetBusinessID": "Consume Group ID",
+ "meta.Consumption.ConsumerDataStreamID": "Consumer Stream ID",
+ "meta.Consumption.ConsumerTargetBusinessID": "Consumer Group ID",
"meta.Consumption.No": "No",
"meta.Consumption.filterEnabled": "FilterEnabled",
"meta.Consumption.MasterAddress": "Master address",
@@ -344,10 +343,10 @@
"pages.GroupDetail.Stream.StreamConfigTitle": "Data stream configuration",
"pages.GroupDetail.Stream.CreateDataStream": "Create",
"pages.GroupDetail.PageTitle": "Detail",
- "pages.GroupDetail.Info": "Data Streams Group",
- "pages.GroupDetail.Streams": "DataStreams",
- "pages.GroupDetail.Sources": "DataSources",
- "pages.GroupDetail.Sinks": "DataStorages",
+ "pages.GroupDetail.Info": "Group Info",
+ "pages.GroupDetail.Streams": "Streams",
+ "pages.GroupDetail.Sources": "Sources",
+ "pages.GroupDetail.Sinks": "Sinks",
"pages.GroupDetail.Audit": "Audit",
"pages.GroupDetail.Audit.DataStream": "DataStream",
"pages.GroupDetail.Audit.Date": "Date",
@@ -413,7 +412,7 @@
"pages.ConsumeDashboard.config.Pending": "Pending",
"pages.ConsumeDashboard.config.ConsumerGroup": "ConsumerGroup",
"pages.ConsumeDashboard.config.ConsumptionInlongGroupId": "Consumption
inlong group id",
- "pages.ConsumeDashboard.config.RecentConsumptionTime": "Recent consumption
time",
+ "pages.ConsumeDashboard.config.RecentConsumptionTime": "Last consumption
time",
"pages.ConsumeDashboard.config.Middleware": "Message Queue",
"pages.ConsumeDashboard.status.Normal": "Normal",
"pages.ConsumeDashboard.status.Abnormal": "Abnormal",
@@ -431,7 +430,7 @@
"pages.Clusters.LastModifier": "LastModifier",
"pages.Clusters.Name": "Cluster Name",
"pages.Clusters.Tag": "Cluster Tag",
- "pages.Clusters.InCharges": "InCharges",
+ "pages.Clusters.InCharges": "Owners",
"pages.Clusters.Description": "Description",
"pages.Clusters.Node.Name": "Node",
"pages.Clusters.Node.Port": "Port",
@@ -445,7 +444,7 @@
"pages.Clusters.Tube.MasterRpcUrlHelper": "Master RPC URL, used to produce
and consume data",
"pages.Clusters.Tube.MasterWebUrlHelper": "Master Web URL, used to manage
(e.g. create, modify) topics and consumer groups",
"pages.ClusterTags.Name": "ClusterTag",
- "pages.ClusterTags.InCharges": "InCharges",
+ "pages.ClusterTags.InCharges": "Owners",
"pages.ClusterTags.Description": "Description",
"pages.ClusterTags.ModifyTime": "ModifyTime",
"pages.ClusterTags.Modifier": "Modifier",
@@ -472,7 +471,7 @@
"pages.Datasources.DbConfig.DbName": "DbName",
"pages.Datasources.DbConfig.Username": "Username",
"pages.Datasources.DbConfig.Password": "Password",
- "pages.Datasources.DbConfig.InCharges": "InCharges",
+ "pages.Datasources.DbConfig.InCharges": "Owners",
"pages.Datasources.DbConfig.DbDescription": "Description",
"pages.Login.PleaseEnterUserName": "Please enter user name",
"pages.Login.PasswordRules": "Only lowercase letters, numbers, minus, and
underscores",
diff --git a/inlong-dashboard/src/metas/sources/binLog.ts
b/inlong-dashboard/src/metas/sources/binLog.ts
index 065d9ad01..28c3c59c8 100644
--- a/inlong-dashboard/src/metas/sources/binLog.ts
+++ b/inlong-dashboard/src/metas/sources/binLog.ts
@@ -117,22 +117,11 @@ export const binLog: FieldItemType[] = [
],
}),
},
- {
- name: 'databaseWhiteList',
- type: 'input',
- label: i18n.t('meta.Sources.Db.DatabaseWhiteList'),
- tooltip: i18n.t('meta.Sources.Db.WhiteListHelp'),
- rules: [{ required: true }],
- props: values => ({
- disabled: values?.status === 101,
- }),
- visible: values => !values?.allMigration,
- },
{
name: 'tableWhiteList',
type: 'input',
label: i18n.t('meta.Sources.Db.TableWhiteList'),
- tooltip: i18n.t('meta.Sources.Db.WhiteListHelp'),
+ tooltip: i18n.t('meta.Sources.Db.TableWhiteListHelp'),
rules: [{ required: true }],
props: values => ({
disabled: values?.status === 101,
