@nocobase/plugin-departments 2.1.0-alpha.19 → 2.1.0-alpha.20

package/dist/externalVersion.js

@@ -8,23 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.19",
+  "@nocobase/client": "2.1.0-alpha.20",
   "react": "18.2.0",
   "@formily/react": "2.3.7",
   "@formily/core": "2.3.7",
-  "@nocobase/utils": "2.1.0-alpha.19",
-  "@nocobase/plugin-acl": "2.1.0-alpha.19",
+  "@nocobase/utils": "2.1.0-alpha.20",
+  "@nocobase/plugin-acl": "2.1.0-alpha.20",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "2.1.0-alpha.19",
+  "@nocobase/database": "2.1.0-alpha.20",
   "lodash": "4.18.1",
-  "@nocobase/plugin-user-data-sync": "2.1.0-alpha.19",
-  "@nocobase/cache": "2.1.0-alpha.19",
-  "@nocobase/server": "2.1.0-alpha.19",
-  "@nocobase/data-source-manager": "2.1.0-alpha.19",
-  "@nocobase/plugin-error-handler": "2.1.0-alpha.19",
+  "@nocobase/plugin-user-data-sync": "2.1.0-alpha.20",
+  "@nocobase/cache": "2.1.0-alpha.20",
+  "@nocobase/server": "2.1.0-alpha.20",
+  "@nocobase/data-source-manager": "2.1.0-alpha.20",
+  "@nocobase/plugin-error-handler": "2.1.0-alpha.20",
+  "sequelize": "6.35.2",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "@formily/shared": "2.3.7",
   "@emotion/css": "11.13.0",
-  "@nocobase/actions": "2.1.0-alpha.19"
+  "@nocobase/actions": "2.1.0-alpha.20"
 };

package/dist/server/middlewares/set-main-department.js

@@ -29,73 +29,37 @@ __export(set_main_department_exports, {
   setMainDepartment: () => setMainDepartment
 });
 module.exports = __toCommonJS(set_main_department_exports);
+var import_sync_user_main_department = require("../sync-user-main-department");
+const normalizeIds = (values = []) => values.map((value) => typeof value === "object" && value ? value.id ?? value : value).filter((value) => value !== null && value !== void 0);
+const syncUsersMainDepartment = async (ctx, userIds) => {
+  const uniqUserIds = [...new Set(normalizeIds(userIds))];
+  for (const userId of uniqUserIds) {
+    await (0, import_sync_user_main_department.syncUserMainDepartment)(ctx.db, userId, ctx.transaction);
+  }
+};
 const setMainDepartment = async (ctx, next) => {
-  var _a, _b;
-  await next();
   const { associatedName, resourceName, associatedIndex, actionName, values, filterByTk } = ctx.action.params;
-  if (associatedName === "departments" && resourceName === "members" && (values == null ? void 0 : values.length)) {
-    const userRepo = ctx.db.getRepository("users");
+  let affectedDepartmentMemberUserIds = [];
+  if (associatedName === "departments" && resourceName === "members" && actionName === "set") {
     const throughRepo = ctx.db.getRepository("departmentsUsers");
-    if (actionName === "add" || actionName === "set") {
-      for (const userId of values) {
-        const user = await userRepo.findOne({ filterByTk: userId, fields: ["id", "mainDepartmentId"] });
-        if (!(user == null ? void 0 : user.mainDepartmentId)) {
-          await userRepo.update({
-            filterByTk: userId,
-            values: { mainDepartmentId: associatedIndex }
-          });
-        }
-      }
-      return;
-    }
-    if (actionName === "remove") {
-      for (const userId of values) {
-        const user = await userRepo.findOne({ filterByTk: userId, fields: ["id", "mainDepartmentId"] });
-        if ((user == null ? void 0 : user.mainDepartmentId) === Number(associatedIndex)) {
-          const firstDept = await throughRepo.findOne({
-            filter: { userId }
-          });
-          await userRepo.update({
-            filterByTk: userId,
-            values: { mainDepartmentId: firstDept ? firstDept.departmentId : null }
-          });
-        }
-      }
-    }
+    const currentMembers = await throughRepo.find({
+      fields: ["userId"],
+      filter: { departmentId: associatedIndex },
+      transaction: ctx.transaction
+    });
+    affectedDepartmentMemberUserIds = currentMembers.map((member) => {
+      var _a;
+      return ((_a = member.get) == null ? void 0 : _a.call(member, "userId")) ?? member.userId;
+    });
   }
-  if (associatedName === "users" && resourceName === "departments" && ["add", "remove", "set"].includes(actionName)) {
-    const userRepo = ctx.db.getRepository("users");
-    const throughRepo = ctx.db.getRepository("departmentsUsers");
-    const user = await userRepo.findOne({ filterByTk: associatedIndex, fields: ["id", "mainDepartmentId"] });
-    let hasValidMain = false;
-    if (user == null ? void 0 : user.mainDepartmentId) {
-      const existingAssoc = await throughRepo.findOne({
-        filter: { userId: associatedIndex, departmentId: user.mainDepartmentId }
-      });
-      hasValidMain = !!existingAssoc;
-    }
-    if (!hasValidMain) {
-      const firstDept = await throughRepo.findOne({
-        filter: { userId: associatedIndex }
-      });
-      await userRepo.update({
-        filterByTk: associatedIndex,
-        values: { mainDepartmentId: firstDept ? firstDept.departmentId : null }
-      });
-    }
+  await next();
+  if (associatedName === "departments" && resourceName === "members" && ["add", "remove", "set"].includes(actionName)) {
+    const affectedUserIds = actionName === "set" ? [...affectedDepartmentMemberUserIds, ...values || []] : values || [];
+    await syncUsersMainDepartment(ctx, affectedUserIds);
+    return;
   }
-  if (resourceName === "users" && actionName === "update") {
-    const userRepo = ctx.db.getRepository("users");
-    const throughRepo = ctx.db.getRepository("departmentsUsers");
-    const userId = associatedIndex ?? filterByTk ?? ((_b = (_a = ctx.body) == null ? void 0 : _a.data) == null ? void 0 : _b.id);
-    if (!userId) return;
-    const deptUsers = await throughRepo.find({ filter: { userId } });
-    if (deptUsers.length === 1) {
-      await userRepo.update({
-        filterByTk: userId,
-        values: { mainDepartmentId: deptUsers[0].departmentId }
-      });
-    }
+  if (associatedName === "users" && resourceName === "departments" && ["add", "remove", "set"].includes(actionName)) {
+    await syncUsersMainDepartment(ctx, [associatedIndex ?? filterByTk]);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/plugin.js

@@ -37,6 +37,7 @@ var import_users2 = require("./collections/users");
 var import_middlewares = require("./middlewares");
 var import_department = require("./models/department");
 var import_department_data_sync_resource = require("./department-data-sync-resource");
+var import_sync_user_main_department = require("./sync-user-main-department");
 class PluginDepartmentsServer extends import_server.Plugin {
   afterAdd() {
   }
@@ -88,16 +89,22 @@ class PluginDepartmentsServer extends import_server.Plugin {
     this.app.resourceManager.use(import_middlewares.updateDepartmentIsLeaf);
     this.app.resourceManager.use(import_middlewares.resetUserDepartmentsCache);
     this.app.resourceManager.use(import_middlewares.setMainDepartment);
-    this.app.db.on("departmentsUsers.afterSave", async (model) => {
+    this.app.db.on("departmentsUsers.afterSave", async (model, options) => {
       const cache = this.app.cache;
+      await (0, import_sync_user_main_department.syncUserMainDepartment)(this.app.db, model.get("userId"), options == null ? void 0 : options.transaction);
       await cache.del(`departments:${model.get("userId")}`);
     });
-    this.app.db.on("departmentsUsers.afterDestroy", async (model) => {
+    this.app.db.on("departmentsUsers.afterDestroy", async (model, options) => {
       const cache = this.app.cache;
+      await (0, import_sync_user_main_department.syncUserMainDepartment)(this.app.db, model.get("userId"), options == null ? void 0 : options.transaction);
       await cache.del(`departments:${model.get("userId")}`);
     });
+    this.app.db.on("users.afterSaveWithAssociations", async (model, options) => {
+      await (0, import_sync_user_main_department.syncUserMainDepartment)(this.app.db, model.get("id"), options == null ? void 0 : options.transaction);
+    });
     this.app.db.on("users.beforeSave", async (model, options) => {
       var _a;
+      const submittedDepartments = (_a = options == null ? void 0 : options.values) == null ? void 0 : _a.departments;
       const mainDepartmentId = model.get("mainDepartmentId");
       if (!mainDepartmentId) {
         return;
@@ -116,7 +123,6 @@ class PluginDepartmentsServer extends import_server.Plugin {
           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;

package/dist/server/sync-user-main-department.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This program is offered under a commercial license.
+ * For more information, see <https://www.nocobase.com/agreement>
+ */
+import type { Database } from '@nocobase/database';
+import type { Transaction } from 'sequelize';
+export declare const syncUserMainDepartment: (db: Database, userId: number | string, transaction?: Transaction) => Promise<void>;

package/dist/server/sync-user-main-department.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 sync_user_main_department_exports = {};
+__export(sync_user_main_department_exports, {
+  syncUserMainDepartment: () => syncUserMainDepartment
+});
+module.exports = __toCommonJS(sync_user_main_department_exports);
+const syncUserMainDepartment = async (db, userId, transaction) => {
+  if (!userId) {
+    return;
+  }
+  const userRepo = db.getRepository("users");
+  const throughRepo = db.getRepository("departmentsUsers");
+  const user = await userRepo.findOne({
+    filterByTk: userId,
+    fields: ["id", "mainDepartmentId"],
+    transaction
+  });
+  if (!user) {
+    return;
+  }
+  const currentMainDepartmentId = user.get("mainDepartmentId");
+  const currentMainDepartment = currentMainDepartmentId && await throughRepo.findOne({
+    filter: {
+      userId,
+      departmentId: currentMainDepartmentId
+    },
+    transaction
+  });
+  if (currentMainDepartment) {
+    return;
+  }
+  const firstDepartment = await throughRepo.findOne({
+    filter: { userId },
+    transaction
+  });
+  const nextMainDepartmentId = firstDepartment ? firstDepartment.get("departmentId") : null;
+  if (currentMainDepartmentId === nextMainDepartmentId) {
+    return;
+  }
+  await userRepo.update({
+    filterByTk: userId,
+    values: { mainDepartmentId: nextMainDepartmentId },
+    transaction
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  syncUserMainDepartment
+});

package/package.json

@@ -6,7 +6,7 @@
   "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.1.0-alpha.19",
+  "version": "2.1.0-alpha.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
@@ -20,6 +20,6 @@
   "keywords": [
     "Users & permissions"
   ],
-  "gitHead": "3d13700360eac1c0f9dbf6a5f167ed396a294a3c",
+  "gitHead": "3d1535db6bf93ca23257faf474afee0d565f54c6",
   "license": "Apache-2.0"
 }