@nocobase/plugin-departments 2.0.0-alpha.6 → 2.0.0-alpha.61

package/dist/server/migrations/migrate-main-department-id-20250828100101.js

@@ -0,0 +1,133 @@
+/**
+ * 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 migrate_main_department_id_20250828100101_exports = {};
+__export(migrate_main_department_id_20250828100101_exports, {
+  default: () => migrate_main_department_id_20250828100101_default
+});
+module.exports = __toCommonJS(migrate_main_department_id_20250828100101_exports);
+var import_server = require("@nocobase/server");
+class migrate_main_department_id_20250828100101_default extends import_server.Migration {
+  on = "afterLoad";
+  appVersion = "<2.0.0";
+  async up() {
+    await this.db.sequelize.transaction(async (transaction) => {
+      var _a, _b;
+      const users = this.db.getCollection("users");
+      const departments = this.db.getCollection("departments");
+      if (!users || !departments) {
+        return;
+      }
+      const fieldRepo = this.db.getRepository("fields");
+      if (!fieldRepo) {
+        return;
+      }
+      const currentMainField = await fieldRepo.findOne({
+        filter: {
+          collectionName: "users",
+          name: "mainDepartment"
+        },
+        transaction
+      });
+      const iface = (_a = currentMainField == null ? void 0 : currentMainField.get) == null ? void 0 : _a.call(currentMainField, "interface");
+      const type = (_b = currentMainField == null ? void 0 : currentMainField.get) == null ? void 0 : _b.call(currentMainField, "type");
+      const shouldMigrate = !currentMainField || type === "belongsToMany" || iface === "m2m";
+      if (!shouldMigrate) {
+        return;
+      }
+      const rows = await this.db.getRepository("departmentsUsers").find({
+        filter: {
+          isMain: true
+        },
+        fields: ["userId", "departmentId"],
+        transaction
+      });
+      for (const row of rows) {
+        await this.db.getRepository("users").update({
+          filter: {
+            id: row.userId
+          },
+          values: {
+            mainDepartmentId: row.departmentId
+          },
+          transaction,
+          hooks: false
+        });
+      }
+      await fieldRepo.destroy({
+        filter: {
+          collectionName: "departmentsUsers",
+          name: "isMain"
+        },
+        transaction
+      });
+      const mainDepartmentField = await fieldRepo.findOne({
+        filter: {
+          collectionName: "users",
+          name: "mainDepartment"
+        },
+        transaction
+      });
+      if (mainDepartmentField) {
+        const nextOptions = {
+          ...mainDepartmentField.options || {},
+          target: "departments",
+          foreignKey: "mainDepartmentId",
+          onDelete: "SET NULL",
+          sourceKey: "id",
+          targetKey: "id",
+          uiSchema: {
+            type: "string",
+            title: '{{t("Main department")}}',
+            "x-component": "AssociationField",
+            "x-component-props": {
+              multiple: false,
+              fieldNames: {
+                label: "title",
+                value: "id"
+              }
+            }
+          }
+        };
+        delete nextOptions.through;
+        delete nextOptions.otherKey;
+        delete nextOptions.throughScope;
+        await fieldRepo.update({
+          filter: {
+            collectionName: "users",
+            name: "mainDepartment"
+          },
+          values: {
+            type: "belongsTo",
+            interface: "m2o",
+            options: nextOptions
+          },
+          transaction
+        });
+      }
+    });
+  }
+}

package/dist/server/plugin.d.ts

@@ -15,5 +15,6 @@ export declare class PluginDepartmentsServer extends Plugin {
     afterEnable(): Promise<void>;
     afterDisable(): Promise<void>;
     remove(): Promise<void>;
+    registerErrorHandler(): void;
 }
 export default PluginDepartmentsServer;

package/dist/server/plugin.js

@@ -35,7 +35,6 @@ var import_departments = require("./actions/departments");
 var import_users = require("./actions/users");
 var import_users2 = require("./collections/users");
 var import_middlewares = require("./middlewares");
-var import_set_departments_roles = require("./middlewares/set-departments-roles");
 var import_department = require("./models/department");
 var import_department_data_sync_resource = require("./department-data-sync-resource");
 class PluginDepartmentsServer extends import_server.Plugin {
@@ -52,6 +51,7 @@ class PluginDepartmentsServer extends import_server.Plugin {
     });
   }
   async load() {
+    this.registerErrorHandler();
     this.app.resourceManager.registerActionHandlers({
       "users:listExcludeDept": import_users.listExcludeDept,
       "users:setMainDepartment": import_users.setMainDepartment,
@@ -73,13 +73,13 @@ class PluginDepartmentsServer extends import_server.Plugin {
         "departments.members:*"
       ]
     });
-    this.app.resourceManager.use(import_set_departments_roles.setDepartmentsInfo, {
+    this.app.resourceManager.use(import_middlewares.setDepartmentsInfo, {
       tag: "setDepartmentsInfo",
       before: "setCurrentRole",
       after: "auth"
     });
     this.app.dataSourceManager.afterAddDataSource((dataSource) => {
-      dataSource.resourceManager.use(import_set_departments_roles.setDepartmentsInfo, {
+      dataSource.resourceManager.use(import_middlewares.setDepartmentsInfo, {
         tag: "setDepartmentsInfo",
         before: "setCurrentRole",
         after: "auth"
@@ -98,6 +98,38 @@ class PluginDepartmentsServer extends import_server.Plugin {
       const cache = this.app.cache;
       await cache.del(`departments:${model.get("userId")}`);
     });
+    this.app.db.on("users.beforeSave", async (model, options) => {
+      var _a;
+      const mainDepartmentId = model.get("mainDepartmentId");
+      if (!mainDepartmentId) {
+        return;
+      }
+      const userId = model.get("id");
+      const transaction = options == null ? void 0 : options.transaction;
+      if (userId) {
+        const userDepartment = await this.app.db.getRepository("departmentsUsers").findOne({
+          filter: {
+            userId,
+            departmentId: mainDepartmentId
+          },
+          transaction
+        });
+        if (userDepartment) {
+          return;
+        }
+      }
+      const submittedDepartments = (_a = options == null ? void 0 : options.values) == null ? void 0 : _a.departments;
+      if (Array.isArray(submittedDepartments)) {
+        const included = submittedDepartments.some((d) => {
+          const id = typeof d === "object" ? d && (d.id ?? d) : d;
+          return `${id}` === `${mainDepartmentId}`;
+        });
+        if (included) {
+          return;
+        }
+      }
+      throw new Error(`Invalid main department, it must be one of the user's departments`);
+    });
     this.app.on("beforeSignOut", ({ userId }) => {
       this.app.cache.del(`departments:${userId}`);
     });
@@ -146,6 +178,20 @@ class PluginDepartmentsServer extends import_server.Plugin {
   }
   async remove() {
   }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
+    errorHandlerPlugin.errorHandler.register(
+      (err) => {
+        return err.message === "Invalid main department, it must be one of the user's departments";
+      },
+      (err, ctx) => {
+        return ctx.throw(
+          400,
+          ctx.i18n.t("Invalid main department, it must be one of the user's departments", { ns: "departments" })
+        );
+      }
+    );
+  }
 }
 var plugin_default = PluginDepartmentsServer;
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@nocobase/plugin-departments",
   "displayName": "Departments",
+  "displayName.ru-RU": "Подразделения",
   "displayName.zh-CN": "部门",
   "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
+  "description.ru-RU": "Организация пользователей по подразделениям, установление иерархических связей, привязка ролей для управления правами и использование подразделений в качестве переменных в рабочих процессах и выражениях.",
   "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.61",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
@@ -16,5 +18,5 @@
   "keywords": [
     "Users & permissions"
   ],
-  "gitHead": "276a65c0656bbace2df7593be0f53c96b7b0725b"
+  "gitHead": "f48b11fd3842abbbbc7bbeb751943d80bc5134bb"
 }