@nocobase/plugin-data-source-manager 1.7.0-beta.7 → 1.7.0-beta.9

package/dist/externalVersion.js

@@ -8,27 +8,27 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.7.0-beta.7",
+  "@nocobase/client": "1.7.0-beta.9",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "1.7.0-beta.7",
-  "@nocobase/utils": "1.7.0-beta.7",
-  "@nocobase/server": "1.7.0-beta.7",
-  "@nocobase/data-source-manager": "1.7.0-beta.7",
+  "@nocobase/plugin-acl": "1.7.0-beta.9",
+  "@nocobase/utils": "1.7.0-beta.9",
+  "@nocobase/server": "1.7.0-beta.9",
+  "@nocobase/data-source-manager": "1.7.0-beta.9",
   "lodash": "4.17.21",
+  "@nocobase/acl": "1.7.0-beta.9",
   "@ant-design/icons": "5.6.1",
-  "antd": "5.12.8",
+  "antd": "5.24.2",
   "react-router-dom": "6.28.1",
   "@formily/shared": "2.3.2",
   "react-i18next": "11.18.6",
   "@formily/react": "2.3.0",
   "@emotion/css": "11.13.0",
-  "@nocobase/database": "1.7.0-beta.7",
-  "@nocobase/acl": "1.7.0-beta.7",
+  "@nocobase/database": "1.7.0-beta.9",
   "sequelize": "6.35.2",
-  "@nocobase/test": "1.7.0-beta.7",
-  "@formily/antd-v5": "1.1.9",
+  "@nocobase/test": "1.7.0-beta.9",
+  "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.0",
   "@formily/reactive": "2.3.0",
-  "@dnd-kit/core": "6.1.0",
+  "@dnd-kit/core": "5.0.3",
   "antd-style": "3.7.1"
 };

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

@@ -130,7 +130,8 @@ class DataSourceModel extends import_database.Model {
         acl.setAvailableAction(actionName, actionParams);
       }
       acl.allow("*", "*", (ctx) => {
-        return ctx.state.currentRole === "root";
+        var _a;
+        return (_a = ctx.state.currentRoles) == null ? void 0 : _a.includes("root");
       });
       dataSource.resourceManager.use(import_plugin_acl.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
       await this.loadIntoACL({ app, acl, transaction: options.transaction });

package/dist/server/plugin.js

@@ -54,6 +54,7 @@ var import_connections_roles_resources = require("./models/connections-roles-res
 var import_connections_roles_resources_action = require("./models/connections-roles-resources-action");
 var import_data_source = require("./models/data-source");
 var import_data_sources_roles_model = require("./models/data-sources-roles-model");
+var import_acl = require("@nocobase/acl");
 const canRefreshStatus = ["loaded", "loading-failed", "reloading-failed"];
 class PluginDataSourceManagerServer extends import_server.Plugin {
   dataSourceErrors = {};
@@ -593,7 +594,7 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       await next();
       const { resourceName, actionName } = action.params;
       if (resourceName === "roles" && actionName == "check") {
-        const roleName = ctx.state.currentRole;
+        const roleNames = ctx.state.currentRoles;
         const dataSources = await ctx.db.getRepository("dataSources").find();
         ctx.bodyMeta = {
           dataSources: dataSources.reduce((carry, dataSourceModel) => {
@@ -606,18 +607,8 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
               return carry;
             }
             const aclInstance = dataSource.acl;
-            const roleInstance = aclInstance.getRole(roleName);
-            const dataObj = {
-              strategy: {},
-              resources: roleInstance ? [...roleInstance.resources.keys()] : [],
-              actions: {}
-            };
-            if (roleInstance) {
-              const data = roleInstance.toJSON();
-              dataObj["name"] = data["name"];
-              dataObj["strategy"] = data["strategy"];
-              dataObj["actions"] = data["actions"];
-            }
+            const roleInstances = aclInstance.getRoles(roleNames);
+            const dataObj = (0, import_acl.mergeRole)(roleInstances);
             carry[dataSourceModel.get("key")] = dataObj;
             return carry;
           }, {})

package/dist/server/utils.d.ts

@@ -1,9 +1 @@
-/**
- * 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.
- */
 export declare function mergeOptions(fieldOptions: any, modelOptions: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.7.0-beta.7",
+  "version": "1.7.0-beta.9",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
@@ -17,5 +17,5 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "cd4ee4a58c0dc80418a71b3bba3b56552b85526f"
+  "gitHead": "7013a5080f3695d7750ab21005c90d2172c16480"
 }