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 986d553bdf [INLONG-8316][Dashboard] Update length limit for partial ID
or name field (#8317)
986d553bdf is described below
commit 986d553bdfaa418dd86e0ad6dea4a65577564470
Author: haifxu <[email protected]>
AuthorDate: Wed Jun 28 10:25:38 2023 +0800
[INLONG-8316][Dashboard] Update length limit for partial ID or name field
(#8317)
* Update length limit for partial ID or name field
* Update inlong-dashboard/src/ui/locales/cn.json
* Update SourceDefaultInfo.ts
---------
Co-authored-by: healchow <[email protected]>
---
.../src/plugins/groups/common/GroupDefaultInfo.ts | 4 ++--
.../src/plugins/sinks/common/SinkDefaultInfo.ts | 4 ++--
.../src/plugins/sources/common/SourceDefaultInfo.ts | 11 +++++++++--
.../src/plugins/streams/common/StreamDefaultInfo.ts | 4 ++--
.../plugins/transform/common/TransformDefaultInfo.ts | 19 +++++++++++--------
inlong-dashboard/src/ui/locales/cn.json | 10 +++++++---
inlong-dashboard/src/ui/locales/en.json | 10 +++++++---
.../apache/inlong/manager/pojo/sink/SinkRequest.java | 2 +-
.../manager/pojo/transform/TransformRequest.java | 2 +-
9 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts
b/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts
index bbf3e1595c..2432e5d148 100644
--- a/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts
+++ b/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts
@@ -39,12 +39,12 @@ export class GroupDefaultInfo implements DataWithBackend,
RenderRow, RenderList
@FieldDecorator({
type: 'input',
props: {
- maxLength: 100,
+ maxLength: 200,
},
rules: [
{ required: true },
{
- pattern: /^[a-z_0-9]+$/,
+ pattern: /^[a-zA-Z0-9_.-]+$/,
message: i18n.t('meta.Group.InlongGroupIdRules'),
},
],
diff --git a/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts
b/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts
index 42b0e9c0ff..d64591f6d9 100644
--- a/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts
+++ b/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts
@@ -79,13 +79,13 @@ export class SinkDefaultInfo implements DataWithBackend,
RenderRow, RenderList {
rules: [
{ required: true },
{
- pattern: /^[a-zA-Z][a-zA-Z0-9_-]*$/,
+ pattern: /^[a-zA-Z0-9_.-]*$/,
message: i18n.t('meta.Sinks.SinkNameRule'),
},
],
props: values => ({
disabled: !!values.id,
- maxLength: 128,
+ maxLength: 100,
}),
visible: values => Boolean(values.sinkType),
})
diff --git a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts
b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts
index bfa15b29f8..7321838694 100644
--- a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts
+++ b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts
@@ -23,6 +23,7 @@ import { RenderList } from '@/plugins/RenderList';
import CheckCard from '@/ui/components/CheckCard';
import { statusList, genStatusTag } from './status';
import { sources, defaultValue } from '..';
+import i18n from '@/i18n';
const { I18nMap, I18n } = DataWithBackend;
const { FieldList, FieldDecorator } = RenderRow;
@@ -73,10 +74,16 @@ export class SourceDefaultInfo implements DataWithBackend,
RenderRow, RenderList
@FieldDecorator({
type: 'input',
- rules: [{ required: true }],
+ rules: [
+ { required: true },
+ {
+ pattern: /^[a-zA-Z0-9_.-]*$/,
+ message: i18n.t('meta.Sources.NameRule'),
+ },
+ ],
props: values => ({
disabled: Boolean(values.id),
- maxLength: 128,
+ maxLength: 100,
}),
visible: values => Boolean(values.sourceType),
})
diff --git a/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
b/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
index 49ac7c3b93..7f4b6944e2 100644
--- a/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
+++ b/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts
@@ -40,12 +40,12 @@ export class StreamDefaultInfo implements DataWithBackend,
RenderRow, RenderList
type: 'input',
props: values => ({
disabled: Boolean(values?.status),
- maxLength: 64,
+ maxLength: 200,
}),
rules: [
{ required: true },
{
- pattern: /^[0-9a-z_-]+$/,
+ pattern: /^[a-zA-Z0-9_.-]+$/,
message: i18n.t('meta.Stream.StreamIdRules'),
},
],
diff --git
a/inlong-dashboard/src/plugins/transform/common/TransformDefaultInfo.ts
b/inlong-dashboard/src/plugins/transform/common/TransformDefaultInfo.ts
index df2346905d..c5cf42f279 100644
--- a/inlong-dashboard/src/plugins/transform/common/TransformDefaultInfo.ts
+++ b/inlong-dashboard/src/plugins/transform/common/TransformDefaultInfo.ts
@@ -20,9 +20,8 @@
import { DataWithBackend } from '@/plugins/DataWithBackend';
import { RenderRow } from '@/plugins/RenderRow';
import { RenderList } from '@/plugins/RenderList';
-import CheckCard from '@/ui/components/CheckCard';
-import { statusList, genStatusTag } from './status';
import { transform, defaultValue } from '..';
+import i18n from '@/i18n';
const { I18nMap, I18n } = DataWithBackend;
const { FieldList, FieldDecorator } = RenderRow;
@@ -52,15 +51,20 @@ export class TransformDefaultInfo implements
DataWithBackend, RenderRow, RenderL
@FieldDecorator({
type: 'input',
- rules: [{ required: true }],
+ rules: [
+ { required: true },
+ {
+ pattern: /^[a-zA-Z0-9_.-]*$/,
+ message: i18n.t('meta.Transform.NameRule'),
+ },
+ ],
props: values => ({
disabled: Boolean(values.id),
- maxLength: 128,
+ maxLength: 100,
}),
- // visible: values => Boolean(values.sourceType),
})
@ColumnDecorator()
- @I18n('转换节点名称')
+ @I18n('meta.Transform.Name')
transformName: string;
@FieldDecorator({
@@ -79,8 +83,7 @@ export class TransformDefaultInfo implements DataWithBackend,
RenderRow, RenderL
}),
})
@ColumnDecorator()
- @I18n('转换类型')
- // sourceType: string;
+ @I18n('meta.Transform.Type')
transformType: string;
parse(data) {
diff --git a/inlong-dashboard/src/ui/locales/cn.json
b/inlong-dashboard/src/ui/locales/cn.json
index e6da083a5e..db3c861f09 100644
--- a/inlong-dashboard/src/ui/locales/cn.json
+++ b/inlong-dashboard/src/ui/locales/cn.json
@@ -22,6 +22,7 @@
"basic.SuccessfullyRestart": "重启成功",
"basic.SuccessfullyStop": "停止成功",
"meta.Sources.Name": "数据源名称",
+ "meta.Sources.NameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
"meta.Sources.Type": "类型",
"meta.Sources.File.SerializationType": "文件类型",
"meta.Sources.File.DataSourceIP": "数据源 IP",
@@ -114,7 +115,7 @@
"meta.Sources.Hudi.ExtListHelper": "hudi 表的 DDL 属性需带前缀'ddl.'",
"meta.Sources.Hudi.ExtList": "高级属性",
"meta.Sinks.SinkName": "名称",
- "meta.Sinks.SinkNameRule": "以英文字母开头，只能包含英文字母、数字、中划线、下划线",
+ "meta.Sinks.SinkNameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
"meta.Sinks.SinkType": "类型",
"meta.Sinks.Description": "描述",
"meta.Sinks.SourceFieldName": "源字段名",
@@ -362,7 +363,7 @@
"meta.Sinks.Kudu.FieldDescription": "描述",
"meta.Sinks.Kudu.buckets": "Buckets",
"meta.Group.InlongGroupId": "数据流组 ID",
- "meta.Group.InlongGroupIdRules": "只能包含小写字母、数字、中划线、下划线",
+ "meta.Group.InlongGroupIdRules": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
"meta.Group.InlongGroupName": "数据流组名称",
"meta.Group.InlongGroupOwners": "责任人",
"meta.Group.InlongGroupOwnersExtra": "责任人，可查看、修改数据流组信息",
@@ -409,7 +410,7 @@
"meta.Group.Status.Restarting": "重启中",
"meta.Group.Status.Restarted": "已重启",
"meta.Stream.StreamId": "数据流 ID",
- "meta.Stream.StreamIdRules": "只能包含小写字母、数字、中划线、下划线",
+ "meta.Stream.StreamIdRules": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
"meta.Stream.DataSeparator": "源数据字段分割符",
"meta.Stream.DataSeparator.Space": "空格",
"meta.Stream.DataSeparator.Asterisk": "星号(*)",
@@ -436,6 +437,9 @@
"meta.Stream.ExecuteSuccess": "执行成功",
"meta.Stream.WrapWithInlongMsg": "InlongMsg 打包",
"meta.Stream.WrapWithInlongMsgHelp": "消息体使用 InlongMsg 打包",
+ "meta.Transform.Name": "转换名称",
+ "meta.Transform.NameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
+ "meta.Transform.Type": "转换类型",
"meta.Consume.ConsumerGroupName": "消费组名称",
"meta.Consume.ConsumerGroupNameRules": "只能包含小写字母、数字、中划线、下划线",
"meta.Consume.TopicName": "Topic 名称",
diff --git a/inlong-dashboard/src/ui/locales/en.json
b/inlong-dashboard/src/ui/locales/en.json
index 81fc188212..249d073c43 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -22,6 +22,7 @@
"basic.SuccessfullyRestart": "Successfully restart",
"basic.SuccessfullyStop": "Successfully stop",
"meta.Sources.Name": "Source Name",
+ "meta.Sources.NameRule": "Only English letters, numbers, dots(.), minus(-),
and underscores(_)",
"meta.Sources.Type": "Type",
"meta.Sources.File.SerializationType": "File type",
"meta.Sources.File.DataSourceIP": "Data source IP",
@@ -114,7 +115,7 @@
"meta.Sources.Hudi.ExtListHelper": "The DDL attribute of the hudi table
needs to be prefixed with 'ddl.'",
"meta.Sources.Hudi.ExtList": "AdvancedProperties",
"meta.Sinks.SinkName": "Name",
- "meta.Sinks.SinkNameRule": "At the beginning of English letters, only
English letters, numbers, minus, and underscores",
+ "meta.Sinks.SinkNameRule": "Only English letters, numbers, dots(.),
minus(-), and underscores(_)",
"meta.Sinks.SinkType": "Type",
"meta.Sinks.Description": "SinkDescription",
"meta.Sinks.SourceFieldName": "SourceFieldName",
@@ -362,7 +363,7 @@
"meta.Sinks.Kudu.FieldDescription": "FieldDescription",
"meta.Sinks.Kudu.buckets": "Buckets",
"meta.Group.InlongGroupId": "Inlong Group ID",
- "meta.Group.InlongGroupIdRules": "Only lowercase letters, numbers, minus,
and underscores",
+ "meta.Group.InlongGroupIdRules": "Only English letters, numbers, dots(.),
minus(-), and underscores(_)",
"meta.Group.InlongGroupName": "Inlong Group Name",
"meta.Group.InlongGroupOwners": "Inlong Group Owners",
"meta.Group.InlongGroupOwnersExtra": "Can view, modify group info",
@@ -409,7 +410,7 @@
"meta.Group.Status.Restarting": "Restarting",
"meta.Group.Status.Restarted": "Restarted",
"meta.Stream.StreamId": "Stream ID",
- "meta.Stream.StreamIdRules": "Only lowercase letters, numbers, minus, and
underscores",
+ "meta.Stream.StreamIdRules": "Only English letters, numbers, dots(.),
minus(-), and underscores(_)",
"meta.Stream.DataSeparator": "Source data separator",
"meta.Stream.DataSeparator.Space": "Space",
"meta.Stream.DataSeparator.Asterisk": "Asterisk(*)",
@@ -436,6 +437,9 @@
"meta.Stream.ExecuteSuccess": "Execution Success",
"meta.Stream.WrapWithInlongMsg": "Wrap with InlongMsg",
"meta.Stream.WrapWithInlongMsgHelp": "The message body packaged with
InlongMsg",
+ "meta.Transform.Name": "Transform Name",
+ "meta.Transform.NameRule": "Only supports letters, numbers, dots(.),
minus(-), and underscores(_)",
+ "meta.Transform.Type": "Transform Type",
"meta.Consume.ConsumerGroupName": "Consumer Group Name",
"meta.Consume.TopicName": "Topic Name",
"meta.Consume.MQType": "MQ Type",
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
index 6c59299a7d..8c190a3a84 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/SinkRequest.java
@@ -68,7 +68,7 @@ public abstract class SinkRequest {
@ApiModelProperty("Sink name, unique in one stream")
@NotBlank(groups = {SaveValidation.class, UpdateByKeyValidation.class},
message = "sinkName cannot be blank")
@Length(min = 1, max = 100, message = "sinkName length must be between 1
and 100")
- @Pattern(regexp = "^[a-zA-Z0-9_-]{1,100}$", message = "sinkName only
supports letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,100}$", message = "sinkName only
supports letters, numbers, '.', '-', or '_'")
private String sinkName;
@ApiModelProperty("Sink description")
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
index a3edcf39c3..98ade456f5 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/transform/TransformRequest.java
@@ -58,7 +58,7 @@ public class TransformRequest {
@ApiModelProperty("Transform name, unique in one stream")
@NotBlank(groups = SaveValidation.class, message = "transformName cannot
be blank")
@Length(min = 1, max = 100, message = "transformName length must be
between 1 and 100")
- @Pattern(regexp = "^[a-zA-Z0-9_-]{1,100}$", message = "transformName only
supports letters, numbers, '-', or '_'")
+ @Pattern(regexp = "^[a-zA-Z0-9_.-]{1,100}$", message = "transformName only
supports letters, numbers, '.', '-', or '_'")
private String transformName;
@ApiModelProperty("Transform type, including: splitter, filter, joiner,
etc.")
