@escapenavigator/utils 2.2.0 → 2.2.2

package/dist/employee-access-permissions.d.ts

@@ -9,6 +9,12 @@ export declare const createFullEmployeeAccess: () => EmployeeAccess;
  * granular editor yet. No existing role is migrated or silently restricted.
  */
 export declare const deriveLegacyEmployeeAccess: (role?: LegacyEmployeeAccessRole | null) => EmployeeAccess;
+/**
+ * Form values must always have every section. A stored object with no sections
+ * (legacy null, or a nested DTO stripped by serialization) keeps the fallback.
+ * A partial object keeps what was saved and denies only the missing sections.
+ */
+export declare const completeEmployeeAccess: (access: Partial<EmployeeAccess> | null | undefined, fallback: EmployeeAccess) => EmployeeAccess;
 export declare const resolveEmployeeAccess: (role?: LegacyEmployeeAccessRole | null) => EmployeeAccess;
 export declare const hasEmployeeAccess: (role: LegacyEmployeeAccessRole | null | undefined, section: EmployeeAccessSection, action: EmployeeAccessAction) => boolean;
 export declare const getEmployeeAccessScope: (role: LegacyEmployeeAccessRole | null | undefined, section: "shifts" | "bonuses" | "fines" | "payroll") => EmployeeAccessScope;

package/dist/employee-access-permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canAssignEmployeeRoles = exports.canManageEmployeeAccess = exports.getEmployeeAccessScope = exports.hasEmployeeAccess = exports.resolveEmployeeAccess = exports.deriveLegacyEmployeeAccess = exports.createFullEmployeeAccess = void 0;
+exports.canAssignEmployeeRoles = exports.canManageEmployeeAccess = exports.getEmployeeAccessScope = exports.hasEmployeeAccess = exports.resolveEmployeeAccess = exports.completeEmployeeAccess = exports.deriveLegacyEmployeeAccess = exports.createFullEmployeeAccess = void 0;
 const employee_access_1 = require("@escapenavigator/types/dist/role/employee-access");
 const crud = (view, create = view, edit = create, remove = edit) => ({
     view,
@@ -42,9 +42,7 @@ const deriveLegacyEmployeeAccess = (role) => {
             ...crud(usersBase, manageAccess, editOthers, manageAccess && editOthers),
             manageAccess,
         },
-        shifts: scoped(crud(usersBase || ownShifts, manageShifts || ownShifts, manageShifts || ownShifts), usersBase || manageShifts
-            ? employee_access_1.EmployeeAccessScope.ALL
-            : employee_access_1.EmployeeAccessScope.SELF),
+        shifts: scoped(crud(usersBase || ownShifts, manageShifts || ownShifts, manageShifts || ownShifts), usersBase || manageShifts ? employee_access_1.EmployeeAccessScope.ALL : employee_access_1.EmployeeAccessScope.SELF),
         bonuses: scoped(crud(manageAdjustments), employee_access_1.EmployeeAccessScope.ALL),
         fines: scoped(crud(manageAdjustments), employee_access_1.EmployeeAccessScope.ALL),
         roles: crud(false),
@@ -54,6 +52,39 @@ const deriveLegacyEmployeeAccess = (role) => {
     };
 };
 exports.deriveLegacyEmployeeAccess = deriveLegacyEmployeeAccess;
+const deniedCrud = () => crud(false);
+const deniedScoped = () => scoped(deniedCrud(), employee_access_1.EmployeeAccessScope.SELF);
+const EMPLOYEE_ACCESS_SECTIONS = [
+    'employees',
+    'shifts',
+    'bonuses',
+    'fines',
+    'roles',
+    'positions',
+    'reports',
+    'payroll',
+];
+/**
+ * Form values must always have every section. A stored object with no sections
+ * (legacy null, or a nested DTO stripped by serialization) keeps the fallback.
+ * A partial object keeps what was saved and denies only the missing sections.
+ */
+const completeEmployeeAccess = (access, fallback) => {
+    const hasSection = !!access && EMPLOYEE_ACCESS_SECTIONS.some((section) => access[section] != null);
+    if (!hasSection)
+        return fallback;
+    return {
+        employees: access.employees ?? { ...deniedCrud(), manageAccess: false },
+        shifts: access.shifts ?? deniedScoped(),
+        bonuses: access.bonuses ?? deniedScoped(),
+        fines: access.fines ?? deniedScoped(),
+        roles: access.roles ?? deniedCrud(),
+        positions: access.positions ?? deniedCrud(),
+        reports: access.reports ?? deniedCrud(),
+        payroll: access.payroll ?? deniedScoped(),
+    };
+};
+exports.completeEmployeeAccess = completeEmployeeAccess;
 const resolveEmployeeAccess = (role) => role?.totalAccess
     ? (0, exports.createFullEmployeeAccess)()
     : role?.employeeAccess || (0, exports.deriveLegacyEmployeeAccess)(role);

package/dist/employee-access-permissions.spec.js

@@ -53,4 +53,24 @@ describe('employee access permissions', () => {
         expect(permissions.payroll.scope).toBe(employee_access_1.EmployeeAccessScope.ALL);
         expect(permissions.reports.create).toBe(false);
     });
+    it('keeps a legacy fallback when stored access has no sections', () => {
+        const fallback = (0, employee_access_permissions_1.deriveLegacyEmployeeAccess)(role({ canEditUsersAccessAndTime: true }));
+        expect((0, employee_access_permissions_1.completeEmployeeAccess)(null, fallback)).toBe(fallback);
+        expect((0, employee_access_permissions_1.completeEmployeeAccess)({}, fallback).employees.view).toBe(true);
+    });
+    it('fills only the sections missing from a partial access object', () => {
+        const fallback = (0, employee_access_permissions_1.deriveLegacyEmployeeAccess)(role({ canEditUsersAccessAndTime: true }));
+        const access = (0, employee_access_permissions_1.completeEmployeeAccess)({
+            employees: {
+                view: true,
+                create: false,
+                edit: false,
+                delete: false,
+                manageAccess: false,
+            },
+        }, fallback);
+        expect(access.employees.create).toBe(false);
+        expect(access.payroll.view).toBe(false);
+        expect(access.payroll.scope).toBe(employee_access_1.EmployeeAccessScope.SELF);
+    });
 });

package/dist/serialize-role-employee-access.spec.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/dist/serialize-role-employee-access.spec.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const create_role_dto_1 = require("@escapenavigator/types/dist/role/create-role.dto");
+const employee_access_1 = require("@escapenavigator/types/dist/role/employee-access");
+const serialize_record_1 = require("./serialize-record");
+describe('CreateRoleDto employeeAccess', () => {
+    it('сохраняет вложенные права при сборке формы роли', () => {
+        const dto = (0, serialize_record_1.serializeRecord)(create_role_dto_1.CreateRoleDto, {
+            title: 'Администратор',
+            totalAccess: false,
+            employeeAccess: {
+                employees: {
+                    view: true,
+                    create: false,
+                    edit: true,
+                    delete: false,
+                    manageAccess: true,
+                },
+                shifts: {
+                    view: true,
+                    create: false,
+                    edit: false,
+                    delete: false,
+                    scope: employee_access_1.EmployeeAccessScope.ALL,
+                },
+                bonuses: {
+                    view: false,
+                    create: false,
+                    edit: false,
+                    delete: false,
+                    scope: employee_access_1.EmployeeAccessScope.SELF,
+                },
+                fines: {
+                    view: false,
+                    create: false,
+                    edit: false,
+                    delete: false,
+                    scope: employee_access_1.EmployeeAccessScope.SELF,
+                },
+                roles: { view: true, create: false, edit: false, delete: false },
+                positions: { view: true, create: true, edit: false, delete: false },
+                reports: { view: true, create: false, edit: false, delete: false },
+                payroll: {
+                    view: true,
+                    create: false,
+                    edit: false,
+                    delete: false,
+                    scope: employee_access_1.EmployeeAccessScope.ASSIGNED_LOCATIONS,
+                },
+            },
+        });
+        expect(dto.employeeAccess?.employees.view).toBe(true);
+        expect(dto.employeeAccess?.employees.manageAccess).toBe(true);
+        expect(dto.employeeAccess?.shifts.scope).toBe(employee_access_1.EmployeeAccessScope.ALL);
+        expect(dto.employeeAccess?.payroll.view).toBe(true);
+        expect(dto.employeeAccess?.roles.view).toBe(true);
+    });
+});

package/dist/user-session-permissions.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const user_session_permissions_1 = require("./user-session-permissions");
 const employee_access_permissions_1 = require("./employee-access-permissions");
+const user_session_permissions_1 = require("./user-session-permissions");
 const openSession = {
     hold: false,
     userId: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^2.2.0",
+    "@escapenavigator/types": "^2.2.2",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -29,5 +29,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "63060e4187f812e4c4e86d4211cfcc1b2e117a76"
+  "gitHead": "18385cda4cb9e0a5a0a1490c9d3374b76f047b9f"
 }