@tachybase/module-data-source 1.6.20 → 1.6.22

package/dist/externalVersion.js

@@ -1,16 +1,16 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.6.20",
-  "@tego/server": "1.6.11",
+  "@tachybase/client": "1.6.22",
+  "@tego/server": "1.6.13",
   "lodash": "4.17.21",
   "@ant-design/icons": "6.1.0",
   "antd": "5.22.5",
   "react-router-dom": "6.28.1",
-  "@tachybase/schema": "1.6.11",
+  "@tachybase/schema": "1.6.13",
   "react-i18next": "16.2.1",
-  "@tachybase/module-acl": "1.6.20",
+  "@tachybase/module-acl": "1.6.22",
   "sequelize": "6.37.5",
-  "@tego/client": "1.6.11",
+  "@tego/client": "1.6.13",
   "@dnd-kit/core": "6.3.1",
   "ahooks": "3.9.0"
 };

package/dist/server/models/data-source.js

@@ -56,6 +56,14 @@ const availableActions = {
     type: "old-data"
   }
 };
+function getDataSourceManagerPlugin(app) {
+  for (const pluginName of ["data-source-manager", "data-source", "@tachybase/module-data-source"]) {
+    const plugin = app.pm.get(pluginName);
+    if (plugin) {
+      return plugin;
+    }
+  }
+}
 class DataSourceModel extends import_server.Model {
   isMainRecord() {
     return this.get("type") === "main";
@@ -87,7 +95,10 @@ class DataSourceModel extends import_server.Model {
   async loadIntoApplication(options) {
     const { app, loadAtAfterStart } = options;
     const dataSourceKey = this.get("key");
-    const pluginDataSourceManagerServer = app.pm.get("data-source");
+    const pluginDataSourceManagerServer = getDataSourceManagerPlugin(app);
+    if (!pluginDataSourceManagerServer) {
+      throw new Error("Data source manager plugin is required to load data sources");
+    }
     if (pluginDataSourceManagerServer.dataSourceStatus[dataSourceKey] === "loaded") {
       pluginDataSourceManagerServer.dataSourceStatus[dataSourceKey] = "reloading";
     } else {

package/dist/server/plugin.js

@@ -252,7 +252,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         const { options, type } = values;
         const klass = ctx.tego.dataSourceManager.factory.getClass(type);
         try {
-          await klass.testConnection(this.renderJsonTemplate(options || {}));
+          await klass.testConnection(plugin.renderJsonTemplate(options || {}));
         } catch (error) {
           throw new Error(`Test connection failed: ${error.message}`);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-data-source",
   "displayName": "Data source manager",
-  "version": "1.6.20",
+  "version": "1.6.22",
   "description": "Manage data sources, including the built-in Master database, external databases, APIs, etc.",
   "keywords": [
     "Data model tools"
@@ -19,10 +19,10 @@
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
     "@dnd-kit/core": "^6.3.1",
-    "@tachybase/schema": "1.6.11",
-    "@tachybase/test": "1.6.11",
-    "@tego/client": "1.6.11",
-    "@tego/server": "1.6.11",
+    "@tachybase/schema": "1.6.13",
+    "@tachybase/test": "1.6.13",
+    "@tego/client": "1.6.13",
+    "@tego/server": "1.6.13",
     "@types/lodash": "^4.17.20",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
@@ -31,8 +31,8 @@
     "react-i18next": "16.2.1",
     "react-router-dom": "6.28.1",
     "sequelize": "6.37.5",
-    "@tachybase/module-acl": "1.6.20",
-    "@tachybase/client": "1.6.20"
+    "@tachybase/client": "1.6.22",
+    "@tachybase/module-acl": "1.6.22"
   },
   "description.zh-CN": "管理数据源，包括内置的 Master 数据库，外部的数据库、API。",
   "displayName.zh-CN": "数据源管理",