@zeniai/client-epic-state 5.0.82-betaAR8 → 5.0.82-betaAS1

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/fetchRemiSetupApproverViewEpic.js

@@ -9,7 +9,7 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const remiSetupApproverViewReducer_1 = require("../remiSetupApproverViewReducer");
 const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiSetupApproverViewReducer_1.fetchRemiSetupApproverView.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, resolveAttributeToUser, includeImplicitActors, useV3, } = action.payload;
+    const { cacheOverride, resolveAttributeToUser, includeImplicitActors } = action.payload;
     const { remiSetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, remiSetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -17,15 +17,8 @@ const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.p
             remiSetupApproverViewState.approvalRuleIds.length ||
         (remiSetupApproverViewState.hasValidState() === false &&
             remiSetupApproverViewState.fetchState !== 'In-Progress')) {
-        // Approval Rules 3.0 — flag-gated endpoint selection.
-        // Explicit `=== true` keeps `strict-boolean-expressions` happy
-        // when RTK's payload type widens to `any` in some configs.
-        const basePath = useV3 === true
-            ? // `https://dev.api.zeni.ai/version/approval/tarun/1.0/reimbursements/approval-rules-v2`
-                `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
         return zeniAPI
-            .getJSON(`${basePath}?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.js

@@ -11,20 +11,16 @@ const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => acti
     if (approvalRuleId != null) {
         const approvalRule = (0, approvalRuleSelector_1.getApprovalRuleById)(state$.value.approvalRuleState, approvalRuleId);
         if (approvalRule != null) {
+            const criteria = approvalRule.criteria[0];
+            const range = criteria?.range;
             const remiSetupApproverViewUpdateData = {
                 approvalRuleId,
                 steps: approvalRule.steps,
                 criteria: {
-                    amount: (0, approvalRuleSelector_1.getAmountCriteria)(approvalRule.criteria),
-                    vendor: (0, approvalRuleSelector_1.getVendorCriteria)(approvalRule.criteria),
-                    department: (0, approvalRuleSelector_1.getDepartmentCriteria)(approvalRule.criteria),
+                    rangeType: criteria?.rangeType,
+                    rangeEntity: criteria?.rangeEntity,
+                    range,
                 },
-                // Approval Rules 3.0 — seed rule-level fields so the form can
-                // round-trip them on edit. Each may be undefined on legacy rules.
-                name: approvalRule.name,
-                description: approvalRule.description,
-                separationOfDuties: approvalRule.separationOfDuties,
-                isFallback: approvalRule.isFallback,
             };
             fetchActions.push((0, remiSetupApproverViewReducer_1.clearRemiSetupApproverViewUpdateData)(), (0, remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdateData)(remiSetupApproverViewUpdateData));
         }
@@ -32,7 +28,7 @@ const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => acti
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push((0, remiSetupApproverViewReducer_1.clearRemiSetupApproverViewUpdateData)(), (0, remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdateData)(remiSetupApproverViewCreateData));
     }

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/saveRemiSetupApproverViewUpdatesEpic.js

@@ -9,24 +9,14 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const commonPayload_1 = require("../../../billPay/billPaySetupApproverView/types/commonPayload");
 const remiSetupApproverViewReducer_1 = require("../remiSetupApproverViewReducer");
-const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdates.match), (0, operators_1.switchMap)((action) => {
+const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiSetupApproverViewReducer_1.saveRemiSetupApproverViewUpdates.match), (0, operators_1.switchMap)(() => {
     const { remiSetupApproverViewState } = state$.value;
     const remiSetupApproverViewUpdateData = remiSetupApproverViewState.remiSetupApproverViewUpdateData;
     if (remiSetupApproverViewUpdateData != null &&
         remiSetupApproverViewUpdateData.data != null) {
-        // Approval Rules 3.0 — gate URL + write-side payload mapper on
-        // the `approval_rule_v3_config` dynamic config. `useV3` arrives
-        // on the action payload from the screen connector.
-        const { useV3 } = action.payload;
-        const payload = useV3
-            ? (0, commonPayload_1.toApprovalChangableInfoPayload)(remiSetupApproverViewUpdateData.data)
-            : (0, commonPayload_1.toApprovalChangableInfoPayloadV1)(remiSetupApproverViewUpdateData.data);
-        const endpoint = useV3
-            ? // `https://dev.api.zeni.ai/version/approval/tarun/1.0/reimbursements/approval-rules-v2`
-                `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
+        const payload = (0, commonPayload_1.toApprovalChangableInfoPayload)(remiSetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(endpoint, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`, payload)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -2,11 +2,10 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { ApprovalRuleCreateData, ApprovalRuleUpdateData } from '../../billPay/billPaySetupApproverView/types/commonState';
 import { RemiSetupApproverViewState } from './remiSetupApproverViewState';
 export declare const initialState: RemiSetupApproverViewState;
-export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, resolveAttributeToUser?: any, includeImplicitActors?: any, useV3?: any], {
+export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, resolveAttributeToUser?: any, includeImplicitActors?: any], {
     cacheOverride: any;
     resolveAttributeToUser: any;
     includeImplicitActors: any;
-    useV3: any;
 }, "remiSetupApproverView/fetchRemiSetupApproverView", never, never>, fetchRemiSetupApproverViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
     approvalRuleIds: string[];
 }, "remiSetupApproverView/fetchRemiSetupApproverViewSuccess", never, never>, fetchRemiSetupApproverViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "remiSetupApproverView/fetchRemiSetupApproverViewFailure", never, never>, fetchRemiApproversDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, includeUserRoles?: any, includeAttributesUserIds?: any, lastUpdatedByUserId?: any], {
@@ -25,25 +24,15 @@ export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").Acti
     attributeSubTypeToUserIdMapping: Record<"manager" | "vendor_owner" | "manager_of_manager", string> | undefined;
 }, "remiSetupApproverView/fetchRemiApproversListSuccess", never, never>, fetchRemiApproversListFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "remiSetupApproverView/fetchRemiApproversListFailure", never, never>, deleteRemiApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, useV3?: any], {
+}, "remiSetupApproverView/fetchRemiApproversListFailure", never, never>, deleteRemiApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string], {
     approvalRuleId: string;
-    useV3: any;
 }, "remiSetupApproverView/deleteRemiApprovalRule", never, never>, deleteRemiApprovalRuleSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[deletedApprovalRuleId: string, approvalRuleIds: string[]], {
     deletedApprovalRuleId: string;
     approvalRuleIds: string[];
 }, "remiSetupApproverView/deleteRemiApprovalRuleSuccess", never, never>, deleteRemiApprovalRuleFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, status: ZeniAPIStatus<Record<string, unknown>>], {
     approvalRuleId: string;
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "remiSetupApproverView/deleteRemiApprovalRuleFailure", never, never>, reorderRemiApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], useV3?: any], {
-    approvalRuleIds: string[];
-    useV3: any;
-}, "remiSetupApproverView/reorderRemiApprovalRules", never, never>, reorderRemiApprovalRulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
-    approvalRuleIds: string[];
-}, "remiSetupApproverView/reorderRemiApprovalRulesSuccess", never, never>, reorderRemiApprovalRulesFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
-    status: ZeniAPIStatus<Record<string, unknown>>;
-}, "remiSetupApproverView/reorderRemiApprovalRulesFailure", never, never>, saveRemiSetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[useV3: boolean], {
-    useV3: boolean;
-}, "remiSetupApproverView/saveRemiSetupApproverViewUpdates", never, never>, saveRemiSetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
+}, "remiSetupApproverView/deleteRemiApprovalRuleFailure", never, never>, saveRemiSetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/saveRemiSetupApproverViewUpdates">, saveRemiSetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
     approvalRuleIds: string[];
     affectedEntityIds: string[] | undefined;
     newApprovalRuleId: string | undefined;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.setListeningToPusherEvent = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.reorderRemiApprovalRulesFailure = exports.reorderRemiApprovalRulesSuccess = exports.reorderRemiApprovalRules = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
+exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.setListeningToPusherEvent = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
@@ -17,7 +17,6 @@ exports.initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     remiSetupApproverViewUpdateData: undefined,
-    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -31,16 +30,12 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
                 draft.fetchState = 'In-Progress';
                 draft.error = undefined;
             },
-            // Approval Rules 3.0 — `useV3` arrives from the screen connector
-            // (`approval_rule_v3_config` dynamic config) and picks v1 vs v2
-            // endpoint in the fetch epic.
-            prepare(cacheOverride = false, resolveAttributeToUser = false, includeImplicitActors = false, useV3 = false) {
+            prepare(cacheOverride = false, resolveAttributeToUser = false, includeImplicitActors = false) {
                 return {
                     payload: {
                         cacheOverride,
                         resolveAttributeToUser,
                         includeImplicitActors,
-                        useV3,
                     },
                 };
             },
@@ -143,11 +138,8 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
                     error: undefined,
                 };
             },
-            // Approval Rules 3.0 — `useV3` flows from the screen connector
-            // (`approval_rule_v3_config` dynamic config) so the delete epic
-            // can pick the v1 vs v2 endpoint.
-            prepare(approvalRuleId, useV3 = false) {
-                return { payload: { approvalRuleId, useV3 } };
+            prepare(approvalRuleId) {
+                return { payload: { approvalRuleId } };
             },
         },
         deleteRemiApprovalRuleSuccess: {
@@ -179,57 +171,13 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        /**
-         * Approval Rules 3.0 — list-page drag-and-drop reorder.
-         * See BillPay equivalent for the longer rationale.
-         */
-        reorderRemiApprovalRules: {
-            reducer(draft, action) {
-                const { approvalRuleIds } = action.payload;
-                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
-                draft.approvalRuleIds = approvalRuleIds;
-            },
-            prepare(approvalRuleIds, useV3 = false) {
-                return { payload: { approvalRuleIds, useV3 } };
-            },
-        },
-        reorderRemiApprovalRulesSuccess: {
-            reducer(draft, action) {
-                const { approvalRuleIds } = action.payload;
-                draft.reorderStatus = { fetchState: 'Completed', error: undefined };
-                draft.approvalRuleIds = approvalRuleIds;
-            },
-            prepare(approvalRuleIds) {
-                return { payload: { approvalRuleIds } };
-            },
-        },
-        reorderRemiApprovalRulesFailure: {
-            reducer(draft, action) {
-                const { status } = action.payload;
-                draft.reorderStatus = { fetchState: 'Error', error: status };
-            },
-            prepare(status) {
-                return { payload: { status } };
-            },
-        },
-        saveRemiSetupApproverViewUpdates: {
-            // Approval Rules 3.0 — `useV3` sourced from
-            // `approval_rule_v3_config` dynamic config in the screen
-            // connector; epic uses it to pick v1 vs v2 URL + mapper. The
-            // reducer doesn't read the action but the parameter must be
-            // declared so the action payload type carries downstream.
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            reducer(draft, _action) {
-                if (draft.remiSetupApproverViewUpdateData != null) {
-                    draft.remiSetupApproverViewUpdateData.updateStatus = {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    };
-                }
-            },
-            prepare(useV3) {
-                return { payload: { useV3 } };
-            },
+        saveRemiSetupApproverViewUpdates(draft) {
+            if (draft.remiSetupApproverViewUpdateData != null) {
+                draft.remiSetupApproverViewUpdateData.updateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            }
         },
         saveRemiSetupApproverViewUpdatesSuccess: {
             reducer(draft, action) {
@@ -318,5 +266,5 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.reorderRemiApprovalRules = _a.reorderRemiApprovalRules, exports.reorderRemiApprovalRulesSuccess = _a.reorderRemiApprovalRulesSuccess, exports.reorderRemiApprovalRulesFailure = _a.reorderRemiApprovalRulesFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
+_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
 exports.default = remiSetupApproverView.reducer;

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

@@ -10,11 +10,6 @@ export interface RemiSetupApproverViewState extends FetchedState {
         fetchStatus: FetchStateAndError;
         attributeSubTypeToUserIdMapping?: Record<AttributeType, ID>;
     };
-    /**
-     * List-page reorder PUT status. See BillPay equivalent for the
-     * longer rationale.
-     */
-    reorderStatus: FetchStateAndError;
     affectedEntityIds?: ID[];
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoIntroClosedByOutsideClickEpic.d.ts

@@ -0,0 +1,8 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser } from '../../../../../entity/tenant/tenantReducer';
+import { RootState } from '../../../../../reducer';
+import { ZeniAPI } from '../../../../../zeniAPI';
+import { updateTreasuryPromoIntroClosedByOutsideClick, updateTreasuryPromoIntroClosedByOutsideClickFailure, updateTreasuryPromoIntroClosedByOutsideClickSuccess } from '../treasurySetupViewReducer';
+export type ActionType = ReturnType<typeof updateTreasuryPromoIntroClosedByOutsideClick> | ReturnType<typeof updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser> | ReturnType<typeof updateTreasuryPromoIntroClosedByOutsideClickSuccess> | ReturnType<typeof updateTreasuryPromoIntroClosedByOutsideClickFailure>;
+export declare const updateTreasuryPromoIntroClosedByOutsideClickEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoIntroClosedByOutsideClickEpic.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTreasuryPromoIntroClosedByOutsideClickEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const tenantReducer_1 = require("../../../../../entity/tenant/tenantReducer");
+const responsePayload_1 = require("../../../../../responsePayload");
+const treasurySetupViewReducer_1 = require("../treasurySetupViewReducer");
+const updateTreasuryPromoIntroClosedByOutsideClickEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(treasurySetupViewReducer_1.updateTreasuryPromoIntroClosedByOutsideClick.match), (0, operators_1.switchMap)(() => {
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/user/self`, { is_treasury_promo_intro_closed_by_outside_click: true })
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessStatus)(response)) {
+            return (0, rxjs_1.of)((0, tenantReducer_1.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser)(), (0, treasurySetupViewReducer_1.updateTreasuryPromoIntroClosedByOutsideClickSuccess)());
+        }
+        else {
+            return (0, rxjs_1.of)((0, treasurySetupViewReducer_1.updateTreasuryPromoIntroClosedByOutsideClickFailure)(response.status));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, treasurySetupViewReducer_1.updateTreasuryPromoIntroClosedByOutsideClickFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Update treasury promo intro closed by outside click REST API call errored out' +
+        JSON.stringify(error))))));
+}));
+exports.updateTreasuryPromoIntroClosedByOutsideClickEpic = updateTreasuryPromoIntroClosedByOutsideClickEpic;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoRemindMeLaterClickedEpic.d.ts

@@ -0,0 +1,8 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateTreasuryPromoRemindMeLaterClickedForLoggedInUser } from '../../../../../entity/tenant/tenantReducer';
+import { RootState } from '../../../../../reducer';
+import { ZeniAPI } from '../../../../../zeniAPI';
+import { updateTreasuryPromoRemindMeLaterClicked, updateTreasuryPromoRemindMeLaterClickedFailure, updateTreasuryPromoRemindMeLaterClickedSuccess } from '../treasurySetupViewReducer';
+export type ActionType = ReturnType<typeof updateTreasuryPromoRemindMeLaterClicked> | ReturnType<typeof updateTreasuryPromoRemindMeLaterClickedForLoggedInUser> | ReturnType<typeof updateTreasuryPromoRemindMeLaterClickedSuccess> | ReturnType<typeof updateTreasuryPromoRemindMeLaterClickedFailure>;
+export declare const updateTreasuryPromoRemindMeLaterClickedEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoRemindMeLaterClickedEpic.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTreasuryPromoRemindMeLaterClickedEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const tenantReducer_1 = require("../../../../../entity/tenant/tenantReducer");
+const responsePayload_1 = require("../../../../../responsePayload");
+const treasurySetupViewReducer_1 = require("../treasurySetupViewReducer");
+const updateTreasuryPromoRemindMeLaterClickedEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(treasurySetupViewReducer_1.updateTreasuryPromoRemindMeLaterClicked.match), (0, operators_1.switchMap)(() => {
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/user/self`, { is_treasury_promo_video_remind_me_later_clicked: true })
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessStatus)(response)) {
+            return (0, rxjs_1.of)((0, tenantReducer_1.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser)(), (0, treasurySetupViewReducer_1.updateTreasuryPromoRemindMeLaterClickedSuccess)());
+        }
+        else {
+            return (0, rxjs_1.of)((0, treasurySetupViewReducer_1.updateTreasuryPromoRemindMeLaterClickedFailure)(response.status));
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, treasurySetupViewReducer_1.updateTreasuryPromoRemindMeLaterClickedFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Update treasury promo remind me later REST API call errored out' +
+        JSON.stringify(error))))));
+}));
+exports.updateTreasuryPromoRemindMeLaterClickedEpic = updateTreasuryPromoRemindMeLaterClickedEpic;

package/lib/view/spendManagement/treasury/treasurySetUp/treasurySetupViewReducer.d.ts

@@ -15,6 +15,6 @@ export declare const fetchTreasuryFunds: import("@reduxjs/toolkit").ActionCreato
 }, "treasurySetupView/updatePortfolioAllocation", never, never>, updatePortfolioAllocationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdatePortfolioAllocationPayload, "treasurySetupView/updatePortfolioAllocationSuccess">, updatePortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updatePortfolioAllocationFailure", never, never>, fetchPortfolioAllocation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/fetchPortfolioAllocation">, fetchPortfolioAllocationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     allocation_percentages: Record<string, number>;
     custom_corporate_id: string | null;
-}, "treasurySetupView/fetchPortfolioAllocationSuccess">, fetchPortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/fetchPortfolioAllocationFailure">, updateFundAllocationLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<FundAllocationOption, "treasurySetupView/updateFundAllocationLocalData">, updateTreasuryVideoViewed: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewed">, updateTreasuryVideoViewedSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewedSuccess">, updateTreasuryVideoViewedFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryVideoViewedFailure">;
+}, "treasurySetupView/fetchPortfolioAllocationSuccess">, fetchPortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/fetchPortfolioAllocationFailure">, updateFundAllocationLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<FundAllocationOption, "treasurySetupView/updateFundAllocationLocalData">, updateTreasuryPromoIntroClosedByOutsideClick: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClick">, updateTreasuryPromoIntroClosedByOutsideClickFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClickFailure">, updateTreasuryPromoIntroClosedByOutsideClickSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClickSuccess">, updateTreasuryPromoRemindMeLaterClicked: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoRemindMeLaterClicked">, updateTreasuryPromoRemindMeLaterClickedFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryPromoRemindMeLaterClickedFailure">, updateTreasuryPromoRemindMeLaterClickedSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoRemindMeLaterClickedSuccess">, updateTreasuryVideoViewed: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewed">, updateTreasuryVideoViewedFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryVideoViewedFailure">, updateTreasuryVideoViewedSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewedSuccess">;
 declare const _default: import("redux").Reducer<TreasurySetupViewState>;
 export default _default;

package/lib/view/spendManagement/treasury/treasurySetUp/treasurySetupViewReducer.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTreasuryVideoViewedFailure = exports.updateTreasuryVideoViewedSuccess = exports.updateTreasuryVideoViewed = exports.updateFundAllocationLocalData = exports.fetchPortfolioAllocationFailure = exports.fetchPortfolioAllocationSuccess = exports.fetchPortfolioAllocation = exports.updatePortfolioAllocationFailure = exports.updatePortfolioAllocationSuccess = exports.updatePortfolioAllocation = exports.updateTreasuryFundsFailure = exports.updateTreasuryFundsSuccess = exports.clearTreasurySetupView = exports.acceptTreasuryTermsFailure = exports.acceptTreasuryTermsSuccess = exports.acceptTreasuryTerms = exports.fetchTreasurySetupViewFailure = exports.fetchTreasurySetupViewSuccess = exports.fetchTreasurySetupView = exports.fetchTreasuryFunds = exports.initialState = void 0;
+exports.updateTreasuryVideoViewedSuccess = exports.updateTreasuryVideoViewedFailure = exports.updateTreasuryVideoViewed = exports.updateTreasuryPromoRemindMeLaterClickedSuccess = exports.updateTreasuryPromoRemindMeLaterClickedFailure = exports.updateTreasuryPromoRemindMeLaterClicked = exports.updateTreasuryPromoIntroClosedByOutsideClickSuccess = exports.updateTreasuryPromoIntroClosedByOutsideClickFailure = exports.updateTreasuryPromoIntroClosedByOutsideClick = exports.updateFundAllocationLocalData = exports.fetchPortfolioAllocationFailure = exports.fetchPortfolioAllocationSuccess = exports.fetchPortfolioAllocation = exports.updatePortfolioAllocationFailure = exports.updatePortfolioAllocationSuccess = exports.updatePortfolioAllocation = exports.updateTreasuryFundsFailure = exports.updateTreasuryFundsSuccess = exports.clearTreasurySetupView = exports.acceptTreasuryTermsFailure = exports.acceptTreasuryTermsSuccess = exports.acceptTreasuryTerms = exports.fetchTreasurySetupViewFailure = exports.fetchTreasurySetupViewSuccess = exports.fetchTreasurySetupView = exports.fetchTreasuryFunds = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const zeniDayJS_1 = require("../../../../zeniDayJS");
@@ -40,6 +40,14 @@ exports.initialState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    updateTreasuryPromoIntroClosedByOutsideClickStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
+    updateTreasuryPromoRemindMeLaterClickedStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     updateTreasuryVideoViewedStatus: {
         fetchState: 'Not-Started',
         error: undefined,
@@ -297,12 +305,48 @@ const treasurySetupView = (0, toolkit_1.createSlice)({
                 error: action.payload,
             };
         },
+        updateTreasuryPromoRemindMeLaterClicked(draft) {
+            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        updateTreasuryPromoRemindMeLaterClickedSuccess(draft) {
+            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        updateTreasuryPromoRemindMeLaterClickedFailure(draft, action) {
+            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
+                fetchState: 'Error',
+                error: action.payload,
+            };
+        },
+        updateTreasuryPromoIntroClosedByOutsideClick(draft) {
+            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        updateTreasuryPromoIntroClosedByOutsideClickSuccess(draft) {
+            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        updateTreasuryPromoIntroClosedByOutsideClickFailure(draft, action) {
+            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
+                fetchState: 'Error',
+                error: action.payload,
+            };
+        },
         clearTreasurySetupView(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = treasurySetupView.actions, exports.fetchTreasuryFunds = _a.fetchTreasuryFunds, exports.fetchTreasurySetupView = _a.fetchTreasurySetupView, exports.fetchTreasurySetupViewSuccess = _a.fetchTreasurySetupViewSuccess, exports.fetchTreasurySetupViewFailure = _a.fetchTreasurySetupViewFailure, exports.acceptTreasuryTerms = _a.acceptTreasuryTerms, exports.acceptTreasuryTermsSuccess = _a.acceptTreasuryTermsSuccess, exports.acceptTreasuryTermsFailure = _a.acceptTreasuryTermsFailure, exports.clearTreasurySetupView = _a.clearTreasurySetupView, exports.updateTreasuryFundsSuccess = _a.updateTreasuryFundsSuccess, exports.updateTreasuryFundsFailure = _a.updateTreasuryFundsFailure, exports.updatePortfolioAllocation = _a.updatePortfolioAllocation, exports.updatePortfolioAllocationSuccess = _a.updatePortfolioAllocationSuccess, exports.updatePortfolioAllocationFailure = _a.updatePortfolioAllocationFailure, exports.fetchPortfolioAllocation = _a.fetchPortfolioAllocation, exports.fetchPortfolioAllocationSuccess = _a.fetchPortfolioAllocationSuccess, exports.fetchPortfolioAllocationFailure = _a.fetchPortfolioAllocationFailure, exports.updateFundAllocationLocalData = _a.updateFundAllocationLocalData, exports.updateTreasuryVideoViewed = _a.updateTreasuryVideoViewed, exports.updateTreasuryVideoViewedSuccess = _a.updateTreasuryVideoViewedSuccess, exports.updateTreasuryVideoViewedFailure = _a.updateTreasuryVideoViewedFailure;
+_a = treasurySetupView.actions, exports.fetchTreasuryFunds = _a.fetchTreasuryFunds, exports.fetchTreasurySetupView = _a.fetchTreasurySetupView, exports.fetchTreasurySetupViewSuccess = _a.fetchTreasurySetupViewSuccess, exports.fetchTreasurySetupViewFailure = _a.fetchTreasurySetupViewFailure, exports.acceptTreasuryTerms = _a.acceptTreasuryTerms, exports.acceptTreasuryTermsSuccess = _a.acceptTreasuryTermsSuccess, exports.acceptTreasuryTermsFailure = _a.acceptTreasuryTermsFailure, exports.clearTreasurySetupView = _a.clearTreasurySetupView, exports.updateTreasuryFundsSuccess = _a.updateTreasuryFundsSuccess, exports.updateTreasuryFundsFailure = _a.updateTreasuryFundsFailure, exports.updatePortfolioAllocation = _a.updatePortfolioAllocation, exports.updatePortfolioAllocationSuccess = _a.updatePortfolioAllocationSuccess, exports.updatePortfolioAllocationFailure = _a.updatePortfolioAllocationFailure, exports.fetchPortfolioAllocation = _a.fetchPortfolioAllocation, exports.fetchPortfolioAllocationSuccess = _a.fetchPortfolioAllocationSuccess, exports.fetchPortfolioAllocationFailure = _a.fetchPortfolioAllocationFailure, exports.updateFundAllocationLocalData = _a.updateFundAllocationLocalData, exports.updateTreasuryPromoIntroClosedByOutsideClick = _a.updateTreasuryPromoIntroClosedByOutsideClick, exports.updateTreasuryPromoIntroClosedByOutsideClickFailure = _a.updateTreasuryPromoIntroClosedByOutsideClickFailure, exports.updateTreasuryPromoIntroClosedByOutsideClickSuccess = _a.updateTreasuryPromoIntroClosedByOutsideClickSuccess, exports.updateTreasuryPromoRemindMeLaterClicked = _a.updateTreasuryPromoRemindMeLaterClicked, exports.updateTreasuryPromoRemindMeLaterClickedFailure = _a.updateTreasuryPromoRemindMeLaterClickedFailure, exports.updateTreasuryPromoRemindMeLaterClickedSuccess = _a.updateTreasuryPromoRemindMeLaterClickedSuccess, exports.updateTreasuryVideoViewed = _a.updateTreasuryVideoViewed, exports.updateTreasuryVideoViewedFailure = _a.updateTreasuryVideoViewedFailure, exports.updateTreasuryVideoViewedSuccess = _a.updateTreasuryVideoViewedSuccess;
 exports.default = treasurySetupView.reducer;
 function mapTreasuryFundsPayloadToFundData(fundsPayload) {
     return fundsPayload.funds.map((fund) => ({

package/lib/view/spendManagement/treasury/treasurySetUp/treasurySetupViewState.d.ts

@@ -16,6 +16,8 @@ export interface TreasurySetupViewState extends FetchedState {
         fundAllocationOptions: FundAllocationOption[];
         fundsDetails: FundData[];
     };
+    updateTreasuryPromoIntroClosedByOutsideClickStatus: FetchStateAndError;
+    updateTreasuryPromoRemindMeLaterClickedStatus: FetchStateAndError;
     updateTreasuryVideoViewedStatus: FetchStateAndError;
     treasuryTermsDetails?: {
         fetchStatus: FetchStateAndError;

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -50,15 +50,15 @@ export interface TaskFilterCategory {
 }
 export type TaskListFilterCategoryField = 'status' | 'dueDate' | 'assignee' | 'creationDate' | 'priority' | 'tag';
 export declare const TASK_LIST_GROUP_BY_KEYS: readonly ["groupName", "status", "dueDate", "assignee", "priority", "tag"];
-export declare const toTaskListGroupByKeyType: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee";
-export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee" | undefined;
+export declare const toTaskListGroupByKeyType: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee";
+export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee" | undefined;
 export declare type TaskGroupKey = ReturnType<typeof toTaskListGroupByKeyType>;
 export interface TaskListUIState extends SpendManagementUIState {
     groupByKey: TaskGroupKey;
     searchText: string;
     sortKey: TaskListViewSortKey;
 }
-declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "priority" | "dueDate" | "tag" | "timeSpent" | "assignee" | "creationDate" | "visibility";
+declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "dueDate" | "tag" | "priority" | "timeSpent" | "assignee" | "creationDate" | "visibility";
 export declare type TaskListViewSortKey = ReturnType<typeof toTaskListSortKeyType>;
 export declare const TASK_LIST_FILTER_CATEGORIES: TaskListFilterCategoryOption[];
 interface TaskListFilterCategoryOption {

package/package.json

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

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

@@ -1,56 +0,0 @@
-import { ID } from '../../commonStateTypes/common';
-import { ApprovalRule, Criteria } from './approvalRuleState';
-/**
- * Approval Rules 3.0 — frontend overlap detection.
- *
- * Per product spec, two rules overlap iff:
- *   1. Their vendor criteria are exactly equal (same operator and
- *      the same set of vendor IDs, or both absent), AND
- *   2. Their department criteria are exactly equal (same shape), AND
- *   3. Their amount intervals intersect.
- *
- * The intuition: we only flag overlap when the non-amount criteria
- * are identical, because the typical mistake is "I tried to create a
- * second rule for the same vendor / department slice at a different
- * amount threshold and forgot the existing one". Subset / superset
- * overlaps (e.g. one rule has a department condition and the other
- * does not) are intentionally not flagged in this iteration.
- *
- * Amount intervals are:
- *   - greater_than(N)   → [N, +∞)
- *   - less_than(N)      → (-∞, N]
- *   - range(min, max)   → [min, max]
- *   - amount absent     → (-∞, +∞)
- *
- * Two intervals overlap iff max(lo) <= min(hi).
- *
- * Exclusions from the comparison pool:
- *   - The rule being edited (caller passes `excludeRuleId`).
- *   - Fallback rules — they are a separate concept (match-all-others)
- *     and not subject to the per-criteria overlap check.
- *
- * Callers should filter `existingRules` to the relevant entityType
- * (BillPay vs Reimbursement) before passing — the function does not
- * cross-check entityType.
- *
- * Pure function: no side effects, deterministic. Returns the list of
- * overlapping rules. Empty list means no overlap.
- */
-/**
- * Structural shape of a rule the algorithm needs. The detector only
- * reads `criteria`, `isFallback`, and `approvalRuleId`; it never
- * touches `steps`, so callers may pass any 'ApprovalRule' subtype
- * (e.g. `ApprovalRuleWithUser`) and we keep the richer type in the
- * output.
- */
-export type RuleForOverlapCheck = Pick<ApprovalRule, 'approvalRuleId' | 'criteria' | 'isFallback'>;
-export interface RuleOverlap<TRule extends RuleForOverlapCheck = ApprovalRule> {
-    conflictingRule: TRule;
-}
-export interface DetectRuleOverlapInput<TRule extends RuleForOverlapCheck = ApprovalRule> {
-    candidateCriteria: Criteria[];
-    existingRules: TRule[];
-    /** When editing an existing rule, exclude it from the comparison. */
-    excludeRuleId?: ID;
-}
-export declare function detectRuleOverlap<TRule extends RuleForOverlapCheck>({ candidateCriteria, existingRules, excludeRuleId, }: DetectRuleOverlapInput<TRule>): RuleOverlap<TRule>[];

package/lib/entity/approvalRule/approvalRuleConflict.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectRuleOverlap = detectRuleOverlap;
-function detectRuleOverlap({ candidateCriteria, existingRules, excludeRuleId, }) {
-    const candidateAmount = pickAmount(candidateCriteria);
-    const candidateVendor = pickVendor(candidateCriteria);
-    const candidateDepartment = pickDepartment(candidateCriteria);
-    const overlaps = [];
-    for (const rule of existingRules) {
-        if (rule.approvalRuleId === excludeRuleId) {
-            continue;
-        }
-        if (rule.isFallback === true) {
-            continue;
-        }
-        const ruleVendor = pickVendor(rule.criteria);
-        const ruleDepartment = pickDepartment(rule.criteria);
-        if (!areVendorCriteriaEqual(candidateVendor, ruleVendor)) {
-            continue;
-        }
-        if (!areDepartmentCriteriaEqual(candidateDepartment, ruleDepartment)) {
-            continue;
-        }
-        const ruleAmount = pickAmount(rule.criteria);
-        if (amountsOverlap(candidateAmount, ruleAmount)) {
-            overlaps.push({ conflictingRule: rule });
-        }
-    }
-    return overlaps;
-}
-const pickAmount = (criteria) => criteria.find((c) => c.type === 'amount');
-const pickVendor = (criteria) => criteria.find((c) => c.type === 'vendor');
-const pickDepartment = (criteria) => criteria.find((c) => c.type === 'department');
-const areVendorCriteriaEqual = (a, b) => {
-    if (a == null && b == null) {
-        return true;
-    }
-    if (a == null || b == null) {
-        return false;
-    }
-    if (a.operator !== b.operator) {
-        return false;
-    }
-    return idsEqual(a.vendorIds, b.vendorIds);
-};
-const areDepartmentCriteriaEqual = (a, b) => {
-    if (a == null && b == null) {
-        return true;
-    }
-    if (a == null || b == null) {
-        return false;
-    }
-    if (a.operator !== b.operator) {
-        return false;
-    }
-    return idsEqual(a.departmentIds, b.departmentIds);
-};
-const idsEqual = (a, b) => {
-    if (a.length !== b.length) {
-        return false;
-    }
-    const aSorted = [...a].sort();
-    const bSorted = [...b].sort();
-    return aSorted.every((id, i) => id === bSorted[i]);
-};
-const amountsOverlap = (a, b) => {
-    // Absent amount criteria covers the whole real line, so any
-    // pairing involving an absent one is a guaranteed overlap.
-    if (a == null || b == null) {
-        return true;
-    }
-    const aLow = a.min?.amount ?? Number.NEGATIVE_INFINITY;
-    const aHigh = a.max?.amount ?? Number.POSITIVE_INFINITY;
-    const bLow = b.min?.amount ?? Number.NEGATIVE_INFINITY;
-    const bHigh = b.max?.amount ?? Number.POSITIVE_INFINITY;
-    return Math.max(aLow, bLow) <= Math.min(aHigh, bHigh);
-};