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

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,6 +1,6 @@
1
1
  import { from } from 'rxjs';
2
2
  import { filter, mergeMap } from 'rxjs/operators';
3
- import { getAmountCriteria, getApprovalRuleById, getDepartmentCriteria, getVendorCriteria, } from '../../../../../entity/approvalRule/approvalRuleSelector';
3
+ import { getApprovalRuleById } from '../../../../../entity/approvalRule/approvalRuleSelector';
4
4
  import { clearBillPaySetupApproverViewUpdateData, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, } from '../billPaySetupApproverViewReducer';
5
5
  export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeBillPaySetupApproverViewUpdateData.match), mergeMap((action) => {
6
6
  const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
8
8
  if (approvalRuleId != null) {
9
9
  const approvalRule = getApprovalRuleById(state$.value.approvalRuleState, approvalRuleId);
10
10
  if (approvalRule != null) {
11
+ const criteria = approvalRule.criteria[0];
12
+ const range = criteria?.range;
11
13
  const billPaySetupApproverViewUpdateData = {
12
14
  approvalRuleId,
13
15
  steps: approvalRule.steps,
14
16
  criteria: {
15
- amount: getAmountCriteria(approvalRule.criteria),
16
- vendor: getVendorCriteria(approvalRule.criteria),
17
- department: getDepartmentCriteria(approvalRule.criteria),
17
+ rangeType: criteria?.rangeType,
18
+ rangeEntity: criteria?.rangeEntity,
19
+ range,
18
20
  },
19
- // Approval Rules 3.0 — seed rule-level fields so the form can
20
- // round-trip them on edit. Each may be undefined on legacy rules.
21
- name: approvalRule.name,
22
- description: approvalRule.description,
23
- separationOfDuties: approvalRule.separationOfDuties,
24
- isFallback: approvalRule.isFallback,
25
21
  };
26
22
  fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
27
23
  }
@@ -29,7 +25,7 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
29
25
  else {
30
26
  const billPaySetupApproverViewCreateData = {
31
27
  steps: [],
32
- criteria: {},
28
+ criteria: undefined,
33
29
  };
34
30
  fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewCreateData));
35
31
  }
@@ -5,25 +5,15 @@ import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
5
5
  import { updateAllUsers } from '../../../../../entity/user/userReducer';
6
6
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
7
7
  import { saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesFailure, saveBillPaySetupApproverViewUpdatesSuccess, } from '../billPaySetupApproverViewReducer';
8
- import { toApprovalChangableInfoPayload, toApprovalChangableInfoPayloadV1, } from '../types/commonPayload';
9
- export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), switchMap((action) => {
8
+ import { toApprovalChangableInfoPayload } from '../types/commonPayload';
9
+ export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), switchMap(() => {
10
10
  const { billPaySetupApproverViewState } = state$.value;
11
11
  const billPaySetupApproverViewUpdateData = billPaySetupApproverViewState.billPaySetupApproverViewUpdateData;
12
12
  if (billPaySetupApproverViewUpdateData != null &&
13
13
  billPaySetupApproverViewUpdateData.data != null) {
14
- // Approval Rules 3.0 — gate URL + write-side payload mapper on
15
- // the `approval_rule_v3_config` dynamic config. `useV3` arrives
16
- // on the action payload from the screen connector.
17
- const { useV3 } = action.payload;
18
- const payload = useV3
19
- ? toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data)
20
- : toApprovalChangableInfoPayloadV1(billPaySetupApproverViewUpdateData.data);
21
- const endpoint = useV3
22
- ? // ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
23
- `https://dev.api.zeni.ai/version/approval/tarun/1.0/bill-pay/approval-rules-v2`
24
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
14
+ const payload = toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data);
25
15
  return zeniAPI
26
- .postAndGetJSON(endpoint, payload)
16
+ .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, payload)
27
17
  .pipe(mergeMap((response) => {
28
18
  if (isSuccessResponse(response) && response.data != null) {
29
19
  const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
@@ -1,48 +1,20 @@
1
1
  export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
2
- // Form-side criteria is a structured object with optional slots for
3
- // amount / vendor / department; flatten it into the wire format's
4
- // `conditions[]` array.
5
- let criteriaPayload;
2
+ let criteriaPayload = [];
6
3
  if (approverViewUpdateData.criteria != null) {
7
- const { amount, vendor, department } = approverViewUpdateData.criteria;
8
- const conditions = [];
9
- if (amount?.min != null) {
10
- conditions.push({
11
- field: 'amount',
12
- type: 'gte',
13
- value: amount.min.amount,
14
- });
15
- }
16
- if (amount?.max != null) {
17
- conditions.push({
18
- field: 'amount',
19
- type: 'lte',
20
- value: amount.max.amount,
21
- });
22
- }
23
- if (vendor != null && vendor.vendorIds.length > 0) {
24
- conditions.push({
25
- field: 'vendor_id',
26
- type: vendor.operator === 'is_not' ? 'not_in' : 'in',
27
- value: vendor.vendorIds,
28
- });
29
- }
30
- if (department != null && department.departmentIds.length > 0) {
31
- conditions.push({
32
- field: 'department_id',
33
- type: department.operator === 'is_not' ? 'not_in' : 'in',
34
- value: department.departmentIds,
35
- });
36
- }
37
- if (conditions.length > 0) {
38
- const currency = amount?.min ?? amount?.max ?? null;
39
- criteriaPayload = {
40
- conditions,
41
- criteria_operator: 'and',
42
- currency_code: currency?.currencyCode ?? 'USD',
43
- currency_symbol: currency?.currencySymbol ?? '$',
44
- };
45
- }
4
+ const criteria = approverViewUpdateData.criteria;
5
+ const { rangeType, rangeEntity, range } = criteria;
6
+ const { min, max } = range;
7
+ const { currencyCode, currencySymbol } = min;
8
+ criteriaPayload = [
9
+ {
10
+ type: rangeType,
11
+ range_entity: rangeEntity,
12
+ min: min.amount,
13
+ max: max?.amount ?? null,
14
+ currency_code: currencyCode,
15
+ currency_symbol: currencySymbol,
16
+ },
17
+ ];
46
18
  }
47
19
  const steps = approverViewUpdateData.steps.map((step) => {
48
20
  return {
@@ -63,87 +35,10 @@ export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
63
35
  });
64
36
  const isUpdate = approverViewUpdateData.approvalRuleId != null;
65
37
  const payload = {
38
+ criteria: criteriaPayload,
66
39
  steps,
67
40
  is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
68
41
  };
69
- if (criteriaPayload != null) {
70
- payload.criteria = criteriaPayload;
71
- }
72
- // Approval Rules 3.0 — surface rule-level fields when the form set them.
73
- // Send only what the user actually entered: an undefined value means
74
- // "no opinion" and stays off the wire.
75
- if (approverViewUpdateData.name != null) {
76
- payload.name = approverViewUpdateData.name;
77
- }
78
- if (approverViewUpdateData.description != null) {
79
- payload.description = approverViewUpdateData.description;
80
- }
81
- if (approverViewUpdateData.separationOfDuties != null) {
82
- payload.separation_of_duties = approverViewUpdateData.separationOfDuties;
83
- }
84
- if (approverViewUpdateData.isFallback != null) {
85
- payload.is_fallback = approverViewUpdateData.isFallback;
86
- }
87
- if (isUpdate) {
88
- payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
89
- }
90
- return payload;
91
- };
92
- /**
93
- * V1 wire mapper — used when `approval_rule_v3_config` resolves to OFF
94
- * for the current tenant. Translates the form-side amount criteria into
95
- * the legacy `{rangeType, rangeEntity, range: {min, max}}` shape. The
96
- * V1 backend does not understand vendor / department criteria or the
97
- * rule-level 3.0 fields, so those are dropped on the wire.
98
- *
99
- * The form-side amount slot is always read as a `range`-style criteria
100
- * here: V1 schemas only supported ranges, so an absent `min` or `max`
101
- * falls back to `0` / `Number.MAX_SAFE_INTEGER`.
102
- */
103
- export const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
104
- const amount = approverViewUpdateData.criteria?.amount;
105
- const minAmount = amount?.min;
106
- const maxAmount = amount?.max;
107
- const currencyCode = minAmount?.currencyCode ?? maxAmount?.currencyCode ?? 'USD';
108
- const currencySymbol = minAmount?.currencySymbol ?? maxAmount?.currencySymbol ?? '$';
109
- const steps = approverViewUpdateData.steps.map((step) => {
110
- return {
111
- action: step.action,
112
- operator: step.operator,
113
- actors: step.actors
114
- .filter((actor) => actor.subType !== 'admin')
115
- .map((actor) => {
116
- return {
117
- type: actor.type,
118
- id: actor.userId ?? null,
119
- sub_type: actor.subType ?? null,
120
- id_type: actor.idType ?? null,
121
- is_implicit_actor: actor.isImplicitActor ?? false,
122
- };
123
- }),
124
- };
125
- });
126
- const isUpdate = approverViewUpdateData.approvalRuleId != null;
127
- const payload = {
128
- steps,
129
- is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
130
- criteria: {
131
- rangeType: 'range',
132
- rangeEntity: 'currency',
133
- range: {
134
- min: {
135
- amount: minAmount?.amount ?? 0,
136
- currencyCode,
137
- currencySymbol,
138
- },
139
- max: {
140
- amount: maxAmount?.amount ?? Number.MAX_SAFE_INTEGER,
141
- currencyCode,
142
- currencySymbol,
143
- },
144
- },
145
- },
146
- };
147
42
  if (isUpdate) {
148
43
  payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
149
44
  }
@@ -1,6 +1,5 @@
1
1
  import recordGet from 'lodash/get';
2
2
  import has from 'lodash/has';
3
- import { getAmountCriteria } from '../../../../entity/approvalRule/approvalRuleSelector';
4
3
  import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
5
4
  import { getBankAccountByBankAccountId, getBankAccountsByBankAccountIds, } from '../../../../entity/bankAccount/bankAccountSelector';
6
5
  import { getContactById, getContactsByIds, } from '../../../../entity/billPay/contact/contactSelector';
@@ -682,13 +681,9 @@ export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId,
682
681
  export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
683
682
  let isCreatorAlsoApprover = false;
684
683
  const approvalRule = approvalRules.find((rule) => {
685
- const amountCriteria = getAmountCriteria(rule.criteria);
686
- if (amountCriteria?.min == null) {
687
- return false;
688
- }
689
- const { min, max } = amountCriteria;
684
+ const { max, min } = rule.criteria[0].range;
690
685
  return (billAmount > min.amount &&
691
- (max?.amount != null ? billAmount <= max.amount : true));
686
+ (max?.amount != null ? billAmount <= max?.amount : true));
692
687
  });
693
688
  if (approvalRule != null) {
694
689
  const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');
@@ -1,9 +1,9 @@
1
- import { dateLocal } from '../../../zeniDayJS';
1
+ import { date } from '../../../zeniDayJS';
2
2
  import { toHistoricEventUpdateDisplayType, toHistoricEventUpdateType, } from './commonHistory';
3
3
  export const toHistoricEvent = (payload) => ({
4
4
  eventText: payload.event_text,
5
5
  eventSubText: payload.event_sub_text ?? [],
6
- timestamp: payload.timestamp != null ? dateLocal(payload.timestamp) : undefined,
6
+ timestamp: payload.timestamp != null ? date(payload.timestamp) : undefined,
7
7
  updates: payload.updates.map((eventUpdatePayload) => toHistoricEventUpdate(eventUpdatePayload)),
8
8
  paymentTraceId: payload.metadata?.payment_trace_id ?? null,
9
9
  });
@@ -6,15 +6,9 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
6
6
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
7
7
  import { deleteRemiApprovalRule, deleteRemiApprovalRuleFailure, deleteRemiApprovalRuleSuccess, } from '../remiSetupApproverViewReducer';
8
8
  export const deleteRemiApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteRemiApprovalRule.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/reimbursements/approval-rules-v2`
13
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
9
+ const { approvalRuleId } = action.payload;
14
10
  return zeniAPI
15
- .deleteAndGetJSON(endpoint, {
16
- approval_rule_id: approvalRuleId,
17
- })
11
+ .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`, { approval_rule_id: approvalRuleId })
18
12
  .pipe(mergeMap((response) => {
19
13
  if (isSuccessResponse(response) && response.data != null) {
20
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 { fetchRemiSetupApproverView, fetchRemiSetupApproverViewFailure, fetchRemiSetupApproverViewSuccess, } from '../remiSetupApproverViewReducer';
8
8
  export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchRemiSetupApproverView.match), switchMap((action) => {
9
- const { cacheOverride, resolveAttributeToUser, includeImplicitActors, useV3, } = action.payload;
9
+ const { cacheOverride, resolveAttributeToUser, includeImplicitActors } = action.payload;
10
10
  const { remiSetupApproverViewState, approvalRuleState } = state$.value;
11
11
  const approvalRules = getApprovalRulesByIds(approvalRuleState, remiSetupApproverViewState.approvalRuleIds);
12
12
  if (cacheOverride === true ||
@@ -14,12 +14,8 @@ export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => act
14
14
  remiSetupApproverViewState.approvalRuleIds.length ||
15
15
  (remiSetupApproverViewState.hasValidState() === false &&
16
16
  remiSetupApproverViewState.fetchState !== 'In-Progress')) {
17
- // Approval Rules 3.0 — flag-gated endpoint selection.
18
- const basePath = useV3
19
- ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
20
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
21
17
  return zeniAPI
22
- .getJSON(`${basePath}?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
18
+ .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
23
19
  .pipe(mergeMap((response) => {
24
20
  if (isSuccessResponse(response) && response.data != null) {
25
21
  const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
@@ -1,6 +1,6 @@
1
1
  import { from } from 'rxjs';
2
2
  import { filter, mergeMap } from 'rxjs/operators';
3
- import { getAmountCriteria, getApprovalRuleById, getDepartmentCriteria, getVendorCriteria, } from '../../../../../entity/approvalRule/approvalRuleSelector';
3
+ import { getApprovalRuleById } from '../../../../../entity/approvalRule/approvalRuleSelector';
4
4
  import { clearRemiSetupApproverViewUpdateData, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, } from '../remiSetupApproverViewReducer';
5
5
  export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeRemiSetupApproverViewUpdateData.match), mergeMap((action) => {
6
6
  const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
8
8
  if (approvalRuleId != null) {
9
9
  const approvalRule = getApprovalRuleById(state$.value.approvalRuleState, approvalRuleId);
10
10
  if (approvalRule != null) {
11
+ const criteria = approvalRule.criteria[0];
12
+ const range = criteria?.range;
11
13
  const remiSetupApproverViewUpdateData = {
12
14
  approvalRuleId,
13
15
  steps: approvalRule.steps,
14
16
  criteria: {
15
- amount: getAmountCriteria(approvalRule.criteria),
16
- vendor: getVendorCriteria(approvalRule.criteria),
17
- department: getDepartmentCriteria(approvalRule.criteria),
17
+ rangeType: criteria?.rangeType,
18
+ rangeEntity: criteria?.rangeEntity,
19
+ range,
18
20
  },
19
- // Approval Rules 3.0 — seed rule-level fields so the form can
20
- // round-trip them on edit. Each may be undefined on legacy rules.
21
- name: approvalRule.name,
22
- description: approvalRule.description,
23
- separationOfDuties: approvalRule.separationOfDuties,
24
- isFallback: approvalRule.isFallback,
25
21
  };
26
22
  fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewUpdateData));
27
23
  }
@@ -29,7 +25,7 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
29
25
  else {
30
26
  const remiSetupApproverViewCreateData = {
31
27
  steps: [],
32
- criteria: {},
28
+ criteria: undefined,
33
29
  };
34
30
  fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewCreateData));
35
31
  }
@@ -4,25 +4,16 @@ import { updateApprovalRules } from '../../../../../entity/approvalRule/approval
4
4
  import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
5
5
  import { updateAllUsers } from '../../../../../entity/user/userReducer';
6
6
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
7
- import { toApprovalChangableInfoPayload, toApprovalChangableInfoPayloadV1, } from '../../../billPay/billPaySetupApproverView/types/commonPayload';
7
+ import { toApprovalChangableInfoPayload } from '../../../billPay/billPaySetupApproverView/types/commonPayload';
8
8
  import { saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesFailure, saveRemiSetupApproverViewUpdatesSuccess, } from '../remiSetupApproverViewReducer';
9
- export const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveRemiSetupApproverViewUpdates.match), switchMap((action) => {
9
+ export const saveRemiSetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveRemiSetupApproverViewUpdates.match), switchMap(() => {
10
10
  const { remiSetupApproverViewState } = state$.value;
11
11
  const remiSetupApproverViewUpdateData = remiSetupApproverViewState.remiSetupApproverViewUpdateData;
12
12
  if (remiSetupApproverViewUpdateData != null &&
13
13
  remiSetupApproverViewUpdateData.data != null) {
14
- // Approval Rules 3.0 — gate URL + write-side payload mapper on
15
- // the `approval_rule_v3_config` dynamic config. `useV3` arrives
16
- // on the action payload from the screen connector.
17
- const { useV3 } = action.payload;
18
- const payload = useV3
19
- ? toApprovalChangableInfoPayload(remiSetupApproverViewUpdateData.data)
20
- : toApprovalChangableInfoPayloadV1(remiSetupApproverViewUpdateData.data);
21
- const endpoint = useV3
22
- ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
23
- : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
14
+ const payload = toApprovalChangableInfoPayload(remiSetupApproverViewUpdateData.data);
24
15
  return zeniAPI
25
- .postAndGetJSON(endpoint, payload)
16
+ .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`, payload)
26
17
  .pipe(mergeMap((response) => {
27
18
  if (isSuccessResponse(response) && response.data != null) {
28
19
  const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
@@ -26,16 +26,12 @@ const remiSetupApproverView = 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 v1 vs v2
31
- // endpoint in the fetch epic.
32
- prepare(cacheOverride = false, resolveAttributeToUser = false, includeImplicitActors = false, useV3 = false) {
29
+ prepare(cacheOverride = false, resolveAttributeToUser = false, includeImplicitActors = false) {
33
30
  return {
34
31
  payload: {
35
32
  cacheOverride,
36
33
  resolveAttributeToUser,
37
34
  includeImplicitActors,
38
- useV3,
39
35
  },
40
36
  };
41
37
  },
@@ -138,11 +134,8 @@ const remiSetupApproverView = createSlice({
138
134
  error: undefined,
139
135
  };
140
136
  },
141
- // Approval Rules 3.0 — `useV3` flows from the screen connector
142
- // (`approval_rule_v3_config` dynamic config) so the delete epic
143
- // can pick the v1 vs v2 endpoint.
144
- prepare(approvalRuleId, useV3 = false) {
145
- return { payload: { approvalRuleId, useV3 } };
137
+ prepare(approvalRuleId) {
138
+ return { payload: { approvalRuleId } };
146
139
  },
147
140
  },
148
141
  deleteRemiApprovalRuleSuccess: {
@@ -174,21 +167,13 @@ const remiSetupApproverView = createSlice({
174
167
  };
175
168
  },
176
169
  },
177
- saveRemiSetupApproverViewUpdates: {
178
- // Approval Rules 3.0 `useV3` sourced from
179
- // `approval_rule_v3_config` dynamic config in the screen
180
- // connector; epic uses it to pick v1 vs v2 URL + mapper.
181
- reducer(draft, _action) {
182
- if (draft.remiSetupApproverViewUpdateData != null) {
183
- draft.remiSetupApproverViewUpdateData.updateStatus = {
184
- fetchState: 'In-Progress',
185
- error: undefined,
186
- };
187
- }
188
- },
189
- prepare(useV3) {
190
- return { payload: { useV3 } };
191
- },
170
+ saveRemiSetupApproverViewUpdates(draft) {
171
+ if (draft.remiSetupApproverViewUpdateData != null) {
172
+ draft.remiSetupApproverViewUpdateData.updateStatus = {
173
+ fetchState: 'In-Progress',
174
+ error: undefined,
175
+ };
176
+ }
192
177
  },
193
178
  saveRemiSetupApproverViewUpdatesSuccess: {
194
179
  reducer(draft, action) {
package/lib/index.d.ts CHANGED
@@ -52,8 +52,7 @@ import { AccountReconciliationEntity, getAccountReconByAccountIdAndSelectedPerio
52
52
  import { BalanceDataStatusCodeType, BankStatusCodeType, RecommendedActionCodeType, ReconciliationStatusCodeType, StatementDataStatusCodeType, StatementStatusCodeType, TransactionsToReview } from './entity/accountRecon/accountReconState';
53
53
  import { getAddressByAddressId } from './entity/address/addressSelector';
54
54
  import { Address } from './entity/address/addressState';
55
- import { Actor, ActorType, AmountComparator, AmountCriteria, ApprovalActionType, ApprovalRule, ApprovalRuleState, Approvers, AttributeType, Criteria, DepartmentCriteria, RoleType, Step, StepOperatorType, VendorCriteria, toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict } from './entity/approvalRule/approvalRuleState';
56
- import { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria } from './entity/approvalRule/approvalRuleSelector';
55
+ import { Actor, ActorType, ApprovalActionType, ApprovalRule, ApprovalRuleState, Approvers, AttributeType, RoleType, Step, StepOperatorType, toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict } from './entity/approvalRule/approvalRuleState';
57
56
  import { BankAccount } from './entity/bankAccount/bankAccount';
58
57
  import { BillPayInfo, BillPaymentRefundStatus, BillPaymentRefundStatusCodeType, BillPaymentStatus, BillPaymentStatusCodeType, BillStage, BillStageCodeType, BillStatus, BillStatusCodeType, BillTransaction, DeletionSourceType, InternationalTransferFeeBearerPaymentMethod, toOutsideZeniPaymentModeType } from './entity/billPay/billTransaction/billTransactionState';
59
58
  import { Contact } from './entity/billPay/contact/contact';
@@ -809,7 +808,7 @@ export { RemiSetupViewState, RemiSetupViewLocalData, MileageDetailsLocalData, Mi
809
808
  export { PaymentAccount, Logo, VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS, };
810
809
  export { SubscriptionPaymentAccount };
811
810
  export { PreviousBillsSelectorView, InvoiceProcessingPayload, InvoiceProcessingResponse, isSuccessResponse, isInvalidSessionError, isAccessDeniedError, };
812
- export { Step, Actor as ApprovalRuleActor, ActorType, ApprovalActionType, StepOperatorType, ApprovalRuleState, ApprovalRule, AmountComparator, AmountCriteria, Criteria, DepartmentCriteria, VendorCriteria, AttributeType, Approvers, RoleType, EntityApprovalStatusState, EntityApprovalStatus, SpendManagementEntityType, SpendManagementEntityTypeWithOtherConnection, getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
811
+ export { Step, Actor as ApprovalRuleActor, ActorType, ApprovalActionType, StepOperatorType, ApprovalRuleState, ApprovalRule, AttributeType, Approvers, RoleType, EntityApprovalStatusState, EntityApprovalStatus, SpendManagementEntityType, SpendManagementEntityTypeWithOtherConnection, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
813
812
  export { ApprovalRuleUpdateData, ApprovalRuleCreateData, BillPayApprovalRuleWithUser, ApprovalUpdateActionType, ApproverViewUpdateData, BillPaySetupApproverViewState, BillPaySetupApproverView, BillPaySetupApproverUpdateDataView, getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
814
813
  export { RemiApprovalRuleWithUser, RemiSetupApproverViewState, RemiSetupApproverView, RemiSetupApproverUpdateDataView, getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
815
814
  export { RemiDetailViewSelector, getRemiDetailView, RemiActivity, RemiDetails, checkApproveRejectBtnShowForRemi, };