@tachybase/module-data-source 1.6.0 → 1.6.1

package/dist/externalVersion.js

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

package/dist/server/plugin.d.ts

@@ -9,6 +9,5 @@ export declare class PluginDataSourceManagerServer extends Plugin {
     };
     renderJsonTemplate(template: any): any;
     beforeLoad(): Promise<void>;
-    load(): Promise<void>;
 }
 export default PluginDataSourceManagerServer;

package/dist/server/plugin.js

@@ -31,7 +31,6 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_node_path = require("node:path");
 var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
 var import_connections_roles_resources = require("./models/connections-roles-resources");
@@ -235,7 +234,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       },
       { tag: "dataSourcesget" }
     );
-    this.app.actions({
+    this.app.resourcer.registerActions({
       async ["dataSources:listEnabled"](ctx, next) {
         const dataSources = await ctx.db.getRepository("dataSources").find({
           filter: {
@@ -251,7 +250,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       async ["dataSources:testConnection"](ctx, next) {
         const { values } = ctx.action.params;
         const { options, type } = values;
-        const klass = ctx.app.dataSourceManager.factory.getClass(type);
+        const klass = ctx.tego.dataSourceManager.factory.getClass(type);
         try {
           await klass.testConnection(this.renderJsonTemplate(options || {}));
         } catch (error) {
@@ -272,7 +271,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         const currentStatus = plugin.dataSourceStatus[filterByTk];
         if (canRefreshStatus.includes(currentStatus) && (clientStatus ? clientStatus && canRefreshStatus.includes(clientStatus) : true)) {
           dataSourceModel.loadIntoApplication({
-            app: ctx.app
+            app: ctx.tego
           });
         }
         ctx.body = {
@@ -480,9 +479,6 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       };
     });
   }
-  async load() {
-    await this.importCollections((0, import_node_path.resolve)(__dirname, "collections"));
-  }
 }
 var plugin_default = PluginDataSourceManagerServer;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/resourcers/data-sources-collections-fields.js

@@ -37,7 +37,7 @@ var data_sources_collections_fields_default = {
     async list(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");
-      const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey);
       const collection = dataSource.collectionManager.getCollection(collectionName);
       const fields = collection.getFields();
       ctx.body = import_lodash.default.sortBy(
@@ -49,7 +49,7 @@ var data_sources_collections_fields_default = {
     async get(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey, filterByTk: name } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");
-      const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey);
       const collection = dataSource.collectionManager.getCollection(collectionName);
       const field = collection.getField(name);
       ctx.body = field.options;
@@ -58,7 +58,7 @@ var data_sources_collections_fields_default = {
     async update(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey, filterByTk: name, values } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");
-      const mainDb = ctx.app.db;
+      const mainDb = ctx.tego.db;
       let fieldRecord = await mainDb.getRepository("dataSourcesFields").findOne({
         filter: {
           name,
@@ -85,14 +85,14 @@ var data_sources_collections_fields_default = {
           values
         });
       }
-      const field = ctx.app.dataSourceManager.dataSources.get(dataSourceKey).collectionManager.getCollection(collectionName).getField(name);
+      const field = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey).collectionManager.getCollection(collectionName).getField(name);
       ctx.body = field.options;
       await next();
     },
     async create(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey, values } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");
-      const mainDb = ctx.app.db;
+      const mainDb = ctx.tego.db;
       const name = values.name;
       if (await mainDb.getRepository("dataSourcesFields").findOne({
         filter: {
@@ -118,7 +118,7 @@ var data_sources_collections_fields_default = {
     async destroy(ctx, next) {
       const { associatedIndex: collectionNameWithDataSourceKey, filterByTk: name } = ctx.action.params;
       const [dataSourceKey, collectionName] = collectionNameWithDataSourceKey.split(".");
-      const mainDb = ctx.app.db;
+      const mainDb = ctx.tego.db;
       const fieldRecord = await mainDb.getRepository("dataSourcesFields").findOne({
         filter: {
           name,

package/dist/server/resourcers/data-sources-collections.js

@@ -38,7 +38,7 @@ var data_sources_collections_default = {
       var _a, _b;
       const params = ctx.action.params;
       const { associatedIndex: dataSourceKey } = params;
-      const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey);
       if (!dataSource) {
         throw new Error(`dataSource ${dataSourceKey} not found`);
       }

package/dist/server/resourcers/roles-data-sources-collections.js

@@ -44,7 +44,7 @@ const rolesRemoteCollectionsResourcer = {
       const { page = 1, pageSize = 20 } = ctx.action.params;
       const { filter } = ctx.action.params;
       const { dataSourceKey } = filter;
-      const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey);
       const collectionRepository = new import_full_data_repository.FullDataRepository(dataSource.collectionManager.getCollections());
       const [collections] = await collectionRepository.findAndCount();
       const filterItem = import_lodash.default.get(filter, "$and");
@@ -52,7 +52,7 @@ const rolesRemoteCollectionsResourcer = {
       const filterByName = filterItem == null ? void 0 : filterItem.find((item) => item.name);
       const filterTitle = (_a = import_lodash.default.get(filterByTitle, "title.$includes")) == null ? void 0 : _a.toLowerCase();
       const filterName = (_b = import_lodash.default.get(filterByName, "name.$includes")) == null ? void 0 : _b.toLowerCase();
-      const roleResources = await ctx.app.db.getRepository("dataSourcesRolesResources").find({
+      const roleResources = await ctx.tego.db.getRepository("dataSourcesRolesResources").find({
         filter: {
           roleName: role,
           dataSourceKey

package/package.json

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