law-common 10.21.1-beta.2 → 10.21.1-beta.4

package/dist/src/api/index.d.ts

@@ -83,3 +83,4 @@ export * from "./interface/to-do.entity.api";
 export * from "./interface/billing-reimbursement-expense.api";
 export * from "./interface/billing-reimbursement-expense-history.api";
 export * from "./interface/project-user-mapping.entity.api";
+export * from "./interface/address-book.create.dto.interface";

package/dist/src/api/index.js

@@ -99,3 +99,4 @@ __exportStar(require("./interface/to-do.entity.api"), exports);
 __exportStar(require("./interface/billing-reimbursement-expense.api"), exports);
 __exportStar(require("./interface/billing-reimbursement-expense-history.api"), exports);
 __exportStar(require("./interface/project-user-mapping.entity.api"), exports);
+__exportStar(require("./interface/address-book.create.dto.interface"), exports);

package/dist/src/api/interface/address-book.create.dto.interface.d.ts

@@ -0,0 +1,19 @@
+import { IAddressBookEntity, IEntityCreateDto } from "../../entities";
+export type IAddressBookCreateExclude = "contactDetails" | "address" | "organizationId";
+export interface IAddressBookContactDetail {
+    id?: number;
+    name: string;
+    email?: string;
+    phone?: string;
+}
+export interface IAddressBookAddress {
+    addressLine1?: string;
+    addressLine2?: string;
+    city?: string;
+    state?: string;
+    zipCode?: string;
+}
+export interface IAddressBookCreateDto extends Omit<IEntityCreateDto<IAddressBookEntity>, IAddressBookCreateExclude> {
+    contactDetails: IAddressBookContactDetail[];
+    address?: IAddressBookAddress;
+}

package/dist/src/api/interface/address-book.create.dto.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/entities/index.d.ts

@@ -65,6 +65,7 @@ export * from "./interface/billing_timesheet.entity.interface";
 export * from "./interface/intermediary_bank.entity.interface";
 export * from "./interface/holiday-list.entity.interface";
 export * from "./interface/holiday.entity.interface";
+export * from "./interface/address-book.entity.interface";
 export * from "./model/leave.entity.model";
 export * from "./model/leave_count.entity.model";
 export * from "./model/holiday.entity.model";
@@ -98,3 +99,4 @@ export * from "./model/timesheet.entity.model";
 export * from "./model/user.entity.model";
 export * from "./model/client-affiliate.entity.model";
 export * from "./model/billing-timesheet.entity.model";
+export * from "./model/country.entity.model";

package/dist/src/entities/index.js

@@ -82,6 +82,7 @@ __exportStar(require("./interface/billing_timesheet.entity.interface"), exports)
 __exportStar(require("./interface/intermediary_bank.entity.interface"), exports);
 __exportStar(require("./interface/holiday-list.entity.interface"), exports);
 __exportStar(require("./interface/holiday.entity.interface"), exports);
+__exportStar(require("./interface/address-book.entity.interface"), exports);
 __exportStar(require("./model/leave.entity.model"), exports);
 __exportStar(require("./model/leave_count.entity.model"), exports);
 __exportStar(require("./model/holiday.entity.model"), exports);
@@ -115,3 +116,4 @@ __exportStar(require("./model/timesheet.entity.model"), exports);
 __exportStar(require("./model/user.entity.model"), exports);
 __exportStar(require("./model/client-affiliate.entity.model"), exports);
 __exportStar(require("./model/billing-timesheet.entity.model"), exports);
+__exportStar(require("./model/country.entity.model"), exports);

package/dist/src/entities/interface/address-book.entity.interface.d.ts

@@ -0,0 +1,10 @@
+import { IAuditColumnEntity } from "./audit-column.entity.interface";
+export interface IAddressBookEntity extends IAuditColumnEntity {
+    id: number;
+    contactDetails: string;
+    address?: string;
+    country: string;
+    notes?: string;
+    organizationId: number;
+    introducedBy?: number;
+}

package/dist/src/entities/interface/address-book.entity.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/entities/interface/entity.utils.interface.d.ts

@@ -10,6 +10,7 @@ import { BillingEntityModel } from "../model/billing.entity.model";
 import { ClientAffiliateEntityModel } from "../model/client-affiliate.entity.model";
 import { ClientEntityModel } from "../model/client.entity.model";
 import { ConfigurationEntityModel } from "../model/configuration.model";
+import { CountryEntityModel } from "../model/country.entity.model";
 import { HolidayEntityModel } from "../model/holiday.entity.model";
 import { LeaveEntityModel } from "../model/leave.entity.model";
 import { LeaveCountVirtualEntityModel } from "../model/leave_count.entity.model";
@@ -20,6 +21,7 @@ import { ReimbursementEntityModel } from "../model/reimbursement.entity.model";
 import { TaskEntityModel } from "../model/task.entity.model";
 import { TimesheetEntityModel } from "../model/timesheet.entity.model";
 import { UserEntityModel } from "../model/user.entity.model";
+import { IAddressBookEntity } from "./address-book.entity.interface";
 import { IAuditColumnEntity } from "./audit-column.entity.interface";
 import { IBankEntity } from "./bank.entity.interface";
 import { IBankHistoryEntity } from "./bank_history.entity.interface";
@@ -139,7 +141,8 @@ export declare enum EntityEnum {
     HOLIDAY = "holiday",
     HOLIDAY_LIST = "holiday_list",
     CRON_JOBS = "cron_jobs",
-    TO_DO_LIST = "to_do_list"
+    TO_DO_LIST = "to_do_list",
+    ADDRESS_BOOK = "address_book"
 }
 export type EntityRelations = {
     [K in EntityEnum | VirtualEntityEnum]: K;
@@ -161,7 +164,7 @@ export type IBaseEntityApiResponse<T extends {
         [K in EntityEnum | VirtualEntityEnum]?: IBaseEntityApiResponse<EnumEntityType<K>>;
     };
 };
-export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends VirtualEntityEnum.LEAVE_COUNT ? ILeaveCountVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : never) & {
+export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends VirtualEntityEnum.LEAVE_COUNT ? ILeaveCountVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : T extends EntityEnum.ADDRESS_BOOK ? IAddressBookEntity : never) & {
     id: number;
 };
 export type EntityRelationConfig<T extends EntityEnum | VirtualEntityEnum> = {
@@ -284,7 +287,7 @@ export declare enum VirtualEntityEnum {
 }
 export type IHistoryConstraintSearchResponse<T> = IBaseResponse<IHistoryEntitySearchByConstraintResponse<T>[]>;
 export type IHistoryConstraintSearchServiceResponse<T> = IHistoryEntitySearchByConstraintResponse<T>[];
-export type EnumToModel<T extends EntityEnum | VirtualEntityEnum> = T extends EntityEnum.BILLING ? BillingEntityModel : T extends EntityEnum.CLIENT ? ClientEntityModel : T extends EntityEnum.PROJECT ? ProjectEntityModel : T extends EntityEnum.PROJECT_USER_MAPPING ? ProjectUserMappingEntityModel : T extends EntityEnum.REIMBURSEMENT ? ReimbursementEntityModel : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? ReimbursementExpenseEntityModel : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? BillingReimbursementExpneseEntityModel : T extends EntityEnum.LEAVE ? LeaveEntityModel : T extends EntityEnum.HOLIDAY ? HolidayEntityModel : T extends VirtualEntityEnum.LEAVE_COUNT ? LeaveCountVirtualEntityModel : T extends EntityEnum.CLIENT_AFFILIATE ? ClientAffiliateEntityModel : T extends EntityEnum.BANK ? BankEntityModel : T extends EntityEnum.CONFIGURATION ? ConfigurationEntityModel : T extends EntityEnum.TASK ? TaskEntityModel : T extends EntityEnum.BILLING_TIMESHEET ? BillingTimesheetEntityModel : T extends EntityEnum.TIMESHEET ? TimesheetEntityModel : UserEntityModel;
+export type EnumToModel<T extends EntityEnum | VirtualEntityEnum> = T extends EntityEnum.BILLING ? BillingEntityModel : T extends EntityEnum.CLIENT ? ClientEntityModel : T extends EntityEnum.PROJECT ? ProjectEntityModel : T extends EntityEnum.PROJECT_USER_MAPPING ? ProjectUserMappingEntityModel : T extends EntityEnum.REIMBURSEMENT ? ReimbursementEntityModel : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? ReimbursementExpenseEntityModel : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? BillingReimbursementExpneseEntityModel : T extends EntityEnum.LEAVE ? LeaveEntityModel : T extends EntityEnum.HOLIDAY ? HolidayEntityModel : T extends VirtualEntityEnum.LEAVE_COUNT ? LeaveCountVirtualEntityModel : T extends EntityEnum.CLIENT_AFFILIATE ? ClientAffiliateEntityModel : T extends EntityEnum.BANK ? BankEntityModel : T extends EntityEnum.CONFIGURATION ? ConfigurationEntityModel : T extends EntityEnum.TASK ? TaskEntityModel : T extends EntityEnum.BILLING_TIMESHEET ? BillingTimesheetEntityModel : T extends EntityEnum.TIMESHEET ? TimesheetEntityModel : T extends EntityEnum.COUNTRY ? CountryEntityModel : UserEntityModel;
 export type EntityMap = {
     [key in EntityEnum | VirtualEntityEnum]: EnumToModel<key>[];
 };

package/dist/src/entities/interface/entity.utils.interface.js

@@ -76,6 +76,7 @@ var EntityEnum;
     EntityEnum["HOLIDAY_LIST"] = "holiday_list";
     EntityEnum["CRON_JOBS"] = "cron_jobs";
     EntityEnum["TO_DO_LIST"] = "to_do_list";
+    EntityEnum["ADDRESS_BOOK"] = "address_book";
 })(EntityEnum || (exports.EntityEnum = EntityEnum = {}));
 var VirtualEntityEnum;
 (function (VirtualEntityEnum) {

package/dist/src/entities/model/country.entity.model.d.ts

@@ -0,0 +1,11 @@
+import { ICountryApiEntity } from "../../api";
+export declare class CountryEntityModel implements ICountryApiEntity {
+    id: number;
+    name: string;
+    createdBy: number;
+    updatedBy: number;
+    createdOn: string;
+    updatedOn: string;
+    constructor(data?: ICountryApiEntity);
+    static fromApiEntity(apiEntity: ICountryApiEntity): CountryEntityModel;
+}

package/dist/src/entities/model/country.entity.model.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CountryEntityModel = void 0;
+class CountryEntityModel {
+    constructor(data) {
+        this.id = 0;
+        this.name = "";
+        this.createdBy = 0;
+        this.updatedBy = 0;
+        this.createdOn = "";
+        this.updatedOn = "";
+        Object.assign(this, data);
+    }
+    static fromApiEntity(apiEntity) {
+        const entity = new CountryEntityModel(apiEntity);
+        Object.assign(entity, apiEntity);
+        return entity;
+    }
+}
+exports.CountryEntityModel = CountryEntityModel;

package/dist/src/entities/model/entity.model.interface.js

@@ -27,6 +27,7 @@ const reimbursement_entity_model_1 = require("./reimbursement.entity.model");
 const task_entity_model_1 = require("./task.entity.model");
 const timesheet_entity_model_1 = require("./timesheet.entity.model");
 const user_entity_model_1 = require("./user.entity.model");
+const country_entity_model_1 = require("./country.entity.model");
 function mapToIndex(entityMap) {
     return Object.keys(entityMap).reduce((acc, key) => {
         // @ts-ignore
@@ -73,6 +74,7 @@ exports.entityEnumToEntityModel = {
     [entity_utils_interface_1.EntityEnum.TASK]: task_entity_model_1.TaskEntityModel.fromApiEntity,
     [entity_utils_interface_1.EntityEnum.BILLING_TIMESHEET]: billing_timesheet_entity_model_1.BillingTimesheetEntityModel.fromApiEntity,
     [entity_utils_interface_1.EntityEnum.TIMESHEET]: timesheet_entity_model_1.TimesheetEntityModel.fromApiEntity,
+    [entity_utils_interface_1.EntityEnum.COUNTRY]: country_entity_model_1.CountryEntityModel.fromApiEntity,
 };
 function entityMapToModels(entityMap) {
     for (const entityName in entityMap) {
@@ -106,9 +108,6 @@ function entityMapToEntityIndexMap(entityMap, entityRelationsFor) {
 }
 function parseEntitiesWithoutModels(json, baseEntity, entityMap = {}) {
     var _a;
-    if (!(baseEntity in exports.entityEnumToEntityModel)) {
-        throw new Error(`Unknown entity: ${baseEntity}`);
-    }
     entityMap[baseEntity] = ((_a = json["baseEntities"]) !== null && _a !== void 0 ? _a : []);
     if (json["relatedEntities"]) {
         const relatedEntities = json["relatedEntities"];

package/dist/src/utils/entity.flow.util.d.ts

@@ -9,24 +9,24 @@ export type LeaveStatusActionPair = {
  * @param currentStatus - The current status of the leave
  * @param userPermissions - Array of permissions the user has
  * @param combineActions - Array of action values to combine into a single action
- * @param data - Optional function to provide additional visibility conditions based on the entity data
+ * @param actionLabels - Object mapping actions to custom labels
+ * @param data - Optional function to provide additional visibility conditions
  * @returns Array of available actions with labels and values
- * @throws Error if user has multiple permissions for a single action
  */
 export declare function getPermittedActions<T extends LeaveStatusActionPair, E>(entityFlowConfig: {
-    [key in T['status']]?: {
+    [key in T["status"]]?: {
         actions: {
-            [key in T['action']]?: {
+            [key in T["action"]]?: {
                 permissions: string[];
-                next: () => T['status'];
+                next: () => T["status"];
             };
         };
     };
-}, currentStatus: T['status'] | null, userPermissions: string[], combineActions?: T['action'][], actionLabels?: {
-    [key in T['action']]?: string;
+}, currentStatus: T["status"] | null, userPermissions: string[], combineActions?: T["action"][], actionLabels?: {
+    [key in T["action"]]?: string;
 }, data?: (a: E) => {
     [key: string]: () => boolean;
 }): {
     label: string;
-    value: T['action'] | string;
+    value: T["action"] | string;
 }[];

package/dist/src/utils/entity.flow.util.js

@@ -1,15 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPermittedActions = getPermittedActions;
+/**
+ * Converts an action or combined action to a value-label pair
+ * @param action - The action or combined action key
+ * @param actionLabels - Object mapping actions to custom labels
+ * @returns Object with label and value
+ */
+function convertToValueLabel(action, actionLabels) {
+    return {
+        label: actionLabels[action] || action,
+        value: action,
+    };
+}
+/**
+ * Filters actions based on user permissions and visibility conditions
+ * @param actionConfig - The actions configuration for the current status
+ * @param userPermissions - Array of permissions the user has
+ * @param data - Optional function to provide additional visibility conditions
+ * @returns Array of permitted action keys
+ * @throws Error if multiple permissions are found for a single action
+ */
+function _getPermittedActions(actionConfig, userPermissions, data) {
+    return Object.entries(actionConfig)
+        .filter(([actionKey, config]) => {
+        var _a;
+        const actionRequiredPermissions = (_a = config === null || config === void 0 ? void 0 : config.permissions) !== null && _a !== void 0 ? _a : [];
+        const matchingPermissions = actionRequiredPermissions.filter((permission) => userPermissions.includes(permission));
+        if (matchingPermissions.length > 1) {
+            throw new Error(`Multiple permissions found for action ${actionKey}: ${matchingPermissions.join(", ")}`);
+        }
+        return (matchingPermissions.length > 0 &&
+            (!data ||
+                !data({})[matchingPermissions[0]] ||
+                data({})[matchingPermissions[0]]()));
+    })
+        .map(([actionKey, _]) => actionKey);
+}
+/**
+ * Combines specified actions into a single action if all are present
+ * @param permittedActions - Array of permitted action keys
+ * @param combineActions - Array of actions to combine
+ * @returns Array of action keys, with combined action if applicable
+ */
+function combinePermittedActions(permittedActions, combineActions) {
+    if (combineActions.length === 0) {
+        return permittedActions;
+    }
+    const isCombinedActionPresent = combineActions.every((action) => permittedActions.includes(action));
+    if (isCombinedActionPresent) {
+        const combinedValue = combineActions.join("_");
+        return [
+            ...permittedActions.filter((action) => !combineActions.includes(action)),
+            combinedValue,
+        ];
+    }
+    return permittedActions;
+}
 /**
  * Gets available actions for a leave based on current status and user permissions
  * @param entityFlowConfig - The flow configuration for the entity
  * @param currentStatus - The current status of the leave
  * @param userPermissions - Array of permissions the user has
  * @param combineActions - Array of action values to combine into a single action
- * @param data - Optional function to provide additional visibility conditions based on the entity data
+ * @param actionLabels - Object mapping actions to custom labels
+ * @param data - Optional function to provide additional visibility conditions
  * @returns Array of available actions with labels and values
- * @throws Error if user has multiple permissions for a single action
  */
 function getPermittedActions(entityFlowConfig, currentStatus, userPermissions, combineActions = [], actionLabels = {}, data = (_) => ({})) {
     var _a;
@@ -18,34 +74,10 @@ function getPermittedActions(entityFlowConfig, currentStatus, userPermissions, c
         return [];
     }
     const actionConfig = ((_a = entityFlowConfig[currentStatus]) === null || _a === void 0 ? void 0 : _a.actions) || {};
-    // Filter actions based on user permissions
-    const permittedActions = Object.entries(actionConfig)
-        .filter(([actionKey, config]) => {
-        var _a;
-        const actionRequiredPermissions = (_a = config.permissions) !== null && _a !== void 0 ? _a : [];
-        const matchingPermissions = actionRequiredPermissions.filter((permission) => userPermissions.includes(permission));
-        // Check for multiple permissions
-        if (matchingPermissions.length > 1) {
-            throw new Error(`Multiple permissions found for action ${actionKey}: ${matchingPermissions.join(', ')}`);
-        }
-        return matchingPermissions.length > 0 && (!data || !data({})[matchingPermissions[0]] || data({})[matchingPermissions[0]]());
-    })
-        .map(([actionKey, _]) => ({
-        label: actionLabels[actionKey] || actionKey,
-        value: actionKey,
-    }));
-    // // Combine specified actions if all are present and combineActions is not empty
-    if (combineActions.length > 0) {
-        const isCombinedActionPresent = combineActions.every((action) => permittedActions.some((a) => a.value === action));
-        if (isCombinedActionPresent) {
-            return [
-                ...permittedActions.filter((action) => !combineActions.includes(action.value)),
-                {
-                    label: actionLabels[combineActions.join('_')] || combineActions.join('_'),
-                    value: combineActions.join('_'),
-                },
-            ];
-        }
-    }
-    return permittedActions;
+    // Get permitted actions
+    const permittedActions = _getPermittedActions(actionConfig, userPermissions, data);
+    // Combine actions if specified
+    const finalActions = combinePermittedActions(permittedActions, combineActions);
+    // Convert to value-label pairs
+    return finalActions.map((action) => convertToValueLabel(action, actionLabels));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "law-common",
- "version": "10.21.1-beta.2",
+ "version": "10.21.1-beta.4",
  "description": "",
  "main": "dist/index.js",
  "files": [