@zeniai/client-epic-state 5.0.90-betaAR4 → 5.0.90-betaAR6

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js

@@ -1,48 +1,20 @@
 export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
-    // Form-side criteria is a structured object with optional slots for
-    // amount / vendor / department; flatten it into the wire format's
-    // `conditions[]` array.
-    let criteriaPayload;
+    let criteriaPayload = [];
     if (approverViewUpdateData.criteria != null) {
-        const { amount, vendor, department } = approverViewUpdateData.criteria;
-        const conditions = [];
-        if (amount?.min != null) {
-            conditions.push({
-                field: 'amount',
-                type: 'gte',
-                value: amount.min.amount,
-            });
-        }
-        if (amount?.max != null) {
-            conditions.push({
-                field: 'amount',
-                type: 'lte',
-                value: amount.max.amount,
-            });
-        }
-        if (vendor != null && vendor.vendorIds.length > 0) {
-            conditions.push({
-                field: 'vendor_id',
-                type: vendor.operator === 'is_not' ? 'not_in' : 'in',
-                value: vendor.vendorIds,
-            });
-        }
-        if (department != null && department.departmentIds.length > 0) {
-            conditions.push({
-                field: 'department_id',
-                type: department.operator === 'is_not' ? 'not_in' : 'in',
-                value: department.departmentIds,
-            });
-        }
-        if (conditions.length > 0) {
-            const currency = amount?.min ?? amount?.max ?? null;
-            criteriaPayload = {
-                conditions,
-                criteria_operator: 'and',
-                currency_code: currency?.currencyCode ?? 'USD',
-                currency_symbol: currency?.currencySymbol ?? '$',
-            };
-        }
+        const criteria = approverViewUpdateData.criteria;
+        const { rangeType, rangeEntity, range } = criteria;
+        const { min, max } = range;
+        const { currencyCode, currencySymbol } = min;
+        criteriaPayload = [
+            {
+                type: rangeType,
+                range_entity: rangeEntity,
+                min: min.amount,
+                max: max?.amount ?? null,
+                currency_code: currencyCode,
+                currency_symbol: currencySymbol,
+            },
+        ];
     }
     const steps = approverViewUpdateData.steps.map((step) => {
         return {
@@ -63,86 +35,10 @@ export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
     });
     const isUpdate = approverViewUpdateData.approvalRuleId != null;
     const payload = {
+        criteria: criteriaPayload,
         steps,
         is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
     };
-    if (criteriaPayload != null) {
-        payload.criteria = criteriaPayload;
-    }
-    // Approval Rules 3.0 — surface rule-level fields when the form set them.
-    // Send only what the user actually entered: an undefined value means
-    // "no opinion" and stays off the wire.
-    if (approverViewUpdateData.name != null) {
-        payload.name = approverViewUpdateData.name;
-    }
-    if (approverViewUpdateData.description != null) {
-        payload.description = approverViewUpdateData.description;
-    }
-    if (approverViewUpdateData.separationOfDuties != null) {
-        payload.is_separation_of_duty_enabled =
-            approverViewUpdateData.separationOfDuties;
-    }
-    if (approverViewUpdateData.isFallback != null) {
-        payload.is_fallback = approverViewUpdateData.isFallback;
-    }
-    if (isUpdate) {
-        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
-    }
-    return payload;
-};
-/**
- * V1 wire mapper — used when 'approval_rule_v3_config' resolves to OFF
- * for the current tenant. Emits the legacy snake_case array shape that
- * '/approval-rules' historically consumed (see the V1 fixture in
- * 'entity/entityApprovalStatus/__mocks__/json/entityApprovalStatusPayload.json'):
- *   criteria: [{type: 'range', range_entity: 'currency', min, max,
- *               currency_code, currency_symbol}]
- *
- * Open-ended semantics are preserved on the wire: an absent 'min' or
- * 'max' is sent as 'null' rather than synthesised to '0' or
- * 'MAX_SAFE_INTEGER', so a 'greater_than' / 'less_than' rule stays
- * one-sided after rollback rather than collapsing into a closed range.
- *
- * The V1 backend does not understand vendor / department criteria or
- * the rule-level 3.0 fields, so those are dropped on the wire.
- */
-export const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
-    const amount = approverViewUpdateData.criteria?.amount;
-    const minAmount = amount?.min;
-    const maxAmount = amount?.max;
-    const currencyCode = minAmount?.currencyCode ?? maxAmount?.currencyCode ?? 'USD';
-    const currencySymbol = minAmount?.currencySymbol ?? maxAmount?.currencySymbol ?? '$';
-    const steps = approverViewUpdateData.steps.map((step) => {
-        return {
-            action: step.action,
-            operator: step.operator,
-            actors: step.actors
-                .filter((actor) => actor.subType !== 'admin')
-                .map((actor) => {
-                return {
-                    type: actor.type,
-                    id: actor.userId ?? null,
-                    sub_type: actor.subType ?? null,
-                    id_type: actor.idType ?? null,
-                    is_implicit_actor: actor.isImplicitActor ?? false,
-                };
-            }),
-        };
-    });
-    const isUpdate = approverViewUpdateData.approvalRuleId != null;
-    const criteriaEntry = {
-        type: 'range',
-        range_entity: 'currency',
-        min: minAmount?.amount ?? null,
-        max: maxAmount?.amount ?? null,
-        currency_code: currencyCode,
-        currency_symbol: currencySymbol,
-    };
-    const payload = {
-        steps,
-        is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria: [criteriaEntry],
-    };
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
     }

package/lib/esm/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -1,6 +1,5 @@
 import recordGet from 'lodash/get';
 import has from 'lodash/has';
-import { getAmountCriteria, getDepartmentCriteria, getVendorCriteria, } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getBankAccountByBankAccountId, getBankAccountsByBankAccountIds, } from '../../../../entity/bankAccount/bankAccountSelector';
 import { getContactById, getContactsByIds, } from '../../../../entity/billPay/contact/contactSelector';
@@ -357,14 +356,6 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
         isDeleted,
         showAutofill,
         addBillAutoFields,
-        // Bill-level accounting class. Approval Rules 3.0 'department'
-        // criteria match against this. Lives on BillTransaction; not on
-        // any sub-section. Empty-string is normalised to 'undefined'
-        // so downstream readers treat "no class" uniformly regardless
-        // of whether the wire used '' or omitted the field.
-        classId: transaction?.classId != null && transaction.classId !== ''
-            ? transaction.classId
-            : undefined,
         billStage,
         deleteStatus,
         billActivities,
@@ -687,59 +678,12 @@ export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId,
     }
     return undefined;
 };
-export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
+export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
     let isCreatorAlsoApprover = false;
-    // Approval Rules 3.0 — a rule applies to a bill only when all of
-    // its present criteria are satisfied. Criteria not declared on
-    // the rule are treated as "no narrowing on this axis".
-    //
-    // Strict-match semantics for vendor / department: if the rule
-    // narrows by an axis but the bill has no value on that axis, the
-    // rule does NOT apply (an absent bill-side value can't satisfy
-    // either 'is' or 'is_not'). Amount is always present on a rule
-    // (the form enforces this), but bounds may be one-sided.
     const approvalRule = approvalRules.find((rule) => {
-        const vendorCriteria = getVendorCriteria(rule.criteria);
-        if (vendorCriteria != null) {
-            if (billVendorId == null) {
-                return false;
-            }
-            const includesVendor = vendorCriteria.vendorIds.includes(billVendorId);
-            if (vendorCriteria.operator === 'is' && !includesVendor) {
-                return false;
-            }
-            if (vendorCriteria.operator === 'is_not' && includesVendor) {
-                return false;
-            }
-        }
-        const departmentCriteria = getDepartmentCriteria(rule.criteria);
-        if (departmentCriteria != null) {
-            if (billDepartmentId == null) {
-                return false;
-            }
-            const includesDepartment = departmentCriteria.departmentIds.includes(billDepartmentId);
-            if (departmentCriteria.operator === 'is' && !includesDepartment) {
-                return false;
-            }
-            if (departmentCriteria.operator === 'is_not' && includesDepartment) {
-                return false;
-            }
-        }
-        const amountCriteria = getAmountCriteria(rule.criteria);
-        if (amountCriteria == null) {
-            // The form guarantees an amount criterion on every rule, so
-            // this branch is defensive against backend drift. Keep
-            // pre-3.0 behaviour: a rule that doesn't declare amount
-            // doesn't participate here.
-            return false;
-        }
-        // Bounds use the wire's inclusive 'gte' / 'lte' semantics, and
-        // either side may be absent for a one-sided 'greater_than' /
-        // 'less_than' rule.
-        const { min, max } = amountCriteria;
-        const matchesMin = min == null || billAmount >= min.amount;
-        const matchesMax = max == null || billAmount <= max.amount;
-        return matchesMin && matchesMax;
+        const { max, min } = rule.criteria[0].range;
+        return (billAmount > min.amount &&
+            (max?.amount != null ? billAmount <= max?.amount : true));
     });
     if (approvalRule != null) {
         const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/deleteRemiApprovalRuleEpic.js

@@ -6,17 +6,9 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { deleteRemiApprovalRule, deleteRemiApprovalRuleFailure, deleteRemiApprovalRuleSuccess, } from '../remiSetupApproverViewReducer';
 export const deleteRemiApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteRemiApprovalRule.match), switchMap((action) => {
-    const { approvalRuleId, useV3 } = action.payload;
-    // 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 endpoint = useV3 === true
-        ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
-        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
+    const { approvalRuleId } = action.payload;
     return zeniAPI
-        .deleteAndGetJSON(endpoint, {
-        approval_rule_id: approvalRuleId,
-    })
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`, { approval_rule_id: approvalRuleId })
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { fetchRemiSetupApproverView, fetchRemiSetupApproverViewFailure, fetchRemiSetupApproverViewSuccess, } from '../remiSetupApproverViewReducer';
 export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchRemiSetupApproverView.match), switchMap((action) => {
-    const { cacheOverride, resolveAttributeToUser, includeImplicitActors, useV3, } = action.payload;
+    const { cacheOverride, resolveAttributeToUser, includeImplicitActors } = action.payload;
     const { remiSetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = getApprovalRulesByIds(approvalRuleState, remiSetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -14,14 +14,8 @@ export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => act
             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
-            ? `${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(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -1,6 +1,6 @@
 import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
-import { getAmountCriteria, getApprovalRuleById, getDepartmentCriteria, getVendorCriteria, } from '../../../../../entity/approvalRule/approvalRuleSelector';
+import { getApprovalRuleById } from '../../../../../entity/approvalRule/approvalRuleSelector';
 import { clearRemiSetupApproverViewUpdateData, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, } from '../remiSetupApproverViewReducer';
 export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeRemiSetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
     if (approvalRuleId != null) {
         const approvalRule = 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: getAmountCriteria(approvalRule.criteria),
-                    vendor: getVendorCriteria(approvalRule.criteria),
-                    department: 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(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewUpdateData));
         }
@@ -29,7 +25,7 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewCreateData));
     }

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

@@ -4,25 +4,16 @@ import { updateApprovalRules } from '../../../../../entity/approvalRule/approval
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
-import { toApprovalChangableInfoPayload, toApprovalChangableInfoPayloadV1, } from '../../../billPay/billPaySetupApproverView/types/commonPayload';
+import { toApprovalChangableInfoPayload } from '../../../billPay/billPaySetupApproverView/types/commonPayload';
 import { saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesFailure, saveRemiSetupApproverViewUpdatesSuccess, } from '../remiSetupApproverViewReducer';
-export const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveRemiSetupApproverViewUpdates.match), switchMap((action) => {
+export const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveRemiSetupApproverViewUpdates.match), 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
-            ? toApprovalChangableInfoPayload(remiSetupApproverViewUpdateData.data)
-            : toApprovalChangableInfoPayloadV1(remiSetupApproverViewUpdateData.data);
-        const endpoint = useV3
-            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
+        const payload = toApprovalChangableInfoPayload(remiSetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(endpoint, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`, payload)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -13,7 +13,6 @@ export const initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     remiSetupApproverViewUpdateData: undefined,
-    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -27,16 +26,12 @@ const remiSetupApproverView = 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,
                     },
                 };
             },
@@ -139,11 +134,8 @@ const remiSetupApproverView = 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: {
@@ -175,70 +167,13 @@ const remiSetupApproverView = 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;
-                const wasReorderInFlight = draft.reorderStatus.fetchState === 'In-Progress';
-                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
-                // Stash the pre-reorder order for synchronous rollback on
-                // 'Failure'. See the BillPay reducer for the rationale,
-                // including the in-flight guard: a second drag before the
-                // first PUT lands must not overwrite the snapshot.
-                if (!wasReorderInFlight) {
-                    draft.reorderRollbackIds = draft.approvalRuleIds;
-                }
-                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;
-                draft.reorderRollbackIds = undefined;
-            },
-            prepare(approvalRuleIds) {
-                return { payload: { approvalRuleIds } };
-            },
-        },
-        reorderRemiApprovalRulesFailure: {
-            reducer(draft, action) {
-                const { status } = action.payload;
-                draft.reorderStatus = { fetchState: 'Error', error: status };
-                if (draft.reorderRollbackIds != null) {
-                    draft.approvalRuleIds = draft.reorderRollbackIds;
-                    draft.reorderRollbackIds = undefined;
-                }
-            },
-            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) {
@@ -327,5 +262,5 @@ const remiSetupApproverView = createSlice({
         },
     },
 });
-export const { fetchRemiSetupApproverView, fetchRemiSetupApproverViewSuccess, fetchRemiSetupApproverViewFailure, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiApproversListSuccess, fetchRemiApproversListFailure, deleteRemiApprovalRule, deleteRemiApprovalRuleSuccess, deleteRemiApprovalRuleFailure, reorderRemiApprovalRules, reorderRemiApprovalRulesSuccess, reorderRemiApprovalRulesFailure, saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesSuccess, saveRemiSetupApproverViewUpdatesFailure, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, setListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, } = remiSetupApproverView.actions;
+export const { fetchRemiSetupApproverView, fetchRemiSetupApproverViewSuccess, fetchRemiSetupApproverViewFailure, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiApproversListSuccess, fetchRemiApproversListFailure, deleteRemiApprovalRule, deleteRemiApprovalRuleSuccess, deleteRemiApprovalRuleFailure, saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesSuccess, saveRemiSetupApproverViewUpdatesFailure, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, setListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, } = remiSetupApproverView.actions;
 export default remiSetupApproverView.reducer;

package/lib/index.d.ts

@@ -52,9 +52,7 @@ import { AccountReconciliationEntity, getAccountReconByAccountIdAndSelectedPerio
 import { BalanceDataStatusCodeType, BankStatusCodeType, RecommendedActionCodeType, ReconciliationStatusCodeType, StatementDataStatusCodeType, StatementStatusCodeType, TransactionsToReview } from './entity/accountRecon/accountReconState';
 import { getAddressByAddressId } from './entity/address/addressSelector';
 import { Address } from './entity/address/addressState';
-import { Actor, ActorType, AmountComparator, AmountCriteria, ApprovalActionType, ApprovalRule, ApprovalRuleState, Approvers, AttributeType, ConditionType, Criteria, DepartmentCriteria, RoleType, Step, StepOperatorType, VendorCriteria, toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict } from './entity/approvalRule/approvalRuleState';
-import { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria } from './entity/approvalRule/approvalRuleSelector';
-import { DetectRuleOverlapInput, RuleForOverlapCheck, RuleOverlap, detectRuleOverlap } from './entity/approvalRule/approvalRuleConflict';
+import { Actor, ActorType, ApprovalActionType, ApprovalRule, ApprovalRuleState, Approvers, AttributeType, RoleType, Step, StepOperatorType, toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict } from './entity/approvalRule/approvalRuleState';
 import { BankAccount } from './entity/bankAccount/bankAccount';
 import { BillPayInfo, BillPaymentRefundStatus, BillPaymentRefundStatusCodeType, BillPaymentStatus, BillPaymentStatusCodeType, BillStage, BillStageCodeType, BillStatus, BillStatusCodeType, BillTransaction, DeletionSourceType, InternationalTransferFeeBearerPaymentMethod, toOutsideZeniPaymentModeType } from './entity/billPay/billTransaction/billTransactionState';
 import { Contact } from './entity/billPay/contact/contact';
@@ -422,7 +420,7 @@ import { getInternationalSubConfigCodeKey } from './view/spendManagement/billPay
 import { AccountTypeSubConfigCodeKeyType, BILL_NEW_PAYMENT_METHODS, BillPayConfig, BillPaymentConfigCodeType, BillPaymentSubConfigCodeType, InternationalSubConfigCodeType, LOCAL_CURRENCY_INTERNATIONAL_METHOD_SUBTEXT, NEW_INTERNATIONAL_METHOD_SUBTEXT, SWIFT_OUR_INTERNATIONAL_METHOD_SUBTEXT, VendorCurrency } from './view/spendManagement/billPay/billPayConfig/billPayConfigState';
 import { clearBillPayReview, fetchDuplicateBill } from './view/spendManagement/billPay/billPayReview/billPayReviewReducer';
 import { BillPayReviewSelectorView, DuplicateBillsSelectorView, getReviewPageBillDetail } from './view/spendManagement/billPay/billPayReview/billPayReviewSelector';
-import { clearBillPaySetupApproverView, clearBillPaySetupApproverViewUpdateData, deleteBillPayApprovalRule, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPaySetupApproverView, initializeBillPaySetupApproverViewUpdateData, reorderBillPayApprovalRules, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setListeningToPusherEvent as setBillsSetupApproverViewListeningToPusherEvent } from './view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer';
+import { clearBillPaySetupApproverView, clearBillPaySetupApproverViewUpdateData, deleteBillPayApprovalRule, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPaySetupApproverView, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setListeningToPusherEvent as setBillsSetupApproverViewListeningToPusherEvent } from './view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer';
 import { getBillPaySetupApproverUpdateDataView, getBillPaySetupApproverView } from './view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector';
 import { ApprovalRuleWithUser as BillPayApprovalRuleWithUser, BillPaySetupApproverUpdateDataView, BillPaySetupApproverView } from './view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes';
 import { BillPaySetupApproverViewState } from './view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState';
@@ -502,7 +500,7 @@ import { RemiListDownloadReport, getRemiDownloadList } from './view/spendManagem
 import { fetchRemiList, fetchRemiListPerTab, updateRemiDetailSaveRemiCode, updateRemiListDownloadUIState, updateFilterResult as updateRemiListFilterResult, updateSearchResult as updateRemiListSearchResult, updateSubTab as updateRemiListSubTab, updateTab as updateRemiListTab, updateRemiListUIState } from './view/spendManagement/reimbursement/remiListView/remiListReducer';
 import { ReimbursementView, RemiListReport, getRemiList } from './view/spendManagement/reimbursement/remiListView/remiListSelector';
 import { REIMBURSEMENT_FILTER_CATEGORIES, REIMBURSEMENT_FILTER_CATEGORIES_RESTRICTED, ReimbursementFilterCategory, ReimbursementFilters, ReimbursementViewSortKey, RemiBulkSelectExceptionInfoType, RemiListUIState, RemiListViewFilterCategoryField, RemiSubTabType, RemiTabType, toRemiSubTabType, toRemiSubTabTypeStrict, toRemiTabType, toRemiTabTypeStrict } from './view/spendManagement/reimbursement/remiListView/remiListState';
-import { clearRemiSetupApproverView, clearRemiSetupApproverViewUpdateData, deleteRemiApprovalRule, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiSetupApproverView, initializeRemiSetupApproverViewUpdateData, reorderRemiApprovalRules, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, setListeningToPusherEvent as setRemiSetupApproverViewListeningToPusherEvent } from './view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer';
+import { clearRemiSetupApproverView, clearRemiSetupApproverViewUpdateData, deleteRemiApprovalRule, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiSetupApproverView, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, setListeningToPusherEvent as setRemiSetupApproverViewListeningToPusherEvent } from './view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer';
 import { getRemiSetupApproverUpdateDataView, getRemiSetupApproverView } from './view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector';
 import { ApprovalRuleWithUser as RemiApprovalRuleWithUser, RemiSetupApproverUpdateDataView, RemiSetupApproverView } from './view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes';
 import { RemiSetupApproverViewState } from './view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState';
@@ -812,9 +810,9 @@ export { RemiSetupViewState, RemiSetupViewLocalData, MileageDetailsLocalData, Mi
 export { PaymentAccount, Logo, VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS, };
 export { SubscriptionPaymentAccount };
 export { PreviousBillsSelectorView, InvoiceProcessingPayload, InvoiceProcessingResponse, isSuccessResponse, isInvalidSessionError, isAccessDeniedError, };
-export { Step, Actor as ApprovalRuleActor, ActorType, ApprovalActionType, StepOperatorType, ApprovalRuleState, ApprovalRule, AmountComparator, AmountCriteria, ConditionType, Criteria, DepartmentCriteria, VendorCriteria, AttributeType, Approvers, RoleType, EntityApprovalStatusState, EntityApprovalStatus, SpendManagementEntityType, SpendManagementEntityTypeWithOtherConnection, getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, DetectRuleOverlapInput, RuleForOverlapCheck, RuleOverlap, detectRuleOverlap, };
-export { ApprovalRuleUpdateData, ApprovalRuleCreateData, BillPayApprovalRuleWithUser, ApprovalUpdateActionType, ApproverViewUpdateData, BillPaySetupApproverViewState, BillPaySetupApproverView, BillPaySetupApproverUpdateDataView, getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, reorderBillPayApprovalRules, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
-export { RemiApprovalRuleWithUser, RemiSetupApproverViewState, RemiSetupApproverView, RemiSetupApproverUpdateDataView, getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, reorderRemiApprovalRules, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
+export { Step, Actor as ApprovalRuleActor, ActorType, ApprovalActionType, StepOperatorType, ApprovalRuleState, ApprovalRule, AttributeType, Approvers, RoleType, EntityApprovalStatusState, EntityApprovalStatus, SpendManagementEntityType, SpendManagementEntityTypeWithOtherConnection, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
+export { ApprovalRuleUpdateData, ApprovalRuleCreateData, BillPayApprovalRuleWithUser, ApprovalUpdateActionType, ApproverViewUpdateData, BillPaySetupApproverViewState, BillPaySetupApproverView, BillPaySetupApproverUpdateDataView, getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
+export { RemiApprovalRuleWithUser, RemiSetupApproverViewState, RemiSetupApproverView, RemiSetupApproverUpdateDataView, getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
 export { RemiDetailViewSelector, getRemiDetailView, RemiActivity, RemiDetails, checkApproveRejectBtnShowForRemi, };
 export { RemiApprovalType, RemiDetailView, DuplicateLine };
 export { saveRealTimeApproval, updateIsEditModeRealTimeApprovals, RealTimeApprovalDetailLocalData, RealTimeStepsData, };