[INLONG-9729][Dashboard] Data access sink field mapping supports unde…

…rscores
bluewang · Feb 27, 2024 · 37bdbc4 · 37bdbc4
1 parent 1dc2d67
commit 37bdbc4
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 39 deletions.
diff --git a/inlong-dashboard/src/plugins/sinks/defaults/ClickHouse.ts b/inlong-dashboard/src/plugins/sinks/defaults/ClickHouse.ts
@@ -404,7 +404,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
+          pattern: /^[_a-zA-Z][a-zA-Z0-9_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Cls.ts b/inlong-dashboard/src/plugins/sinks/defaults/Cls.ts
@@ -142,7 +142,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Doris.ts b/inlong-dashboard/src/plugins/sinks/defaults/Doris.ts
@@ -280,7 +280,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Elasticsearch.ts b/inlong-dashboard/src/plugins/sinks/defaults/Elasticsearch.ts
@@ -137,7 +137,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
+          pattern: /^[_a-zA-Z][a-zA-Z0-9_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Greenplum.ts b/inlong-dashboard/src/plugins/sinks/defaults/Greenplum.ts
@@ -203,7 +203,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/HBase.ts b/inlong-dashboard/src/plugins/sinks/defaults/HBase.ts
@@ -180,7 +180,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Hive.ts b/inlong-dashboard/src/plugins/sinks/defaults/Hive.ts
@@ -349,7 +349,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts b/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts
@@ -187,7 +187,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Oracle.ts b/inlong-dashboard/src/plugins/sinks/defaults/Oracle.ts
@@ -196,7 +196,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/PostgreSQL.ts b/inlong-dashboard/src/plugins/sinks/defaults/PostgreSQL.ts
@@ -213,7 +213,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Redis.ts b/inlong-dashboard/src/plugins/sinks/defaults/Redis.ts
@@ -451,7 +451,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/SQLServer.ts b/inlong-dashboard/src/plugins/sinks/defaults/SQLServer.ts
@@ -252,7 +252,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/StarRocks.ts b/inlong-dashboard/src/plugins/sinks/defaults/StarRocks.ts
@@ -160,7 +160,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sinks/defaults/TDSQLPostgreSQL.ts b/inlong-dashboard/src/plugins/sinks/defaults/TDSQLPostgreSQL.ts
@@ -208,7 +208,7 @@ const getFieldListColumns = sinkValues => {
       rules: [
         { required: true },
         {
-          pattern: /^[a-z][0-9a-z_]*$/,
+          pattern: /^[_a-zA-Z][0-9a-z_]*$/,
           message: i18n.t('meta.Sinks.SinkFieldNameRule'),
         },
       ],

diff --git a/inlong-dashboard/src/plugins/sources/defaults/File.ts b/inlong-dashboard/src/plugins/sources/defaults/File.ts
@@ -150,28 +150,6 @@ export default class PulsarSource
   @I18n('meta.Sources.File.MaxFileCount')
   maxFileCount: number;
 
-  @FieldDecorator({
-    type: 'radio',
-    rules: [{ required: true }],
-    initialValue: 'default',
-    props: values => ({
-      disabled: Boolean(values.id),
-      options: [
-        {
-          label: 'Default',
-          value: 'default',
-        },
-        {
-          label: 'Mix',
-          value: 'mix',
-        },
-      ],
-    }),
-  })
-  @IngestionField()
-  @I18n('meta.Sources.File.DataContentStyle')
-  dataContentStyle: string;
-
   @FieldDecorator({
     type: 'radio',
     props: values => ({
@@ -229,5 +207,5 @@ export default class PulsarSource
   })
   @IngestionField()
   @I18n('meta.Sources.File.TimeZone')
-  timeZone: string;
+  agentTimeZone: string;
 }
diff --git a/inlong-dashboard/src/ui/locales/cn.json b/inlong-dashboard/src/ui/locales/cn.json
@@ -35,7 +35,6 @@
   "meta.Sources.File.TimeOffsetHelp": "从文件的某个时间开始采集，'1m'表示1分钟之后，'-1m'表示1分钟之前，支持m(分钟)，h(小时)，d(天)，空则从当前时间开始采集",
   "meta.Sources.File.TimeOffsetRules": "只能包含数字和字母 m、h、d",
   "meta.Sources.File.MaxFileCount": "最大文件数量",
-  "meta.Sources.File.DataContentStyle": "数据内容样式",
   "meta.Sources.File.Cycle": "周期",
   "meta.Sources.File.Cycle.Day": "天",
   "meta.Sources.File.Cycle.Hour": "小时",

diff --git a/inlong-dashboard/src/ui/locales/en.json b/inlong-dashboard/src/ui/locales/en.json
@@ -35,7 +35,6 @@
   "meta.Sources.File.TimeOffsetHelp": "The file will be collected from a certain time,' 1m' means 1 minute later,' -1m' means 1 minute before, and m(minute), h(hour), d(day) are supported. If it is empty, the file will be collected from the current time",
   "meta.Sources.File.TimeOffsetRules": "Can only contain numbers and letters m, h, d",
   "meta.Sources.File.MaxFileCount": "Max file count",
-  "meta.Sources.File.DataContentStyle": "Data content style",
   "meta.Sources.File.Cycle": "Cycle",
   "meta.Sources.File.Cycle.Day": "Day",
   "meta.Sources.File.Cycle.Hour": "Hour",