[INLONG-9495][Dashboard] Data synchronization basic information page …

…optimization
apache · Dec 19, 2023 · e23772d · e23772d
1 parent 5c367a7
commit e23772d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 72 deletions.
diff --git a/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts b/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts
@@ -51,47 +51,12 @@ export class SyncDefaultInfo implements DataWithBackend, RenderRow, RenderList {
     ],
   })
   @ColumnDecorator()
-  @I18n('meta.Group.InlongGroupId')
+  @I18n('meta.Synchronize.TaskName')
   inlongGroupId: string;
 
-  @FieldDecorator({
-    type: 'input',
-    props: values => ({
-      maxLength: 100,
-      disable: Boolean(values?.id),
-    }),
-    rules: [
-      { required: true },
-      {
-        pattern: /^[a-z_0-9]+$/,
-        message: i18n.t('meta.Group.InlongGroupIdRules'),
-      },
-    ],
-  })
-  @I18n('StreamID')
-  inlongStreamId: string;
-
-  @FieldDecorator({
-    type: 'input',
-    props: {
-      maxLength: 32,
-    },
-  })
-  @I18n('meta.Group.InlongGroupName')
-  name: string;
-
-  @FieldDecorator({
-    type: 'input',
-    props: {
-      maxLength: 32,
-    },
-  })
-  @I18n('meta.Stream.StreamName')
-  streamName: string;
-
   @FieldDecorator({
     type: UserSelect,
-    extra: i18n.t('meta.Group.InlongGroupOwnersExtra'),
+    extra: i18n.t('meta.Synchronize.InlongGroupOwnersExtra'),
     rules: [{ required: true }],
     props: {
       mode: 'multiple',
@@ -119,7 +84,7 @@ export class SyncDefaultInfo implements DataWithBackend, RenderRow, RenderList {
       ],
     },
   })
-  @I18n('components.Synchronize.SinkMultipleEnable')
+  @I18n('meta.Synchronize.SinkMultipleEnable')
   sinkMultipleEnable: boolean;
 
   @FieldDecorator({

diff --git a/inlong-dashboard/src/ui/locales/cn.json b/inlong-dashboard/src/ui/locales/cn.json
@@ -205,6 +205,7 @@
   "meta.Sinks.Iceberg.Description": "表描述",
   "meta.Sinks.Iceberg.ExtList": "属性",
   "meta.Sinks.Iceberg.DataConsistency": "数据一致性",
+  "meta.Sinks.Iceberg.PartitionStrategy": "分区策略",
   "meta.Sinks.Iceberg.DatabasePattern": "库匹配策略",
   "meta.Sinks.Iceberg.TablePattern": "表匹配策略",
   "meta.Sinks.Iceberg.Options.DBSameName": "与来源库同名",
@@ -283,11 +284,8 @@
   "meta.Sinks.StarRocks.TablePattern": "多表模式",
   "meta.Sinks.StarRocks.IsMetaField": "是否为元字段",
   "meta.Sinks.StarRocks.FieldFormat": "字段格式",
-  "meta.Sinks.Redis.ttlUnit": "秒",
-  "meta.Sinks.Redis.IsMetaField": "是否为元字段",
   "meta.Sinks.Redis.FieldFormat": "字段格式",
   "meta.Sinks.Redis.Database": "DatabaseID",
-  "meta.Sinks.Redis.Password": "密码",
   "meta.Sinks.Redis.Ttl": "TTL",
   "meta.Sinks.Redis.TtlUnit": "秒",
   "meta.Sinks.Redis.ExtList": "高级参数",
@@ -331,7 +329,6 @@
   "meta.Sinks.Cls.Tag": "标签",
   "meta.Sinks.Cls.Tokenizer": "分词规则",
   "meta.Sinks.Cls.IsMetaField": "是否为元字段",
-  "meta.Sinks.Cls.FieldFormat": "字段格式",
   "meta.Group.InlongGroupId": "数据流组 ID",
   "meta.Group.InlongGroupIdRules": "只能包含小写字母、数字、点号(.)、中划线(-)、下划线(_)",
   "meta.Group.InlongGroupName": "数据流组名称",
@@ -379,6 +376,9 @@
   "meta.Group.Status.Suspended": "已停止",
   "meta.Group.Status.Restarting": "重启中",
   "meta.Group.Status.Restarted": "已重启",
+  "meta.Synchronize.SinkMultipleEnable": "整库迁移",
+  "meta.Synchronize.TaskName": "任务名称",
+  "meta.Synchronize.InlongGroupOwnersExtra": "责任人，可查看、修改任务信息",
   "meta.Stream.StreamId": "数据流 ID",
   "meta.Stream.StreamIdRules": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
   "meta.Stream.DataSeparator": "源数据字段分割符",
@@ -409,8 +409,6 @@
   "meta.Stream.WrapTypeHelp": "消息体打包类型，默认 InLongMsg V0。Raw：不对消息体进行任何协议打包，InLongMsg V0：六段式打包协议，InLongMsg V1：PB 打包协议",
   "meta.Stream.PredefinedFields": "预定义字段",
   "meta.Transform.Name": "转换名称",
-  "meta.Transform.NameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)",
-  "meta.Transform.Type": "转换类型",
   "meta.Consume.ConsumerGroupName": "消费组名称",
   "meta.Consume.ConsumerGroupNameRules": "只能包含小写字母、数字、中划线、下划线",
   "meta.Consume.TopicName": "Topic 名称",
@@ -479,8 +477,6 @@
   "meta.Nodes.Redis.Database": "Database",
   "meta.Nodes.Redis.ClusterMode": "集群模式",
   "meta.Nodes.Redis.clusterModeHelp": "Redis 集群模式, 可为 [cluster|sentinel|standalone]",
-  "meta.Nodes.Redis.Password": "密码",
-  "meta.Nodes.Redis.Url": "地址",
   "meta.Nodes.Kudu.masters": "主节点",
   "meta.Nodes.Kudu.DefaultAdminOperationTimeoutMs": "管理操作默认超时(ms)",
   "meta.Nodes.Kudu.DefaultOperationTimeoutMs": "用户操作默认超时(ms)",
@@ -793,7 +789,6 @@
   "pages.SynchronizeDashboard.config.Reject": "已驳回",
   "pages.SynchronizeDetail.Info.Back": "返回",
   "pages.SynchronizeDetail.Info.NextStep": "下一步",
-  "pages.SynchronizeDetail.Info.DataStreams": "数据流",
   "pages.SynchronizeDetail.Info.Submit": "提交审批",
   "pages.SynchronizeDetail.Info.SubmittedSuccessfully": "提交成功",
   "pages.SynchronizeDetail.Info.SubmittedWarn": "请先创建数据源和数据目标",
@@ -820,7 +815,6 @@
   "pages.SynchronizeDetail.Transform.Type.Field": "字段",
   "pages.SynchronizeDetail.Transform.Type.CustomValue": "自定义值",
   "pages.SynchronizeDetail.Transform.ComparisonValue": "比较值",
-  "components.Synchronize.SinkMultipleEnable": "整库迁移",
   "components.FieldList.Source": "源字段",
   "components.FieldList.Sink": "目标字段",
   "components.FieldList.CreateSource": "新建源字段",

diff --git a/inlong-dashboard/src/ui/locales/en.json b/inlong-dashboard/src/ui/locales/en.json
@@ -284,23 +284,19 @@
   "meta.Sinks.StarRocks.TablePattern": "Table pattern",
   "meta.Sinks.StarRocks.IsMetaField": "Is meta field",
   "meta.Sinks.StarRocks.FieldFormat": "Field format",
-  "meta.Sinks.Redis.clusterModeHelp": "Redis cluster mode, contains [cluster|sentinel|standalone]",
-  "meta.Sinks.Redis.ttlUnit": "s",
-  "meta.Sinks.Redis.IsMetaField": "Is meta field",
   "meta.Sinks.Redis.FieldFormat": "Field format",
-  "meta.Sinks.Redis.database": "Database id",
-  "meta.Sinks.Redis.password": "Password",
-  "meta.Sinks.Redis.ttl": "TTL",
+  "meta.Sinks.Redis.Database": "Database id",
+  "meta.Sinks.Redis.Ttl": "TTL",
   "meta.Sinks.Redis.TtlUnit": "s",
   "meta.Sinks.Redis.ExtList": "Ext list",
   "meta.Sinks.Redis.Timeout": "Time out",
   "meta.Sinks.Redis.SoTimeout": "So timeout",
   "meta.Sinks.Redis.MaxTotal": "Max total",
   "meta.Sinks.Redis.MaxIdle": "Max idle",
   "meta.Sinks.Redis.MinIdle": "Min idle",
-  "meta.Sinks.Redis.maxRetries": "Max retries",
-  "meta.Sinks.Redis.dataType": "Data type",
-  "meta.Sinks.Redis.schemaMapMode": "Schema map mode",
+  "meta.Sinks.Redis.MaxRetries": "Max retries",
+  "meta.Sinks.Redis.DataType": "Data type",
+  "meta.Sinks.Redis.SchemaMapMode": "Schema map mode",
   "meta.Sinks.Redis.TimeoutUnit": "s",
   "meta.Sinks.Redis.SoTimeoutUnit": "s",
   "meta.Sinks.Redis.FormatDataType": "Format data type",
@@ -333,7 +329,6 @@
   "meta.Sinks.Cls.Tag": "Tag",
   "meta.Sinks.Cls.Tokenizer": "Tokenizer rule",
   "meta.Sinks.Cls.IsMetaField": "Is meta field",
-  "meta.Sinks.Cls.FieldFormat": "Field format",
   "meta.Group.InlongGroupId": "Inlong group id",
   "meta.Group.InlongGroupIdRules": "Only English letters, numbers, dots(.), minus(-), and underscores(_)",
   "meta.Group.InlongGroupName": "Inlong group name",
@@ -381,6 +376,9 @@
   "meta.Group.Status.Suspended": "Suspended",
   "meta.Group.Status.Restarting": "Restarting",
   "meta.Group.Status.Restarted": "Restarted",
+  "meta.Synchronize.SinkMultipleEnable": "Full database migration",
+  "meta.Synchronize.TaskName": "Task name",
+  "meta.Synchronize.InlongGroupOwnersExtra": "Can view, modify task info",
   "meta.Stream.StreamId": "Stream id",
   "meta.Stream.StreamIdRules": "Only English letters, numbers, dots(.), minus(-), and underscores(_)",
   "meta.Stream.DataSeparator": "Source data separator",
@@ -411,8 +409,6 @@
   "meta.Stream.WrapTypeHelp": "Message body packaging type, default InLongMsg V0. Raw: No protocol packaging of the message body, InLongMsg V0: Six-stage packaging protocol, InLongMsg V1: PB packaging protocol",
   "meta.Stream.PredefinedFields": "Predefined fields",
   "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",
@@ -476,8 +472,6 @@
   "meta.Nodes.Redis.ClusterMode": "Cluster mode",
   "meta.Nodes.Redis.ClusterModeHelper": "Please select custer mode",
   "meta.Nodes.Redis.PortHelper": "Please select Redis server port, default: 6379",
-  "meta.Nodes.Redis.Password": "Password",
-  "meta.Nodes.Redis.Url": "URL",
   "meta.Nodes.Hudi.Username": "Username",
   "meta.Nodes.Hudi.Password": "Password",
   "meta.Nodes.Hudi.Url": "URL",
@@ -529,6 +523,8 @@
   "components.FieldList.SinkFieldName": "Sink field name",
   "components.FieldList.SinkFieldType": "Sink field type",
   "components.FieldList.FieldComment": "Field comment",
+  "components.CreateTable.Table": "Create  table",
+  "components.CreateTable.TableType": "Table type",
   "configs.pagination.Total": "Total {{total}} items",
   "pages.GroupDashboard.ExecutionLogModal.Re-executingSuccess": "Re-executing success",
   "pages.GroupDashboard.ExecutionLogModal.TaskType": "Task type",
@@ -791,7 +787,6 @@
   "pages.SynchronizeDashboard.config.ExecuteLog": "Execute log",
   "pages.SynchronizeDashboard.config.Restart": "Restart",
   "pages.SynchronizeDashboard.config.Stop": "Stop",
-  "pages.SynchronizeDashboard.Info.NextStep": "Next",
   "pages.SynchronizeDetail.Info.Back": "Back",
   "pages.SynchronizeDetail.Info.NextStep": "Next",
   "pages.SynchronizeDetail.Info.Submit": "Submit",
@@ -806,10 +801,6 @@
   "pages.SynchronizeDetail.Transform.Create": "Create",
   "pages.SynchronizeDetail.Audit.Read": "Read",
   "pages.SynchronizeDetail.Audit.Receive": "Receive",
-  "components.FieldList.Source": "Source fields",
-  "components.FieldList.Sink": "Sink fields",
-  "components.FieldList.CreateSource": "Create source fields",
-  "components.FieldList.CreateSink": "Create sink fields",
   "pages.SynchronizeDetail.Transform.FilterAction": "filter Strategy",
   "pages.SynchronizeDetail.Transform.FilterAction.Tooltip": "Retain: Write the data that matches the filtering rule to the target table. Remove: Do not write the data of the hit rule into the target table.",
   "pages.SynchronizeDetail.Transform.FilterAction.RemoveData": "Remove matching data",
@@ -824,7 +815,10 @@
   "pages.SynchronizeDetail.Transform.Type.Field": "Field",
   "pages.SynchronizeDetail.Transform.Type.CustomValue": "Custom value",
   "pages.SynchronizeDetail.Transform.ComparisonValue": "Comparison value",
-  "components.Synchronize.SinkMultipleEnable": "Full database migration",
+  "components.FieldList.Source": "Source fields",
+  "components.FieldList.Sink": "Sink fields",
+  "components.FieldList.CreateSource": "Create source fields",
+  "components.FieldList.CreateSink": "Create sink fields",
   "components.FieldList.AddField": "Add field",
   "pages.Tenant.config.Description": "Description",
   "pages.Tenant.config.Name": "Tenant name",

diff --git a/inlong-dashboard/src/ui/pages/SynchronizeDetail/Info/index.tsx b/inlong-dashboard/src/ui/pages/SynchronizeDetail/Info/index.tsx
@@ -108,8 +108,7 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly, isCreate }: Props, ref)
 
     const submitDataStream = {
       inlongGroupId: values.inlongGroupId,
-      inlongStreamId: values.inlongStreamId,
-      name: values.streamName,
+      inlongStreamId: values.inlongGroupId,
       fieldList: streamDetail?.fieldList,
       sinkMultipleEnable: values.sinkMultipleEnable,
     };
@@ -163,7 +162,6 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly, isCreate }: Props, ref)
 
   const onCancel = () => {
     form.setFieldsValue(data);
-    // form.setFieldsValue(dataStream);
     setFalse();
   };
 
@@ -182,7 +180,7 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly, isCreate }: Props, ref)
         initialValues={data}
         onValuesChange={(c, values) => setMqType(values.mqType)}
         useMaxWidth={1400}
-        col={12}
+        col={14}
       />
 
       {!isCreate && !readonly && (