@zeniai/client-epic-state 5.0.90-betaAR1 → 5.0.90-betaAR2

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

@@ -91,19 +91,15 @@ export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
     return payload;
 };
 /**
- * V1 wire mapper — used when 'approval_rule_v3_config' resolves to OFF
- * for the current tenant. Emits the legacy snake_case array shape that
- * '/approval-rules' historically consumed:
- *   criteria: [{type: 'range', range_entity: 'currency', min, max,
- *               currency_code, currency_symbol}]
+ * V1 wire mapper — used when `approval_rule_v3_config` resolves to OFF
+ * for the current tenant. Translates the form-side amount criteria into
+ * the legacy `{rangeType, rangeEntity, range: {min, max}}` shape. The
+ * V1 backend does not understand vendor / department criteria or the
+ * rule-level 3.0 fields, so those are dropped on the wire.
  *
- * 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.
+ * The form-side amount slot is always read as a `range`-style criteria
+ * here: V1 schemas only supported ranges, so an absent `min` or `max`
+ * falls back to `0` / `Number.MAX_SAFE_INTEGER`.
  */
 export const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
     const amount = approverViewUpdateData.criteria?.amount;
@@ -129,18 +125,25 @@ export const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
         };
     });
     const isUpdate = approverViewUpdateData.approvalRuleId != null;
-    const criteriaEntry = {
-        type: 'range',
-        range_entity: 'currency',
-        min: minAmount?.amount ?? null,
-        max: maxAmount?.amount ?? null,
-        currency_code: currencyCode,
-        currency_symbol: currencySymbol,
-    };
     const payload = {
         steps,
         is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria: [criteriaEntry],
+        criteria: {
+            rangeType: 'range',
+            rangeEntity: 'currency',
+            range: {
+                min: {
+                    amount: minAmount?.amount ?? 0,
+                    currencyCode,
+                    currencySymbol,
+                },
+                max: {
+                    amount: maxAmount?.amount ?? Number.MAX_SAFE_INTEGER,
+                    currencyCode,
+                    currencySymbol,
+                },
+            },
+        },
     };
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;

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

@@ -1,6 +1,6 @@
 import recordGet from 'lodash/get';
 import has from 'lodash/has';
-import { getAmountCriteria, getDepartmentCriteria, getVendorCriteria, } from '../../../../entity/approvalRule/approvalRuleSelector';
+import { getAmountCriteria } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getBankAccountByBankAccountId, getBankAccountsByBankAccountIds, } from '../../../../entity/bankAccount/bankAccountSelector';
 import { getContactById, getContactsByIds, } from '../../../../entity/billPay/contact/contactSelector';
@@ -679,50 +679,16 @@ export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId,
     }
     return undefined;
 };
-export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
+export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
     let isCreatorAlsoApprover = false;
-    // Approval Rules 3.0 — a rule is applicable when every criterion it
-    // carries matches the bill. Amount uses inclusive bounds ('gte'/'lte'
-    // on the wire), and either bound may be absent for a one-sided
-    // 'greater_than' or 'less_than' rule. Vendor / department criteria
-    // narrow the rule by entity; an absent criterion means 'no narrowing
-    // on this axis'. Rules without an amount criterion at all are not
-    // considered here, preserving the pre-3.0 behaviour where this
-    // selector only ever matched amount-bearing rules.
     const approvalRule = approvalRules.find((rule) => {
         const amountCriteria = getAmountCriteria(rule.criteria);
-        if (amountCriteria == null) {
+        if (amountCriteria?.min == null) {
             return false;
         }
         const { min, max } = amountCriteria;
-        const matchesMin = min == null || billAmount >= min.amount;
-        const matchesMax = max == null || billAmount <= max.amount;
-        if (!matchesMin || !matchesMax) {
-            return false;
-        }
-        const vendorCriteria = getVendorCriteria(rule.criteria);
-        if (vendorCriteria != null) {
-            const includesVendor = billVendorId != null &&
-                vendorCriteria.vendorIds.includes(billVendorId);
-            if (vendorCriteria.operator === 'is' && !includesVendor) {
-                return false;
-            }
-            if (vendorCriteria.operator === 'is_not' && includesVendor) {
-                return false;
-            }
-        }
-        const departmentCriteria = getDepartmentCriteria(rule.criteria);
-        if (departmentCriteria != null) {
-            const includesDepartment = billDepartmentId != null &&
-                departmentCriteria.departmentIds.includes(billDepartmentId);
-            if (departmentCriteria.operator === 'is' && !includesDepartment) {
-                return false;
-            }
-            if (departmentCriteria.operator === 'is_not' && includesDepartment) {
-                return false;
-            }
-        }
-        return true;
+        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/billPaySetupApproverView/types/commonPayload.d.ts

@@ -30,48 +30,42 @@ interface ApprovalUpdatableInfoPayload {
 }
 /**
  * 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.
- *
- * The wire historically expected:
- *   criteria: [{type, range_entity, min, max, currency_code, currency_symbol}]
- * with 'min' and 'max' as scalar numbers, and 'null' representing an
- * absent bound for one-sided rules. See 'LegacyAmountRangeCriterionPayload'
- * in '../../../../../entity/approvalRule/approvalRulePayload.ts' for the
- * matching read-side shape.
+ * `approval_rule_v3_config` dynamic config) can target the original
+ * `/approval-rules` endpoint with the legacy `{rangeType, rangeEntity, range}`
+ * criteria. None of the 3.0 rule-level fields are sent.
  */
-interface ApprovalUpdatableInfoPayloadV1CriterionEntry {
-    currency_code: string;
-    currency_symbol: string;
-    /** Upper bound. 'null' for a 'greater_than' rule. */
-    max: number | null;
-    /** Lower bound. 'null' for a 'less_than' rule. */
-    min: number | null;
-    range_entity: 'currency';
-    type: 'range';
-}
 interface ApprovalUpdatableInfoPayloadV1 {
-    criteria: ApprovalUpdatableInfoPayloadV1CriterionEntry[];
+    criteria: {
+        range: {
+            max: {
+                amount: number;
+                currencyCode: string;
+                currencySymbol: string;
+            };
+            min: {
+                amount: number;
+                currencyCode: string;
+                currencySymbol: string;
+            };
+        };
+        rangeEntity: 'currency';
+        rangeType: 'range';
+    };
     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:
- *   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.
+ * V1 wire mapper — used when `approval_rule_v3_config` resolves to OFF
+ * for the current tenant. Translates the form-side amount criteria into
+ * the legacy `{rangeType, rangeEntity, range: {min, max}}` shape. The
+ * V1 backend does not understand vendor / department criteria or the
+ * rule-level 3.0 fields, so those are dropped on the wire.
  *
- * The V1 backend does not understand vendor / department criteria or
- * the rule-level 3.0 fields, so those are dropped on the wire.
+ * The form-side amount slot is always read as a `range`-style criteria
+ * here: V1 schemas only supported ranges, so an absent `min` or `max`
+ * falls back to `0` / `Number.MAX_SAFE_INTEGER`.
  */
 export declare const toApprovalChangableInfoPayloadV1: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayloadV1>;
 export {};

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

@@ -95,19 +95,15 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
 };
 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:
- *   criteria: [{type: 'range', range_entity: 'currency', min, max,
- *               currency_code, currency_symbol}]
+ * V1 wire mapper — used when `approval_rule_v3_config` resolves to OFF
+ * for the current tenant. Translates the form-side amount criteria into
+ * the legacy `{rangeType, rangeEntity, range: {min, max}}` shape. The
+ * V1 backend does not understand vendor / department criteria or the
+ * rule-level 3.0 fields, so those are dropped on the wire.
  *
- * 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.
+ * The form-side amount slot is always read as a `range`-style criteria
+ * here: V1 schemas only supported ranges, so an absent `min` or `max`
+ * falls back to `0` / `Number.MAX_SAFE_INTEGER`.
  */
 const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
     const amount = approverViewUpdateData.criteria?.amount;
@@ -133,18 +129,25 @@ const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
         };
     });
     const isUpdate = approverViewUpdateData.approvalRuleId != null;
-    const criteriaEntry = {
-        type: 'range',
-        range_entity: 'currency',
-        min: minAmount?.amount ?? null,
-        max: maxAmount?.amount ?? null,
-        currency_code: currencyCode,
-        currency_symbol: currencySymbol,
-    };
     const payload = {
         steps,
         is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria: [criteriaEntry],
+        criteria: {
+            rangeType: 'range',
+            rangeEntity: 'currency',
+            range: {
+                min: {
+                    amount: minAmount?.amount ?? 0,
+                    currencyCode,
+                    currencySymbol,
+                },
+                max: {
+                    amount: maxAmount?.amount ?? Number.MAX_SAFE_INTEGER,
+                    currencyCode,
+                    currencySymbol,
+                },
+            },
+        },
     };
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;

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

@@ -157,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

@@ -696,50 +696,16 @@ 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 is applicable when every criterion it
-    // carries matches the bill. Amount uses inclusive bounds ('gte'/'lte'
-    // on the wire), and either bound may be absent for a one-sided
-    // 'greater_than' or 'less_than' rule. Vendor / department criteria
-    // narrow the rule by entity; an absent criterion means 'no narrowing
-    // on this axis'. Rules without an amount criterion at all are not
-    // considered here, preserving the pre-3.0 behaviour where this
-    // selector only ever matched amount-bearing rules.
     const approvalRule = approvalRules.find((rule) => {
         const amountCriteria = (0, approvalRuleSelector_1.getAmountCriteria)(rule.criteria);
-        if (amountCriteria == null) {
+        if (amountCriteria?.min == null) {
             return false;
         }
         const { min, max } = amountCriteria;
-        const matchesMin = min == null || billAmount >= min.amount;
-        const matchesMax = max == null || billAmount <= max.amount;
-        if (!matchesMin || !matchesMax) {
-            return false;
-        }
-        const vendorCriteria = (0, approvalRuleSelector_1.getVendorCriteria)(rule.criteria);
-        if (vendorCriteria != null) {
-            const includesVendor = billVendorId != null &&
-                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) {
-            const includesDepartment = billDepartmentId != null &&
-                departmentCriteria.departmentIds.includes(billDepartmentId);
-            if (departmentCriteria.operator === 'is' && !includesDepartment) {
-                return false;
-            }
-            if (departmentCriteria.operator === 'is_not' && includesDepartment) {
-                return false;
-            }
-        }
-        return true;
+        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/package.json

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