@nocobase/plugin-data-source-manager 1.4.0-alpha → 1.4.0-alpha.1

package/dist/externalVersion.js

@@ -8,26 +8,27 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.4.0-alpha",
+  "@nocobase/client": "1.4.0-alpha.1",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "1.4.0-alpha",
-  "@nocobase/utils": "1.4.0-alpha",
-  "@nocobase/server": "1.4.0-alpha",
+  "@nocobase/plugin-acl": "1.4.0-alpha.1",
+  "@nocobase/utils": "1.4.0-alpha.1",
+  "@nocobase/server": "1.4.0-alpha.1",
   "lodash": "4.17.21",
+  "@nocobase/data-source-manager": "1.4.0-alpha.1",
   "@ant-design/icons": "5.2.6",
   "antd": "5.12.8",
   "react-router-dom": "6.21.0",
-  "@formily/shared": "2.3.0",
+  "@formily/shared": "2.3.2",
   "react-i18next": "11.18.6",
   "@formily/react": "2.3.0",
   "@emotion/css": "11.13.0",
-  "@nocobase/database": "1.4.0-alpha",
-  "@nocobase/acl": "1.4.0-alpha",
+  "@nocobase/database": "1.4.0-alpha.1",
+  "@nocobase/acl": "1.4.0-alpha.1",
   "sequelize": "6.35.2",
-  "@nocobase/test": "1.4.0-alpha",
+  "@nocobase/test": "1.4.0-alpha.1",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "@formily/reactive": "2.3.0",
   "@dnd-kit/core": "6.1.0",
-  "antd-style": "3.4.5"
+  "antd-style": "3.7.1"
 };

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

@@ -97,27 +97,30 @@ class DataSourceModel extends import_database.Model {
     }
     const type = this.get("type");
     const createOptions = this.get("options");
-    const dataSource = app.dataSourceManager.factory.create(type, {
-      ...createOptions,
-      name: dataSourceKey,
-      logger: app.logger.child({ dataSourceKey }),
-      sqlLogger: app.sqlLogger.child({ dataSourceKey })
-    });
-    if (loadAtAfterStart) {
-      dataSource.on("loadMessage", ({ message }) => {
-        app.setMaintainingMessage(`${message} in data source ${this.get("displayName")}`);
-      });
-    }
-    const acl = dataSource.acl;
-    for (const [actionName, actionParams] of Object.entries(availableActions)) {
-      acl.setAvailableAction(actionName, actionParams);
-    }
-    acl.allow("*", "*", (ctx) => {
-      return ctx.state.currentRole === "root";
-    });
-    dataSource.resourceManager.use(import_plugin_acl.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
-    await this.loadIntoACL({ app, acl, transaction: options.transaction });
     try {
+      const dataSource = app.dataSourceManager.factory.create(type, {
+        ...createOptions,
+        name: dataSourceKey,
+        logger: app.logger.child({ dataSourceKey }),
+        sqlLogger: app.sqlLogger.child({ dataSourceKey })
+      });
+      dataSource.on("loadingProgress", (progress) => {
+        pluginDataSourceManagerServer.dataSourceLoadingProgress[dataSourceKey] = progress;
+      });
+      if (loadAtAfterStart) {
+        dataSource.on("loadMessage", ({ message }) => {
+          app.setMaintainingMessage(`${message} in data source ${this.get("displayName")}`);
+        });
+      }
+      const acl = dataSource.acl;
+      for (const [actionName, actionParams] of Object.entries(availableActions)) {
+        acl.setAvailableAction(actionName, actionParams);
+      }
+      acl.allow("*", "*", (ctx) => {
+        return ctx.state.currentRole === "root";
+      });
+      dataSource.resourceManager.use(import_plugin_acl.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
+      await this.loadIntoACL({ app, acl, transaction: options.transaction });
       await app.dataSourceManager.add(dataSource, {
         localData: await this.loadLocalData()
       });

package/dist/server/plugin.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Plugin } from '@nocobase/server';
+import { LoadingProgress } from '@nocobase/data-source-manager';
 type DataSourceState = 'loading' | 'loaded' | 'loading-failed' | 'reloading' | 'reloading-failed';
 export declare class PluginDataSourceManagerServer extends Plugin {
     dataSourceErrors: {
@@ -15,6 +16,9 @@ export declare class PluginDataSourceManagerServer extends Plugin {
     dataSourceStatus: {
         [dataSourceKey: string]: DataSourceState;
     };
+    dataSourceLoadingProgress: {
+        [dataSourceKey: string]: LoadingProgress;
+    };
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
 }

package/dist/server/plugin.js

@@ -58,6 +58,7 @@ const canRefreshStatus = ["loaded", "loading-failed", "reloading-failed"];
 class PluginDataSourceManagerServer extends import_server.Plugin {
   dataSourceErrors = {};
   dataSourceStatus = {};
+  dataSourceLoadingProgress = {};
   async beforeLoad() {
     this.app.db.registerModels({
       DataSourcesCollectionModel: import_data_sources_collection_model.DataSourcesCollectionModel,
@@ -98,6 +99,9 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         const dataSourceOptions = model.get("options");
         const type = model.get("type");
         const klass = this.app.dataSourceManager.factory.getClass(type);
+        if (!klass) {
+          throw new Error(`Data source type "${type}" is not registered`);
+        }
         try {
           await klass.testConnection(dataSourceOptions);
         } catch (error) {
@@ -128,7 +132,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       });
     });
     const app = this.app;
-    this.app.use(async (ctx, next) => {
+    this.app.use(async function setDataSourceListItemStatus(ctx, next) {
       await next();
       if (!ctx.action) {
         return;
@@ -152,10 +156,10 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
               data["status"] = "loaded";
               return data;
             }
-            const dataSourceStatus = this.dataSourceStatus[item.get("key")];
+            const dataSourceStatus = plugin.dataSourceStatus[item.get("key")];
             data["status"] = dataSourceStatus;
             if (dataSourceStatus === "loading-failed" || dataSourceStatus === "reloading-failed") {
-              data["errorMessage"] = this.dataSourceErrors[item.get("key")].message;
+              data["errorMessage"] = plugin.dataSourceErrors[item.get("key")].message;
             }
             return data;
           })
@@ -205,7 +209,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       }
       return item;
     };
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async function setDataSourceListDefaultSort(ctx, next) {
       if (!ctx.action) {
         await next();
         return;
@@ -218,7 +222,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       }
       await next();
     });
-    this.app.use(async (ctx, next) => {
+    this.app.use(async function handleAppendDataSourceCollection(ctx, next) {
       await next();
       if (!ctx.action) {
         return;
@@ -305,7 +309,9 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
     });
     this.app.db.on("dataSourcesCollections.afterDestroy", async (model) => {
       const dataSource = this.app.dataSourceManager.dataSources.get(model.get("dataSourceKey"));
-      dataSource.collectionManager.removeCollection(model.get("name"));
+      if (dataSource) {
+        dataSource.collectionManager.removeCollection(model.get("name"));
+      }
     });
     this.app.db.on("dataSourcesFields.afterSaveWithAssociations", async (model) => {
       model.load({
@@ -409,7 +415,8 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         transaction
       });
     });
-    this.app.resourcer.use(async (ctx, next) => {
+    const self = this;
+    this.app.resourceManager.use(async function appendDataToRolesCheck(ctx, next) {
       const action = ctx.action;
       await next();
       const { resourceName, actionName } = action.params;
@@ -418,11 +425,11 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         const dataSources = await ctx.db.getRepository("dataSources").find();
         ctx.bodyMeta = {
           dataSources: dataSources.reduce((carry, dataSourceModel) => {
-            const dataSource = this.app.dataSourceManager.dataSources.get(dataSourceModel.get("key"));
+            const dataSource = self.app.dataSourceManager.dataSources.get(dataSourceModel.get("key"));
             if (!dataSource) {
               return carry;
             }
-            const dataSourceStatus = this.dataSourceStatus[dataSourceModel.get("key")];
+            const dataSourceStatus = self.dataSourceStatus[dataSourceModel.get("key")];
             if (dataSourceStatus !== "loaded") {
               return carry;
             }

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

@@ -48,6 +48,22 @@ var data_sources_collections_default = {
       const params = ctx.action.params;
       const { associatedIndex: dataSourceKey } = params;
       const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const plugin = ctx.app.pm.get("data-source-manager");
+      const dataSourceStatus = plugin.dataSourceStatus[dataSourceKey];
+      if (dataSourceStatus === "loading-failed") {
+        const error = plugin.dataSourceErrors[dataSourceKey];
+        if (error) {
+          throw new Error(`dataSource ${dataSourceKey} loading failed: ${error.message}`);
+        }
+        throw new Error(`dataSource ${dataSourceKey} loading failed`);
+      }
+      if (["loading", "reloading"].includes(dataSourceStatus)) {
+        const progress = plugin.dataSourceLoadingProgress[dataSourceKey];
+        if (progress) {
+          throw new Error(`dataSource ${dataSourceKey} is ${dataSourceStatus} (${progress.loaded}/${progress.total})`);
+        }
+        throw new Error(`dataSource ${dataSourceKey} is ${dataSourceStatus}`);
+      }
       if (!dataSource) {
         throw new Error(`dataSource ${dataSourceKey} not found`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.4.0-alpha",
+  "version": "1.4.0-alpha.1",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
@@ -17,5 +17,5 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
+  "gitHead": "b42379db55cd8774d3543c8d6cdc566434d3f170"
 }