@zeniai/client-epic-state 4.19.53 → 4.19.54
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.
- package/lib/entity/chargeCardRepayment/chargeCardRepayment.d.ts +1 -6
- package/lib/entity/chargeCardRepayment/chargeCardRepayment.js +1 -4
- package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.d.ts +3 -8
- package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.js +2 -5
- package/lib/epic.d.ts +1 -3
- package/lib/epic.js +1 -3
- package/lib/esm/entity/chargeCardRepayment/chargeCardRepayment.js +0 -2
- package/lib/esm/entity/chargeCardRepayment/chargeCardRepaymentPayload.js +3 -6
- package/lib/esm/epic.js +1 -3
- package/lib/esm/index.js +5 -10
- package/lib/esm/reducer.js +0 -3
- package/lib/esm/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementDocumentAIHelper.js +1 -1
- package/lib/esm/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementEpic.js +1 -3
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +1 -10
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js +2 -4
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +2 -5
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js +6 -12
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js +2 -2
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js +0 -5
- package/lib/esm/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js +1 -1
- package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js +0 -15
- package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +1 -10
- package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js +2 -4
- package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +2 -29
- package/lib/esm/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js +3 -5
- package/lib/index.d.ts +5 -11
- package/lib/index.js +13 -32
- package/lib/reducer.d.ts +0 -3
- package/lib/reducer.js +0 -3
- package/lib/tsconfig.typecheck.tsbuildinfo +1 -1
- package/lib/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementDocumentAIHelper.js +1 -1
- package/lib/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementEpic.js +1 -3
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts +1 -1
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +2 -11
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js +2 -4
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts +0 -2
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState.d.ts +0 -1
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts +0 -1
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +2 -5
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts +0 -2
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js +4 -10
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js +2 -2
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.d.ts +1 -2
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js +0 -5
- package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js +1 -1
- package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts +1 -2
- package/lib/view/spendManagement/commonSetup/setupViewSelector.js +1 -17
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.d.ts +1 -1
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +2 -11
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js +2 -4
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts +0 -2
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState.d.ts +0 -1
- package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts +4 -6
- package/lib/view/spendManagement/spendManagementFilterHelpers.js +2 -29
- package/lib/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js +3 -5
- package/package.json +1 -1
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js +0 -32
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js +0 -22
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js +0 -79
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.js +0 -1
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +0 -83
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js +0 -104
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.js +0 -31
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +0 -31
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts +0 -50
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js +0 -35
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.d.ts +0 -8
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js +0 -26
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.d.ts +0 -7
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js +0 -87
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.d.ts +0 -13
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.js +0 -2
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.d.ts +0 -19
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +0 -87
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.d.ts +0 -24
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js +0 -108
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.d.ts +0 -9
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.js +0 -35
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.d.ts +0 -7
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +0 -35
package/lib/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementDocumentAIHelper.js
CHANGED
|
@@ -8,7 +8,7 @@ const cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
|
8
8
|
const init_1 = require("../../../../init");
|
|
9
9
|
async function uploadAccountStatementIntoDocumentAI(accountType, fileBlob, authParams) {
|
|
10
10
|
let statementUpload;
|
|
11
|
-
const urlEndPoint = `${init_1.zeniAPI.apiEndPoints.documentAIMicroServiceBaseUrl}/1.0/processors/statement`;
|
|
11
|
+
const urlEndPoint = `${init_1.zeniAPI.apiEndPoints.documentAIMicroServiceBaseUrl}/1.0/processors/bank-statement`;
|
|
12
12
|
const data = new FormData();
|
|
13
13
|
data.append('attachment_file_0', fileBlob);
|
|
14
14
|
const attachment_json = JSON.stringify({
|
|
@@ -21,16 +21,14 @@ const uploadAccountStatementEpic = (actions$, state$, zeniAPI) => actions$.pipe(
|
|
|
21
21
|
error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Account not found'),
|
|
22
22
|
}));
|
|
23
23
|
}
|
|
24
|
-
const statementType = accountBase.accountType == 'credit_card' ? 'card' : 'bank';
|
|
25
24
|
const requestPayload = {
|
|
26
25
|
account_id: accountId,
|
|
27
26
|
statement_start_date: start.toString(),
|
|
28
27
|
statement_end_date: end.toString(),
|
|
29
28
|
processor_run_id: payload.processor_run_id,
|
|
30
29
|
file_id: payload.files[0].file_id,
|
|
31
|
-
statement_type: statementType,
|
|
32
30
|
};
|
|
33
|
-
const uploadAccountStatementApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/statements`, requestPayload);
|
|
31
|
+
const uploadAccountStatementApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/bank-statements`, requestPayload);
|
|
34
32
|
return uploadAccountStatementApi$.pipe((0, operators_1.mergeMap)((response) => {
|
|
35
33
|
if ((0, responsePayload_1.isSuccessResponse)(response) === true && response.data != null) {
|
|
36
34
|
const actions = [];
|
|
@@ -34,6 +34,6 @@ export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").A
|
|
|
34
34
|
approvalRuleId: string | undefined;
|
|
35
35
|
}, "billPaySetupApproverView/initializeBillPaySetupApproverViewUpdateData", never, never>, saveBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
|
|
36
36
|
billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
|
|
37
|
-
}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">,
|
|
37
|
+
}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
|
|
38
38
|
declare const _default: import("redux").Reducer<BillPaySetupApproverViewState>;
|
|
39
39
|
export default _default;
|
package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.clearBillPaySetupApproverView = exports.
|
|
4
|
+
exports.clearBillPaySetupApproverView = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
|
|
5
5
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
6
6
|
exports.initialState = {
|
|
7
7
|
fetchState: 'Not-Started',
|
|
8
8
|
error: undefined,
|
|
9
|
-
listeningToPusherEvent: false,
|
|
10
9
|
approverListState: {
|
|
11
10
|
approverIds: [],
|
|
12
11
|
attributes: [],
|
|
@@ -159,11 +158,6 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
159
158
|
reducer(draft, action) {
|
|
160
159
|
const { approvalRuleIds } = action.payload;
|
|
161
160
|
if (draft.billPaySetupApproverViewUpdateData != null) {
|
|
162
|
-
if (draft.billPaySetupApproverViewUpdateData.type === 'approval_update' &&
|
|
163
|
-
draft.billPaySetupApproverViewUpdateData.data
|
|
164
|
-
?.isApplicableOnPendingApprovalEntity === true) {
|
|
165
|
-
draft.listeningToPusherEvent = true;
|
|
166
|
-
}
|
|
167
161
|
draft.billPaySetupApproverViewUpdateData.updateStatus = {
|
|
168
162
|
fetchState: 'Completed',
|
|
169
163
|
error: undefined,
|
|
@@ -224,9 +218,6 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
224
218
|
return { payload: { billPaySetupApproverViewUpdateData } };
|
|
225
219
|
},
|
|
226
220
|
},
|
|
227
|
-
setListeningToPusherEvent(draft, action) {
|
|
228
|
-
draft.listeningToPusherEvent = action.payload;
|
|
229
|
-
},
|
|
230
221
|
clearBillPaySetupApproverViewUpdateData(draft) {
|
|
231
222
|
if (draft.billPaySetupApproverViewUpdateData != null) {
|
|
232
223
|
draft.billPaySetupApproverViewUpdateData.data = undefined;
|
|
@@ -237,5 +228,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
237
228
|
},
|
|
238
229
|
},
|
|
239
230
|
});
|
|
240
|
-
_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.
|
|
231
|
+
_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
|
|
241
232
|
exports.default = billPaySetupApproverView.reducer;
|
|
@@ -12,7 +12,7 @@ const classSelector_1 = require("../../../../entity/class/classSelector");
|
|
|
12
12
|
const userSelector_1 = require("../../../../entity/user/userSelector");
|
|
13
13
|
const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
|
|
14
14
|
exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
|
|
15
|
-
const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error
|
|
15
|
+
const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = billPaySetupApproverViewState;
|
|
16
16
|
const deleteStateList = Object.values(approvalRulesDeleteStatusById);
|
|
17
17
|
const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
|
|
18
18
|
const allApprovalRules = approvalRules.map((approvalRule) => {
|
|
@@ -46,11 +46,10 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
|
|
|
46
46
|
approvalRulesStatus,
|
|
47
47
|
fetchState,
|
|
48
48
|
error,
|
|
49
|
-
listeningToPusherEvent,
|
|
50
49
|
};
|
|
51
50
|
});
|
|
52
51
|
exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
|
|
53
|
-
const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error,
|
|
52
|
+
const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, } = billPaySetupApproverViewState;
|
|
54
53
|
const { approverIds, attributes } = approverListState;
|
|
55
54
|
const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
|
|
56
55
|
const allApprovers = approverIds
|
|
@@ -103,6 +102,5 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
|
|
|
103
102
|
fetchState,
|
|
104
103
|
allAccountingClasses,
|
|
105
104
|
error,
|
|
106
|
-
listeningToPusherEvent,
|
|
107
105
|
};
|
|
108
106
|
});
|
|
@@ -17,7 +17,6 @@ export interface BillPaySetupApproverView extends SelectorView {
|
|
|
17
17
|
allApprovalRules: ApprovalRuleWithUser[];
|
|
18
18
|
approvalRulesStatus: AllowedValueWithCode;
|
|
19
19
|
deleteStatus: FetchStateAndError;
|
|
20
|
-
listeningToPusherEvent?: boolean;
|
|
21
20
|
}
|
|
22
21
|
export interface BillPaySetupApproverUpdateDataView extends SelectorView {
|
|
23
22
|
allAccountingClasses: Class[];
|
|
@@ -28,5 +27,4 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
|
|
|
28
27
|
filteredApprovers: UserAndRole[];
|
|
29
28
|
filteredAttributes: AttributeType[];
|
|
30
29
|
billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
|
|
31
|
-
listeningToPusherEvent?: boolean;
|
|
32
30
|
}
|
|
@@ -13,7 +13,6 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
|
|
|
13
13
|
interface ApprovalUpdatableInfoPayload {
|
|
14
14
|
approval_rule_id: ID;
|
|
15
15
|
criteria: CriteriaPayload[];
|
|
16
|
-
is_applicable_on_pending_approval_entity: boolean;
|
|
17
16
|
steps: ApproverViewStepPayload[];
|
|
18
17
|
}
|
|
19
18
|
export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;
|
|
@@ -36,15 +36,12 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
|
|
|
36
36
|
}),
|
|
37
37
|
};
|
|
38
38
|
});
|
|
39
|
-
const isUpdate = approverViewUpdateData.approvalRuleId != null;
|
|
40
39
|
const payload = {
|
|
41
40
|
criteria: criteriaPayload,
|
|
42
41
|
steps,
|
|
43
42
|
};
|
|
44
|
-
if (
|
|
45
|
-
payload
|
|
46
|
-
payload.is_applicable_on_pending_approval_entity =
|
|
47
|
-
approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? false;
|
|
43
|
+
if (approverViewUpdateData.approvalRuleId != null) {
|
|
44
|
+
payload['approval_rule_id'] = approverViewUpdateData.approvalRuleId;
|
|
48
45
|
}
|
|
49
46
|
return payload;
|
|
50
47
|
};
|
|
@@ -10,10 +10,8 @@ export interface ApprovalRuleUpdateData {
|
|
|
10
10
|
approvalRuleId: ID;
|
|
11
11
|
criteria: Criteria;
|
|
12
12
|
steps: Step[];
|
|
13
|
-
isApplicableOnPendingApprovalEntity?: boolean;
|
|
14
13
|
}
|
|
15
14
|
export interface ApprovalRuleCreateData {
|
|
16
15
|
criteria: Criteria;
|
|
17
16
|
steps: Step[];
|
|
18
|
-
isApplicableOnPendingApprovalEntity?: boolean;
|
|
19
17
|
}
|
|
@@ -11,17 +11,11 @@ const getChargeCardRepaymentDetail = (state) => {
|
|
|
11
11
|
const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
|
|
12
12
|
const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
|
|
13
13
|
let transferFromAccounts = [];
|
|
14
|
-
if (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
const depositFundingFromLimit = Object.values(depositAccountState.depositAccountLimitForChargeCardByID ?? {}).map(setupViewSelector_1.mapDepositAccountWithLimitToFundingAccount);
|
|
20
|
-
const paymentFundingAccounts = (0, setupViewSelector_1.getAllFundingAccounts)([], paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
|
|
21
|
-
transferFromAccounts = [...depositFundingFromLimit, ...paymentFundingAccounts];
|
|
22
|
-
}
|
|
14
|
+
if (depositAccountsView.fetchState === 'Completed' &&
|
|
15
|
+
paymentAccountsView.fetchState === 'Completed') {
|
|
16
|
+
transferFromAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
|
|
23
17
|
}
|
|
24
|
-
const reducedFetchState = (0, reduceFetchState_1.
|
|
18
|
+
const reducedFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
|
|
25
19
|
depositAccountsView,
|
|
26
20
|
paymentAccountsView,
|
|
27
21
|
...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),
|
|
@@ -10,8 +10,8 @@ const fetchChargeCardRepaymentDetailEpic = (actions$, state$) => actions$.pipe((
|
|
|
10
10
|
const fetchChargeCardRepaymentDetailActions = [];
|
|
11
11
|
const state = state$.value;
|
|
12
12
|
const depositAccounts = state.depositAccountListState;
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
if (depositAccounts.fetchState !== 'In-Progress' &&
|
|
14
|
+
depositAccounts.fetchState !== 'Completed') {
|
|
15
15
|
fetchChargeCardRepaymentDetailActions.push((0, depositAccountListReducer_1.fetchDepositAccountList)());
|
|
16
16
|
}
|
|
17
17
|
const paymentAccounts = state.paymentAccountListState;
|
|
@@ -4,8 +4,7 @@ import { updateChargeCardRepayment } from '../../../../entity/chargeCardRepaymen
|
|
|
4
4
|
import { updateCompanyPrimaryAccount, updateEnableAutoPayForChargeCard } from '../../../../entity/company/companyReducer';
|
|
5
5
|
import { RootState } from '../../../../reducer';
|
|
6
6
|
import { ZeniAPI } from '../../../../zeniAPI';
|
|
7
|
-
import { addRepaymentToChargeCardPaymentHistory } from '../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer';
|
|
8
7
|
import { updateCreditAccountRepaymentAmountAndDate } from '../chargeCardList/chargeCardListReducer';
|
|
9
8
|
import { initiateChargeCardRepayment, updateChargeCardRepaymentStatus } from './chargeCardRepaymentDetailReducer';
|
|
10
|
-
export type ActionType = ReturnType<typeof
|
|
9
|
+
export type ActionType = ReturnType<typeof initiateChargeCardRepayment> | ReturnType<typeof updateChargeCardRepayment> | ReturnType<typeof updateCreditAccountRepaymentAmountAndDate> | ReturnType<typeof updateChargeCardRepaymentStatus> | ReturnType<typeof updateCompanyPrimaryAccount> | ReturnType<typeof updateEnableAutoPayForChargeCard>;
|
|
11
10
|
export declare const initiateChargeCardRepaymentEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
|
|
@@ -12,7 +12,6 @@ const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
|
|
|
12
12
|
const helpers_1 = require("../../helpers");
|
|
13
13
|
const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
|
|
14
14
|
const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
|
|
15
|
-
const chargeCardPaymentHistoryReducer_1 = require("../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer");
|
|
16
15
|
const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
|
|
17
16
|
const chargeCardRepaymentDetailReducer_1 = require("./chargeCardRepaymentDetailReducer");
|
|
18
17
|
const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardRepaymentDetailReducer_1.initiateChargeCardRepayment.match), (0, operators_1.switchMap)((action) => {
|
|
@@ -40,10 +39,6 @@ const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => actions$.
|
|
|
40
39
|
if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
|
|
41
40
|
const actions = [
|
|
42
41
|
(0, chargeCardRepaymentReducer_1.updateChargeCardRepayment)(response.data.card_repayment),
|
|
43
|
-
(0, chargeCardPaymentHistoryReducer_1.addRepaymentToChargeCardPaymentHistory)({
|
|
44
|
-
cardRepaymentId: response.data.card_repayment.card_repayment_id,
|
|
45
|
-
zeniCreditAccountId: response.data.card_repayment.zeni_credit_account_id,
|
|
46
|
-
}),
|
|
47
42
|
(0, chargeCardListReducer_1.updateCreditAccountRepaymentAmountAndDate)({
|
|
48
43
|
amount: (0, amount_1.toAmount)(response.data.card_repayment.amount, response.data.card_repayment.currency_code, response.data.card_repayment.currency_symbol),
|
|
49
44
|
date: (0, zeniDayJS_1.date)(response.data.card_repayment.repayment_date),
|
package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js
CHANGED
|
@@ -51,7 +51,7 @@ const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pip
|
|
|
51
51
|
(0, depositAccountReducer_1.updateDepositAccounts)(response.data.deposit_accounts ?? []),
|
|
52
52
|
(0, depositAccountListReducer_1.updateDepositAccountList)({
|
|
53
53
|
data: response.data?.deposit_accounts ?? [],
|
|
54
|
-
updateType: '
|
|
54
|
+
updateType: 'replace',
|
|
55
55
|
}),
|
|
56
56
|
(0, setupViewReducer_1.updateSetupViewLocalStoreData)({
|
|
57
57
|
companyId: response.data.companies[0].company_id,
|
|
@@ -5,7 +5,7 @@ import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
|
|
|
5
5
|
import { AccountBase } from '../../../entity/account/accountState';
|
|
6
6
|
import { CompanyBillPayInfo } from '../../../entity/company/companyStateTypes';
|
|
7
7
|
import { Country } from '../../../entity/countryList/countryListState';
|
|
8
|
-
import { DepositAccount
|
|
8
|
+
import { DepositAccount } from '../../../entity/depositAccount/depositAccount';
|
|
9
9
|
import { File } from '../../../entity/file/fileState';
|
|
10
10
|
import { InstitutionDetails, Logo, PaymentAccount } from '../../../entity/paymentAccount/paymentAccountState';
|
|
11
11
|
import { RootState } from '../../../reducer';
|
|
@@ -94,6 +94,5 @@ export declare function getBusinessVerificationDetails(state: RootState, company
|
|
|
94
94
|
export declare const getCompanyAndIdentityDetails: (state: RootState, companyId: ID, companyAndIdentityDetails: CompanyAndIdentityDetails) => CompanyAndOfficerLocalData;
|
|
95
95
|
export declare const getAllFundingAccounts: (depositAccounts: DepositAccount[], paymentAccounts: PaymentAccount[], paymentAccountBalanceFetchStatus: Record<ID, FetchStateAndError>, includeOnlyVerifiedAccounts?: boolean) => FundingAccount[];
|
|
96
96
|
export declare const mapDepositAccToFundingAccount: (depositAcc: DepositAccount) => FundingAccount;
|
|
97
|
-
export declare const mapDepositAccountWithLimitToFundingAccount: (depositAcc: DepositAccountWithLimit) => FundingAccount;
|
|
98
97
|
export declare const mapPaymentAccToFundingAccount: (paymentAcc: PaymentAccount, paymentAccountBalanceFetchStatus: Record<ID, FetchStateAndError>) => FundingAccount;
|
|
99
98
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mapPaymentAccToFundingAccount = exports.
|
|
3
|
+
exports.mapPaymentAccToFundingAccount = exports.mapDepositAccToFundingAccount = exports.getAllFundingAccounts = exports.getCompanyAndIdentityDetails = void 0;
|
|
4
4
|
exports.getCommonSetupViewDetails = getCommonSetupViewDetails;
|
|
5
5
|
exports.getBusinessVerificationDetails = getBusinessVerificationDetails;
|
|
6
6
|
const accountSelector_1 = require("../../../entity/account/accountSelector");
|
|
@@ -227,22 +227,6 @@ const mapDepositAccToFundingAccount = (depositAcc) => ({
|
|
|
227
227
|
accountLast4: depositAcc.accountLast4,
|
|
228
228
|
});
|
|
229
229
|
exports.mapDepositAccToFundingAccount = mapDepositAccToFundingAccount;
|
|
230
|
-
const mapDepositAccountWithLimitToFundingAccount = (depositAcc) => ({
|
|
231
|
-
id: depositAcc.id,
|
|
232
|
-
accType: 'depositAccount',
|
|
233
|
-
label: depositAcc.accountName,
|
|
234
|
-
maskedAccountNumber: depositAcc.maskedAccountNumber,
|
|
235
|
-
accountBalance: depositAcc.accountBalance,
|
|
236
|
-
logo: undefined,
|
|
237
|
-
zeniAccountId: depositAcc.zeniAccountId,
|
|
238
|
-
balanceFetchStatus: {
|
|
239
|
-
fetchState: 'Completed',
|
|
240
|
-
error: undefined,
|
|
241
|
-
},
|
|
242
|
-
createTime: depositAcc.createTime,
|
|
243
|
-
accountLast4: depositAcc.maskedAccountNumber.match(/(\d{4})$/)?.[1] ?? undefined,
|
|
244
|
-
});
|
|
245
|
-
exports.mapDepositAccountWithLimitToFundingAccount = mapDepositAccountWithLimitToFundingAccount;
|
|
246
230
|
const mapPaymentAccToFundingAccount = (paymentAcc, paymentAccountBalanceFetchStatus) => ({
|
|
247
231
|
id: paymentAcc.paymentAccountId,
|
|
248
232
|
accType: 'paymentAccount',
|
|
@@ -40,6 +40,6 @@ export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").Acti
|
|
|
40
40
|
approvalRuleId: string | undefined;
|
|
41
41
|
}, "remiSetupApproverView/initializeRemiSetupApproverViewUpdateData", never, never>, saveRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
|
|
42
42
|
remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
|
|
43
|
-
}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>,
|
|
43
|
+
}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>, clearRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverViewUpdateData">, clearRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverView">;
|
|
44
44
|
declare const _default: import("redux").Reducer<RemiSetupApproverViewState>;
|
|
45
45
|
export default _default;
|
package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.
|
|
4
|
+
exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
|
|
5
5
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
6
6
|
exports.initialState = {
|
|
7
7
|
fetchState: 'Not-Started',
|
|
8
8
|
error: undefined,
|
|
9
|
-
listeningToPusherEvent: false,
|
|
10
9
|
approverListState: {
|
|
11
10
|
approverIds: [],
|
|
12
11
|
attributes: [],
|
|
@@ -181,11 +180,6 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
181
180
|
reducer(draft, action) {
|
|
182
181
|
const { approvalRuleIds } = action.payload;
|
|
183
182
|
if (draft.remiSetupApproverViewUpdateData != null) {
|
|
184
|
-
if (draft.remiSetupApproverViewUpdateData.type === 'approval_update' &&
|
|
185
|
-
draft.remiSetupApproverViewUpdateData.data
|
|
186
|
-
?.isApplicableOnPendingApprovalEntity === true) {
|
|
187
|
-
draft.listeningToPusherEvent = true;
|
|
188
|
-
}
|
|
189
183
|
draft.remiSetupApproverViewUpdateData.updateStatus = {
|
|
190
184
|
fetchState: 'Completed',
|
|
191
185
|
error: undefined,
|
|
@@ -246,9 +240,6 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
246
240
|
return { payload: { remiSetupApproverViewUpdateData } };
|
|
247
241
|
},
|
|
248
242
|
},
|
|
249
|
-
setListeningToPusherEvent(draft, action) {
|
|
250
|
-
draft.listeningToPusherEvent = action.payload;
|
|
251
|
-
},
|
|
252
243
|
clearRemiSetupApproverViewUpdateData(draft) {
|
|
253
244
|
if (draft.remiSetupApproverViewUpdateData != null) {
|
|
254
245
|
draft.remiSetupApproverViewUpdateData.data = undefined;
|
|
@@ -259,5 +250,5 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
259
250
|
},
|
|
260
251
|
},
|
|
261
252
|
});
|
|
262
|
-
_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.
|
|
253
|
+
_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
|
|
263
254
|
exports.default = remiSetupApproverView.reducer;
|
|
@@ -13,7 +13,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
|
|
|
13
13
|
const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
|
|
14
14
|
const getRemiSetupApproverView = (state, filterAdmins = true) => {
|
|
15
15
|
const { remiSetupApproverViewState, approvalRuleState, userState } = state;
|
|
16
|
-
const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error
|
|
16
|
+
const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = remiSetupApproverViewState;
|
|
17
17
|
const deleteStateList = Object.values(approvalRulesDeleteStatusById);
|
|
18
18
|
const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
|
|
19
19
|
const allApprovalRules = approvalRules.map((approvalRule) => {
|
|
@@ -48,12 +48,11 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
|
|
|
48
48
|
approvalRulesStatus,
|
|
49
49
|
fetchState,
|
|
50
50
|
error,
|
|
51
|
-
listeningToPusherEvent,
|
|
52
51
|
};
|
|
53
52
|
};
|
|
54
53
|
exports.getRemiSetupApproverView = getRemiSetupApproverView;
|
|
55
54
|
exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.remiSetupApproverViewState, (state) => state.approvalRuleState, (state) => state.classState, (state) => state.classListState, (state) => state.userState, (state) => state.userRoleState, (remiSetupApproverViewState, approvalRuleState, classState, classListState, userState, userRoleState) => {
|
|
56
|
-
const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error,
|
|
55
|
+
const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error, } = remiSetupApproverViewState;
|
|
57
56
|
const { approverIds, attributes, fetchStatus } = approverListState;
|
|
58
57
|
const { fetchState: classListFetchState, error: classListFetchStateError, classIds, } = classListState;
|
|
59
58
|
const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds).map((approvalRule) => {
|
|
@@ -121,6 +120,5 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
|
|
|
121
120
|
]),
|
|
122
121
|
fetchState,
|
|
123
122
|
error,
|
|
124
|
-
listeningToPusherEvent,
|
|
125
123
|
};
|
|
126
124
|
});
|
|
@@ -17,7 +17,6 @@ export interface RemiSetupApproverView extends SelectorView {
|
|
|
17
17
|
allApprovalRules: ApprovalRuleWithUser[];
|
|
18
18
|
approvalRulesStatus: AllowedValueWithCode;
|
|
19
19
|
deleteStatus: FetchStateAndError;
|
|
20
|
-
listeningToPusherEvent?: boolean;
|
|
21
20
|
}
|
|
22
21
|
export interface RemiSetupApproverUpdateDataView extends SelectorView {
|
|
23
22
|
allAccountingClasses: Class[];
|
|
@@ -27,6 +26,5 @@ export interface RemiSetupApproverUpdateDataView extends SelectorView {
|
|
|
27
26
|
approversDetailsFetchStatus: FetchStateAndError;
|
|
28
27
|
filteredApprovers: UserAndRole[];
|
|
29
28
|
filteredAttributes: AttributeType[];
|
|
30
|
-
listeningToPusherEvent?: boolean;
|
|
31
29
|
remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
|
|
32
30
|
}
|
package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState.d.ts
CHANGED
|
@@ -10,6 +10,5 @@ export interface RemiSetupApproverViewState extends FetchedState {
|
|
|
10
10
|
fetchStatus: FetchStateAndError;
|
|
11
11
|
attributeSubTypeToUserIdMapping?: Record<AttributeType, ID>;
|
|
12
12
|
};
|
|
13
|
-
listeningToPusherEvent?: boolean;
|
|
14
13
|
remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
|
|
15
14
|
}
|
|
@@ -6,12 +6,10 @@ import { TaskListFilterCategoryField, TaskListFilters } from '../taskManager/tas
|
|
|
6
6
|
import { TaskWithUserDetails } from '../taskManager/taskListView/taskListSelector';
|
|
7
7
|
import { BillTransactionView } from './billPay/billList/billListSelector';
|
|
8
8
|
import { BillListViewFilterCategoryField, BillPayFilters } from './billPay/billList/billListState';
|
|
9
|
-
import { PaymentHistoryFilterCategoryDropdownOption, PaymentHistoryFilters } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory';
|
|
10
|
-
import { ChargeCardRepaymentWithUser } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector';
|
|
11
9
|
import { ReimbursementView } from './reimbursement/remiListView/remiListSelector';
|
|
12
10
|
import { ReimbursementFilters, RemiListViewFilterCategoryField } from './reimbursement/remiListView/remiListState';
|
|
13
|
-
export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters
|
|
14
|
-
export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management'
|
|
11
|
+
export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters;
|
|
12
|
+
export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management';
|
|
15
13
|
export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
|
|
16
14
|
export interface MatchingOperatorDropdownOption {
|
|
17
15
|
label: 'is' | 'is not';
|
|
@@ -33,9 +31,9 @@ export interface TaskFilterCategoryDropdownOption {
|
|
|
33
31
|
multiple?: boolean;
|
|
34
32
|
type?: FilterCategoryType;
|
|
35
33
|
}
|
|
36
|
-
export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption
|
|
34
|
+
export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption;
|
|
37
35
|
export type FilterCategoryValueType = string | number | ZeniDate;
|
|
38
|
-
export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[]
|
|
36
|
+
export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails)[];
|
|
39
37
|
export declare const isBillListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
|
|
40
38
|
export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
|
|
41
39
|
export declare const hideCreatedByFilter: (userRole: UserRoleType[]) => boolean;
|
|
@@ -72,17 +72,10 @@ const filterItemOnCategoriesWithMultipleValues = (categoryValue, currentFilter)
|
|
|
72
72
|
return true;
|
|
73
73
|
}
|
|
74
74
|
};
|
|
75
|
-
const getItemId = (item) => {
|
|
76
|
-
if ('cardRepaymentId' in item) {
|
|
77
|
-
return item.cardRepaymentId;
|
|
78
|
-
}
|
|
79
|
-
return item
|
|
80
|
-
.id;
|
|
81
|
-
};
|
|
82
75
|
const removeDuplicatesFromList = (list) => {
|
|
83
76
|
const foundIds = [];
|
|
84
77
|
return list.filter((item) => {
|
|
85
|
-
const itemId =
|
|
78
|
+
const itemId = item.id;
|
|
86
79
|
if (foundIds.indexOf(itemId) === -1) {
|
|
87
80
|
foundIds.push(itemId);
|
|
88
81
|
return true;
|
|
@@ -117,9 +110,7 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
|
|
|
117
110
|
? getCategoryValueForBill(key, item)
|
|
118
111
|
: entity === 'reimbursement'
|
|
119
112
|
? getCategoryValueForReimbursement(key, item)
|
|
120
|
-
:
|
|
121
|
-
? getCategoryValueForTaskList(key, item)
|
|
122
|
-
: getCategoryValueForPaymentHistory(key, item);
|
|
113
|
+
: getCategoryValueForTaskList(key, item);
|
|
123
114
|
if (categoryValue == null) {
|
|
124
115
|
if (currentFilter.matchingOperator === 'not-equal') {
|
|
125
116
|
return true;
|
|
@@ -139,7 +130,6 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
|
|
|
139
130
|
'dueDate',
|
|
140
131
|
'creationDate',
|
|
141
132
|
'receiptDate',
|
|
142
|
-
'repaymentDate',
|
|
143
133
|
]);
|
|
144
134
|
}
|
|
145
135
|
});
|
|
@@ -241,23 +231,6 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
|
|
|
241
231
|
return undefined;
|
|
242
232
|
}
|
|
243
233
|
};
|
|
244
|
-
const getCategoryValueForPaymentHistory = (key, repayment) => {
|
|
245
|
-
switch (key) {
|
|
246
|
-
case 'repaymentDate':
|
|
247
|
-
return repayment.repaymentDate;
|
|
248
|
-
case 'sourceAccount': {
|
|
249
|
-
return repayment.paymentAccountId;
|
|
250
|
-
}
|
|
251
|
-
case 'status':
|
|
252
|
-
return repayment.status;
|
|
253
|
-
case 'initiatedBy':
|
|
254
|
-
return repayment.repaymentType === 'scheduled'
|
|
255
|
-
? 'autopay'
|
|
256
|
-
: repayment.paidById;
|
|
257
|
-
default:
|
|
258
|
-
return undefined;
|
|
259
|
-
}
|
|
260
|
-
};
|
|
261
234
|
const isBillListDownloadable = (state, currentTimePeriod) => {
|
|
262
235
|
const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
|
|
263
236
|
const keys = billListState_1.ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, billListState_1.getBillListKey)(currentTimePeriod, tab));
|
package/lib/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js
CHANGED
|
@@ -11,13 +11,11 @@ const fetchDepositAccountListEpic = (actions$, _state$, zeniAPI) => actions$.pip
|
|
|
11
11
|
return zeniAPI
|
|
12
12
|
.getJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts?query=${encodeURIComponent(`{"is_include_deposit_accounts_summary":true}`)}`)
|
|
13
13
|
.pipe((0, operators_1.mergeMap)((response) => {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const depositAccounts = response.data?.deposit_accounts ?? [];
|
|
17
|
-
return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)(depositAccounts), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
|
|
14
|
+
if ((0, responsePayload_1.isSuccessResponse)(response)) {
|
|
15
|
+
return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)(response.data?.deposit_accounts ?? []), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
|
|
18
16
|
summaryPayload: response.data?.all_deposit_accounts_summary,
|
|
19
17
|
}), (0, depositAccountListReducer_1.updateDepositAccountList)({
|
|
20
|
-
data:
|
|
18
|
+
data: response.data?.deposit_accounts ?? [],
|
|
21
19
|
updateType: 'replace',
|
|
22
20
|
}));
|
|
23
21
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zeniai/client-epic-state",
|
|
3
|
-
"version": "4.19.
|
|
3
|
+
"version": "4.19.54",
|
|
4
4
|
"description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib/esm/index.js",
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
export const PAYMENT_HISTORY_FILTER_CATEGORIES = [
|
|
2
|
-
{ value: 'repaymentDate', type: 'dateRange', multiple: true },
|
|
3
|
-
{ value: 'sourceAccount', multiple: true, type: 'dropdown' },
|
|
4
|
-
{ value: 'status', multiple: true, type: 'dropdown' },
|
|
5
|
-
{ value: 'initiatedBy', multiple: true, type: 'dropdown' },
|
|
6
|
-
];
|
|
7
|
-
export const initialChargeCardPaymentHistoryState = {
|
|
8
|
-
fetchState: 'Not-Started',
|
|
9
|
-
error: undefined,
|
|
10
|
-
creditAccountId: '',
|
|
11
|
-
currencyCode: 'USD',
|
|
12
|
-
currencySymbol: '$',
|
|
13
|
-
downloadUIState: {
|
|
14
|
-
downloadState: 'Not-Started',
|
|
15
|
-
},
|
|
16
|
-
filters: {
|
|
17
|
-
categories: [],
|
|
18
|
-
categoryCombinationOperator: 'AND',
|
|
19
|
-
},
|
|
20
|
-
isAutoPayEnabled: false,
|
|
21
|
-
repaymentHistoryIds: [],
|
|
22
|
-
searchText: '',
|
|
23
|
-
totalRepayments: 0,
|
|
24
|
-
repaymentHistoryXlsDownloadUrl: '',
|
|
25
|
-
uiState: {
|
|
26
|
-
sortKey: 'paymentDate',
|
|
27
|
-
sortOrder: 'ascending',
|
|
28
|
-
},
|
|
29
|
-
hasValidState() {
|
|
30
|
-
return this.fetchState === 'Completed';
|
|
31
|
-
},
|
|
32
|
-
};
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { getChargeCardRepaymentByIds } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector';
|
|
2
|
-
import { getUsersByUserIds } from '../../../../entity/user/userSelector';
|
|
3
|
-
import { applyPaymentHistoryFiltersSearchAndSort } from './chargeCardPaymentHistoryHelpers';
|
|
4
|
-
export const getChargeCardPaymentHistoryDownloadReport = (state) => {
|
|
5
|
-
const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, } = state;
|
|
6
|
-
const { filters, repaymentHistoryIds, searchText, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
|
|
7
|
-
const repaymentHistory = getChargeCardRepaymentByIds(chargeCardRepaymentState, repaymentHistoryIds);
|
|
8
|
-
const repaymentHistoryUserIds = Array.from(new Set(repaymentHistory.map((r) => r.paidById)));
|
|
9
|
-
const repaymentHistoryUsers = getUsersByUserIds(userState, repaymentHistoryUserIds);
|
|
10
|
-
const userMap = new Map(repaymentHistoryUsers.map((user) => [user.userId, user]));
|
|
11
|
-
const repaymentHistoryWithUsers = repaymentHistory.map((repayment) => ({
|
|
12
|
-
...repayment,
|
|
13
|
-
paidByUser: userMap.get(repayment.paidById),
|
|
14
|
-
}));
|
|
15
|
-
const transactions = applyPaymentHistoryFiltersSearchAndSort(repaymentHistoryWithUsers, filters, searchText, uiState);
|
|
16
|
-
return {
|
|
17
|
-
reportTitle: 'Card Payment History',
|
|
18
|
-
fetchState,
|
|
19
|
-
error,
|
|
20
|
-
transactions,
|
|
21
|
-
};
|
|
22
|
-
};
|