@zeniai/client-epic-state 4.19.52 → 4.19.53-betaAR1
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/account/accountSelector.d.ts +18 -0
- package/lib/entity/account/accountSelector.js +31 -1
- package/lib/entity/account/accountState.d.ts +5 -0
- package/lib/entity/account/accountState.js +11 -4
- package/lib/entity/chargeCardRepayment/chargeCardRepayment.d.ts +6 -1
- package/lib/entity/chargeCardRepayment/chargeCardRepayment.js +4 -1
- package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.d.ts +8 -3
- package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.js +5 -2
- package/lib/entity/class/classSelector.d.ts +5 -0
- package/lib/entity/class/classSelector.js +8 -0
- package/lib/epic.d.ts +3 -1
- package/lib/epic.js +3 -1
- package/lib/esm/entity/account/accountSelector.js +29 -1
- package/lib/esm/entity/account/accountState.js +7 -1
- package/lib/esm/entity/chargeCardRepayment/chargeCardRepayment.js +2 -0
- package/lib/esm/entity/chargeCardRepayment/chargeCardRepaymentPayload.js +6 -3
- package/lib/esm/entity/class/classSelector.js +7 -0
- package/lib/esm/epic.js +3 -1
- package/lib/esm/index.js +17 -11
- package/lib/esm/reducer.js +3 -0
- package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +11 -1
- package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +57 -8
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +10 -1
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js +4 -2
- package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +5 -2
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js +32 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js +22 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js +79 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.js +1 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +83 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js +104 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.js +31 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +31 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js +12 -6
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js +2 -2
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js +5 -0
- package/lib/esm/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js +1 -1
- package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js +15 -0
- package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +10 -1
- package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js +4 -2
- package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +226 -16
- package/lib/esm/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js +5 -3
- package/lib/index.d.ts +20 -14
- package/lib/index.js +55 -29
- package/lib/reducer.d.ts +3 -0
- package/lib/reducer.js +3 -0
- package/lib/tsconfig.typecheck.tsbuildinfo +1 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +5 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +12 -2
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +4 -1
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +59 -8
- package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +2 -0
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts +1 -1
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js +11 -2
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js +4 -2
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts +2 -0
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState.d.ts +1 -0
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts +1 -0
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js +5 -2
- package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts +2 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts +50 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js +35 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.d.ts +8 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js +26 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.d.ts +7 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js +87 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.d.ts +13 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.js +2 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.d.ts +19 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +87 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.d.ts +24 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js +108 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.d.ts +9 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.js +35 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.d.ts +7 -0
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +35 -0
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js +10 -4
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js +2 -2
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.d.ts +2 -1
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js +5 -0
- package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js +1 -1
- package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts +2 -1
- package/lib/view/spendManagement/commonSetup/setupViewSelector.js +17 -1
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.d.ts +1 -1
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js +11 -2
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js +4 -2
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts +2 -0
- package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState.d.ts +1 -0
- package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts +47 -4
- package/lib/view/spendManagement/spendManagementFilterHelpers.js +227 -17
- package/lib/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js +5 -3
- package/package.json +1 -1
|
@@ -13,6 +13,7 @@ import { ZeniAPIStatus } from '../../../responsePayload';
|
|
|
13
13
|
import { UncategorizedAccounts } from '../../accountList/accountListSelector';
|
|
14
14
|
import { UpdateTransactionCategorizationResponsePayload } from '../payload/transactionCategorizationPayload';
|
|
15
15
|
import { SupportedTransactionCategorization, TransactionSaveUpdates, TransactionsTab, TransactionsTabViewState, TransactionsViewState, TransactionsViewUIState } from '../types/transactionsViewState';
|
|
16
|
+
import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
|
|
16
17
|
export declare const initialTransactionTabViewState: TransactionsTabViewState;
|
|
17
18
|
export declare const initialState: TransactionsViewState;
|
|
18
19
|
export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: boolean | undefined, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
|
|
@@ -28,7 +29,10 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
|
|
|
28
29
|
}, "expenseAutomationTransactionsView/fetchTransactionCategorization", never, never>, updateTransactionCategorizationUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
29
30
|
selectedTab: TransactionsTab;
|
|
30
31
|
uiState: Partial<TransactionsViewUIState>;
|
|
31
|
-
}, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">,
|
|
32
|
+
}, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">, updateTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
33
|
+
filters: TransactionFilters;
|
|
34
|
+
selectedTab: TransactionsTab;
|
|
35
|
+
}, "expenseAutomationTransactionsView/updateTransactionFilters">, initializeTransactionCategorizationViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionIds: string[], selectedPeriod: MonthYearPeriod, keepExistingListItems: any, pageToken: PageToken, totalCount: number, lineItemsByTransactionIds: Record<string, string[]>, refreshViewInBackground?: any, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
|
|
32
36
|
selectedTab: "review" | "autoCategorized";
|
|
33
37
|
transactionIds: string[];
|
|
34
38
|
selectedPeriod: MonthYearPeriod;
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
var _a;
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
|
|
7
|
+
exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
|
|
8
8
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
9
9
|
const get_1 = __importDefault(require("lodash/get"));
|
|
10
10
|
const uniq_1 = __importDefault(require("lodash/uniq"));
|
|
@@ -34,6 +34,10 @@ exports.initialTransactionTabViewState = {
|
|
|
34
34
|
totalCount: {},
|
|
35
35
|
limit: 10,
|
|
36
36
|
},
|
|
37
|
+
filters: {
|
|
38
|
+
categoryCombinationOperator: 'AND',
|
|
39
|
+
categories: [],
|
|
40
|
+
},
|
|
37
41
|
fetchState: 'Not-Started',
|
|
38
42
|
error: undefined,
|
|
39
43
|
hasValidState() {
|
|
@@ -242,6 +246,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
|
|
|
242
246
|
uiState.totalCount;
|
|
243
247
|
}
|
|
244
248
|
},
|
|
249
|
+
updateTransactionFilters(draft, action) {
|
|
250
|
+
const { selectedTab, filters } = action.payload;
|
|
251
|
+
if (filters != null) {
|
|
252
|
+
draft.transactionCategorizationView[selectedTab].filters = filters;
|
|
253
|
+
}
|
|
254
|
+
},
|
|
245
255
|
saveTransactionCategorization: {
|
|
246
256
|
prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
|
|
247
257
|
return {
|
|
@@ -777,5 +787,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
|
|
|
777
787
|
},
|
|
778
788
|
},
|
|
779
789
|
});
|
|
780
|
-
_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab;
|
|
790
|
+
_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab;
|
|
781
791
|
exports.default = expenseAutomationTransactionsView.reducer;
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { TransactionWithCOT } from '../../../entity/transaction/stateTypes/transaction';
|
|
1
2
|
import { RootState } from '../../../reducer';
|
|
2
|
-
import {
|
|
3
|
+
import { TransactionView } from '../../spendManagement/spendManagementFilterHelpers';
|
|
4
|
+
import { ExpenseAutomationTransactionViewSelector, TransactionReviewLocalDataSelectorView } from '../selectorTypes/transactionsViewSelectorTypes';
|
|
5
|
+
export declare const toTransactionView: (transaction: TransactionWithCOT, transactionLocalData?: TransactionReviewLocalDataSelectorView) => TransactionView;
|
|
3
6
|
export declare function getExpenseAutomationTransactionView(state: RootState): ExpenseAutomationTransactionViewSelector;
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.toTransactionView = void 0;
|
|
6
7
|
exports.getExpenseAutomationTransactionView = getExpenseAutomationTransactionView;
|
|
7
8
|
const omit_1 = __importDefault(require("lodash/omit"));
|
|
8
9
|
const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
|
|
@@ -10,13 +11,33 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
|
|
|
10
11
|
const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
|
|
11
12
|
const transactionHelper_1 = require("../../../entity/transaction/transactionHelper");
|
|
12
13
|
const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
|
|
14
|
+
const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
|
|
13
15
|
const accountListSelector_1 = require("../../accountList/accountListSelector");
|
|
14
16
|
const classListSelector_1 = require("../../classList/classListSelector");
|
|
15
17
|
const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
|
|
18
|
+
const toTransactionView = (transaction, transactionLocalData) => {
|
|
19
|
+
return {
|
|
20
|
+
id: transaction.id,
|
|
21
|
+
date: transaction.date,
|
|
22
|
+
amount: transaction.amount,
|
|
23
|
+
vendorName: transaction.vendorName,
|
|
24
|
+
customerName: transaction.customerName,
|
|
25
|
+
vendorId: transaction.vendorId,
|
|
26
|
+
customerId: transaction.customerId,
|
|
27
|
+
description: transaction.description,
|
|
28
|
+
memo: transaction.memo,
|
|
29
|
+
type: transaction.type,
|
|
30
|
+
typeName: transaction.typeName,
|
|
31
|
+
createTime: transaction.createTime,
|
|
32
|
+
transaction: transaction,
|
|
33
|
+
transactionLocalData,
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
exports.toTransactionView = toTransactionView;
|
|
16
37
|
function getExpenseAutomationTransactionView(state) {
|
|
17
38
|
const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
|
|
18
39
|
const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
|
|
19
|
-
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
|
|
40
|
+
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
|
|
20
41
|
const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
|
|
21
42
|
const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
|
|
22
43
|
const classList = (0, classListSelector_1.getClassList)(classState, classListState);
|
|
@@ -33,10 +54,42 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
33
54
|
? transactionIdsBySelectedPeriod[monthYearPeriodId]
|
|
34
55
|
: null;
|
|
35
56
|
const transactionIds = transactionIdsForSelectedPeriod ?? [];
|
|
36
|
-
const
|
|
37
|
-
|
|
57
|
+
const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
|
|
58
|
+
const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
|
|
59
|
+
const transactionLocalDataMap = new Map();
|
|
60
|
+
transactionIds.forEach((transactionId) => {
|
|
38
61
|
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
39
62
|
if (transactionData != null) {
|
|
63
|
+
transactionLocalDataMap.set(transactionId, {
|
|
64
|
+
transactionId,
|
|
65
|
+
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
// Step 2: Convert to TransactionView and apply advanced filters
|
|
70
|
+
const transactionViews = transactionsWithCOT.map((transaction) => {
|
|
71
|
+
const localData = transactionLocalDataMap.get(transaction.id);
|
|
72
|
+
return (0, exports.toTransactionView)(transaction, localData);
|
|
73
|
+
});
|
|
74
|
+
// Apply advanced filters if they exist
|
|
75
|
+
const filteredTransactionViews = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('transaction_categorization', transactionViews, filters);
|
|
76
|
+
// Convert back to TransactionWithCOT for return
|
|
77
|
+
const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
|
|
78
|
+
// Get transactionLocalData for filtered transactions
|
|
79
|
+
// Also include transactionLocalData for transactions that don't exist in transactionState
|
|
80
|
+
// but have local data (to match original behavior)
|
|
81
|
+
const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
|
|
82
|
+
const filteredTransactionLocalData = transactionIds
|
|
83
|
+
.map((transactionId) => {
|
|
84
|
+
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
85
|
+
if (transactionData == null) {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
// Include if transaction is in filtered results, or if transaction doesn't exist in state
|
|
89
|
+
// (to maintain backward compatibility with tests)
|
|
90
|
+
const transactionExists = transactions.some((t) => t.id === transactionId);
|
|
91
|
+
if (filteredTransactionIds.has(transactionId) ||
|
|
92
|
+
!transactionExists) {
|
|
40
93
|
return {
|
|
41
94
|
transactionId,
|
|
42
95
|
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
@@ -44,9 +97,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
44
97
|
}
|
|
45
98
|
return null;
|
|
46
99
|
})
|
|
47
|
-
.filter((
|
|
48
|
-
const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
|
|
49
|
-
const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
|
|
100
|
+
.filter((data) => data != null);
|
|
50
101
|
const fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
|
|
51
102
|
accountList,
|
|
52
103
|
classList,
|
|
@@ -83,7 +134,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
83
134
|
version: 0,
|
|
84
135
|
fetchState: fetchStatus.fetchState,
|
|
85
136
|
error: fetchStatus.error,
|
|
86
|
-
transactions:
|
|
137
|
+
transactions: filteredTransactionsWithCOT,
|
|
87
138
|
selectedCheckBoxTransactionIds,
|
|
88
139
|
transactionIdsWithUnsavedData,
|
|
89
140
|
uncategorizedAccounts: uncategorizedIncomeExpense,
|
|
@@ -92,7 +143,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
92
143
|
classList: allClasses,
|
|
93
144
|
accountsHierarchyList,
|
|
94
145
|
classHierarchyList,
|
|
95
|
-
transactionLocalData,
|
|
146
|
+
transactionLocalData: filteredTransactionLocalData,
|
|
96
147
|
uiState,
|
|
97
148
|
refreshStatus,
|
|
98
149
|
saveStatus,
|
|
@@ -14,6 +14,7 @@ import { TransactionCategory, TransactionType } from '../../../entity/transactio
|
|
|
14
14
|
import { VendorBase } from '../../../entity/vendor/vendorState';
|
|
15
15
|
import { ZeniDate } from '../../../zeniDayJS';
|
|
16
16
|
import { EntityRecommendationKey } from '../../recommendation/recommendationState';
|
|
17
|
+
import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
|
|
17
18
|
import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
|
|
18
19
|
export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
|
|
19
20
|
export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
|
|
@@ -89,6 +90,7 @@ export interface SupportedTransactionCategorization {
|
|
|
89
90
|
}
|
|
90
91
|
export declare const initialSupportedTransactionCategorization: SupportedTransactionCategorization;
|
|
91
92
|
export interface TransactionsTabViewState extends FetchedState {
|
|
93
|
+
filters: TransactionFilters;
|
|
92
94
|
markAsNotMiscategorizedStatus: FetchStateAndError;
|
|
93
95
|
refreshStatus: FetchStateAndError;
|
|
94
96
|
saveStatus: FetchStateAndError;
|
|
@@ -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">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
|
|
37
|
+
}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, setListeningToPusherEvent: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "billPaySetupApproverView/setListeningToPusherEvent">, 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,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
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;
|
|
4
|
+
exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = 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,
|
|
9
10
|
approverListState: {
|
|
10
11
|
approverIds: [],
|
|
11
12
|
attributes: [],
|
|
@@ -158,6 +159,11 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
158
159
|
reducer(draft, action) {
|
|
159
160
|
const { approvalRuleIds } = action.payload;
|
|
160
161
|
if (draft.billPaySetupApproverViewUpdateData != null) {
|
|
162
|
+
if (draft.billPaySetupApproverViewUpdateData.type === 'approval_update' &&
|
|
163
|
+
draft.billPaySetupApproverViewUpdateData.data
|
|
164
|
+
?.isApplicableOnPendingApprovalEntity === true) {
|
|
165
|
+
draft.listeningToPusherEvent = true;
|
|
166
|
+
}
|
|
161
167
|
draft.billPaySetupApproverViewUpdateData.updateStatus = {
|
|
162
168
|
fetchState: 'Completed',
|
|
163
169
|
error: undefined,
|
|
@@ -218,6 +224,9 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
218
224
|
return { payload: { billPaySetupApproverViewUpdateData } };
|
|
219
225
|
},
|
|
220
226
|
},
|
|
227
|
+
setListeningToPusherEvent(draft, action) {
|
|
228
|
+
draft.listeningToPusherEvent = action.payload;
|
|
229
|
+
},
|
|
221
230
|
clearBillPaySetupApproverViewUpdateData(draft) {
|
|
222
231
|
if (draft.billPaySetupApproverViewUpdateData != null) {
|
|
223
232
|
draft.billPaySetupApproverViewUpdateData.data = undefined;
|
|
@@ -228,5 +237,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
|
|
|
228
237
|
},
|
|
229
238
|
},
|
|
230
239
|
});
|
|
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;
|
|
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.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
|
|
232
241
|
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 } = billPaySetupApproverViewState;
|
|
15
|
+
const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, } = 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,10 +46,11 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
|
|
|
46
46
|
approvalRulesStatus,
|
|
47
47
|
fetchState,
|
|
48
48
|
error,
|
|
49
|
+
listeningToPusherEvent,
|
|
49
50
|
};
|
|
50
51
|
});
|
|
51
52
|
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) => {
|
|
52
|
-
const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, } = billPaySetupApproverViewState;
|
|
53
|
+
const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
|
|
53
54
|
const { approverIds, attributes } = approverListState;
|
|
54
55
|
const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
|
|
55
56
|
const allApprovers = approverIds
|
|
@@ -102,5 +103,6 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
|
|
|
102
103
|
fetchState,
|
|
103
104
|
allAccountingClasses,
|
|
104
105
|
error,
|
|
106
|
+
listeningToPusherEvent,
|
|
105
107
|
};
|
|
106
108
|
});
|
|
@@ -17,6 +17,7 @@ export interface BillPaySetupApproverView extends SelectorView {
|
|
|
17
17
|
allApprovalRules: ApprovalRuleWithUser[];
|
|
18
18
|
approvalRulesStatus: AllowedValueWithCode;
|
|
19
19
|
deleteStatus: FetchStateAndError;
|
|
20
|
+
listeningToPusherEvent?: boolean;
|
|
20
21
|
}
|
|
21
22
|
export interface BillPaySetupApproverUpdateDataView extends SelectorView {
|
|
22
23
|
allAccountingClasses: Class[];
|
|
@@ -27,4 +28,5 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
|
|
|
27
28
|
filteredApprovers: UserAndRole[];
|
|
28
29
|
filteredAttributes: AttributeType[];
|
|
29
30
|
billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
|
|
31
|
+
listeningToPusherEvent?: boolean;
|
|
30
32
|
}
|
|
@@ -13,6 +13,7 @@ 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;
|
|
16
17
|
steps: ApproverViewStepPayload[];
|
|
17
18
|
}
|
|
18
19
|
export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;
|
|
@@ -36,12 +36,15 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
|
|
|
36
36
|
}),
|
|
37
37
|
};
|
|
38
38
|
});
|
|
39
|
+
const isUpdate = approverViewUpdateData.approvalRuleId != null;
|
|
39
40
|
const payload = {
|
|
40
41
|
criteria: criteriaPayload,
|
|
41
42
|
steps,
|
|
42
43
|
};
|
|
43
|
-
if (
|
|
44
|
-
payload
|
|
44
|
+
if (isUpdate) {
|
|
45
|
+
payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
|
|
46
|
+
payload.is_applicable_on_pending_approval_entity =
|
|
47
|
+
approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? false;
|
|
45
48
|
}
|
|
46
49
|
return payload;
|
|
47
50
|
};
|
|
@@ -10,8 +10,10 @@ export interface ApprovalRuleUpdateData {
|
|
|
10
10
|
approvalRuleId: ID;
|
|
11
11
|
criteria: Criteria;
|
|
12
12
|
steps: Step[];
|
|
13
|
+
isApplicableOnPendingApprovalEntity?: boolean;
|
|
13
14
|
}
|
|
14
15
|
export interface ApprovalRuleCreateData {
|
|
15
16
|
criteria: Criteria;
|
|
16
17
|
steps: Step[];
|
|
18
|
+
isApplicableOnPendingApprovalEntity?: boolean;
|
|
17
19
|
}
|
package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { FetchState, FetchedState, ID } from '../../../../commonStateTypes/common';
|
|
2
|
+
import { Logo } from '../../../../entity/paymentAccount/paymentAccountState';
|
|
3
|
+
import { ZeniDate } from '../../../../zeniDayJS';
|
|
4
|
+
import { SpendManagementUIState } from '../../billPay/billList/billListState';
|
|
5
|
+
import { CategoryCombinationOperator, FilterCategoryType } from '../../spendManagementFilterHelpers';
|
|
6
|
+
export interface PaymentHistoryAccountInfo {
|
|
7
|
+
accountId: ID;
|
|
8
|
+
accountType: 'depositAccount' | 'paymentAccount';
|
|
9
|
+
depositAccountName: string;
|
|
10
|
+
accountLogo?: Logo;
|
|
11
|
+
depositAccountLast4?: string;
|
|
12
|
+
}
|
|
13
|
+
export type PaymentHistorySortKey = 'paymentDate' | 'sourceAccount' | 'paymentStatus' | 'initiatedBy' | 'amount';
|
|
14
|
+
export interface PaymentHistoryUIState extends SpendManagementUIState {
|
|
15
|
+
sortKey: PaymentHistorySortKey;
|
|
16
|
+
}
|
|
17
|
+
export interface ChargeCardPaymentHistoryDownloadUIState {
|
|
18
|
+
downloadState: FetchState;
|
|
19
|
+
}
|
|
20
|
+
export interface ChargeCardPaymentHistoryState extends FetchedState {
|
|
21
|
+
creditAccountId: ID;
|
|
22
|
+
currencyCode: string;
|
|
23
|
+
currencySymbol: string;
|
|
24
|
+
downloadUIState: ChargeCardPaymentHistoryDownloadUIState;
|
|
25
|
+
filters: PaymentHistoryFilters;
|
|
26
|
+
isAutoPayEnabled: boolean;
|
|
27
|
+
repaymentHistoryIds: ID[];
|
|
28
|
+
repaymentHistoryXlsDownloadUrl: string;
|
|
29
|
+
searchText: string;
|
|
30
|
+
totalRepayments: number;
|
|
31
|
+
uiState: PaymentHistoryUIState;
|
|
32
|
+
}
|
|
33
|
+
export interface PaymentHistoryFilters {
|
|
34
|
+
categories: PaymentHistoryFilterCategory[];
|
|
35
|
+
categoryCombinationOperator: CategoryCombinationOperator;
|
|
36
|
+
}
|
|
37
|
+
export interface PaymentHistoryFilterCategory {
|
|
38
|
+
field: PaymentHistoryFilterCategoryField;
|
|
39
|
+
matchingOperator: 'equal' | 'not-equal';
|
|
40
|
+
values: (string | ZeniDate)[];
|
|
41
|
+
valuesCombinationOperator: 'ANY';
|
|
42
|
+
}
|
|
43
|
+
export type PaymentHistoryFilterCategoryField = 'repaymentDate' | 'sourceAccount' | 'status' | 'initiatedBy';
|
|
44
|
+
export interface PaymentHistoryFilterCategoryDropdownOption {
|
|
45
|
+
value: PaymentHistoryFilterCategoryField;
|
|
46
|
+
multiple?: boolean;
|
|
47
|
+
type?: FilterCategoryType;
|
|
48
|
+
}
|
|
49
|
+
export declare const PAYMENT_HISTORY_FILTER_CATEGORIES: PaymentHistoryFilterCategoryDropdownOption[];
|
|
50
|
+
export declare const initialChargeCardPaymentHistoryState: ChargeCardPaymentHistoryState;
|
package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js
ADDED
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.initialChargeCardPaymentHistoryState = exports.PAYMENT_HISTORY_FILTER_CATEGORIES = void 0;
|
|
4
|
+
exports.PAYMENT_HISTORY_FILTER_CATEGORIES = [
|
|
5
|
+
{ value: 'repaymentDate', type: 'dateRange', multiple: true },
|
|
6
|
+
{ value: 'sourceAccount', multiple: true, type: 'dropdown' },
|
|
7
|
+
{ value: 'status', multiple: true, type: 'dropdown' },
|
|
8
|
+
{ value: 'initiatedBy', multiple: true, type: 'dropdown' },
|
|
9
|
+
];
|
|
10
|
+
exports.initialChargeCardPaymentHistoryState = {
|
|
11
|
+
fetchState: 'Not-Started',
|
|
12
|
+
error: undefined,
|
|
13
|
+
creditAccountId: '',
|
|
14
|
+
currencyCode: 'USD',
|
|
15
|
+
currencySymbol: '$',
|
|
16
|
+
downloadUIState: {
|
|
17
|
+
downloadState: 'Not-Started',
|
|
18
|
+
},
|
|
19
|
+
filters: {
|
|
20
|
+
categories: [],
|
|
21
|
+
categoryCombinationOperator: 'AND',
|
|
22
|
+
},
|
|
23
|
+
isAutoPayEnabled: false,
|
|
24
|
+
repaymentHistoryIds: [],
|
|
25
|
+
searchText: '',
|
|
26
|
+
totalRepayments: 0,
|
|
27
|
+
repaymentHistoryXlsDownloadUrl: '',
|
|
28
|
+
uiState: {
|
|
29
|
+
sortKey: 'paymentDate',
|
|
30
|
+
sortOrder: 'ascending',
|
|
31
|
+
},
|
|
32
|
+
hasValidState() {
|
|
33
|
+
return this.fetchState === 'Completed';
|
|
34
|
+
},
|
|
35
|
+
};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
|
|
2
|
+
import { RootState } from '../../../../reducer';
|
|
3
|
+
import { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
|
|
4
|
+
export interface ChargeCardPaymentHistoryDownloadReport extends SelectorView {
|
|
5
|
+
reportTitle: string;
|
|
6
|
+
transactions: ChargeCardRepaymentWithUser[];
|
|
7
|
+
}
|
|
8
|
+
export declare const getChargeCardPaymentHistoryDownloadReport: (state: RootState) => ChargeCardPaymentHistoryDownloadReport;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getChargeCardPaymentHistoryDownloadReport = void 0;
|
|
4
|
+
const chargeCardRepaymentSelector_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector");
|
|
5
|
+
const userSelector_1 = require("../../../../entity/user/userSelector");
|
|
6
|
+
const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
|
|
7
|
+
const getChargeCardPaymentHistoryDownloadReport = (state) => {
|
|
8
|
+
const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, } = state;
|
|
9
|
+
const { filters, repaymentHistoryIds, searchText, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
|
|
10
|
+
const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
|
|
11
|
+
const repaymentHistoryUserIds = Array.from(new Set(repaymentHistory.map((r) => r.paidById)));
|
|
12
|
+
const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
|
|
13
|
+
const userMap = new Map(repaymentHistoryUsers.map((user) => [user.userId, user]));
|
|
14
|
+
const repaymentHistoryWithUsers = repaymentHistory.map((repayment) => ({
|
|
15
|
+
...repayment,
|
|
16
|
+
paidByUser: userMap.get(repayment.paidById),
|
|
17
|
+
}));
|
|
18
|
+
const transactions = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState);
|
|
19
|
+
return {
|
|
20
|
+
reportTitle: 'Card Payment History',
|
|
21
|
+
fetchState,
|
|
22
|
+
error,
|
|
23
|
+
transactions,
|
|
24
|
+
};
|
|
25
|
+
};
|
|
26
|
+
exports.getChargeCardPaymentHistoryDownloadReport = getChargeCardPaymentHistoryDownloadReport;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ID } from '../../../../commonStateTypes/common';
|
|
2
|
+
import { ChargeCardRepaymentStatusCodeType } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
|
|
3
|
+
import { PaymentHistoryAccountInfo, PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
|
|
4
|
+
import type { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
|
|
5
|
+
export declare function getPaymentHistorySourceAccountName(repayment: ChargeCardRepaymentWithUser, accountInfoByAccountId?: Record<ID, PaymentHistoryAccountInfo>): string;
|
|
6
|
+
export declare function getPaymentStatusDisplayText(status: ChargeCardRepaymentStatusCodeType): string;
|
|
7
|
+
export declare function applyPaymentHistoryFiltersSearchAndSort(repayments: ChargeCardRepaymentWithUser[], filters: PaymentHistoryFilters, searchText: string, uiState: PaymentHistoryUIState, accountInfoByAccountId?: Record<ID, PaymentHistoryAccountInfo>): ChargeCardRepaymentWithUser[];
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getPaymentHistorySourceAccountName = getPaymentHistorySourceAccountName;
|
|
7
|
+
exports.getPaymentStatusDisplayText = getPaymentStatusDisplayText;
|
|
8
|
+
exports.applyPaymentHistoryFiltersSearchAndSort = applyPaymentHistoryFiltersSearchAndSort;
|
|
9
|
+
const orderBy_1 = __importDefault(require("lodash/orderBy"));
|
|
10
|
+
const userSelector_1 = require("../../../../entity/user/userSelector");
|
|
11
|
+
const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
|
|
12
|
+
function getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId) {
|
|
13
|
+
const fromMap = repayment.paymentAccountId != null
|
|
14
|
+
? accountInfoByAccountId?.[repayment.paymentAccountId]?.depositAccountName
|
|
15
|
+
: undefined;
|
|
16
|
+
return fromMap ?? repayment.paymentAccountName ?? '';
|
|
17
|
+
}
|
|
18
|
+
function getPaymentStatusDisplayText(status) {
|
|
19
|
+
const statusMap = {
|
|
20
|
+
PendingReview: 'In Progress',
|
|
21
|
+
Pending: 'In Progress',
|
|
22
|
+
Sent: 'Complete',
|
|
23
|
+
Clear: 'Complete',
|
|
24
|
+
Rejected: 'Failed',
|
|
25
|
+
Returned: 'Failed',
|
|
26
|
+
};
|
|
27
|
+
return statusMap[status] ?? status;
|
|
28
|
+
}
|
|
29
|
+
function getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId) {
|
|
30
|
+
switch (sortKey) {
|
|
31
|
+
case 'paymentDate':
|
|
32
|
+
return repayment.repaymentDate.valueOf();
|
|
33
|
+
case 'amount':
|
|
34
|
+
return repayment.amount.amount;
|
|
35
|
+
case 'paymentStatus':
|
|
36
|
+
return getPaymentStatusDisplayText(repayment.status);
|
|
37
|
+
case 'initiatedBy':
|
|
38
|
+
return repayment.repaymentType === 'scheduled'
|
|
39
|
+
? 'autopay'
|
|
40
|
+
: (0, userSelector_1.getUserName)(repayment.paidByUser);
|
|
41
|
+
case 'sourceAccount':
|
|
42
|
+
return getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId);
|
|
43
|
+
default:
|
|
44
|
+
return '';
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoByAccountId) {
|
|
48
|
+
const getColumnWiseSortOrder = (sortOrder) => {
|
|
49
|
+
// Note: For date and amount fields, the sort order is intentionally inverted.
|
|
50
|
+
// This allows the UI to request 'ascending' sort to get the most recent dates
|
|
51
|
+
// or largest amounts first, which is a more intuitive default for users.
|
|
52
|
+
switch (sortKey) {
|
|
53
|
+
case 'sourceAccount':
|
|
54
|
+
case 'paymentStatus':
|
|
55
|
+
case 'initiatedBy':
|
|
56
|
+
return sortOrder === 'ascending' ? 'asc' : 'desc';
|
|
57
|
+
default:
|
|
58
|
+
return sortOrder === 'ascending' ? 'desc' : 'asc';
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
const order = getColumnWiseSortOrder(sortOrder);
|
|
62
|
+
return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId), [order]);
|
|
63
|
+
}
|
|
64
|
+
function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoByAccountId) {
|
|
65
|
+
const loweredSearchText = searchText.trim().toLowerCase();
|
|
66
|
+
if (loweredSearchText.length === 0) {
|
|
67
|
+
return repayments;
|
|
68
|
+
}
|
|
69
|
+
return repayments.filter((repayment) => {
|
|
70
|
+
const amountString = repayment.amount.amount.toString();
|
|
71
|
+
const statusString = getPaymentStatusDisplayText(repayment.status).toLowerCase();
|
|
72
|
+
const initiatedByString = repayment.repaymentType === 'scheduled'
|
|
73
|
+
? 'autopay'
|
|
74
|
+
: (0, userSelector_1.getUserName)(repayment.paidByUser);
|
|
75
|
+
const accountNameString = getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId).toLowerCase();
|
|
76
|
+
return (amountString.includes(loweredSearchText) ||
|
|
77
|
+
statusString.includes(loweredSearchText) ||
|
|
78
|
+
initiatedByString.toLowerCase().includes(loweredSearchText) ||
|
|
79
|
+
accountNameString.includes(loweredSearchText));
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
function applyPaymentHistoryFiltersSearchAndSort(repayments, filters, searchText, uiState, accountInfoByAccountId) {
|
|
83
|
+
let result = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repayments, filters);
|
|
84
|
+
result = filterPaymentHistoryBySearchText(result, searchText, accountInfoByAccountId);
|
|
85
|
+
result = sortPaymentHistory(result, uiState.sortKey, uiState.sortOrder, accountInfoByAccountId);
|
|
86
|
+
return result;
|
|
87
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ChargeCardRepaymentPayload } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentPayload';
|
|
2
|
+
import { ZeniAPIResponse } from '../../../../responsePayload';
|
|
3
|
+
export interface ChargeCardPaymentHistoryPayload {
|
|
4
|
+
credit_account_id: string;
|
|
5
|
+
currency_code: string;
|
|
6
|
+
currency_symbol: string;
|
|
7
|
+
is_auto_pay_enabled: boolean;
|
|
8
|
+
repayment_history: RepaymentHistoryPayload[];
|
|
9
|
+
total_repayments: number;
|
|
10
|
+
}
|
|
11
|
+
type RepaymentHistoryPayload = Omit<ChargeCardRepaymentPayload, 'is_deleted' | 'provider_counterparty_account_id'>;
|
|
12
|
+
export type FetchChargeCardPaymentHistoryResponse = ZeniAPIResponse<ChargeCardPaymentHistoryPayload>;
|
|
13
|
+
export {};
|