@nocobase/plugin-data-source-manager 1.9.13 → 1.9.14

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.9.13",
+  "@nocobase/client": "1.9.14",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "1.9.13",
-  "@nocobase/utils": "1.9.13",
-  "@nocobase/server": "1.9.13",
-  "@nocobase/data-source-manager": "1.9.13",
+  "@nocobase/plugin-acl": "1.9.14",
+  "@nocobase/utils": "1.9.14",
+  "@nocobase/server": "1.9.14",
+  "@nocobase/data-source-manager": "1.9.14",
   "lodash": "4.17.21",
-  "@nocobase/acl": "1.9.13",
+  "@nocobase/acl": "1.9.14",
   "@ant-design/icons": "5.6.1",
   "antd": "5.24.2",
   "react-router-dom": "6.28.1",
@@ -23,9 +23,9 @@ module.exports = {
   "@formily/shared": "2.3.2",
   "react-i18next": "11.18.6",
   "@emotion/css": "11.13.0",
-  "@nocobase/database": "1.9.13",
+  "@nocobase/database": "1.9.14",
   "sequelize": "6.35.2",
-  "@nocobase/test": "1.9.13",
+  "@nocobase/test": "1.9.14",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.0",
   "@formily/reactive": "2.3.0",

package/dist/server/plugin.js

@@ -319,24 +319,16 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         return;
       }
       const { actionName, resourceName, params } = ctx.action;
-      if (resourceName === "dataSources" && (actionName === "add" || actionName === "update")) {
-        const { values, filterByTk: dataSourceKey } = params;
+      if (resourceName === "dataSources" && (actionName === "create" || actionName === "update")) {
+        const { values } = params;
         if ((_a = values.options) == null ? void 0 : _a.addAllCollections) {
           let introspector = null;
           const dataSourceManager = ctx.app["dataSourceManager"];
-          if (actionName === "add") {
-            const klass = dataSourceManager.factory.getClass(values.options.type);
-            const dataSource = new klass(dbOptions);
-            introspector = dataSource.collectionManager.dataSource.createDatabaseIntrospector(
-              dataSource.collectionManager.db
-            );
-          } else {
-            const dataSource = dataSourceManager.dataSources.get(dataSourceKey);
-            if (!dataSource) {
-              throw new Error(`dataSource ${dataSourceKey} not found`);
-            }
-            introspector = dataSource["introspector"];
-          }
+          const klass = dataSourceManager.factory.getClass(values.type);
+          const dataSource = new klass(values.options);
+          introspector = dataSource.collectionManager.dataSource.createDatabaseIntrospector(
+            dataSource.collectionManager.db
+          );
           const allCollections = await introspector.getCollections();
           if (allCollections.length > import_constants.ALLOW_MAX_COLLECTIONS_COUNT) {
             throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.9.13",
+  "version": "1.9.14",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.ru-RU": "Менеджер управления источниками данных",
@@ -20,5 +20,5 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "47824c7d2bd99998253a5df8414990b007f9c7cf"
+  "gitHead": "2373dd8980c27cc8220e71ea2f84884bbec4781d"
 }