@zeniai/client-epic-state 5.0.90-betaAR5 → 5.0.90-betaAR7

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

@@ -1,51 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toApprovalChangableInfoPayloadV1 = exports.toApprovalChangableInfoPayload = void 0;
+exports.toApprovalChangableInfoPayload = void 0;
 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 {
@@ -66,110 +38,13 @@ 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;
 };
 exports.toApprovalChangableInfoPayload = toApprovalChangableInfoPayload;
-/**
- * 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.
- */
-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 minValue = minAmount?.amount ?? null;
-    const maxValue = maxAmount?.amount ?? null;
-    // Approval Rules 3.0 — guard against the both-null case. The form
-    // is expected to always set at least one bound, but if drift ever
-    // hands us a rule with no min and no max we'd otherwise emit
-    // '[{type: range, min: null, max: null, ...}]' — a payload that
-    // (a) the read-side 'legacyAmountRangeToCriteria' decodes back to
-    // '[]' (asymmetric round-trip), and (b) the V1 backend will
-    // reject anyway. Emit 'criteria: []' instead so the save fails
-    // cleanly on the server side and we leave a breadcrumb in the
-    // console for diagnosis rather than persisting mis-shaped data.
-    const criteria = [];
-    if (minValue == null && maxValue == null) {
-        console.warn('[approvalRules][V1] toApprovalChangableInfoPayloadV1: rule has ' +
-            'no amount bounds; emitting empty criteria array. The V1 backend ' +
-            'will reject this save — caller should ensure at least one bound ' +
-            'is set on the form.');
-    }
-    else {
-        criteria.push({
-            type: 'range',
-            range_entity: 'currency',
-            min: minValue,
-            max: maxValue,
-            currency_code: currencyCode,
-            currency_symbol: currencySymbol,
-        });
-    }
-    const payload = {
-        steps,
-        is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria,
-    };
-    if (isUpdate) {
-        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
-    }
-    return payload;
-};
-exports.toApprovalChangableInfoPayloadV1 = toApprovalChangableInfoPayloadV1;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts

@@ -1,45 +1,19 @@
 import { FetchStateAndError, ID } from '../../../../../commonStateTypes/common';
-import { AmountCriteria, DepartmentCriteria, Step, VendorCriteria } from '../../../../../entity/approvalRule/approvalRuleState';
+import { Criteria, Step } from '../../../../../entity/approvalRule/approvalRuleState';
 export type ApprovalUpdateActionType = 'approval_create' | 'approval_update';
 export interface ApproverViewUpdateData {
     type: ApprovalUpdateActionType;
     updateStatus: FetchStateAndError;
     data?: ApprovalRuleUpdateData | ApprovalRuleCreateData;
 }
-/**
- * Form-side criteria shape used by the rule create/edit form.
- *
- * Each condition kind gets its own optional slot, mirroring how the UI
- * edits them as distinct rows. At most one of each kind is present; this
- * matches the design constraint that each condition type can be added once.
- */
-export interface ApprovalRuleFormCriteria {
-    amount?: AmountCriteria;
-    department?: DepartmentCriteria;
-    vendor?: VendorCriteria;
-}
-/**
- * Rule-level fields shared by both create and update flows.
- *
- * These come from the 3.0 design: the form now owns a name, an optional
- * description, an optional Separation-of-Duties toggle, and a flag that
- * marks the rule as the org-wide fallback rule. They live alongside
- * criteria/steps but are not part of either.
- */
-export interface ApprovalRuleFormBase {
-    description?: string;
-    isFallback?: boolean;
-    name?: string;
-    separationOfDuties?: boolean;
-}
-export interface ApprovalRuleUpdateData extends ApprovalRuleFormBase {
+export interface ApprovalRuleUpdateData {
     approvalRuleId: ID;
-    criteria: ApprovalRuleFormCriteria;
+    criteria: Criteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }
-export interface ApprovalRuleCreateData extends ApprovalRuleFormBase {
-    criteria: ApprovalRuleFormCriteria;
+export interface ApprovalRuleCreateData {
+    criteria: Criteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts

@@ -100,13 +100,6 @@ export interface EditBillDetailSelectorView extends SelectorView {
     withdrawFromList: FundingAccount[];
     billPayInfo?: BillPayInfo;
     bookCloseDate?: ZeniDate;
-    /**
-     * Bill-level accounting class id. Approval Rules 3.0 'department'
-     * criteria match against this — selectors needing to evaluate a
-     * department-narrowed rule against the current bill should read
-     * this rather than digging through 'state.billTransactionState'.
-     */
-    classId?: ID;
     createTime?: ZeniDate;
     editBillInitialDetails?: EditBillInitialDetails;
     internationalWireOnboardingStatus?: AllowedValueWithCode;
@@ -164,4 +157,4 @@ export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAc
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 }) => FundingAccount | undefined;
-export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser, billVendorId?: ID, billDepartmentId?: ID) => boolean;
+export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser) => boolean;

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

@@ -9,7 +9,6 @@ exports.getPaymentSection = getPaymentSection;
 exports.toPaymentToOption = toPaymentToOption;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
-const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
@@ -366,14 +365,6 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         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,
@@ -704,59 +695,12 @@ const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSe
     return undefined;
 };
 exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;
-const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
+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 = (0, approvalRuleSelector_1.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 = (0, approvalRuleSelector_1.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 = (0, approvalRuleSelector_1.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/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -41,10 +41,7 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         else {
             billDetailActions.push((0, editBillViewReducer_1.updateShowAutofill)(true));
         }
-        // Side-fetch from the edit-bill page bootstrap. The triggering
-        // action doesn't carry the V3 flag, so we explicitly target v1
-        // here; tenants on v3 re-fetch through their own screen connector.
-        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
+        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true));
     }
     else {
         if (state.ownerListState.fetchState !== 'In-Progress' &&
@@ -87,10 +84,7 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         // While opening New Bill Refresh Approval Rules and Payment Accounts
         if (approvalViewFetchState !== 'In-Progress' &&
             approvalViewFetchState !== 'Completed') {
-            // Side-fetch from the edit-bill page bootstrap. The triggering
-            // action doesn't carry the V3 flag, so we explicitly target v1
-            // here; tenants on v3 re-fetch through their own screen connector.
-            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
+            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true));
         }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(billDetailActions));

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.d.ts

@@ -61,7 +61,7 @@ export declare const initialCreditAcc: CreditAccount;
 export declare const initialDebitCardSummaries: DebitCardSummaries;
 export declare const initialResendRevokeCardInvite: ResendRevokeCardInvite;
 export declare const initialCreditAccountRepayment: CreditAccountRepayment;
-export declare const toChargeCardSortKeyType: (v: string) => "status" | "department" | "accountType" | "owner" | "cardName" | "limit" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
 export declare type ChargeCardViewSortKey = ReturnType<typeof toChargeCardSortKeyType>;
 export declare const ALL_CASHBACK_SORT_KEYS: readonly ["month", "cashback"];
 export declare const toCashbackSortKeyType: (v: string) => "month" | "cashback";

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.js

@@ -66,11 +66,7 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
             const approvalRules = state.remiSetupApproverViewState;
             if (approvalRules.fetchState !== 'Completed' &&
                 approvalRules.fetchState !== 'In-Progress') {
-                // Side-fetch from the edit-reim page bootstrap. The
-                // triggering action doesn't carry the V3 flag, so we
-                // explicitly target v1; v3 tenants re-fetch via their
-                // own screen connector.
-                remiDetailActions.push((0, remiSetupApproverViewReducer_1.fetchRemiSetupApproverView)(true, false, false, false));
+                remiDetailActions.push((0, remiSetupApproverViewReducer_1.fetchRemiSetupApproverView)(true));
             }
         }
     }

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

@@ -9,17 +9,9 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const remiSetupApproverViewReducer_1 = require("../remiSetupApproverViewReducer");
 const deleteRemiApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(remiSetupApproverViewReducer_1.deleteRemiApprovalRule.match), (0, operators_1.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((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/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,14 +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
-            ? `${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,23 +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
-            ? `${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: boolean], {
+export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, resolveAttributeToUser?: any, includeImplicitActors?: any], {
     cacheOverride: any;
     resolveAttributeToUser: any;
     includeImplicitActors: any;
-    useV3: boolean;
 }, "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: boolean], {
+}, "remiSetupApproverView/fetchRemiApproversListFailure", never, never>, deleteRemiApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string], {
     approvalRuleId: string;
-    useV3: boolean;
 }, "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: boolean], {
-    approvalRuleIds: string[];
-    useV3: boolean;
-}, "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;