@zeniai/client-epic-state 5.2.14-betaRD0 → 5.2.14-betaRD1

package/lib/entity/approvalRule/approvalRuleConflict.d.ts

@@ -46,6 +46,19 @@ import { ApprovalRule, Criteria } from './approvalRuleState';
 export type RuleForOverlapCheck = Pick<ApprovalRule, 'approvalRuleId' | 'criteria' | 'isFallback'>;
 export interface RuleOverlap<TRule extends RuleForOverlapCheck = ApprovalRule> {
     conflictingRule: TRule;
+    /**
+     * 'duplicate' — every criterion matches exactly, including the
+     * amount interval (same comparator + min + max, not just an
+     * intersecting range). 'partial' — vendor/department match exactly
+     * (required for any overlap at all) but the amount intervals only
+     * intersect.
+     *
+     * Callers typically treat 'duplicate' as a blocking error (the
+     * candidate rule is unreachable — the existing rule already
+     * matches every bill/reimbursement it would) and 'partial' as a
+     * dismissible warning.
+     */
+    overlapKind: 'duplicate' | 'partial';
 }
 export interface DetectRuleOverlapInput<TRule extends RuleForOverlapCheck = ApprovalRule> {
     candidateCriteria: Criteria[];

package/lib/entity/approvalRule/approvalRuleConflict.js

@@ -23,7 +23,12 @@ function detectRuleOverlap({ candidateCriteria, existingRules, excludeRuleId, })
         }
         const ruleAmount = pickAmount(rule.criteria);
         if (amountsOverlap(candidateAmount, ruleAmount)) {
-            overlaps.push({ conflictingRule: rule });
+            overlaps.push({
+                conflictingRule: rule,
+                overlapKind: areAmountCriteriaEqual(candidateAmount, ruleAmount)
+                    ? 'duplicate'
+                    : 'partial',
+            });
         }
     }
     return overlaps;
@@ -75,3 +80,13 @@ const amountsOverlap = (a, b) => {
     const bHigh = b.max?.amount ?? Number.POSITIVE_INFINITY;
     return Math.max(aLow, bLow) <= Math.min(aHigh, bHigh);
 };
+// Only called once `amountsOverlap` is already true, so this decides
+// duplicate vs partial rather than overlap vs no-overlap.
+const areAmountCriteriaEqual = (a, b) => {
+    if (a == null || b == null) {
+        return a == null && b == null;
+    }
+    return (a.comparator === b.comparator &&
+        (a.min?.amount ?? null) === (b.min?.amount ?? null) &&
+        (a.max?.amount ?? null) === (b.max?.amount ?? null));
+};

package/lib/esm/entity/approvalRule/approvalRuleConflict.js

@@ -20,7 +20,12 @@ export function detectRuleOverlap({ candidateCriteria, existingRules, excludeRul
         }
         const ruleAmount = pickAmount(rule.criteria);
         if (amountsOverlap(candidateAmount, ruleAmount)) {
-            overlaps.push({ conflictingRule: rule });
+            overlaps.push({
+                conflictingRule: rule,
+                overlapKind: areAmountCriteriaEqual(candidateAmount, ruleAmount)
+                    ? 'duplicate'
+                    : 'partial',
+            });
         }
     }
     return overlaps;
@@ -72,3 +77,13 @@ const amountsOverlap = (a, b) => {
     const bHigh = b.max?.amount ?? Number.POSITIVE_INFINITY;
     return Math.max(aLow, bLow) <= Math.min(aHigh, bHigh);
 };
+// Only called once `amountsOverlap` is already true, so this decides
+// duplicate vs partial rather than overlap vs no-overlap.
+const areAmountCriteriaEqual = (a, b) => {
+    if (a == null || b == null) {
+        return a == null && b == null;
+    }
+    return (a.comparator === b.comparator &&
+        (a.min?.amount ?? null) === (b.min?.amount ?? null) &&
+        (a.max?.amount ?? null) === (b.max?.amount ?? null));
+};

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -7,7 +7,7 @@ import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantS
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getBillPaySetupApproverView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -35,10 +35,15 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: reduceAnyFetchState(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -57,6 +62,19 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = billPaySetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: getUserByUserId(userState, userId),
+            role: getUserRoleByUserId(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = cloneDeep(allApprovers);
     const filteredAttributes = cloneDeep(attributes);
@@ -90,6 +108,7 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allApprovalRules,
         allApprovers,
         filteredApprovers,
+        inactiveActorApprovers,
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -7,7 +7,7 @@ import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -36,10 +36,15 @@ export const getRemiSetupApproverView = (state, filterAdmins = true) => {
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: reduceAnyFetchState(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -74,6 +79,19 @@ export const getRemiSetupApproverUpdateDataView = createSelector((state) => stat
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = remiSetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: getUserByUserId(userState, userId),
+            role: getUserRoleByUserId(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = cloneDeep(allApprovers);
     const filteredAttributes = cloneDeep(attributes);
@@ -108,6 +126,7 @@ export const getRemiSetupApproverUpdateDataView = createSelector((state) => stat
         allAttributes,
         filteredApprovers,
         filteredAttributes,
+        inactiveActorApprovers,
         allAccountingClasses,
         remiSetupApproverViewUpdateData,
         approversDetailsFetchStatus: reduceAllFetchState([

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -13,7 +13,7 @@ const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -41,10 +41,15 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: (0, reduceFetchState_1.reduceAnyFetchState)(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -63,6 +68,19 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = billPaySetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: (0, userSelector_1.getUserByUserId)(userState, userId),
+            role: (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = (0, cloneDeep_1.default)(allApprovers);
     const filteredAttributes = (0, cloneDeep_1.default)(attributes);
@@ -96,6 +114,7 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allApprovalRules,
         allApprovers,
         filteredApprovers,
+        inactiveActorApprovers,
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts

@@ -49,7 +49,9 @@ export interface ApprovalRuleWithUser extends Omit<ApprovalRule, 'steps'> {
 export interface BillPaySetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
+    approverListFetchStatus: FetchStateAndError;
     deleteStatus: FetchStateAndError;
+    inactiveApproverIds: ID[];
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
 }
@@ -61,6 +63,7 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     approverListFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
+    inactiveActorApprovers: UserAndRole[];
     affectedEntityIds?: ID[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
     listeningToPusherEvent?: boolean;

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -13,7 +13,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, approverListState, fetchState, error, listeningToPusherEvent, newApprovalRuleId, } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -42,10 +42,15 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
             name: 'Require Info',
             code: 'require_info',
         };
+    const activeApproverIds = new Set(approverListState.approverIds);
+    const referencedApproverIds = new Set(allApprovalRules.flatMap((approvalRule) => approvalRule.steps.flatMap((step) => step.actors.map((actor) => actor.userId))));
+    const inactiveApproverIds = Array.from(referencedApproverIds).filter((userId) => !activeApproverIds.has(userId));
     return {
         allApprovalRules,
         deleteStatus: (0, reduceFetchState_1.reduceAnyFetchState)(deleteStateList),
         approvalRulesStatus,
+        approverListFetchStatus: approverListState.fetchStatus,
+        inactiveApproverIds,
         fetchState,
         error,
         listeningToPusherEvent,
@@ -81,6 +86,19 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         };
     })
         .filter((approver) => approver.user != null);
+    const activeApproverIds = new Set(approverIds);
+    const currentRuleSteps = remiSetupApproverViewUpdateData?.data?.steps ?? [];
+    const inactiveActorUserIds = new Set(currentRuleSteps
+        .flatMap((step) => step.actors.map((actor) => actor.userId))
+        .filter((userId) => userId != null && !activeApproverIds.has(userId)));
+    const inactiveActorApprovers = Array.from(inactiveActorUserIds)
+        .map((userId) => {
+        return {
+            user: (0, userSelector_1.getUserByUserId)(userState, userId),
+            role: (0, userRoleSelector_1.getUserRoleByUserId)(userRoleState, userId),
+        };
+    })
+        .filter((approver) => approver.user != null);
     const allAttributes = attributes;
     const filteredApprovers = (0, cloneDeep_1.default)(allApprovers);
     const filteredAttributes = (0, cloneDeep_1.default)(attributes);
@@ -115,6 +133,7 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         allAttributes,
         filteredApprovers,
         filteredAttributes,
+        inactiveActorApprovers,
         allAccountingClasses,
         remiSetupApproverViewUpdateData,
         approversDetailsFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts

@@ -48,7 +48,9 @@ export interface ApprovalRuleWithUser extends Omit<ApprovalRule, 'steps'> {
 export interface RemiSetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
+    approverListFetchStatus: FetchStateAndError;
     deleteStatus: FetchStateAndError;
+    inactiveApproverIds: ID[];
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
 }
@@ -60,6 +62,7 @@ export interface RemiSetupApproverUpdateDataView extends SelectorView {
     approversDetailsFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
+    inactiveActorApprovers: UserAndRole[];
     affectedEntityIds?: ID[];
     listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.14-betaRD0",
+  "version": "5.2.14-betaRD1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",