feat: filter out duplicate data sources

twinkle77 · liujuping · commit 14e4983a4447 · 2022-08-08T16:05:30.000+08:00
diff --git a/demo/src/index.ts b/demo/src/index.ts
@@ -9,39 +9,39 @@ preference.set('DataSourcePane', {
   dataSourceTypes: [
     {
       type: 'fetch',
-      schema: {
-        type: "object",
-        properties: {
-          id: {
-            type: "string"
-          },
-          type: {
-            type: "string"
-          },
-          isInit: {
-            type: "boolean",
-          },
-          options: {
-            type: "object",
-            properties: {
-              method: {
-                type: "string",
-              },
-              isCors: {
-                type: "boolean",
-              },
-              timeout: {
-                type: "number",
-              },
-              uri: {
-                type: "string",
-              },
-            },
-            required: ["method", "isCors", "timeout", "uri"]
-          }
-        },
-        required: ["id", "type", "isInit", "options"]
-      }
+      // schema: {
+      //   type: "object",
+      //   properties: {
+      //     id: {
+      //       type: "string"
+      //     },
+      //     type: {
+      //       type: "string"
+      //     },
+      //     isInit: {
+      //       type: "boolean",
+      //     },
+      //     options: {
+      //       type: "object",
+      //       properties: {
+      //         method: {
+      //           type: "string",
+      //         },
+      //         isCors: {
+      //           type: "boolean",
+      //         },
+      //         timeout: {
+      //           type: "number",
+      //         },
+      //         uri: {
+      //           type: "string",
+      //         },
+      //       },
+      //       required: ["method", "isCors", "timeout", "uri"]
+      //     }
+      //   },
+      //   required: ["id", "type", "isInit", "options"]
+      // }
     },
     {
       type: 'jsonp',
diff --git a/packages/plugin-datasource-pane/src/components/DataSourceImport/DataSourceImport.tsx b/packages/plugin-datasource-pane/src/components/DataSourceImport/DataSourceImport.tsx
@@ -67,7 +67,7 @@ export class DataSourceImport extends PureComponent<
 
   constructor(props: DataSourceImportProps) {
     super(props);
-    this.state.code = JSON.stringify(this.deriveValue(this.props.defaultValue));
+    this.state.code = JSON.stringify(this.deriveValue(this.props.defaultValue), null, 2);
     this.handleEditorDidMount = this.handleEditorDidMount.bind(this);
     this.handleEditorChange = this.handleEditorChange.bind(this);
     this.handleComplete = this.handleComplete.bind(this);
@@ -97,11 +97,17 @@ export class DataSourceImport extends PureComponent<
 
       if (!dataSourceType) return false;
 
-      // 校验失败的数据源，给予用户提示
-      const validate = ajv.compile(dataSourceType.schema)
-      const valid = validate(dataSource)
-      if (!valid) console.warn(validate.errors)
-      return valid
+      // 向下兼容
+      if (dataSourceType.schema) {
+        // 校验失败的数据源，给予用户提示
+        const validate = ajv.compile(dataSourceType.schema)
+        const valid = validate(dataSource)
+        if (!valid) console.warn(validate.errors)
+        return valid
+      } else {
+        // 用户不传入 schema 校验规则，默认返回 true
+        return true
+      }
     });
   };
 
diff --git a/packages/plugin-datasource-pane/src/utils/stateMachine.ts b/packages/plugin-datasource-pane/src/utils/stateMachine.ts
@@ -161,7 +161,14 @@ export const createStateMachine = (dataSourceList: DataSourceConfig[] = []) => c
                   target: 'idle',
                   actions: assign({
                     dataSourceList: (context, event) => {
-                      return context.dataSourceList.concat(event.payload);
+                      // 直接 concat 会出现重复
+                      const filterDataSourceList = context.dataSourceList.filter((item) => {
+                        return !event.payload.find(
+                          (dataSource: DataSourceConfig) => dataSource.id === item.id,
+                        )
+                      })
+
+                      return filterDataSourceList.concat(event.payload);
                     },
                     detail: {
                       visible: false,
