@zeniai/client-epic-state 5.0.77-betaAR2 → 5.0.77-betaAS1

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

@@ -1,27 +1,11 @@
 import { ApprovalRule } from './approvalRuleState';
-/**
- * Condition Payload — one entry inside criteria.conditions[].
- *
- * field examples: 'amount' | 'vendor_id' | 'department_id'
- * type examples:  'gte' | 'lte' | 'eq' | 'in' | 'not_in'
- * value: number for amount comparisons; string[] for in / not_in lookups.
- */
-export interface ConditionPayload {
-    field: string;
-    type: string;
-    value: number | string[];
-}
-/**
- * Criteria Payload — list of conditions joined by `criteria_operator`.
- *
- * `currency_code` / `currency_symbol` apply to amount conditions inside
- * `conditions[]`. Kept here pending confirmation that they should remain.
- */
 export interface CriteriaPayload {
-    conditions: ConditionPayload[];
-    criteria_operator: string;
     currency_code: string;
     currency_symbol: string;
+    min: number;
+    range_entity: string;
+    type: string;
+    max?: number | null;
 }
 export interface ActorPayload {
     type: string;
@@ -41,17 +25,11 @@ export interface StepPayload {
 export interface ApprovalRulePayload {
     approval_rule_id: string;
     create_time: string;
-    criteria: CriteriaPayload;
+    criteria: CriteriaPayload[];
     entity_type: string;
     name: string | null;
     steps: StepPayload[];
     update_time: string;
-    are_approvals_serialized?: boolean;
-    description?: string | null;
-    is_fallback?: boolean;
-    pending_approvals_count?: number;
-    pending_entity_approval_update_status?: string;
-    priority?: number;
     version?: number | string;
 }
 /**

package/lib/entity/approvalRule/approvalRulePayload.js

@@ -17,140 +17,19 @@ const toApprovalRule = (payload) => ({
     version: payload.version,
     criteria: toApprovalCriteria(payload.criteria),
     steps: toApprovalSteps(payload.steps),
-    description: payload.description ?? undefined,
-    priority: payload.priority,
-    isFallback: payload.is_fallback ?? false,
-    // separationOfDuties: backend doesn't ship this field yet; left undefined
-    // until the spec is finalized.
-    areApprovalsSerialized: payload.are_approvals_serialized,
-    pendingApprovalsCount: payload.pending_approvals_count,
-    pendingEntityApprovalUpdateStatus: payload.pending_entity_approval_update_status,
 });
 exports.toApprovalRule = toApprovalRule;
-/**
- * Maps the wire-level criteria block into the state-side discriminated
- * `Criteria[]` union.
- *
- * The wire keeps each condition as a flat row inside `conditions[]`.
- * Amount comparisons can show up as a `gte` only, a `lte` only, or a
- * `gte` + `lte` pair — those collapse into a single AmountCriteria whose
- * `comparator` is `greater_than`, `less_than`, or `range` respectively.
- *
- * Vendor and department conditions map one-to-one: `in` becomes `is`,
- * `not_in` becomes `is_not`.
- *
- * Resilient to two forms of upstream drift:
- *  - Missing / null criteria → returns [].
- *  - Legacy criteria shape (array of amount-range objects, the pre-3.0
- *    wire) → converted to an AmountCriteria so existing rules in production
- *    still render while the backend rolls out.
- */
 const toApprovalCriteria = (payload) => {
-    if (payload == null) {
-        return [];
-    }
-    if (Array.isArray(payload)) {
-        // Legacy pre-3.0 wire: an array of amount-range entries.
-        return legacyAmountRangeToCriteria(payload);
-    }
-    if (!Array.isArray(payload.conditions)) {
-        return [];
-    }
-    const results = [];
-    const amountCriteria = toAmountCriteria(payload);
-    if (amountCriteria != null) {
-        results.push(amountCriteria);
-    }
-    payload.conditions
-        .filter((condition) => condition.field === 'vendor_id')
-        .forEach((condition) => {
-        const vendor = toVendorCriteria(condition);
-        if (vendor != null) {
-            results.push(vendor);
-        }
-    });
-    payload.conditions
-        .filter((condition) => condition.field === 'department_id')
-        .forEach((condition) => {
-        const department = toDepartmentCriteria(condition);
-        if (department != null) {
-            results.push(department);
-        }
-    });
-    return results;
-};
-const legacyAmountRangeToCriteria = (legacy) => {
-    if (legacy.length === 0) {
-        return [];
-    }
-    const first = legacy[0] ?? {};
-    const currency = first.currency_code ?? 'USD';
-    const symbol = first.currency_symbol ?? '$';
-    const min = typeof first.min === 'number'
-        ? (0, amount_1.toAmount)(first.min, currency, symbol)
-        : undefined;
-    const max = typeof first.max === 'number'
-        ? (0, amount_1.toAmount)(first.max, currency, symbol)
-        : undefined;
-    if (min == null && max == null) {
-        return [];
-    }
-    const comparator = min != null && max != null
-        ? 'range'
-        : min != null
-            ? 'greater_than'
-            : 'less_than';
-    return [{ type: 'amount', comparator, min, max }];
-};
-const toAmountCriteria = (payload) => {
-    if (!Array.isArray(payload.conditions)) {
-        return undefined;
-    }
-    const amountConditions = payload.conditions.filter((condition) => condition.field === 'amount');
-    const gteCondition = amountConditions.find((condition) => condition.type === 'gte' || condition.type === 'eq');
-    const lteCondition = amountConditions.find((condition) => condition.type === 'lte');
-    if (gteCondition == null && lteCondition == null) {
-        return undefined;
-    }
-    const currencyCode = payload.currency_code ?? 'USD';
-    const currencySymbol = payload.currency_symbol ?? '$';
-    const min = typeof gteCondition?.value === 'number'
-        ? (0, amount_1.toAmount)(gteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    const max = typeof lteCondition?.value === 'number'
-        ? (0, amount_1.toAmount)(lteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    let comparator;
-    if (min != null && max != null) {
-        comparator = 'range';
-    }
-    else if (min != null) {
-        comparator = 'greater_than';
-    }
-    else {
-        comparator = 'less_than';
-    }
-    return { type: 'amount', comparator, min, max };
-};
-const toVendorCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'vendor',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        vendorIds: condition.value,
-    };
-};
-const toDepartmentCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'department',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        departmentIds: condition.value,
-    };
+    return payload.map((criteria) => ({
+        rangeType: criteria.type,
+        rangeEntity: criteria.range_entity,
+        range: {
+            min: (0, amount_1.toAmount)(criteria.min, criteria.currency_code, criteria.currency_symbol),
+            max: criteria.max != null
+                ? (0, amount_1.toAmount)(criteria.max, criteria.currency_code, criteria.currency_symbol)
+                : undefined,
+        },
+    }));
 };
 const toApprovalSteps = (payload) => {
     return payload.map((step) => ({

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

@@ -1,28 +1,4 @@
 import { ID } from '../../commonStateTypes/common';
-import { EntityType } from '../entityApprovalStatus/entityApprovalStatusState';
-import { AmountCriteria, ApprovalRule, ApprovalRuleState, Criteria, DepartmentCriteria, VendorCriteria } from './approvalRuleState';
+import { ApprovalRule, ApprovalRuleState } from './approvalRuleState';
 export declare function getApprovalRuleById(approvalRuleState: ApprovalRuleState, approvalRuleId: ID): ApprovalRule | undefined;
 export declare function getApprovalRulesByIds(approvalRuleState: ApprovalRuleState, approvalRuleIds: ID[]): ApprovalRule[];
-/**
- * Returns the amount-range portion of a rule's criteria, if any.
- *
- * Use this whenever a caller needs to read amount min/max from the new
- * discriminated `Criteria` union without inlining a type guard.
- */
-export declare function getAmountCriteria(criteria: Criteria[]): AmountCriteria | undefined;
-export declare function getVendorCriteria(criteria: Criteria[]): VendorCriteria | undefined;
-export declare function getDepartmentCriteria(criteria: Criteria[]): DepartmentCriteria | undefined;
-/**
- * Returns all rules of the given entityType, sorted by `priority` ascending.
- *
- * Rules without a `priority` value sort to the end (treated as Infinity).
- * Use this for the list page where rules render in evaluation order.
- */
-export declare function getApprovalRulesByEntityType(approvalRuleState: ApprovalRuleState, entityType: EntityType): ApprovalRule[];
-/**
- * Returns the tenant's fallback rule for the given entityType, if one exists.
- *
- * The fallback rule is shown by the "fallback engine active" banner on the
- * list page and is used to handle bills/reimbursements that match no other rule.
- */
-export declare function getFallbackApprovalRule(approvalRuleState: ApprovalRuleState, entityType: EntityType): ApprovalRule | undefined;

package/lib/entity/approvalRule/approvalRuleSelector.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApprovalRuleById = getApprovalRuleById;
 exports.getApprovalRulesByIds = getApprovalRulesByIds;
-exports.getAmountCriteria = getAmountCriteria;
-exports.getVendorCriteria = getVendorCriteria;
-exports.getDepartmentCriteria = getDepartmentCriteria;
-exports.getApprovalRulesByEntityType = getApprovalRulesByEntityType;
-exports.getFallbackApprovalRule = getFallbackApprovalRule;
 function getApprovalRuleById(approvalRuleState, approvalRuleId) {
     return approvalRuleState.approvalRuleById[approvalRuleId] ?? undefined;
 }
@@ -16,38 +11,3 @@ function getApprovalRulesByIds(approvalRuleState, approvalRuleIds) {
         .filter((value) => value != null);
     return approvalRulesByIds;
 }
-/**
- * Returns the amount-range portion of a rule's criteria, if any.
- *
- * Use this whenever a caller needs to read amount min/max from the new
- * discriminated `Criteria` union without inlining a type guard.
- */
-function getAmountCriteria(criteria) {
-    return criteria.find((c) => c.type === 'amount');
-}
-function getVendorCriteria(criteria) {
-    return criteria.find((c) => c.type === 'vendor');
-}
-function getDepartmentCriteria(criteria) {
-    return criteria.find((c) => c.type === 'department');
-}
-/**
- * Returns all rules of the given entityType, sorted by `priority` ascending.
- *
- * Rules without a `priority` value sort to the end (treated as Infinity).
- * Use this for the list page where rules render in evaluation order.
- */
-function getApprovalRulesByEntityType(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById)
-        .filter((rule) => rule.entityType === entityType)
-        .sort((a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity));
-}
-/**
- * Returns the tenant's fallback rule for the given entityType, if one exists.
- *
- * The fallback rule is shown by the "fallback engine active" banner on the
- * list page and is used to handle bills/reimbursements that match no other rule.
- */
-function getFallbackApprovalRule(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById).find((rule) => rule.entityType === entityType && rule.isFallback === true);
-}

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

@@ -25,37 +25,14 @@ export interface Actor {
     subType?: AttributeType | RoleType;
     userId?: ID;
 }
-/**
- * Approval rule criteria — discriminated union over the three condition
- * types the wire format supports: amount, vendor, and department.
- *
- * State-side, each rule carries a `Criteria[]` with at most one variant of
- * each kind (e.g. one AmountCriteria + one VendorCriteria + one DepartmentCriteria).
- *
- * Form-side, the rule create/edit form uses `ApprovalRuleFormCriteria`
- * (defined in commonState) — a structured object with named slots for
- * amount/vendor/department. Epics translate between the two.
- */
-export type AmountComparator = 'greater_than' | 'less_than' | 'range';
-export interface AmountCriteria {
-    comparator: AmountComparator;
-    type: 'amount';
-    /** Upper bound. Present for `less_than` and `range`. */
-    max?: Amount;
-    /** Lower bound. Present for `greater_than` and `range`. */
-    min?: Amount;
-}
-export interface VendorCriteria {
-    operator: 'is' | 'is_not';
-    type: 'vendor';
-    vendorIds: ID[];
-}
-export interface DepartmentCriteria {
-    departmentIds: ID[];
-    operator: 'is' | 'is_not';
-    type: 'department';
+export interface Criteria {
+    range: {
+        min: Amount;
+        max?: Amount;
+    };
+    rangeEntity: string;
+    rangeType: string;
 }
-export type Criteria = AmountCriteria | VendorCriteria | DepartmentCriteria;
 export interface Step {
     actors: Actor[];
     operator: StepOperatorType;
@@ -74,25 +51,7 @@ export interface ApprovalRule {
     entityType: EntityType;
     steps: Step[];
     updateTime: ZeniDate;
-    /** Backend bookkeeping: whether approval steps must run serialized. */
-    areApprovalsSerialized?: boolean;
-    /** Free-text description shown beneath the rule name on the list page. */
-    description?: string;
-    /** True when this rule is the tenant's default fallback rule. */
-    isFallback?: boolean;
     name?: string;
-    /** Backend bookkeeping: number of entities currently pending against this rule. */
-    pendingApprovalsCount?: number;
-    /** Backend bookkeeping: status of background updates against this rule. */
-    pendingEntityApprovalUpdateStatus?: string;
-    /** Rule's position in the evaluation order; lower number = higher priority. */
-    priority?: number;
-    /**
-     * When on, the creator of a bill/reimbursement cannot auto-approve
-     * their own request even if they are also an approver. Backend spec
-     * is still pending — kept optional for now.
-     */
-    separationOfDuties?: boolean;
     version?: number | string;
 }
 export interface Approvers {

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

@@ -14,139 +14,18 @@ export const toApprovalRule = (payload) => ({
     version: payload.version,
     criteria: toApprovalCriteria(payload.criteria),
     steps: toApprovalSteps(payload.steps),
-    description: payload.description ?? undefined,
-    priority: payload.priority,
-    isFallback: payload.is_fallback ?? false,
-    // separationOfDuties: backend doesn't ship this field yet; left undefined
-    // until the spec is finalized.
-    areApprovalsSerialized: payload.are_approvals_serialized,
-    pendingApprovalsCount: payload.pending_approvals_count,
-    pendingEntityApprovalUpdateStatus: payload.pending_entity_approval_update_status,
 });
-/**
- * Maps the wire-level criteria block into the state-side discriminated
- * `Criteria[]` union.
- *
- * The wire keeps each condition as a flat row inside `conditions[]`.
- * Amount comparisons can show up as a `gte` only, a `lte` only, or a
- * `gte` + `lte` pair — those collapse into a single AmountCriteria whose
- * `comparator` is `greater_than`, `less_than`, or `range` respectively.
- *
- * Vendor and department conditions map one-to-one: `in` becomes `is`,
- * `not_in` becomes `is_not`.
- *
- * Resilient to two forms of upstream drift:
- *  - Missing / null criteria → returns [].
- *  - Legacy criteria shape (array of amount-range objects, the pre-3.0
- *    wire) → converted to an AmountCriteria so existing rules in production
- *    still render while the backend rolls out.
- */
 const toApprovalCriteria = (payload) => {
-    if (payload == null) {
-        return [];
-    }
-    if (Array.isArray(payload)) {
-        // Legacy pre-3.0 wire: an array of amount-range entries.
-        return legacyAmountRangeToCriteria(payload);
-    }
-    if (!Array.isArray(payload.conditions)) {
-        return [];
-    }
-    const results = [];
-    const amountCriteria = toAmountCriteria(payload);
-    if (amountCriteria != null) {
-        results.push(amountCriteria);
-    }
-    payload.conditions
-        .filter((condition) => condition.field === 'vendor_id')
-        .forEach((condition) => {
-        const vendor = toVendorCriteria(condition);
-        if (vendor != null) {
-            results.push(vendor);
-        }
-    });
-    payload.conditions
-        .filter((condition) => condition.field === 'department_id')
-        .forEach((condition) => {
-        const department = toDepartmentCriteria(condition);
-        if (department != null) {
-            results.push(department);
-        }
-    });
-    return results;
-};
-const legacyAmountRangeToCriteria = (legacy) => {
-    if (legacy.length === 0) {
-        return [];
-    }
-    const first = legacy[0] ?? {};
-    const currency = first.currency_code ?? 'USD';
-    const symbol = first.currency_symbol ?? '$';
-    const min = typeof first.min === 'number'
-        ? toAmount(first.min, currency, symbol)
-        : undefined;
-    const max = typeof first.max === 'number'
-        ? toAmount(first.max, currency, symbol)
-        : undefined;
-    if (min == null && max == null) {
-        return [];
-    }
-    const comparator = min != null && max != null
-        ? 'range'
-        : min != null
-            ? 'greater_than'
-            : 'less_than';
-    return [{ type: 'amount', comparator, min, max }];
-};
-const toAmountCriteria = (payload) => {
-    if (!Array.isArray(payload.conditions)) {
-        return undefined;
-    }
-    const amountConditions = payload.conditions.filter((condition) => condition.field === 'amount');
-    const gteCondition = amountConditions.find((condition) => condition.type === 'gte' || condition.type === 'eq');
-    const lteCondition = amountConditions.find((condition) => condition.type === 'lte');
-    if (gteCondition == null && lteCondition == null) {
-        return undefined;
-    }
-    const currencyCode = payload.currency_code ?? 'USD';
-    const currencySymbol = payload.currency_symbol ?? '$';
-    const min = typeof gteCondition?.value === 'number'
-        ? toAmount(gteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    const max = typeof lteCondition?.value === 'number'
-        ? toAmount(lteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    let comparator;
-    if (min != null && max != null) {
-        comparator = 'range';
-    }
-    else if (min != null) {
-        comparator = 'greater_than';
-    }
-    else {
-        comparator = 'less_than';
-    }
-    return { type: 'amount', comparator, min, max };
-};
-const toVendorCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'vendor',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        vendorIds: condition.value,
-    };
-};
-const toDepartmentCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'department',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        departmentIds: condition.value,
-    };
+    return payload.map((criteria) => ({
+        rangeType: criteria.type,
+        rangeEntity: criteria.range_entity,
+        range: {
+            min: toAmount(criteria.min, criteria.currency_code, criteria.currency_symbol),
+            max: criteria.max != null
+                ? toAmount(criteria.max, criteria.currency_code, criteria.currency_symbol)
+                : undefined,
+        },
+    }));
 };
 const toApprovalSteps = (payload) => {
     return payload.map((step) => ({

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

@@ -7,38 +7,3 @@ export function getApprovalRulesByIds(approvalRuleState, approvalRuleIds) {
         .filter((value) => value != null);
     return approvalRulesByIds;
 }
-/**
- * Returns the amount-range portion of a rule's criteria, if any.
- *
- * Use this whenever a caller needs to read amount min/max from the new
- * discriminated `Criteria` union without inlining a type guard.
- */
-export function getAmountCriteria(criteria) {
-    return criteria.find((c) => c.type === 'amount');
-}
-export function getVendorCriteria(criteria) {
-    return criteria.find((c) => c.type === 'vendor');
-}
-export function getDepartmentCriteria(criteria) {
-    return criteria.find((c) => c.type === 'department');
-}
-/**
- * Returns all rules of the given entityType, sorted by `priority` ascending.
- *
- * Rules without a `priority` value sort to the end (treated as Infinity).
- * Use this for the list page where rules render in evaluation order.
- */
-export function getApprovalRulesByEntityType(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById)
-        .filter((rule) => rule.entityType === entityType)
-        .sort((a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity));
-}
-/**
- * Returns the tenant's fallback rule for the given entityType, if one exists.
- *
- * The fallback rule is shown by the "fallback engine active" banner on the
- * list page and is used to handle bills/reimbursements that match no other rule.
- */
-export function getFallbackApprovalRule(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById).find((rule) => rule.entityType === entityType && rule.isFallback === true);
-}

package/lib/esm/index.js

@@ -33,7 +33,6 @@ import { getAccountGroupKey, toAccountGroupType, } from './entity/accountGroup/a
 import { getAccountReconByAccountIdAndSelectedPeriod, } from './entity/accountRecon/accountReconSelector';
 import { getAddressByAddressId } from './entity/address/addressSelector';
 import { toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict, } from './entity/approvalRule/approvalRuleState';
-import { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, } from './entity/approvalRule/approvalRuleSelector';
 import { toOutsideZeniPaymentModeType, } from './entity/billPay/billTransaction/billTransactionState';
 import { toRecurringBillFrequency, toRecurringBillFrequencyStrict, } from './entity/billPay/recurringBills/recurringBillsState';
 import { toCardAddressType, toCardType, toCreditLimitFrequencyCodeType, toShippingAddressType, } from './entity/chargeCard/chargeCard';
@@ -570,7 +569,7 @@ export { getUserFinancialAccount };
 export { fetchRemiSetupView, updateMileageDetails, saveRemiSetupViewDataInLocalStore, acceptRemiTerms, acceptEmployeeRemiTerms, clearRemiSetupView, getRemiSetupViewDetails, getRemiBusinessVerificationDetails, };
 export { VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS, };
 export { isSuccessResponse, isInvalidSessionError, isAccessDeniedError, };
-export { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
+export { toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
 export { getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
 export { getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
 export { getRemiDetailView, checkApproveRejectBtnShowForRemi, };

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

@@ -8,9 +8,7 @@ import { deleteBillPayApprovalRule, deleteBillPayApprovalRuleFailure, deleteBill
 export const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteBillPayApprovalRule.match), switchMap((action) => {
     const { approvalRuleId } = action.payload;
     return zeniAPI
-        .deleteAndGetJSON(`https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`, 
-    // `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`,
-    { approval_rule_id: approvalRuleId })
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/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/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -15,9 +15,7 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
         (billPaySetupApproverViewState.hasValidState() === false &&
             billPaySetupApproverViewState.fetchState !== 'In-Progress')) {
         return zeniAPI
-            .getJSON(`https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`
-        // `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`
-        )
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
             .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/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.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 { clearBillPaySetupApproverViewUpdateData, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, } from '../billPaySetupApproverViewReducer';
 export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeBillPaySetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (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 billPaySetupApproverViewUpdateData = {
                 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(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
         }
@@ -29,7 +25,7 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewCreateData));
     }

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

@@ -13,9 +13,7 @@ export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAP
         billPaySetupApproverViewUpdateData.data != null) {
         const payload = toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(`https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`, 
-        // `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`,
-        payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, payload)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);