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

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.d.ts

@@ -24,13 +24,6 @@ export interface BillPayReviewSelectorView extends SelectorView {
     vendor: Vendor | undefined;
     zeniAssistRetryStatus: FetchStateAndError | undefined;
     billPayInfo?: BillPayInfo;
-    /**
-     * Bill-level accounting class id. Approval Rules 3.0 'department'
-     * criteria match against this — readers needing it (e.g. the
-     * creator-as-approver lookup) should read it off the view rather
-     * than digging through 'state.billTransactionState'.
-     */
-    classId?: ID;
     invoiceNumber?: string;
     isBillMarkedForRetry?: boolean;
     outsideZeniPaymentInfo?: OutsideZeniPaymentLocalData;

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -59,12 +59,6 @@ const getReviewPageBillDetail = (state, billId) => {
     let recurringConfig;
     let billPayInfo;
     let isBillMarkedForRetry = false;
-    // Bill-level accounting class id. Approval Rules 3.0 'department'
-    // criteria match against this. Sourced from BillTransaction so
-    // any selector that needs it (e.g. creator-as-approver lookup)
-    // can read it off the view rather than reaching into
-    // 'state.billTransactionState' itself.
-    let classId;
     const zeniAssistRetryStatus = billId != null
         ? billDetailViewState.billDetailById[key].zeniAssist.retryStatus
         : undefined;
@@ -75,13 +69,6 @@ const getReviewPageBillDetail = (state, billId) => {
             transaction?.billPayInfo.isCollectToAccountInfoFromVendorContact ?? false;
         isRecurring = transaction?.isRecurring ?? false;
         billPayInfo = transaction?.billPayInfo;
-        // Normalise empty-string 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;
         if (isRecurring &&
             transaction?.recurringBillConfigId != null &&
             transaction.recurringBillInstance != null) {
@@ -198,7 +185,6 @@ const getReviewPageBillDetail = (state, billId) => {
         zeniAssistRetryStatus,
         billPayInfo,
         outsideZeniPaymentInfo,
-        classId,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

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

@@ -2,10 +2,9 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { BillPaySetupApproverViewState } from './billPaySetupApproverViewState';
 import { ApprovalRuleCreateData, ApprovalRuleUpdateData } from './types/commonState';
 export declare const initialState: BillPaySetupApproverViewState;
-export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: any, includeUserRoles: any, useV3: boolean], {
+export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, includeUserRoles?: any], {
     cacheOverride: any;
     includeUserRoles: any;
-    useV3: boolean;
 }, "billPaySetupApproverView/fetchBillPaySetupApproverView", never, never>, fetchBillPaySetupApproverViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
     approvalRuleIds: string[];
 }, "billPaySetupApproverView/fetchBillPaySetupApproverViewSuccess", never, never>, fetchBillPaySetupApproverViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "billPaySetupApproverView/fetchBillPaySetupApproverViewFailure", never, never>, fetchBillPayApproversDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, includeUserRoles?: any], {
@@ -19,25 +18,15 @@ export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").A
     attributes: ("manager" | "vendor_owner" | "manager_of_manager")[];
 }, "billPaySetupApproverView/fetchBillPayApproversListSuccess", never, never>, fetchBillPayApproversListFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "billPaySetupApproverView/fetchBillPayApproversListFailure", never, never>, deleteBillPayApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, useV3: boolean], {
+}, "billPaySetupApproverView/fetchBillPayApproversListFailure", never, never>, deleteBillPayApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string], {
     approvalRuleId: string;
-    useV3: boolean;
 }, "billPaySetupApproverView/deleteBillPayApprovalRule", never, never>, deleteBillPayApprovalRuleSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[deletedApprovalRuleId: string, approvalRuleIds: string[]], {
     deletedApprovalRuleId: string;
     approvalRuleIds: string[];
 }, "billPaySetupApproverView/deleteBillPayApprovalRuleSuccess", never, never>, deleteBillPayApprovalRuleFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, status: ZeniAPIStatus<Record<string, unknown>>], {
     approvalRuleId: string;
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "billPaySetupApproverView/deleteBillPayApprovalRuleFailure", never, never>, reorderBillPayApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], useV3: boolean], {
-    approvalRuleIds: string[];
-    useV3: boolean;
-}, "billPaySetupApproverView/reorderBillPayApprovalRules", never, never>, reorderBillPayApprovalRulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
-    approvalRuleIds: string[];
-}, "billPaySetupApproverView/reorderBillPayApprovalRulesSuccess", never, never>, reorderBillPayApprovalRulesFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
-    status: ZeniAPIStatus<Record<string, unknown>>;
-}, "billPaySetupApproverView/reorderBillPayApprovalRulesFailure", never, never>, saveBillPaySetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[useV3: boolean], {
-    useV3: boolean;
-}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdates", never, never>, saveBillPaySetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
+}, "billPaySetupApproverView/deleteBillPayApprovalRuleFailure", never, never>, saveBillPaySetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/saveBillPaySetupApproverViewUpdates">, saveBillPaySetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
     approvalRuleIds: string[];
     affectedEntityIds: string[] | undefined;
     newApprovalRuleId: string | undefined;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.reorderBillPayApprovalRulesFailure = exports.reorderBillPayApprovalRulesSuccess = exports.reorderBillPayApprovalRules = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
+exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
@@ -17,7 +17,6 @@ exports.initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     billPaySetupApproverViewUpdateData: undefined,
-    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -31,13 +30,8 @@ const billPaySetupApproverView = (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 the v1
-            // vs v2 endpoint in the fetch epic. Required (no default) so a
-            // missing screen-connector wire surfaces at compile time rather
-            // than silently falling back to v1 on a v3 tenant.
-            prepare(cacheOverride = false, includeUserRoles = true, useV3) {
-                return { payload: { cacheOverride, includeUserRoles, useV3 } };
+            prepare(cacheOverride = false, includeUserRoles = true) {
+                return { payload: { cacheOverride, includeUserRoles } };
             },
         },
         fetchBillPaySetupApproverViewSuccess: {
@@ -122,12 +116,8 @@ const billPaySetupApproverView = (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. Required (no default) so a
-            // missing connector wire surfaces at compile time.
-            prepare(approvalRuleId, useV3) {
-                return { payload: { approvalRuleId, useV3 } };
+            prepare(approvalRuleId) {
+                return { payload: { approvalRuleId } };
             },
         },
         deleteBillPayApprovalRuleSuccess: {
@@ -159,100 +149,13 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        /**
-         * Approval Rules 3.0 — list-page drag-and-drop reorder.
-         *
-         * The trigger action carries the desired ordering as an ID list.
-         * The reducer optimistically replaces 'approvalRuleIds' so the
-         * list page renders the new order immediately; the epic then
-         * fires the PUT and either confirms (success — pulls updated
-         * priorities from the response) or recovers (failure — refetches
-         * the view so we don't strand a stale local order).
-         */
-        reorderBillPayApprovalRules: {
-            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 so 'Failure' can restore it
-                // synchronously. The epic's refetch on failure remains as a
-                // safety net (covers cases where the server's truth has
-                // drifted from the local snapshot), but the snappy UX path
-                // is the in-memory rollback.
-                //
-                // Only capture a fresh snapshot when no reorder is already in
-                // flight. If a second drag fires before the first PUT lands,
-                // the existing snapshot already holds the last server-backed
-                // order; overwriting it with the first reorder's optimistic
-                // result would mean a Failure rolls back to an uncommitted
-                // intermediate order instead of the last good list.
-                if (!wasReorderInFlight) {
-                    draft.reorderRollbackIds = draft.approvalRuleIds;
-                }
-                // Optimistic: render new order immediately. On failure, the
-                // reducer restores 'reorderRollbackIds' and the epic refetch
-                // reconciles any drift.
-                draft.approvalRuleIds = approvalRuleIds;
-            },
-            // Approval Rules 3.0 — `useV3` required so a missing wire
-            // surfaces at compile time. The reorder epic always hits the
-            // v2 endpoint (v1 has no reorder route), but the payload still
-            // carries the flag for the failure-path refetch which needs it.
-            prepare(approvalRuleIds, useV3) {
-                return { payload: { approvalRuleIds, useV3 } };
-            },
-        },
-        reorderBillPayApprovalRulesSuccess: {
-            reducer(draft, action) {
-                const { approvalRuleIds } = action.payload;
-                draft.reorderStatus = { fetchState: 'Completed', error: undefined };
-                // The API response is authoritative — overwrite with the
-                // server's reported order in case it normalised anything.
-                draft.approvalRuleIds = approvalRuleIds;
-                // Reorder succeeded — discard the snapshot so the next
-                // reorder starts from this committed order.
-                draft.reorderRollbackIds = undefined;
-            },
-            prepare(approvalRuleIds) {
-                return { payload: { approvalRuleIds } };
-            },
-        },
-        reorderBillPayApprovalRulesFailure: {
-            reducer(draft, action) {
-                const { status } = action.payload;
-                draft.reorderStatus = { fetchState: 'Error', error: status };
-                // Restore the snapshot taken on the trigger reducer before
-                // the optimistic mutation. The epic still fires a refetch
-                // alongside the failure action for cross-tab drift recovery,
-                // but locally the user sees their last good order instantly.
-                if (draft.reorderRollbackIds != null) {
-                    draft.approvalRuleIds = draft.reorderRollbackIds;
-                    draft.reorderRollbackIds = undefined;
-                }
-            },
-            prepare(status) {
-                return { payload: { status } };
-            },
-        },
-        saveBillPaySetupApproverViewUpdates: {
-            // Approval Rules 3.0 — `useV3` is sourced from the
-            // `approval_rule_v3_config` dynamic config in the screen
-            // connector. The reducer doesn't read it (the field only
-            // matters in the save epic), but it must be declared so the
-            // action's payload type is correctly inferred for downstream
-            // consumers.
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            reducer(draft, _action) {
-                if (draft.billPaySetupApproverViewUpdateData != null) {
-                    draft.billPaySetupApproverViewUpdateData.updateStatus = {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    };
-                }
-            },
-            prepare(useV3) {
-                return { payload: { useV3 } };
-            },
+        saveBillPaySetupApproverViewUpdates(draft) {
+            if (draft.billPaySetupApproverViewUpdateData != null) {
+                draft.billPaySetupApproverViewUpdateData.updateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            }
         },
         saveBillPaySetupApproverViewUpdatesSuccess: {
             reducer(draft, action) {
@@ -341,5 +244,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.reorderBillPayApprovalRules = _a.reorderBillPayApprovalRules, exports.reorderBillPayApprovalRulesSuccess = _a.reorderBillPayApprovalRulesSuccess, exports.reorderBillPayApprovalRulesFailure = _a.reorderBillPayApprovalRulesFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
+_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
 exports.default = billPaySetupApproverView.reducer;

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

@@ -9,24 +9,8 @@ export interface BillPaySetupApproverViewState extends FetchedState {
         attributes: AttributeType[];
         fetchStatus: FetchStateAndError;
     };
-    /**
-     * Tracks the in-flight status of the list-page reorder PUT
-     * (approval-rules-v2/reorder). The reducer optimistically updates
-     * 'approvalRuleIds' on the trigger action. On Failure the reducer
-     * restores the snapshot below before the epic's safety-net refetch
-     * fires, so the UI bounces back to the user's last good order
-     * without waiting for a network roundtrip.
-     */
-    reorderStatus: FetchStateAndError;
     affectedEntityIds?: ID[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
-    /**
-     * Pre-reorder snapshot of 'approvalRuleIds'. Stashed on the trigger
-     * reducer right before the optimistic mutation and consumed on
-     * Failure to restore the previous order. Cleared on Success so the
-     * next reorder starts from a clean slate.
-     */
-    reorderRollbackIds?: ID[];
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/deleteBillPayApprovalRuleEpic.js

@@ -9,17 +9,9 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.deleteBillPayApprovalRule.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/bill-pay/approval-rules-v2`
-        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
+    const { approvalRuleId } = action.payload;
     return zeniAPI
-        .deleteAndGetJSON(endpoint, {
-        approval_rule_id: approvalRuleId,
-    })
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/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/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -9,7 +9,7 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, useV3 } = action.payload;
+    const { cacheOverride } = action.payload;
     const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -17,13 +17,9 @@ const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions
             billPaySetupApproverViewState.approvalRuleIds.length ||
         (billPaySetupApproverViewState.hasValidState() === false &&
             billPaySetupApproverViewState.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 endpoint = useV3 === true
-            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
-        return zeniAPI.getJSON(endpoint).pipe((0, operators_1.mergeMap)((response) => {
+        return zeniAPI
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
+            .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);
                 const actions = [

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js

@@ -11,20 +11,16 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     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 billPaySetupApproverViewUpdateData = {
                 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, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewUpdateData));
         }
@@ -32,7 +28,7 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewCreateData));
     }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/saveBillPaySetupApproverViewUpdatesEpic.js

@@ -9,23 +9,14 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const commonPayload_1 = require("../types/commonPayload");
-const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdates.match), (0, operators_1.switchMap)((action) => {
+const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdates.match), (0, operators_1.switchMap)(() => {
     const { billPaySetupApproverViewState } = state$.value;
     const billPaySetupApproverViewUpdateData = billPaySetupApproverViewState.billPaySetupApproverViewUpdateData;
     if (billPaySetupApproverViewUpdateData != null &&
         billPaySetupApproverViewUpdateData.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)(billPaySetupApproverViewUpdateData.data)
-            : (0, commonPayload_1.toApprovalChangableInfoPayloadV1)(billPaySetupApproverViewUpdateData.data);
-        const endpoint = useV3
-            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
+        const payload = (0, commonPayload_1.toApprovalChangableInfoPayload)(billPaySetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(endpoint, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/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/billPay/billPaySetupApproverView/types/commonPayload.d.ts

@@ -14,67 +14,9 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
 }
 interface ApprovalUpdatableInfoPayload {
     approval_rule_id: ID;
-    criteria: CriteriaPayload;
+    criteria: CriteriaPayload[];
     is_applicable_on_pending_approval_entity: boolean;
     steps: ApproverViewStepPayload[];
-    description?: string;
-    is_fallback?: boolean;
-    is_separation_of_duty_enabled?: boolean;
-    /**
-     * Approval Rules 3.0 — rule-level wire fields. The backend accepts these
-     * as optional today; once 3.0 ships they become first-class. The SoD
-     * field name matches the GET response shape (confirmed with backend),
-     * so the same identifier flows both directions on the wire.
-     */
-    name?: string;
-}
-/**
- * V1 / pre-3.0 wire shape. Kept so the rollback flag (gated by
- * 'approval_rule_v3_config' dynamic config) can target the original
- * '/approval-rules' endpoint with the legacy snake_case array of
- * range entries. None of the 3.0 rule-level fields are sent.
- *
- * Reference: 'entityApprovalStatusPayload.json' fixture, which carries
- * a real V1 approval rule from the legacy backend:
- *   criteria: [{type: 'range', range_entity: 'currency',
- *               min, max, currency_code, currency_symbol}]
- * with 'min' / 'max' as scalar numbers and 'null' representing an
- * absent bound for one-sided rules. The read-side mapper in
- * 'approvalRulePayload.ts' (see 'LegacyAmountRangeCriterionPayload')
- * decodes the same shape — write-side has to match.
- */
-interface ApprovalUpdatableInfoPayloadV1CriterionEntry {
-    currency_code: string;
-    currency_symbol: string;
-    /** Upper bound. 'null' for a 'greater_than' (open-upper) rule. */
-    max: number | null;
-    /** Lower bound. 'null' for a 'less_than' (open-lower) rule. */
-    min: number | null;
-    range_entity: 'currency';
-    type: 'range';
-}
-interface ApprovalUpdatableInfoPayloadV1 {
-    criteria: ApprovalUpdatableInfoPayloadV1CriterionEntry[];
-    is_applicable_on_pending_approval_entity: boolean;
-    steps: ApproverViewStepPayload[];
-    approval_rule_id?: ID;
 }
 export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;
-/**
- * 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 declare const toApprovalChangableInfoPayloadV1: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayloadV1>;
 export {};