@zeniai/client-epic-state 5.0.77-betaAR3 → 5.0.77-betaAS2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/lib/entity/approvalRule/approvalRulePayload.d.ts +5 -27
  2. package/lib/entity/approvalRule/approvalRulePayload.js +10 -131
  3. package/lib/entity/approvalRule/approvalRuleSelector.d.ts +1 -25
  4. package/lib/entity/approvalRule/approvalRuleSelector.js +0 -40
  5. package/lib/entity/approvalRule/approvalRuleState.d.ts +7 -48
  6. package/lib/esm/entity/approvalRule/approvalRulePayload.js +10 -131
  7. package/lib/esm/entity/approvalRule/approvalRuleSelector.js +0 -35
  8. package/lib/esm/index.js +1 -2
  9. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +11 -26
  10. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/deleteBillPayApprovalRuleEpic.js +2 -9
  11. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js +4 -7
  12. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js +7 -11
  13. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/saveBillPaySetupApproverViewUpdatesEpic.js +4 -14
  14. package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +16 -121
  15. package/lib/esm/view/spendManagement/billPay/editBillView/editBillViewSelector.js +2 -7
  16. package/lib/esm/view/spendManagement/commonHistoryView/commonHistoryPayload.js +2 -2
  17. package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/deleteRemiApprovalRuleEpic.js +2 -8
  18. package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/fetchRemiSetupApproverViewEpic.js +2 -6
  19. package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.js +7 -11
  20. package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/saveRemiSetupApproverViewUpdatesEpic.js +4 -13
  21. package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +10 -25
  22. package/lib/index.d.ts +2 -3
  23. package/lib/index.js +16 -22
  24. package/lib/view/companyTaskManagerView/companyTaskManagerViewReducer.d.ts +2 -2
  25. package/lib/view/companyView/types/cockpitTypes.d.ts +1 -1
  26. package/lib/view/people/peopleTypes.d.ts +1 -1
  27. package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts +3 -7
  28. package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +11 -26
  29. package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/deleteBillPayApprovalRuleEpic.js +2 -9
  30. package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js +4 -7
  31. package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js +6 -10
  32. package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/saveBillPaySetupApproverViewUpdatesEpic.js +3 -13
  33. package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts +1 -48
  34. package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +17 -123
  35. package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts +5 -31
  36. package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js +2 -7
  37. package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.d.ts +1 -1
  38. package/lib/view/spendManagement/commonHistoryView/commonHistoryPayload.js +1 -1
  39. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/deleteRemiApprovalRuleEpic.js +2 -8
  40. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/fetchRemiSetupApproverViewEpic.js +2 -6
  41. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.js +6 -10
  42. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/epic/saveRemiSetupApproverViewUpdatesEpic.js +3 -12
  43. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.d.ts +3 -7
  44. package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +10 -25
  45. package/lib/view/taskManager/taskListView/taskList.d.ts +3 -3
  46. package/package.json +1 -1
@@ -1,27 +1,11 @@
1
1
  import { ApprovalRule } from './approvalRuleState';
2
- /**
3
- * Condition Payload — one entry inside criteria.conditions[].
4
- *
5
- * field examples: 'amount' | 'vendor_id' | 'department_id'
6
- * type examples: 'gte' | 'lte' | 'eq' | 'in' | 'not_in'
7
- * value: number for amount comparisons; string[] for in / not_in lookups.
8
- */
9
- export interface ConditionPayload {
10
- field: string;
11
- type: string;
12
- value: number | string[];
13
- }
14
- /**
15
- * Criteria Payload — list of conditions joined by `criteria_operator`.
16
- *
17
- * `currency_code` / `currency_symbol` apply to amount conditions inside
18
- * `conditions[]`. Kept here pending confirmation that they should remain.
19
- */
20
2
  export interface CriteriaPayload {
21
- conditions: ConditionPayload[];
22
- criteria_operator: string;
23
3
  currency_code: string;
24
4
  currency_symbol: string;
5
+ min: number;
6
+ range_entity: string;
7
+ type: string;
8
+ max?: number | null;
25
9
  }
26
10
  export interface ActorPayload {
27
11
  type: string;
@@ -41,17 +25,11 @@ export interface StepPayload {
41
25
  export interface ApprovalRulePayload {
42
26
  approval_rule_id: string;
43
27
  create_time: string;
44
- criteria: CriteriaPayload;
28
+ criteria: CriteriaPayload[];
45
29
  entity_type: string;
46
30
  name: string | null;
47
31
  steps: StepPayload[];
48
32
  update_time: string;
49
- are_approvals_serialized?: boolean;
50
- description?: string | null;
51
- is_fallback?: boolean;
52
- pending_approvals_count?: number;
53
- pending_entity_approval_update_status?: string;
54
- priority?: number;
55
33
  version?: number | string;
56
34
  }
57
35
  /**
@@ -17,140 +17,19 @@ const toApprovalRule = (payload) => ({
17
17
  version: payload.version,
18
18
  criteria: toApprovalCriteria(payload.criteria),
19
19
  steps: toApprovalSteps(payload.steps),
20
- description: payload.description ?? undefined,
21
- priority: payload.priority,
22
- isFallback: payload.is_fallback ?? false,
23
- // separationOfDuties: backend doesn't ship this field yet; left undefined
24
- // until the spec is finalized.
25
- areApprovalsSerialized: payload.are_approvals_serialized,
26
- pendingApprovalsCount: payload.pending_approvals_count,
27
- pendingEntityApprovalUpdateStatus: payload.pending_entity_approval_update_status,
28
20
  });
29
21
  exports.toApprovalRule = toApprovalRule;
30
- /**
31
- * Maps the wire-level criteria block into the state-side discriminated
32
- * `Criteria[]` union.
33
- *
34
- * The wire keeps each condition as a flat row inside `conditions[]`.
35
- * Amount comparisons can show up as a `gte` only, a `lte` only, or a
36
- * `gte` + `lte` pair — those collapse into a single AmountCriteria whose
37
- * `comparator` is `greater_than`, `less_than`, or `range` respectively.
38
- *
39
- * Vendor and department conditions map one-to-one: `in` becomes `is`,
40
- * `not_in` becomes `is_not`.
41
- *
42
- * Resilient to two forms of upstream drift:
43
- * - Missing / null criteria → returns [].
44
- * - Legacy criteria shape (array of amount-range objects, the pre-3.0
45
- * wire) → converted to an AmountCriteria so existing rules in production
46
- * still render while the backend rolls out.
47
- */
48
22
  const toApprovalCriteria = (payload) => {
49
- if (payload == null) {
50
- return [];
51
- }
52
- if (Array.isArray(payload)) {
53
- // Legacy pre-3.0 wire: an array of amount-range entries.
54
- return legacyAmountRangeToCriteria(payload);
55
- }
56
- if (!Array.isArray(payload.conditions)) {
57
- return [];
58
- }
59
- const results = [];
60
- const amountCriteria = toAmountCriteria(payload);
61
- if (amountCriteria != null) {
62
- results.push(amountCriteria);
63
- }
64
- payload.conditions
65
- .filter((condition) => condition.field === 'vendor_id')
66
- .forEach((condition) => {
67
- const vendor = toVendorCriteria(condition);
68
- if (vendor != null) {
69
- results.push(vendor);
70
- }
71
- });
72
- payload.conditions
73
- .filter((condition) => condition.field === 'department_id')
74
- .forEach((condition) => {
75
- const department = toDepartmentCriteria(condition);
76
- if (department != null) {
77
- results.push(department);
78
- }
79
- });
80
- return results;
81
- };
82
- const legacyAmountRangeToCriteria = (legacy) => {
83
- if (legacy.length === 0) {
84
- return [];
85
- }
86
- const first = legacy[0] ?? {};
87
- const currency = first.currency_code ?? 'USD';
88
- const symbol = first.currency_symbol ?? '$';
89
- const min = typeof first.min === 'number'
90
- ? (0, amount_1.toAmount)(first.min, currency, symbol)
91
- : undefined;
92
- const max = typeof first.max === 'number'
93
- ? (0, amount_1.toAmount)(first.max, currency, symbol)
94
- : undefined;
95
- if (min == null && max == null) {
96
- return [];
97
- }
98
- const comparator = min != null && max != null
99
- ? 'range'
100
- : min != null
101
- ? 'greater_than'
102
- : 'less_than';
103
- return [{ type: 'amount', comparator, min, max }];
104
- };
105
- const toAmountCriteria = (payload) => {
106
- if (!Array.isArray(payload.conditions)) {
107
- return undefined;
108
- }
109
- const amountConditions = payload.conditions.filter((condition) => condition.field === 'amount');
110
- const gteCondition = amountConditions.find((condition) => condition.type === 'gte' || condition.type === 'eq');
111
- const lteCondition = amountConditions.find((condition) => condition.type === 'lte');
112
- if (gteCondition == null && lteCondition == null) {
113
- return undefined;
114
- }
115
- const currencyCode = payload.currency_code ?? 'USD';
116
- const currencySymbol = payload.currency_symbol ?? '$';
117
- const min = typeof gteCondition?.value === 'number'
118
- ? (0, amount_1.toAmount)(gteCondition.value, currencyCode, currencySymbol)
119
- : undefined;
120
- const max = typeof lteCondition?.value === 'number'
121
- ? (0, amount_1.toAmount)(lteCondition.value, currencyCode, currencySymbol)
122
- : undefined;
123
- let comparator;
124
- if (min != null && max != null) {
125
- comparator = 'range';
126
- }
127
- else if (min != null) {
128
- comparator = 'greater_than';
129
- }
130
- else {
131
- comparator = 'less_than';
132
- }
133
- return { type: 'amount', comparator, min, max };
134
- };
135
- const toVendorCriteria = (condition) => {
136
- if (!Array.isArray(condition.value)) {
137
- return undefined;
138
- }
139
- return {
140
- type: 'vendor',
141
- operator: condition.type === 'not_in' ? 'is_not' : 'is',
142
- vendorIds: condition.value,
143
- };
144
- };
145
- const toDepartmentCriteria = (condition) => {
146
- if (!Array.isArray(condition.value)) {
147
- return undefined;
148
- }
149
- return {
150
- type: 'department',
151
- operator: condition.type === 'not_in' ? 'is_not' : 'is',
152
- departmentIds: condition.value,
153
- };
23
+ return payload.map((criteria) => ({
24
+ rangeType: criteria.type,
25
+ rangeEntity: criteria.range_entity,
26
+ range: {
27
+ min: (0, amount_1.toAmount)(criteria.min, criteria.currency_code, criteria.currency_symbol),
28
+ max: criteria.max != null
29
+ ? (0, amount_1.toAmount)(criteria.max, criteria.currency_code, criteria.currency_symbol)
30
+ : undefined,
31
+ },
32
+ }));
154
33
  };
155
34
  const toApprovalSteps = (payload) => {
156
35
  return payload.map((step) => ({
@@ -1,28 +1,4 @@
1
1
  import { ID } from '../../commonStateTypes/common';
2
- import { EntityType } from '../entityApprovalStatus/entityApprovalStatusState';
3
- import { AmountCriteria, ApprovalRule, ApprovalRuleState, Criteria, DepartmentCriteria, VendorCriteria } from './approvalRuleState';
2
+ import { ApprovalRule, ApprovalRuleState } from './approvalRuleState';
4
3
  export declare function getApprovalRuleById(approvalRuleState: ApprovalRuleState, approvalRuleId: ID): ApprovalRule | undefined;
5
4
  export declare function getApprovalRulesByIds(approvalRuleState: ApprovalRuleState, approvalRuleIds: ID[]): ApprovalRule[];
6
- /**
7
- * Returns the amount-range portion of a rule's criteria, if any.
8
- *
9
- * Use this whenever a caller needs to read amount min/max from the new
10
- * discriminated `Criteria` union without inlining a type guard.
11
- */
12
- export declare function getAmountCriteria(criteria: Criteria[]): AmountCriteria | undefined;
13
- export declare function getVendorCriteria(criteria: Criteria[]): VendorCriteria | undefined;
14
- export declare function getDepartmentCriteria(criteria: Criteria[]): DepartmentCriteria | undefined;
15
- /**
16
- * Returns all rules of the given entityType, sorted by `priority` ascending.
17
- *
18
- * Rules without a `priority` value sort to the end (treated as Infinity).
19
- * Use this for the list page where rules render in evaluation order.
20
- */
21
- export declare function getApprovalRulesByEntityType(approvalRuleState: ApprovalRuleState, entityType: EntityType): ApprovalRule[];
22
- /**
23
- * Returns the tenant's fallback rule for the given entityType, if one exists.
24
- *
25
- * The fallback rule is shown by the "fallback engine active" banner on the
26
- * list page and is used to handle bills/reimbursements that match no other rule.
27
- */
28
- export declare function getFallbackApprovalRule(approvalRuleState: ApprovalRuleState, entityType: EntityType): ApprovalRule | undefined;
@@ -2,11 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getApprovalRuleById = getApprovalRuleById;
4
4
  exports.getApprovalRulesByIds = getApprovalRulesByIds;
5
- exports.getAmountCriteria = getAmountCriteria;
6
- exports.getVendorCriteria = getVendorCriteria;
7
- exports.getDepartmentCriteria = getDepartmentCriteria;
8
- exports.getApprovalRulesByEntityType = getApprovalRulesByEntityType;
9
- exports.getFallbackApprovalRule = getFallbackApprovalRule;
10
5
  function getApprovalRuleById(approvalRuleState, approvalRuleId) {
11
6
  return approvalRuleState.approvalRuleById[approvalRuleId] ?? undefined;
12
7
  }
@@ -16,38 +11,3 @@ function getApprovalRulesByIds(approvalRuleState, approvalRuleIds) {
16
11
  .filter((value) => value != null);
17
12
  return approvalRulesByIds;
18
13
  }
19
- /**
20
- * Returns the amount-range portion of a rule's criteria, if any.
21
- *
22
- * Use this whenever a caller needs to read amount min/max from the new
23
- * discriminated `Criteria` union without inlining a type guard.
24
- */
25
- function getAmountCriteria(criteria) {
26
- return criteria.find((c) => c.type === 'amount');
27
- }
28
- function getVendorCriteria(criteria) {
29
- return criteria.find((c) => c.type === 'vendor');
30
- }
31
- function getDepartmentCriteria(criteria) {
32
- return criteria.find((c) => c.type === 'department');
33
- }
34
- /**
35
- * Returns all rules of the given entityType, sorted by `priority` ascending.
36
- *
37
- * Rules without a `priority` value sort to the end (treated as Infinity).
38
- * Use this for the list page where rules render in evaluation order.
39
- */
40
- function getApprovalRulesByEntityType(approvalRuleState, entityType) {
41
- return Object.values(approvalRuleState.approvalRuleById)
42
- .filter((rule) => rule.entityType === entityType)
43
- .sort((a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity));
44
- }
45
- /**
46
- * Returns the tenant's fallback rule for the given entityType, if one exists.
47
- *
48
- * The fallback rule is shown by the "fallback engine active" banner on the
49
- * list page and is used to handle bills/reimbursements that match no other rule.
50
- */
51
- function getFallbackApprovalRule(approvalRuleState, entityType) {
52
- return Object.values(approvalRuleState.approvalRuleById).find((rule) => rule.entityType === entityType && rule.isFallback === true);
53
- }
@@ -25,37 +25,14 @@ export interface Actor {
25
25
  subType?: AttributeType | RoleType;
26
26
  userId?: ID;
27
27
  }
28
- /**
29
- * Approval rule criteria — discriminated union over the three condition
30
- * types the wire format supports: amount, vendor, and department.
31
- *
32
- * State-side, each rule carries a `Criteria[]` with at most one variant of
33
- * each kind (e.g. one AmountCriteria + one VendorCriteria + one DepartmentCriteria).
34
- *
35
- * Form-side, the rule create/edit form uses `ApprovalRuleFormCriteria`
36
- * (defined in commonState) — a structured object with named slots for
37
- * amount/vendor/department. Epics translate between the two.
38
- */
39
- export type AmountComparator = 'greater_than' | 'less_than' | 'range';
40
- export interface AmountCriteria {
41
- comparator: AmountComparator;
42
- type: 'amount';
43
- /** Upper bound. Present for `less_than` and `range`. */
44
- max?: Amount;
45
- /** Lower bound. Present for `greater_than` and `range`. */
46
- min?: Amount;
47
- }
48
- export interface VendorCriteria {
49
- operator: 'is' | 'is_not';
50
- type: 'vendor';
51
- vendorIds: ID[];
52
- }
53
- export interface DepartmentCriteria {
54
- departmentIds: ID[];
55
- operator: 'is' | 'is_not';
56
- type: 'department';
28
+ export interface Criteria {
29
+ range: {
30
+ min: Amount;
31
+ max?: Amount;
32
+ };
33
+ rangeEntity: string;
34
+ rangeType: string;
57
35
  }
58
- export type Criteria = AmountCriteria | VendorCriteria | DepartmentCriteria;
59
36
  export interface Step {
60
37
  actors: Actor[];
61
38
  operator: StepOperatorType;
@@ -74,25 +51,7 @@ export interface ApprovalRule {
74
51
  entityType: EntityType;
75
52
  steps: Step[];
76
53
  updateTime: ZeniDate;
77
- /** Backend bookkeeping: whether approval steps must run serialized. */
78
- areApprovalsSerialized?: boolean;
79
- /** Free-text description shown beneath the rule name on the list page. */
80
- description?: string;
81
- /** True when this rule is the tenant's default fallback rule. */
82
- isFallback?: boolean;
83
54
  name?: string;
84
- /** Backend bookkeeping: number of entities currently pending against this rule. */
85
- pendingApprovalsCount?: number;
86
- /** Backend bookkeeping: status of background updates against this rule. */
87
- pendingEntityApprovalUpdateStatus?: string;
88
- /** Rule's position in the evaluation order; lower number = higher priority. */
89
- priority?: number;
90
- /**
91
- * When on, the creator of a bill/reimbursement cannot auto-approve
92
- * their own request even if they are also an approver. Backend spec
93
- * is still pending — kept optional for now.
94
- */
95
- separationOfDuties?: boolean;
96
55
  version?: number | string;
97
56
  }
98
57
  export interface Approvers {
@@ -14,139 +14,18 @@ export const toApprovalRule = (payload) => ({
14
14
  version: payload.version,
15
15
  criteria: toApprovalCriteria(payload.criteria),
16
16
  steps: toApprovalSteps(payload.steps),
17
- description: payload.description ?? undefined,
18
- priority: payload.priority,
19
- isFallback: payload.is_fallback ?? false,
20
- // separationOfDuties: backend doesn't ship this field yet; left undefined
21
- // until the spec is finalized.
22
- areApprovalsSerialized: payload.are_approvals_serialized,
23
- pendingApprovalsCount: payload.pending_approvals_count,
24
- pendingEntityApprovalUpdateStatus: payload.pending_entity_approval_update_status,
25
17
  });
26
- /**
27
- * Maps the wire-level criteria block into the state-side discriminated
28
- * `Criteria[]` union.
29
- *
30
- * The wire keeps each condition as a flat row inside `conditions[]`.
31
- * Amount comparisons can show up as a `gte` only, a `lte` only, or a
32
- * `gte` + `lte` pair — those collapse into a single AmountCriteria whose
33
- * `comparator` is `greater_than`, `less_than`, or `range` respectively.
34
- *
35
- * Vendor and department conditions map one-to-one: `in` becomes `is`,
36
- * `not_in` becomes `is_not`.
37
- *
38
- * Resilient to two forms of upstream drift:
39
- * - Missing / null criteria → returns [].
40
- * - Legacy criteria shape (array of amount-range objects, the pre-3.0
41
- * wire) → converted to an AmountCriteria so existing rules in production
42
- * still render while the backend rolls out.
43
- */
44
18
  const toApprovalCriteria = (payload) => {
45
- if (payload == null) {
46
- return [];
47
- }
48
- if (Array.isArray(payload)) {
49
- // Legacy pre-3.0 wire: an array of amount-range entries.
50
- return legacyAmountRangeToCriteria(payload);
51
- }
52
- if (!Array.isArray(payload.conditions)) {
53
- return [];
54
- }
55
- const results = [];
56
- const amountCriteria = toAmountCriteria(payload);
57
- if (amountCriteria != null) {
58
- results.push(amountCriteria);
59
- }
60
- payload.conditions
61
- .filter((condition) => condition.field === 'vendor_id')
62
- .forEach((condition) => {
63
- const vendor = toVendorCriteria(condition);
64
- if (vendor != null) {
65
- results.push(vendor);
66
- }
67
- });
68
- payload.conditions
69
- .filter((condition) => condition.field === 'department_id')
70
- .forEach((condition) => {
71
- const department = toDepartmentCriteria(condition);
72
- if (department != null) {
73
- results.push(department);
74
- }
75
- });
76
- return results;
77
- };
78
- const legacyAmountRangeToCriteria = (legacy) => {
79
- if (legacy.length === 0) {
80
- return [];
81
- }
82
- const first = legacy[0] ?? {};
83
- const currency = first.currency_code ?? 'USD';
84
- const symbol = first.currency_symbol ?? '$';
85
- const min = typeof first.min === 'number'
86
- ? toAmount(first.min, currency, symbol)
87
- : undefined;
88
- const max = typeof first.max === 'number'
89
- ? toAmount(first.max, currency, symbol)
90
- : undefined;
91
- if (min == null && max == null) {
92
- return [];
93
- }
94
- const comparator = min != null && max != null
95
- ? 'range'
96
- : min != null
97
- ? 'greater_than'
98
- : 'less_than';
99
- return [{ type: 'amount', comparator, min, max }];
100
- };
101
- const toAmountCriteria = (payload) => {
102
- if (!Array.isArray(payload.conditions)) {
103
- return undefined;
104
- }
105
- const amountConditions = payload.conditions.filter((condition) => condition.field === 'amount');
106
- const gteCondition = amountConditions.find((condition) => condition.type === 'gte' || condition.type === 'eq');
107
- const lteCondition = amountConditions.find((condition) => condition.type === 'lte');
108
- if (gteCondition == null && lteCondition == null) {
109
- return undefined;
110
- }
111
- const currencyCode = payload.currency_code ?? 'USD';
112
- const currencySymbol = payload.currency_symbol ?? '$';
113
- const min = typeof gteCondition?.value === 'number'
114
- ? toAmount(gteCondition.value, currencyCode, currencySymbol)
115
- : undefined;
116
- const max = typeof lteCondition?.value === 'number'
117
- ? toAmount(lteCondition.value, currencyCode, currencySymbol)
118
- : undefined;
119
- let comparator;
120
- if (min != null && max != null) {
121
- comparator = 'range';
122
- }
123
- else if (min != null) {
124
- comparator = 'greater_than';
125
- }
126
- else {
127
- comparator = 'less_than';
128
- }
129
- return { type: 'amount', comparator, min, max };
130
- };
131
- const toVendorCriteria = (condition) => {
132
- if (!Array.isArray(condition.value)) {
133
- return undefined;
134
- }
135
- return {
136
- type: 'vendor',
137
- operator: condition.type === 'not_in' ? 'is_not' : 'is',
138
- vendorIds: condition.value,
139
- };
140
- };
141
- const toDepartmentCriteria = (condition) => {
142
- if (!Array.isArray(condition.value)) {
143
- return undefined;
144
- }
145
- return {
146
- type: 'department',
147
- operator: condition.type === 'not_in' ? 'is_not' : 'is',
148
- departmentIds: condition.value,
149
- };
19
+ return payload.map((criteria) => ({
20
+ rangeType: criteria.type,
21
+ rangeEntity: criteria.range_entity,
22
+ range: {
23
+ min: toAmount(criteria.min, criteria.currency_code, criteria.currency_symbol),
24
+ max: criteria.max != null
25
+ ? toAmount(criteria.max, criteria.currency_code, criteria.currency_symbol)
26
+ : undefined,
27
+ },
28
+ }));
150
29
  };
151
30
  const toApprovalSteps = (payload) => {
152
31
  return payload.map((step) => ({
@@ -7,38 +7,3 @@ export function getApprovalRulesByIds(approvalRuleState, approvalRuleIds) {
7
7
  .filter((value) => value != null);
8
8
  return approvalRulesByIds;
9
9
  }
10
- /**
11
- * Returns the amount-range portion of a rule's criteria, if any.
12
- *
13
- * Use this whenever a caller needs to read amount min/max from the new
14
- * discriminated `Criteria` union without inlining a type guard.
15
- */
16
- export function getAmountCriteria(criteria) {
17
- return criteria.find((c) => c.type === 'amount');
18
- }
19
- export function getVendorCriteria(criteria) {
20
- return criteria.find((c) => c.type === 'vendor');
21
- }
22
- export function getDepartmentCriteria(criteria) {
23
- return criteria.find((c) => c.type === 'department');
24
- }
25
- /**
26
- * Returns all rules of the given entityType, sorted by `priority` ascending.
27
- *
28
- * Rules without a `priority` value sort to the end (treated as Infinity).
29
- * Use this for the list page where rules render in evaluation order.
30
- */
31
- export function getApprovalRulesByEntityType(approvalRuleState, entityType) {
32
- return Object.values(approvalRuleState.approvalRuleById)
33
- .filter((rule) => rule.entityType === entityType)
34
- .sort((a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity));
35
- }
36
- /**
37
- * Returns the tenant's fallback rule for the given entityType, if one exists.
38
- *
39
- * The fallback rule is shown by the "fallback engine active" banner on the
40
- * list page and is used to handle bills/reimbursements that match no other rule.
41
- */
42
- export function getFallbackApprovalRule(approvalRuleState, entityType) {
43
- return Object.values(approvalRuleState.approvalRuleById).find((rule) => rule.entityType === entityType && rule.isFallback === true);
44
- }
package/lib/esm/index.js CHANGED
@@ -33,7 +33,6 @@ import { getAccountGroupKey, toAccountGroupType, } from './entity/accountGroup/a
33
33
  import { getAccountReconByAccountIdAndSelectedPeriod, } from './entity/accountRecon/accountReconSelector';
34
34
  import { getAddressByAddressId } from './entity/address/addressSelector';
35
35
  import { toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict, } from './entity/approvalRule/approvalRuleState';
36
- import { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, } from './entity/approvalRule/approvalRuleSelector';
37
36
  import { toOutsideZeniPaymentModeType, } from './entity/billPay/billTransaction/billTransactionState';
38
37
  import { toRecurringBillFrequency, toRecurringBillFrequencyStrict, } from './entity/billPay/recurringBills/recurringBillsState';
39
38
  import { toCardAddressType, toCardType, toCreditLimitFrequencyCodeType, toShippingAddressType, } from './entity/chargeCard/chargeCard';
@@ -570,7 +569,7 @@ export { getUserFinancialAccount };
570
569
  export { fetchRemiSetupView, updateMileageDetails, saveRemiSetupViewDataInLocalStore, acceptRemiTerms, acceptEmployeeRemiTerms, clearRemiSetupView, getRemiSetupViewDetails, getRemiBusinessVerificationDetails, };
571
570
  export { VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS, };
572
571
  export { isSuccessResponse, isInvalidSessionError, isAccessDeniedError, };
573
- export { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
572
+ export { toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
574
573
  export { getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
575
574
  export { getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
576
575
  export { getRemiDetailView, checkApproveRejectBtnShowForRemi, };
@@ -26,11 +26,8 @@ const billPaySetupApproverView = createSlice({
26
26
  draft.fetchState = 'In-Progress';
27
27
  draft.error = undefined;
28
28
  },
29
- // Approval Rules 3.0 `useV3` arrives from the screen connector
30
- // (`approval_rule_v3_config` dynamic config) and picks the v1 vs
31
- // v2 endpoint in the fetch epic.
32
- prepare(cacheOverride = false, includeUserRoles = true, useV3 = false) {
33
- return { payload: { cacheOverride, includeUserRoles, useV3 } };
29
+ prepare(cacheOverride = false, includeUserRoles = true) {
30
+ return { payload: { cacheOverride, includeUserRoles } };
34
31
  },
35
32
  },
36
33
  fetchBillPaySetupApproverViewSuccess: {
@@ -115,11 +112,8 @@ const billPaySetupApproverView = createSlice({
115
112
  error: undefined,
116
113
  };
117
114
  },
118
- // Approval Rules 3.0 — `useV3` flows from the screen connector
119
- // (`approval_rule_v3_config` dynamic config) so the delete epic
120
- // can pick the v1 vs v2 endpoint.
121
- prepare(approvalRuleId, useV3 = false) {
122
- return { payload: { approvalRuleId, useV3 } };
115
+ prepare(approvalRuleId) {
116
+ return { payload: { approvalRuleId } };
123
117
  },
124
118
  },
125
119
  deleteBillPayApprovalRuleSuccess: {
@@ -151,22 +145,13 @@ const billPaySetupApproverView = createSlice({
151
145
  };
152
146
  },
153
147
  },
154
- saveBillPaySetupApproverViewUpdates: {
155
- // Approval Rules 3.0 `useV3` is sourced from the
156
- // `approval_rule_v3_config` dynamic config in the screen
157
- // connector. The epic reads it off the action payload to pick
158
- // the v1 or v2 endpoint and the matching write-side mapper.
159
- reducer(draft, _action) {
160
- if (draft.billPaySetupApproverViewUpdateData != null) {
161
- draft.billPaySetupApproverViewUpdateData.updateStatus = {
162
- fetchState: 'In-Progress',
163
- error: undefined,
164
- };
165
- }
166
- },
167
- prepare(useV3) {
168
- return { payload: { useV3 } };
169
- },
148
+ saveBillPaySetupApproverViewUpdates(draft) {
149
+ if (draft.billPaySetupApproverViewUpdateData != null) {
150
+ draft.billPaySetupApproverViewUpdateData.updateStatus = {
151
+ fetchState: 'In-Progress',
152
+ error: undefined,
153
+ };
154
+ }
170
155
  },
171
156
  saveBillPaySetupApproverViewUpdatesSuccess: {
172
157
  reducer(draft, action) {
@@ -6,16 +6,9 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
6
6
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
7
7
  import { deleteBillPayApprovalRule, deleteBillPayApprovalRuleFailure, deleteBillPayApprovalRuleSuccess, } from '../billPaySetupApproverViewReducer';
8
8
  export const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteBillPayApprovalRule.match), switchMap((action) => {
9
- const { approvalRuleId, useV3 } = action.payload;
10
- // Approval Rules 3.0 — flag-gated endpoint selection.
11
- const endpoint = useV3
12
- ? // ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
13
- `https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`
14
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
9
+ const { approvalRuleId } = action.payload;
15
10
  return zeniAPI
16
- .deleteAndGetJSON(endpoint, {
17
- approval_rule_id: approvalRuleId,
18
- })
11
+ .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, { approval_rule_id: approvalRuleId })
19
12
  .pipe(mergeMap((response) => {
20
13
  if (isSuccessResponse(response) && response.data != null) {
21
14
  const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
6
6
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
7
7
  import { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewFailure, fetchBillPaySetupApproverViewSuccess, } from '../billPaySetupApproverViewReducer';
8
8
  export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBillPaySetupApproverView.match), switchMap((action) => {
9
- const { cacheOverride, useV3 } = action.payload;
9
+ const { cacheOverride } = action.payload;
10
10
  const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
11
11
  const approvalRules = getApprovalRulesByIds(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
12
12
  if (cacheOverride === true ||
@@ -14,12 +14,9 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
14
14
  billPaySetupApproverViewState.approvalRuleIds.length ||
15
15
  (billPaySetupApproverViewState.hasValidState() === false &&
16
16
  billPaySetupApproverViewState.fetchState !== 'In-Progress')) {
17
- // Approval Rules 3.0 — flag-gated endpoint selection.
18
- const endpoint = useV3
19
- ? // ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
20
- `https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`
21
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
22
- return zeniAPI.getJSON(endpoint).pipe(mergeMap((response) => {
17
+ return zeniAPI
18
+ .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
19
+ .pipe(mergeMap((response) => {
23
20
  if (isSuccessResponse(response) && response.data != null) {
24
21
  const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
25
22
  const actions = [