[INLONG-11379][Dashboard] Redis sink Properties saving problem (#11380)

apache · Oct 22, 2024 · 827a739 · 827a739
1 parent 6596da9
commit 827a739
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 29 deletions.
diff --git a/inlong-dashboard/src/plugins/sinks/defaults/Redis.ts b/inlong-dashboard/src/plugins/sinks/defaults/Redis.ts
@@ -295,35 +295,6 @@ export default class RedisSink extends SinkInfo implements DataWithBackend, Rend
   @I18n('meta.Sinks.Redis.Ttl')
   ttl: number;
 
-  @FieldDecorator({
-    type: EditableTable,
-    props: values => ({
-      size: 'small',
-      editing: ![110].includes(values?.status),
-      columns: getFieldListColumns(values),
-      canBatchAdd: true,
-      upsertByFieldKey: true,
-    }),
-  })
-  @IngestionField()
-  sinkFieldList: Record<string, unknown>[];
-
-  @FieldDecorator({
-    type: EditableTable,
-    initialValue: [],
-    props: values => ({
-      size: 'small',
-      editing: ![110].includes(values?.status),
-      columns: getFieldListColumns(values).filter(
-        item => item.dataIndex !== 'sourceFieldName' && item.dataIndex !== 'sourceFieldType',
-      ),
-      canBatchAdd: true,
-      upsertByFieldKey: true,
-    }),
-  })
-  @SyncCreateTableField()
-  createTableField: Record<string, unknown>[];
-
   @FieldDecorator({
     type: EditableTable,
     rules: [{ required: false }],
@@ -352,6 +323,34 @@ export default class RedisSink extends SinkInfo implements DataWithBackend, Rend
   @IngestionField()
   @I18n('meta.Sinks.Redis.ExtList')
   properties: string;
+  @FieldDecorator({
+    type: EditableTable,
+    props: values => ({
+      size: 'small',
+      editing: ![110].includes(values?.status),
+      columns: getFieldListColumns(values),
+      canBatchAdd: true,
+      upsertByFieldKey: true,
+    }),
+  })
+  @IngestionField()
+  sinkFieldList: Record<string, unknown>[];
+
+  @FieldDecorator({
+    type: EditableTable,
+    initialValue: [],
+    props: values => ({
+      size: 'small',
+      editing: ![110].includes(values?.status),
+      columns: getFieldListColumns(values).filter(
+        item => item.dataIndex !== 'sourceFieldName' && item.dataIndex !== 'sourceFieldType',
+      ),
+      canBatchAdd: true,
+      upsertByFieldKey: true,
+    }),
+  })
+  @SyncCreateTableField()
+  createTableField: Record<string, unknown>[];
 
   @FieldDecorator({
     type: 'inputnumber',

diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/DataStorage/DetailModal.tsx b/inlong-dashboard/src/ui/pages/GroupDetail/DataStorage/DetailModal.tsx
@@ -73,6 +73,12 @@ const Comp: React.FC<DetailModalProps> = ({
       formatResult: result => new Entity()?.parse(result) || result,
       onSuccess: result => {
         setSinkType(result.sinkType);
+        if (result.sinkType === 'REDIS') {
+          result.properties = Object.entries(result.properties).map(([key, value]) => ({
+            keyName: key,
+            keyValue: value,
+          }));
+        }
         form.setFieldsValue(result);
       },
     },
@@ -158,6 +164,19 @@ const Comp: React.FC<DetailModalProps> = ({
     if (startProcess) {
       submitData.startProcess = true;
     }
+    if (sinkType === 'REDIS') {
+      if (Array.isArray(submitData.properties) && submitData.properties.length > 0) {
+        const propertiesObject = submitData.properties.reduce((acc, item) => {
+          if (item.keyName && item.keyValue !== undefined) {
+            acc[item.keyName] = item.keyValue;
+          }
+          return acc;
+        }, {});
+        submitData.properties = propertiesObject;
+      } else {
+        submitData.properties = {};
+      }
+    }
     await request({
       url: isUpdate ? '/sink/update' : '/sink/save',
       method: 'POST',