You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/11/02 07:47:17 UTC
[inlong] branch master updated: [INLONG-6365][Dashboard] Modify the options of the data type and modify some files name (#6367)
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/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new af75de320 [INLONG-6365][Dashboard] Modify the options of the data type and modify some files name (#6367)
af75de320 is described below
commit af75de3209c9e4cf1877bcebfb48e0fdbe47a33f
Author: healchow <he...@gmail.com>
AuthorDate: Wed Nov 2 15:47:11 2022 +0800
[INLONG-6365][Dashboard] Modify the options of the data type and modify some files name (#6367)
---
inlong-dashboard/src/locales/cn.json | 97 ++++++++------------
inlong-dashboard/src/locales/en.json | 101 +++++++++------------
.../defaults/{Clickhouse.ts => ClickHouse.ts} | 54 +++++------
.../src/metas/sinks/defaults/{Es.ts => ES.ts} | 28 +++---
.../metas/sinks/defaults/{Mysql.ts => MySQL.ts} | 0
.../src/metas/sinks/defaults/Oracle.ts | 1 -
.../defaults/{PostgreSql.ts => PostgreSQL.ts} | 0
.../src/metas/sinks/defaults/SQLServer.ts | 1 -
.../{TDSQLPostgreSql.ts => TDSQLPostgreSQL.ts} | 3 +-
inlong-dashboard/src/metas/sinks/defaults/index.ts | 12 +--
.../defaults/{MysqlBinlog.ts => MySQLBinlog.ts} | 0
.../src/metas/sources/defaults/index.ts | 12 +--
.../src/metas/streams/common/StreamDefaultInfo.ts | 14 +--
inlong-dashboard/src/pages/Login/index.tsx | 2 +-
14 files changed, 138 insertions(+), 187 deletions(-)
diff --git a/inlong-dashboard/src/locales/cn.json b/inlong-dashboard/src/locales/cn.json
index 48f104ea4..de06b20ec 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -71,43 +71,43 @@
"meta.Sinks.Hive.FieldDescription": "字段描述",
"meta.Sinks.Hive.IsMetaField": "是否为元字段",
"meta.Sinks.Hive.FieldFormat": "字段格式",
- "meta.Sinks.Clickhouse.DbName": "DB名称",
- "meta.Sinks.Clickhouse.TableName": "表名称",
- "meta.Sinks.Clickhouse.FlushInterval": "刷新的间隔",
- "meta.Sinks.Clickhouse.FlushIntervalUnit": "秒",
- "meta.Sinks.Clickhouse.FlushRecord": "刷新的数据条数",
- "meta.Sinks.Clickhouse.FlushRecordUnit": "条",
- "meta.Sinks.Clickhouse.RetryTimes": "重试次数",
- "meta.Sinks.Clickhouse.RetryTimesUnit": "次",
- "meta.Sinks.Clickhouse.IsDistributed": "分布式表",
- "meta.Sinks.Clickhouse.Yes": "是",
- "meta.Sinks.Clickhouse.No": "否",
- "meta.Sinks.Clickhouse.PartitionStrategy": "分区策略",
- "meta.Sinks.Clickhouse.PartitionFields": "分区字段",
- "meta.Sinks.Clickhouse.FieldName": "字段名",
- "meta.Sinks.Clickhouse.FieldNameRule": "以英文字母开头，只能包含英文字母、数字、下划线",
- "meta.Sinks.Clickhouse.FieldType": "字段类型",
- "meta.Sinks.Clickhouse.FieldDescription": "字段描述",
- "meta.Sinks.Clickhouse.Engine": "引擎",
- "meta.Sinks.Clickhouse.OrderBy": "排序",
- "meta.Sinks.Clickhouse.PartitionBy": "分区",
- "meta.Sinks.Clickhouse.PrimaryKey": "主键",
- "meta.Sinks.Clickhouse.CompressionCode": "压缩格式",
- "meta.Sinks.Clickhouse.TtlExpr": "生命周期",
- "meta.Sinks.Es.IndexName": "索引名称",
- "meta.Sinks.Es.FlushInterval": "刷新的间隔",
- "meta.Sinks.Es.FlushIntervalUnit": "秒",
- "meta.Sinks.Es.FlushRecord": "刷新的数据条数",
- "meta.Sinks.Es.FlushRecordUnit": "条",
- "meta.Sinks.Es.RetryTimes": "重试次数",
- "meta.Sinks.Es.RetryTimesUnit": "次",
- "meta.Sinks.Es.Host": "主机地址",
- "meta.Sinks.Es.Port": "端口",
- "meta.Sinks.Es.FieldName": "字段名",
- "meta.Sinks.Es.FieldNameRule": "以英文字母开头，只能包含英文字母、数字、下划线",
- "meta.Sinks.Es.FieldType": "字段类型",
- "meta.Sinks.Es.FieldDescription": "字段描述",
- "meta.Sinks.Es.DateFormat": "日期格式",
+ "meta.Sinks.ClickHouse.DbName": "DB名称",
+ "meta.Sinks.ClickHouse.TableName": "表名称",
+ "meta.Sinks.ClickHouse.FlushInterval": "刷新的间隔",
+ "meta.Sinks.ClickHouse.FlushIntervalUnit": "秒",
+ "meta.Sinks.ClickHouse.FlushRecord": "刷新的数据条数",
+ "meta.Sinks.ClickHouse.FlushRecordUnit": "条",
+ "meta.Sinks.ClickHouse.RetryTimes": "重试次数",
+ "meta.Sinks.ClickHouse.RetryTimesUnit": "次",
+ "meta.Sinks.ClickHouse.IsDistributed": "分布式表",
+ "meta.Sinks.ClickHouse.Yes": "是",
+ "meta.Sinks.ClickHouse.No": "否",
+ "meta.Sinks.ClickHouse.PartitionStrategy": "分区策略",
+ "meta.Sinks.ClickHouse.PartitionFields": "分区字段",
+ "meta.Sinks.ClickHouse.FieldName": "字段名",
+ "meta.Sinks.ClickHouse.FieldNameRule": "以英文字母开头，只能包含英文字母、数字、下划线",
+ "meta.Sinks.ClickHouse.FieldType": "字段类型",
+ "meta.Sinks.ClickHouse.FieldDescription": "字段描述",
+ "meta.Sinks.ClickHouse.Engine": "引擎",
+ "meta.Sinks.ClickHouse.OrderBy": "排序",
+ "meta.Sinks.ClickHouse.PartitionBy": "分区",
+ "meta.Sinks.ClickHouse.PrimaryKey": "主键",
+ "meta.Sinks.ClickHouse.CompressionCode": "压缩格式",
+ "meta.Sinks.ClickHouse.TtlExpr": "生命周期",
+ "meta.Sinks.ES.IndexName": "索引名称",
+ "meta.Sinks.ES.FlushInterval": "刷新的间隔",
+ "meta.Sinks.ES.FlushIntervalUnit": "秒",
+ "meta.Sinks.ES.FlushRecord": "刷新的数据条数",
+ "meta.Sinks.ES.FlushRecordUnit": "条",
+ "meta.Sinks.ES.RetryTimes": "重试次数",
+ "meta.Sinks.ES.RetryTimesUnit": "次",
+ "meta.Sinks.ES.Host": "主机地址",
+ "meta.Sinks.ES.Port": "端口",
+ "meta.Sinks.ES.FieldName": "字段名",
+ "meta.Sinks.ES.FieldNameRule": "以英文字母开头，只能包含英文字母、数字、下划线",
+ "meta.Sinks.ES.FieldType": "字段类型",
+ "meta.Sinks.ES.FieldDescription": "字段描述",
+ "meta.Sinks.ES.DateFormat": "日期格式",
"meta.Sinks.Kafka.Server": "服务器地址",
"meta.Sinks.Kafka.SerializationType": "序列化类型",
"meta.Sinks.Kafka.PartitionNum": "Topic分区数",
@@ -255,7 +255,7 @@
"meta.Stream.FieldName": "字段名",
"meta.Stream.FieldNameRule": "以英文字母开头，只能包含英文字母、数字、下划线",
"meta.Stream.DataType": "数据格式",
- "meta.Stream.DataTypeCsvHelp": "CSV：按特定分隔符分隔的任意文件",
+ "meta.Stream.DataTypeHelp": "CSV：消息体为原生 CSV 的 InLong 消息类型；Raw-CSV：原生 CSV，消息按特定分隔符分隔",
"meta.Stream.FieldType": "字段类型",
"meta.Stream.FieldComment": "字段描述",
"meta.Stream.DataEncoding": "数据编码",
@@ -468,28 +468,9 @@
"pages.ClusterTags.DelClusterSuccess": "解绑成功",
"pages.ClusterTags.DelConfirm": "删除集群标签，会将其从绑定了此标签的所有集群中解绑，且需确保此标签没有被 InlongGroup 所使用",
"pages.ClusterTags.NameEditHelp": "修改集群标签名称，会同时修改所有绑定了此标签的集群中的标签名，且需确保此标签没有被 InlongGroup 所使用",
- "pages.Datasources.status.Success": "正常",
- "pages.Datasources.status.Error": "失败",
- "pages.Datasources.status.Deleted": "已删除",
- "pages.Datasources.Create": "新建服务器",
- "pages.Datasources.LastModifier": "最后操作",
- "pages.Datasources.Type": "类型",
- "pages.Datasources.CreateModal.Server": "服务器",
- "pages.Datasources.DbConfig.ServerName": "DB连接名",
- "pages.Datasources.DbConfig.Type": "DB类型",
- "pages.Datasources.DbConfig.IpPattern": "请正确输入Ip地址",
- "pages.Datasources.DbConfig.Port": "DB端口",
- "pages.Datasources.DbConfig.PortPattern": "请正确输入端口号(1-65535)",
- "pages.Datasources.DbConfig.BackupDbIp": "备份DB IP",
- "pages.Datasources.DbConfig.BackupDbPort": "备份DB端口",
- "pages.Datasources.DbConfig.DbName": "目标库",
- "pages.Datasources.DbConfig.Username": "用户名",
- "pages.Datasources.DbConfig.Password": "密码",
- "pages.Datasources.DbConfig.InCharges": "DB负责人",
- "pages.Datasources.DbConfig.DbDescription": "DB描述",
"pages.Login.PleaseEnterUserName": "请输入用户名",
"pages.Login.PasswordRules": "只能包含小写字母、数字、中划线、下划线",
- "pages.Login.LogIn": "登录",
+ "pages.Login.Login": "登录",
"pages.Login.PleaseEnterYourPassword": "请输入密码",
"pages.UserManagement.DetailModal.Day": "天",
"pages.UserManagement.DetailModal.New": "新建",
diff --git a/inlong-dashboard/src/locales/en.json b/inlong-dashboard/src/locales/en.json
index 2dc4948b4..c7310be00 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -71,43 +71,43 @@
"meta.Sinks.Hive.FieldDescription": "Field description",
"meta.Sinks.Hive.IsMetaField": "IsMetaField",
"meta.Sinks.Hive.FieldFormat": "FieldFormat",
- "meta.Sinks.Clickhouse.DbName": "DbName",
- "meta.Sinks.Clickhouse.TableName": "TableName",
- "meta.Sinks.Clickhouse.FlushInterval": "FlushInterval",
- "meta.Sinks.Clickhouse.FlushIntervalUnit": "S",
- "meta.Sinks.Clickhouse.FlushRecord": "FlushRecord",
- "meta.Sinks.Clickhouse.FlushRecordUnit": "items",
- "meta.Sinks.Clickhouse.RetryTimes": "RetryTimes",
- "meta.Sinks.Clickhouse.RetryTimesUnit": "items",
- "meta.Sinks.Clickhouse.IsDistributed": "IsDistributedTable",
- "meta.Sinks.Clickhouse.Yes": "Yes",
- "meta.Sinks.Clickhouse.No": "No",
- "meta.Sinks.Clickhouse.PartitionStrategy": "PartitionStrategy",
- "meta.Sinks.Clickhouse.PartitionFields": "PartitionFields",
- "meta.Sinks.Clickhouse.FieldName": "FieldName",
- "meta.Sinks.Clickhouse.FieldNameRule": "At the beginning of English letters, only English letters, numbers, and underscores",
- "meta.Sinks.Clickhouse.FieldType": "FieldType",
- "meta.Sinks.Clickhouse.FieldDescription": "FieldDescription",
- "meta.Sinks.Clickhouse.Engine": "Engine",
- "meta.Sinks.Clickhouse.OrderBy": "OrderBy",
- "meta.Sinks.Clickhouse.PartitionBy": "PartitionBy",
- "meta.Sinks.Clickhouse.PrimaryKey": "PrimaryKey",
- "meta.Sinks.Clickhouse.CompressionCode": "CompressionCode",
- "meta.Sinks.Clickhouse.TtlExpr": "TtlExpr",
- "meta.Sinks.Es.IndexName": "IndexName",
- "meta.Sinks.Es.FlushInterval": "FlushInterval",
- "meta.Sinks.Es.FlushIntervalUnit": "S",
- "meta.Sinks.Es.FlushRecord": "FlushRecord",
- "meta.Sinks.Es.FlushRecordUnit": "items",
- "meta.Sinks.Es.RetryTimes": "RetryTimes",
- "meta.Sinks.Es.RetryTimesUnit": "items",
- "meta.Sinks.Es.Host": "Host",
- "meta.Sinks.Es.Port": "Port",
- "meta.Sinks.Es.FieldName": "FieldName",
- "meta.Sinks.Es.FieldNameRule": "At the beginning of English letters, only English letters, numbers, and underscores",
- "meta.Sinks.Es.FieldType": "FieldType",
- "meta.Sinks.Es.FieldDescription": "FieldDescription",
- "meta.Sinks.Es.DateFormat": "DateFormat",
+ "meta.Sinks.ClickHouse.DbName": "DbName",
+ "meta.Sinks.ClickHouse.TableName": "TableName",
+ "meta.Sinks.ClickHouse.FlushInterval": "FlushInterval",
+ "meta.Sinks.ClickHouse.FlushIntervalUnit": "S",
+ "meta.Sinks.ClickHouse.FlushRecord": "FlushRecord",
+ "meta.Sinks.ClickHouse.FlushRecordUnit": "items",
+ "meta.Sinks.ClickHouse.RetryTimes": "RetryTimes",
+ "meta.Sinks.ClickHouse.RetryTimesUnit": "items",
+ "meta.Sinks.ClickHouse.IsDistributed": "IsDistributedTable",
+ "meta.Sinks.ClickHouse.Yes": "Yes",
+ "meta.Sinks.ClickHouse.No": "No",
+ "meta.Sinks.ClickHouse.PartitionStrategy": "PartitionStrategy",
+ "meta.Sinks.ClickHouse.PartitionFields": "PartitionFields",
+ "meta.Sinks.ClickHouse.FieldName": "FieldName",
+ "meta.Sinks.ClickHouse.FieldNameRule": "At the beginning of English letters, only English letters, numbers, and underscores",
+ "meta.Sinks.ClickHouse.FieldType": "FieldType",
+ "meta.Sinks.ClickHouse.FieldDescription": "FieldDescription",
+ "meta.Sinks.ClickHouse.Engine": "Engine",
+ "meta.Sinks.ClickHouse.OrderBy": "OrderBy",
+ "meta.Sinks.ClickHouse.PartitionBy": "PartitionBy",
+ "meta.Sinks.ClickHouse.PrimaryKey": "PrimaryKey",
+ "meta.Sinks.ClickHouse.CompressionCode": "CompressionCode",
+ "meta.Sinks.ClickHouse.TtlExpr": "TtlExpr",
+ "meta.Sinks.ES.IndexName": "IndexName",
+ "meta.Sinks.ES.FlushInterval": "FlushInterval",
+ "meta.Sinks.ES.FlushIntervalUnit": "S",
+ "meta.Sinks.ES.FlushRecord": "FlushRecord",
+ "meta.Sinks.ES.FlushRecordUnit": "items",
+ "meta.Sinks.ES.RetryTimes": "RetryTimes",
+ "meta.Sinks.ES.RetryTimesUnit": "items",
+ "meta.Sinks.ES.Host": "Host",
+ "meta.Sinks.ES.Port": "Port",
+ "meta.Sinks.ES.FieldName": "FieldName",
+ "meta.Sinks.ES.FieldNameRule": "At the beginning of English letters, only English letters, numbers, and underscores",
+ "meta.Sinks.ES.FieldType": "FieldType",
+ "meta.Sinks.ES.FieldDescription": "FieldDescription",
+ "meta.Sinks.ES.DateFormat": "DateFormat",
"meta.Sinks.Kafka.Server": "Server",
"meta.Sinks.Kafka.SerializationType": "SerializationType",
"meta.Sinks.Kafka.PartitionNum": "PartitionNum",
@@ -244,7 +244,7 @@
"meta.Group.Status.ConfigurationFailed": "Configuration failed",
"meta.Stream.StreamId": "Stream ID",
"meta.Stream.StreamIdRules": "Only lowercase letters, numbers, minus, and underscores",
- "meta.Stream.DataSeparator": "Source data fileDelimiter",
+ "meta.Stream.DataSeparator": "Source data separator",
"meta.Stream.DataSeparator.Space": "Space",
"meta.Stream.DataSeparator.Asterisk": "Asterisk(*)",
"meta.Stream.DataSeparator.Comma": "Comma(,)",
@@ -255,9 +255,9 @@
"meta.Stream.FieldName": "Field name",
"meta.Stream.FieldNameRule": "At the beginning of English letters, only English letters, numbers, and underscores",
"meta.Stream.DataType": "DataType",
- "meta.Stream.DataTypeCsvHelp": "CSV: Any file separated by a specific delimiter",
+ "meta.Stream.DataTypeHelp": "CSV: InLong message type whose message body is raw CSV; Raw-CSV: messages are separated by a specific separator",
"meta.Stream.FieldType": "FieldType",
- "meta.Stream.FieldComment": "FieldComment",
+ "meta.Stream.FieldComment": "Field comment",
"meta.Stream.DataEncoding": "Data encoding",
"meta.Stream.Description": "Description",
"meta.Stream.SourceDataField": "Source fields",
@@ -469,28 +469,9 @@
"pages.ClusterTags.DelClusterSuccess": "Unbind successfully",
"pages.ClusterTags.DelConfirm": "Deleting a cluster tag will unbind it from all clusters bound to this tag, and make sure this tag is not used by InlongGroup",
"pages.ClusterTags.NameEditHelp": "Modifying a cluster tag will also modify the tag name in all clusters bound to this tag, and make sure that this label is not used by InlongGroup",
- "pages.Datasources.status.Success": "Success",
- "pages.Datasources.status.Error": "Error",
- "pages.Datasources.status.Deleted": "Deleted",
- "pages.Datasources.Create": "Create",
- "pages.Datasources.LastModifier": "Last Modifier",
- "pages.Datasources.Type": "Type",
- "pages.Datasources.CreateModal.Server": "Server",
- "pages.Datasources.DbConfig.ServerName": "ServerName",
- "pages.Datasources.DbConfig.Type": "Type",
- "pages.Datasources.DbConfig.IpPattern": "Please enter the IP address correctly",
- "pages.Datasources.DbConfig.Port": "Port",
- "pages.Datasources.DbConfig.PortPattern": "Please enter the Port correctly",
- "pages.Datasources.DbConfig.BackupDbIp": "Backup IP",
- "pages.Datasources.DbConfig.BackupDbPort": "Backup Port",
- "pages.Datasources.DbConfig.DbName": "DbName",
- "pages.Datasources.DbConfig.Username": "Username",
- "pages.Datasources.DbConfig.Password": "Password",
- "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",
- "pages.Login.LogIn": "LogIn",
+ "pages.Login.Login": "Login",
"pages.Login.PleaseEnterYourPassword": "Please enter your password",
"pages.UserManagement.DetailModal.Day": "Days",
"pages.UserManagement.DetailModal.New": "New construction",
diff --git a/inlong-dashboard/src/metas/sinks/defaults/Clickhouse.ts b/inlong-dashboard/src/metas/sinks/defaults/ClickHouse.ts
similarity index 84%
rename from inlong-dashboard/src/metas/sinks/defaults/Clickhouse.ts
rename to inlong-dashboard/src/metas/sinks/defaults/ClickHouse.ts
index 35994561e..095357879 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/Clickhouse.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/ClickHouse.ts
@@ -25,7 +25,7 @@ import { sourceFields } from '../common/sourceFields';
const { I18n, FormField, TableColumn } = DataWithBackend;
-const clickhouseTargetTypes = [
+const clickHouseTargetTypes = [
'String',
'Int8',
'Int16',
@@ -40,7 +40,7 @@ const clickhouseTargetTypes = [
value: item,
}));
-export default class ClickhouseSink extends SinkInfo implements DataWithBackend {
+export default class ClickHouseSink extends SinkInfo implements DataWithBackend {
@FormField({
type: 'input',
rules: [{ required: true }],
@@ -49,7 +49,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
}),
})
@TableColumn()
- @I18n('meta.Sinks.Clickhouse.DbName')
+ @I18n('meta.Sinks.ClickHouse.DbName')
dbName: string;
@FormField({
@@ -60,7 +60,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
}),
})
@TableColumn()
- @I18n('meta.Sinks.Clickhouse.TableName')
+ @I18n('meta.Sinks.ClickHouse.TableName')
tableName: string;
@FormField({
@@ -124,9 +124,9 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
min: 1,
}),
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Clickhouse.FlushIntervalUnit'),
+ suffix: i18n.t('meta.Sinks.ClickHouse.FlushIntervalUnit'),
})
- @I18n('meta.Sinks.Clickhouse.FlushInterval')
+ @I18n('meta.Sinks.ClickHouse.FlushInterval')
flushInterval: number;
@FormField({
@@ -137,9 +137,9 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
min: 1,
}),
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Clickhouse.FlushRecordUnit'),
+ suffix: i18n.t('meta.Sinks.ClickHouse.FlushRecordUnit'),
})
- @I18n('meta.Sinks.Clickhouse.FlushRecord')
+ @I18n('meta.Sinks.ClickHouse.FlushRecord')
flushRecord: number;
@FormField({
@@ -150,9 +150,9 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
min: 1,
}),
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Clickhouse.RetryTimesUnit'),
+ suffix: i18n.t('meta.Sinks.ClickHouse.RetryTimesUnit'),
})
- @I18n('meta.Sinks.Clickhouse.RetryTimes')
+ @I18n('meta.Sinks.ClickHouse.RetryTimes')
retryTime: number;
@FormField({
@@ -162,18 +162,18 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
options: [
{
- label: i18n.t('meta.Sinks.Clickhouse.Yes'),
+ label: i18n.t('meta.Sinks.ClickHouse.Yes'),
value: 1,
},
{
- label: i18n.t('meta.Sinks.Clickhouse.No'),
+ label: i18n.t('meta.Sinks.ClickHouse.No'),
value: 0,
},
],
}),
rules: [{ required: true }],
})
- @I18n('meta.Sinks.Clickhouse.IsDistributed')
+ @I18n('meta.Sinks.ClickHouse.IsDistributed')
isDistributed: number;
@FormField({
@@ -199,7 +199,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
}),
visible: values => values.isDistributed,
})
- @I18n('meta.Sinks.Clickhouse.PartitionStrategy')
+ @I18n('meta.Sinks.ClickHouse.PartitionStrategy')
partitionStrategy: string;
@FormField({
@@ -210,7 +210,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
}),
})
- @I18n('meta.Sinks.Clickhouse.PartitionFields')
+ @I18n('meta.Sinks.ClickHouse.PartitionFields')
partitionFields: string;
@FormField({
@@ -221,7 +221,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
}),
})
- @I18n('meta.Sinks.Clickhouse.Engine')
+ @I18n('meta.Sinks.ClickHouse.Engine')
engine: string;
@FormField({
@@ -230,7 +230,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
}),
})
- @I18n('meta.Sinks.Clickhouse.OrderBy')
+ @I18n('meta.Sinks.ClickHouse.OrderBy')
orderBy: string;
@FormField({
@@ -239,7 +239,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
}),
})
- @I18n('meta.Sinks.Clickhouse.PartitionBy')
+ @I18n('meta.Sinks.ClickHouse.PartitionBy')
partitionBy: string;
@FormField({
@@ -248,7 +248,7 @@ export default class ClickhouseSink extends SinkInfo implements DataWithBackend
disabled: [110, 130].includes(values?.status),
}),
})
- @I18n('meta.Sinks.Clickhouse.PrimaryKey')
+ @I18n('meta.Sinks.ClickHouse.PrimaryKey')
primaryKey: string;
@FormField({
@@ -266,13 +266,13 @@ const getFieldListColumns = sinkValues => {
return [
...sourceFields,
{
- title: `ClickHouse${i18n.t('meta.Sinks.Clickhouse.FieldName')}`,
+ title: `ClickHouse${i18n.t('meta.Sinks.ClickHouse.FieldName')}`,
dataIndex: 'fieldName',
rules: [
{ required: true },
{
pattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
- message: i18n.t('meta.Sinks.Clickhouse.FieldNameRule'),
+ message: i18n.t('meta.Sinks.ClickHouse.FieldNameRule'),
},
],
props: (text, record, idx, isNew) => ({
@@ -280,13 +280,13 @@ const getFieldListColumns = sinkValues => {
}),
},
{
- title: `ClickHouse${i18n.t('meta.Sinks.Clickhouse.FieldType')}`,
+ title: `ClickHouse${i18n.t('meta.Sinks.ClickHouse.FieldType')}`,
dataIndex: 'fieldType',
- initialValue: clickhouseTargetTypes[0].value,
+ initialValue: clickHouseTargetTypes[0].value,
type: 'select',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
- options: clickhouseTargetTypes,
+ options: clickHouseTargetTypes,
}),
rules: [{ required: true }],
},
@@ -313,21 +313,21 @@ const getFieldListColumns = sinkValues => {
['DEFAULT', 'EPHEMERAL', 'MATERIALIZED', 'ALIAS'].includes(record.defaultType as string),
},
{
- title: i18n.t('meta.Sinks.Clickhouse.CompressionCode'),
+ title: i18n.t('meta.Sinks.ClickHouse.CompressionCode'),
dataIndex: 'compressionCode',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
}),
},
{
- title: i18n.t('meta.Sinks.Clickhouse.TtlExpr'),
+ title: i18n.t('meta.Sinks.ClickHouse.TtlExpr'),
dataIndex: 'ttlExpr',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
}),
},
{
- title: `ClickHouse${i18n.t('meta.Sinks.Clickhouse.FieldDescription')}`,
+ title: `ClickHouse${i18n.t('meta.Sinks.ClickHouse.FieldDescription')}`,
dataIndex: 'fieldComment',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
diff --git a/inlong-dashboard/src/metas/sinks/defaults/Es.ts b/inlong-dashboard/src/metas/sinks/defaults/ES.ts
similarity index 90%
rename from inlong-dashboard/src/metas/sinks/defaults/Es.ts
rename to inlong-dashboard/src/metas/sinks/defaults/ES.ts
index 4367ac511..3ff63d203 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/Es.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/ES.ts
@@ -52,7 +52,7 @@ export default class EsSink extends SinkInfo implements DataWithBackend {
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.IndexName')
+ @I18n('meta.Sinks.ES.IndexName')
indexName: string;
@FormField({
@@ -107,7 +107,7 @@ export default class EsSink extends SinkInfo implements DataWithBackend {
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.Host')
+ @I18n('meta.Sinks.ES.Host')
host: string;
@FormField({
@@ -121,49 +121,49 @@ export default class EsSink extends SinkInfo implements DataWithBackend {
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.Port')
+ @I18n('meta.Sinks.ES.Port')
port: number;
@FormField({
type: 'inputnumber',
initialValue: 1,
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Es.FlushIntervalUnit'),
+ suffix: i18n.t('meta.Sinks.ES.FlushIntervalUnit'),
props: values => ({
min: 1,
disabled: [110, 130].includes(values?.status),
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.FlushInterval')
+ @I18n('meta.Sinks.ES.FlushInterval')
flushInterval: number;
@FormField({
type: 'inputnumber',
initialValue: 1000,
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Es.FlushRecordUnit'),
+ suffix: i18n.t('meta.Sinks.ES.FlushRecordUnit'),
props: values => ({
min: 1,
disabled: [110, 130].includes(values?.status),
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.FlushRecord')
+ @I18n('meta.Sinks.ES.FlushRecord')
flushRecord: number;
@FormField({
type: 'inputnumber',
initialValue: 3,
rules: [{ required: true }],
- suffix: i18n.t('meta.Sinks.Es.RetryTimesUnit'),
+ suffix: i18n.t('meta.Sinks.ES.RetryTimesUnit'),
props: values => ({
min: 1,
disabled: [110, 130].includes(values?.status),
}),
})
@TableColumn()
- @I18n('meta.Sinks.Es.RetryTimes')
+ @I18n('meta.Sinks.ES.RetryTimes')
retryTime: number;
@FormField({
@@ -181,13 +181,13 @@ const getFieldListColumns = sinkValues => {
return [
...sourceFields,
{
- title: `ES ${i18n.t('meta.Sinks.Es.FieldName')}`,
+ title: `ES ${i18n.t('meta.Sinks.ES.FieldName')}`,
dataIndex: 'fieldName',
rules: [
{ required: true },
{
pattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
- message: i18n.t('meta.Sinks.Es.FieldNameRule'),
+ message: i18n.t('meta.Sinks.ES.FieldNameRule'),
},
],
props: (text, record, idx, isNew) => ({
@@ -195,7 +195,7 @@ const getFieldListColumns = sinkValues => {
}),
},
{
- title: `ES ${i18n.t('meta.Sinks.Es.FieldType')}`,
+ title: `ES ${i18n.t('meta.Sinks.ES.FieldType')}`,
dataIndex: 'fieldType',
initialValue: esTypes[0].value,
type: 'select',
@@ -223,7 +223,7 @@ const getFieldListColumns = sinkValues => {
visible: (text, record) => record.fieldType === 'text',
},
{
- title: i18n.t('meta.Sinks.Es.DateFormat'),
+ title: i18n.t('meta.Sinks.ES.DateFormat'),
dataIndex: 'format',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
@@ -239,7 +239,7 @@ const getFieldListColumns = sinkValues => {
visible: (text, record) => record.fieldType === 'scaled_float',
},
{
- title: `ES ${i18n.t('meta.Sinks.Es.FieldDescription')}`,
+ title: `ES ${i18n.t('meta.Sinks.ES.FieldDescription')}`,
dataIndex: 'fieldComment',
props: (text, record, idx, isNew) => ({
disabled: [110, 130].includes(sinkValues?.status as number) && !isNew,
diff --git a/inlong-dashboard/src/metas/sinks/defaults/Mysql.ts b/inlong-dashboard/src/metas/sinks/defaults/MySQL.ts
similarity index 100%
rename from inlong-dashboard/src/metas/sinks/defaults/Mysql.ts
rename to inlong-dashboard/src/metas/sinks/defaults/MySQL.ts
diff --git a/inlong-dashboard/src/metas/sinks/defaults/Oracle.ts b/inlong-dashboard/src/metas/sinks/defaults/Oracle.ts
index f351c992c..6837be3c2 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/Oracle.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/Oracle.ts
@@ -16,7 +16,6 @@
*/
import i18n from '@/i18n';
-import type { FieldItemType } from '@/metas/common';
import { DataWithBackend } from '@/metas/DataWithBackend';
import { SinkInfo } from '../common/SinkInfo';
import { sourceFields } from '../common/sourceFields';
diff --git a/inlong-dashboard/src/metas/sinks/defaults/PostgreSql.ts b/inlong-dashboard/src/metas/sinks/defaults/PostgreSQL.ts
similarity index 100%
rename from inlong-dashboard/src/metas/sinks/defaults/PostgreSql.ts
rename to inlong-dashboard/src/metas/sinks/defaults/PostgreSQL.ts
diff --git a/inlong-dashboard/src/metas/sinks/defaults/SQLServer.ts b/inlong-dashboard/src/metas/sinks/defaults/SQLServer.ts
index 41fbd37b5..52b46b3fd 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/SQLServer.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/SQLServer.ts
@@ -16,7 +16,6 @@
*/
import i18n from '@/i18n';
-import type { FieldItemType } from '@/metas/common';
import EditableTable from '@/components/EditableTable';
import { SinkInfo } from '../common/SinkInfo';
import { DataWithBackend } from '@/metas/DataWithBackend';
diff --git a/inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSql.ts b/inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSQL.ts
similarity index 97%
rename from inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSql.ts
rename to inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSQL.ts
index 628a364fe..26e7cc9fa 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSql.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/TDSQLPostgreSQL.ts
@@ -16,7 +16,6 @@
*/
import i18n from '@/i18n';
-import type { FieldItemType } from '@/metas/common';
import EditableTable from '@/components/EditableTable';
import { DataWithBackend } from '@/metas/DataWithBackend';
import { sourceFields } from '../common/sourceFields';
@@ -53,7 +52,7 @@ const tdsqlPostgreSQLFieldTypes = [
value: item,
}));
-export default class TDSQLPostgreSqlSink extends SinkInfo implements DataWithBackend {
+export default class TDSQLPostgreSQLSink extends SinkInfo implements DataWithBackend {
@FormField({
type: 'input',
rules: [{ required: true }],
diff --git a/inlong-dashboard/src/metas/sinks/defaults/index.ts b/inlong-dashboard/src/metas/sinks/defaults/index.ts
index c48571b27..9c4e13378 100644
--- a/inlong-dashboard/src/metas/sinks/defaults/index.ts
+++ b/inlong-dashboard/src/metas/sinks/defaults/index.ts
@@ -26,9 +26,9 @@ export const allDefaultSinks: MetaExportWithBackendList = [
LoadEntity: () => import('../common/SinkInfo').then(r => ({ default: r.SinkInfo })),
},
{
- label: 'Clickhouse',
+ label: 'ClickHouse',
value: 'CLICKHOUSE',
- LoadEntity: () => import('./Clickhouse'),
+ LoadEntity: () => import('./ClickHouse'),
},
{
label: 'Doris',
@@ -38,7 +38,7 @@ export const allDefaultSinks: MetaExportWithBackendList = [
{
label: 'Elasticsearch',
value: 'ELASTICSEARCH',
- LoadEntity: () => import('./Es'),
+ LoadEntity: () => import('./ES'),
},
{
label: 'Greenplum',
@@ -68,7 +68,7 @@ export const allDefaultSinks: MetaExportWithBackendList = [
{
label: 'MySQL',
value: 'MYSQL',
- LoadEntity: () => import('./Mysql'),
+ LoadEntity: () => import('./MySQL'),
},
{
label: 'Oracle',
@@ -78,7 +78,7 @@ export const allDefaultSinks: MetaExportWithBackendList = [
{
label: 'PostgreSQL',
value: 'POSTGRESQL',
- LoadEntity: () => import('./PostgreSql'),
+ LoadEntity: () => import('./PostgreSQL'),
},
{
label: 'SQLServer',
@@ -88,6 +88,6 @@ export const allDefaultSinks: MetaExportWithBackendList = [
{
label: 'TDSQLPostgreSQL',
value: 'TDSQLPOSTGRESQL',
- LoadEntity: () => import('./TDSQLPostgreSql'),
+ LoadEntity: () => import('./TDSQLPostgreSQL'),
},
];
diff --git a/inlong-dashboard/src/metas/sources/defaults/MysqlBinlog.ts b/inlong-dashboard/src/metas/sources/defaults/MySQLBinlog.ts
similarity index 100%
rename from inlong-dashboard/src/metas/sources/defaults/MysqlBinlog.ts
rename to inlong-dashboard/src/metas/sources/defaults/MySQLBinlog.ts
diff --git a/inlong-dashboard/src/metas/sources/defaults/index.ts b/inlong-dashboard/src/metas/sources/defaults/index.ts
index dcf3c80ad..735b7f604 100644
--- a/inlong-dashboard/src/metas/sources/defaults/index.ts
+++ b/inlong-dashboard/src/metas/sources/defaults/index.ts
@@ -26,18 +26,18 @@ export const allDefaultSources: MetaExportWithBackendList = [
LoadEntity: () => import('../common/SourceInfo').then(r => ({ default: r.SourceInfo })),
},
{
- label: 'Auto Push',
+ label: 'Auto-Push',
value: 'AUTO_PUSH',
LoadEntity: () => import('./AutoPush'),
},
- {
- label: 'MySQL BinLog',
- value: 'MYSQL_BINLOG',
- LoadEntity: () => import('./MysqlBinlog'),
- },
{
label: 'File',
value: 'FILE',
LoadEntity: () => import('./File'),
},
+ {
+ label: 'MySQL-BinLog',
+ value: 'MYSQL_BINLOG',
+ LoadEntity: () => import('./MySQLBinlog'),
+ },
];
diff --git a/inlong-dashboard/src/metas/streams/common/StreamDefaultInfo.ts b/inlong-dashboard/src/metas/streams/common/StreamDefaultInfo.ts
index 87f153467..35e639d56 100644
--- a/inlong-dashboard/src/metas/streams/common/StreamDefaultInfo.ts
+++ b/inlong-dashboard/src/metas/streams/common/StreamDefaultInfo.ts
@@ -88,7 +88,7 @@ export class StreamDefaultInfo extends DataWithBackend {
@FormField({
type: 'radio',
initialValue: 'CSV',
- tooltip: i18n.t('meta.Stream.DataTypeCsvHelp'),
+ tooltip: i18n.t('meta.Stream.DataTypeHelp'),
props: {
options: [
{
@@ -96,16 +96,8 @@ export class StreamDefaultInfo extends DataWithBackend {
value: 'CSV',
},
{
- label: 'KEY-VALUE',
- value: 'KEY-VALUE',
- },
- {
- label: 'JSON',
- value: 'JSON',
- },
- {
- label: 'AVRO',
- value: 'AVRO',
+ label: 'Raw-CSV',
+ value: 'RAW_CSV',
},
],
},
diff --git a/inlong-dashboard/src/pages/Login/index.tsx b/inlong-dashboard/src/pages/Login/index.tsx
index fbe72c0a7..9103f2226 100644
--- a/inlong-dashboard/src/pages/Login/index.tsx
+++ b/inlong-dashboard/src/pages/Login/index.tsx
@@ -76,7 +76,7 @@ const Comp: React.FC = () => {
<img src={config.logo} style={{ width: '100%' }} alt={config.title} />
<FormGenerator form={form} content={formConfig} />
<Button type="primary" onClick={login} style={{ width: '100%' }} size="large">
- {t('pages.Login.LogIn')}
+ {t('pages.Login.Login')}
</Button>
</div>
</div>