@nocobase/plugin-departments 2.1.0-beta.11 → 2.1.0-beta.12

package/dist/externalVersion.js

@@ -8,23 +8,23 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.11",
+  "@nocobase/client": "2.1.0-beta.12",
   "react": "18.2.0",
   "@formily/react": "2.3.7",
   "@formily/core": "2.3.7",
-  "@nocobase/utils": "2.1.0-beta.11",
-  "@nocobase/plugin-acl": "2.1.0-beta.11",
+  "@nocobase/utils": "2.1.0-beta.12",
+  "@nocobase/plugin-acl": "2.1.0-beta.12",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "2.1.0-beta.11",
+  "@nocobase/database": "2.1.0-beta.12",
   "lodash": "4.17.21",
-  "@nocobase/plugin-user-data-sync": "2.1.0-beta.11",
-  "@nocobase/cache": "2.1.0-beta.11",
-  "@nocobase/server": "2.1.0-beta.11",
-  "@nocobase/data-source-manager": "2.1.0-beta.11",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.11",
+  "@nocobase/plugin-user-data-sync": "2.1.0-beta.12",
+  "@nocobase/cache": "2.1.0-beta.12",
+  "@nocobase/server": "2.1.0-beta.12",
+  "@nocobase/data-source-manager": "2.1.0-beta.12",
+  "@nocobase/plugin-error-handler": "2.1.0-beta.12",
   "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-beta.11"
+  "@nocobase/actions": "2.1.0-beta.12"
 };

package/dist/server/actions/users.d.ts

@@ -17,4 +17,3 @@
 import { Context, Next } from '@nocobase/actions';
 export declare const listExcludeDept: (ctx: Context, next: Next) => Promise<void>;
 export declare const setDepartments: (ctx: Context, next: Next) => Promise<void>;
-export declare const setMainDepartment: (ctx: Context, next: Next) => Promise<void>;

package/dist/server/actions/users.js

@@ -27,8 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var users_exports = {};
 __export(users_exports, {
   listExcludeDept: () => listExcludeDept,
-  setDepartments: () => setDepartments,
-  setMainDepartment: () => setMainDepartment
+  setDepartments: () => setDepartments
 });
 module.exports = __toCommonJS(users_exports);
 var import_actions = require("@nocobase/actions");
@@ -102,36 +101,8 @@ const setDepartments = async (ctx, next) => {
   });
   await next();
 };
-const setMainDepartment = async (ctx, next) => {
-  const { userId, departmentId } = ctx.action.params.values || {};
-  const repo = ctx.db.getRepository("users");
-  const throughRepo = ctx.db.getRepository("departmentsUsers");
-  await ctx.db.sequelize.transaction(async (t) => {
-    await repo.update({
-      filterByTk: userId,
-      values: { mainDepartmentId: departmentId },
-      transaction: t
-    });
-    const existingAssoc = await throughRepo.findOne({
-      filter: { userId, departmentId },
-      transaction: t
-    });
-    if (!existingAssoc) {
-      await throughRepo.create({
-        values: {
-          userId,
-          departmentId,
-          isOwner: false
-        },
-        transaction: t
-      });
-    }
-  });
-  await next();
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   listExcludeDept,
-  setDepartments,
-  setMainDepartment
+  setDepartments
 });

package/dist/server/plugin.js

@@ -54,12 +54,11 @@ class PluginDepartmentsServer extends import_server.Plugin {
     this.registerErrorHandler();
     this.app.resourceManager.registerActionHandlers({
       "users:listExcludeDept": import_users.listExcludeDept,
-      "users:setMainDepartment": import_users.setMainDepartment,
       "departments:aggregateSearch": import_departments.aggregateSearch,
       "departments:setOwner": import_departments.setOwner,
       "departments:removeOwner": import_departments.removeOwner
     });
-    this.app.acl.allow("users", ["setMainDepartment", "listExcludeDept"], "loggedIn");
+    this.app.acl.allow("users", ["listExcludeDept"], "loggedIn");
     this.app.acl.registerSnippet({
       name: `pm.${this.name}`,
       actions: [
@@ -67,7 +66,6 @@ class PluginDepartmentsServer extends import_server.Plugin {
         "roles:list",
         "users:list",
         "users:listExcludeDept",
-        "users:setMainDepartment",
         "users.departments:*",
         "roles.departments:*",
         "departments.members:*"

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-beta.11",
+  "version": "2.1.0-beta.12",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
@@ -18,6 +18,6 @@
   "keywords": [
     "Users & permissions"
   ],
-  "gitHead": "b02e78b928f476d848b88bc545d3acddca00fe3c",
+  "gitHead": "25cee9643f42f850afc4adc33c55a56850ac730d",
   "license": "Apache-2.0"
 }