@nocobase/plugin-data-source-manager 1.8.0-beta.6 → 1.8.0-beta.8

package/dist/externalVersion.js

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

package/dist/server/migrations/20250613230000-clean-datasource-collection-schema.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250613230000-clean-datasource-collection-schema.js

@@ -0,0 +1,74 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var clean_datasource_collection_schema_exports = {};
+__export(clean_datasource_collection_schema_exports, {
+  default: () => clean_datasource_collection_schema_default
+});
+module.exports = __toCommonJS(clean_datasource_collection_schema_exports);
+var import_database = require("@nocobase/database");
+var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
+class clean_datasource_collection_schema_default extends import_server.Migration {
+  on = "afterLoad";
+  appVersion = "<1.8.0";
+  async up() {
+    const repository = this.context.db.getRepository("dataSourcesCollections");
+    const transaction = await repository.model.sequelize.transaction();
+    try {
+      const collections = await repository.find({
+        where: {
+          [import_database.Op.or]: [
+            { "options.schema": "{{$deps[0].split('@')?.[0]}}" },
+            { "options.viewName": "{{$deps[0].split('@')?.[1]}}" }
+          ]
+        },
+        transaction
+      });
+      for (const collection of collections) {
+        const { key, options } = collection;
+        const newOptions = { ...options };
+        if (options.schema === "{{$deps[0].split('@')?.[0]}}") {
+          newOptions.schema = "";
+        }
+        if (options.viewName === "{{$deps[0].split('@')?.[1]}}") {
+          newOptions.viewName = "";
+        }
+        await repository.model.update(
+          { options: newOptions },
+          {
+            where: { key },
+            transaction
+          }
+        );
+      }
+      await transaction.commit();
+    } catch (error) {
+      console.error("Error during migration:", error);
+      await transaction.rollback();
+    }
+  }
+}

package/dist/server/plugin.js

@@ -503,6 +503,26 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         );
       }
     );
+    this.app.db.on("dataSourcesRolesResourcesScopes.afterSaveWithAssociations", async (model, options) => {
+      const { transaction } = options;
+      const dataSourcesRolesResourcesActions = await this.app.db.getRepository("dataSourcesRolesResourcesActions").find({
+        filter: { scopeId: model.get("id") },
+        transaction
+      });
+      const rolesRolesResourceIds = dataSourcesRolesResourcesActions.map((x) => x.get("rolesResourceId"));
+      const dataSourcesRolesResources = await this.app.db.getRepository("dataSourcesRolesResources").find({
+        filter: {
+          id: rolesRolesResourceIds
+        },
+        transaction
+      });
+      for (const instance of dataSourcesRolesResources) {
+        await this.app.db.emitAsync(`dataSourcesRolesResources.afterSaveWithAssociations`, instance, {
+          ...options,
+          transaction
+        });
+      }
+    });
     this.app.db.on(
       "dataSourcesRolesResourcesActions.afterUpdateWithAssociations",
       async (model, options) => {

package/package.json

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