@zeniai/client-epic-state 5.0.79 → 5.0.80
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/coreEpics.js +1 -1
- package/lib/entity/account/accountSelector.d.ts +1 -27
- package/lib/entity/account/accountSelector.js +1 -47
- package/lib/entity/account/accountState.d.ts +1 -6
- package/lib/entity/account/accountState.js +4 -11
- package/lib/entity/account/subAccountSelector.d.ts +1 -1
- package/lib/entity/aiAccountantCustomer/aiAccountantCustomerPayload.js +3 -1
- package/lib/entity/aiAccountantCustomer/aiAccountantCustomerReducer.js +2 -1
- package/lib/entity/aiAccountantCustomer/aiAccountantCustomerSelector.d.ts +1 -1
- package/lib/entity/chargeCard/chargeCardReducer.d.ts +2 -19
- package/lib/entity/chargeCard/chargeCardReducer.js +2 -35
- package/lib/entity/chargeCardTransaction/chargeCardTransactionReducer.d.ts +1 -14
- package/lib/entity/chargeCardTransaction/chargeCardTransactionReducer.js +2 -36
- package/lib/entity/class/classSelector.d.ts +0 -35
- package/lib/entity/class/classSelector.js +0 -50
- package/lib/entity/sectionProjectView/sectionProjectViewReducer.d.ts +1 -1
- package/lib/entity/sectionProjectView/sectionProjectViewSelector.js +1 -1
- package/lib/entity/tenant/SessionManager.js +3 -6
- package/lib/entity/tenant/clearAllEpic.d.ts +2 -2
- package/lib/entity/tenant/clearAllEpic.js +2 -2
- package/lib/entity/tenant/epic/saveAPIKeyConnectionEpic.js +2 -6
- package/lib/entity/tenant/epic/saveOAuthConnectionEpic.js +2 -6
- package/lib/entity/tenant/tenantReducer.js +1 -6
- package/lib/entity/transaction/payloadTypes/transactionLinePayload.js +1 -3
- package/lib/epic.d.ts +11 -11
- package/lib/epic.js +12 -12
- package/lib/esm/coreEpics.js +1 -1
- package/lib/esm/entity/account/accountSelector.js +1 -46
- package/lib/esm/entity/account/accountState.js +1 -7
- package/lib/esm/entity/aiAccountantCustomer/aiAccountantCustomerPayload.js +3 -1
- package/lib/esm/entity/aiAccountantCustomer/aiAccountantCustomerReducer.js +2 -1
- package/lib/esm/entity/chargeCard/chargeCardReducer.js +1 -34
- package/lib/esm/entity/chargeCardTransaction/chargeCardTransactionReducer.js +1 -35
- package/lib/esm/entity/class/classSelector.js +0 -48
- package/lib/esm/entity/sectionProjectView/sectionProjectViewSelector.js +1 -1
- package/lib/esm/entity/tenant/SessionManager.js +1 -4
- package/lib/esm/entity/tenant/clearAllEpic.js +2 -2
- package/lib/esm/entity/tenant/epic/saveAPIKeyConnectionEpic.js +2 -6
- package/lib/esm/entity/tenant/epic/saveOAuthConnectionEpic.js +2 -6
- package/lib/esm/entity/tenant/tenantReducer.js +1 -6
- package/lib/esm/entity/transaction/payloadTypes/transactionLinePayload.js +1 -3
- package/lib/esm/epic.js +12 -12
- package/lib/esm/index.js +21 -31
- package/lib/esm/reducer.js +2 -2
- package/lib/esm/view/aiAccountantView/epics/fetchAiAccountantCustomersEpic.js +5 -2
- package/lib/esm/view/aiAccountantView/epics/fetchAiAccountantJobsEpic.js +5 -2
- package/lib/esm/view/aiAccountantView/epics/triggerAiAccountantJobEpic.js +1 -4
- package/lib/esm/view/companyHealthMetricView/companyHealthMetricViewSelector.js +1 -1
- package/lib/esm/view/companyTaskManagerView/companyTaskManagerViewSelector.js +1 -1
- package/lib/esm/view/companyTaskManagerView/epics/fetchTaskManagerMetricsEpic.js +1 -1
- package/lib/esm/view/companyView/helpers/cockpitHelpers.js +1 -1
- package/lib/esm/view/companyView/selector/companyManagementViewSelector.js +1 -1
- package/lib/esm/view/companyView/selector/companyPortfolioViewSelector.js +1 -1
- package/lib/esm/view/creditAgentView/creditAgentViewReducer.js +16 -1
- package/lib/esm/view/creditAgentView/epics/fetchCreditAgentAccessEpic.js +13 -0
- package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchBulkUploadBatchesEpic.js +2 -2
- package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js +1 -2
- package/lib/esm/view/expenseAutomationView/epics/missingReceipts/restoreBulkUploadAutomatchingOnMountEpic.js +6 -8
- package/lib/esm/view/expenseAutomationView/epics/missingReceipts/searchTransactionsForManualMatchEpic.js +1 -7
- package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js +1 -11
- package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js +1 -21
- package/lib/esm/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js +1 -2
- package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +14 -253
- package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +13 -147
- package/lib/esm/view/expenseAutomationView/types/missingReceiptsViewState.js +2 -0
- package/lib/esm/view/financeStatement/financeStatementSelector.js +1 -1
- package/lib/esm/view/recommendation/recommendationHelper.js +0 -29
- package/lib/esm/view/recommendation/recommendationReducer.js +1 -26
- package/lib/esm/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailReducer.js +2 -3
- package/lib/esm/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.js +2 -3
- package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.js +18 -55
- package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailEpic.js +2 -16
- package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailPageEpic.js +4 -5
- package/lib/esm/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.js +9 -26
- package/lib/esm/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.js +6 -9
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +2 -3
- package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +1 -1
- package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer.js +3 -7
- package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +2 -4
- package/lib/esm/view/subscriptionView/subscriptionViewSelector.js +1 -1
- package/lib/esm/view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic.js +1 -1
- package/lib/esm/view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic.js +1 -1
- package/lib/esm/view/taskManager/taskDetailView/epics/unsnoozeTaskEpic.js +1 -1
- package/lib/esm/view/taskManager/taskListView/taskListReducer.js +1 -1
- package/lib/esm/view/transactionDetail/transactionDetailReducer.js +6 -121
- package/lib/esm/view/transactionDetail/transactionDetailSelector.js +1 -29
- package/lib/index.d.ts +24 -31
- package/lib/index.js +60 -84
- package/lib/reducer.d.ts +2 -2
- package/lib/reducer.js +2 -2
- package/lib/tsconfig.typecheck.tsbuildinfo +1 -0
- package/lib/view/aiAccountantView/aiAccountantViewPayload.d.ts +2 -2
- package/lib/view/aiAccountantView/aiAccountantViewReducer.d.ts +1 -1
- package/lib/view/aiAccountantView/epics/fetchAiAccountantCustomersEpic.js +5 -2
- package/lib/view/aiAccountantView/epics/fetchAiAccountantJobsEpic.js +5 -2
- package/lib/view/aiAccountantView/epics/triggerAiAccountantJobEpic.js +1 -4
- package/lib/view/companyHealthMetricView/companyHealthMetricViewSelector.js +1 -1
- package/lib/view/companyTaskManagerView/companyTaskManagerViewSelector.d.ts +1 -1
- package/lib/view/companyTaskManagerView/companyTaskManagerViewSelector.js +1 -1
- package/lib/view/companyView/helpers/cockpitHelpers.js +1 -1
- package/lib/view/companyView/selector/companyManagementViewSelector.js +1 -1
- package/lib/view/companyView/selector/companyPortfolioViewSelector.js +1 -1
- package/lib/view/companyView/types/cockpitTypes.d.ts +1 -1
- package/lib/view/creditAgentView/creditAgentViewPayload.d.ts +3 -0
- package/lib/view/creditAgentView/creditAgentViewReducer.d.ts +1 -1
- package/lib/view/creditAgentView/creditAgentViewReducer.js +17 -2
- package/lib/view/creditAgentView/creditAgentViewState.d.ts +5 -0
- package/lib/view/creditAgentView/epics/fetchCreditAgentAccessEpic.d.ts +11 -0
- package/lib/view/creditAgentView/epics/fetchCreditAgentAccessEpic.js +17 -0
- package/lib/view/expenseAutomationView/epics/missingReceipts/fetchBulkUploadBatchesEpic.js +2 -2
- package/lib/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js +1 -2
- package/lib/view/expenseAutomationView/epics/missingReceipts/restoreBulkUploadAutomatchingOnMountEpic.js +6 -8
- package/lib/view/expenseAutomationView/epics/missingReceipts/searchTransactionsForManualMatchEpic.js +1 -7
- package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.d.ts +2 -2
- package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js +0 -10
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts +1 -2
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js +2 -23
- package/lib/view/expenseAutomationView/payload/transactionCategorizationPayload.d.ts +0 -21
- package/lib/view/expenseAutomationView/reducers/missingReceiptsViewReducer.d.ts +1 -2
- package/lib/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js +1 -2
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +5 -28
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +14 -253
- package/lib/view/expenseAutomationView/selectorTypes/missingReceiptsSelectorTypes.d.ts +1 -2
- package/lib/view/expenseAutomationView/selectorTypes/transactionsViewSelectorTypes.d.ts +0 -16
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +1 -7
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +13 -150
- package/lib/view/expenseAutomationView/types/missingReceiptsViewState.d.ts +2 -1
- package/lib/view/expenseAutomationView/types/missingReceiptsViewState.js +4 -1
- package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +2 -44
- package/lib/view/financeStatement/financeStatementSelector.js +1 -1
- package/lib/view/profitAndLossProjectView/profitAndLossProjectViewSelectorTypes.d.ts +1 -1
- package/lib/view/recommendation/recommendationHelper.d.ts +0 -9
- package/lib/view/recommendation/recommendationHelper.js +1 -31
- package/lib/view/recommendation/recommendationReducer.d.ts +1 -20
- package/lib/view/recommendation/recommendationReducer.js +2 -27
- package/lib/view/spendManagement/billPay/billList/billListState.d.ts +1 -1
- package/lib/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailReducer.d.ts +1 -3
- package/lib/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailReducer.js +2 -3
- package/lib/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.d.ts +1 -3
- package/lib/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.js +2 -3
- package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.js +18 -55
- package/lib/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailEpic.js +2 -16
- package/lib/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailPageEpic.js +4 -5
- package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.d.ts +3 -18
- package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.js +10 -27
- package/lib/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.js +6 -9
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts +1 -1
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.d.ts +1 -3
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js +2 -3
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js +1 -1
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer.d.ts +1 -3
- package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer.js +3 -7
- package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts +1 -1
- package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts +3 -12
- package/lib/view/spendManagement/spendManagementFilterHelpers.js +2 -4
- package/lib/view/subscriptionView/subscriptionViewSelector.js +1 -1
- package/lib/view/taskManager/taskListView/taskList.d.ts +1 -1
- package/lib/view/taskManager/taskListView/taskListReducer.js +1 -1
- package/lib/view/transactionDetail/transactionDetailReducer.d.ts +1 -11
- package/lib/view/transactionDetail/transactionDetailReducer.js +7 -122
- package/lib/view/transactionDetail/transactionDetailSelector.d.ts +0 -2
- package/lib/view/transactionDetail/transactionDetailSelector.js +2 -31
- package/lib/view/transactionDetail/transactionDetailTypes.d.ts +0 -1
- package/lib/view/zeniOAuthView/zeniOAuthSelector.d.ts +1 -1
- package/package.json +4 -9
- package/lib/commonStateTypes/cacheOverrideFetchReducer.d.ts +0 -17
- package/lib/commonStateTypes/cacheOverrideFetchReducer.js +0 -20
- package/lib/commonStateTypes/filterPrimitives.d.ts +0 -23
- package/lib/commonStateTypes/filterPrimitives.js +0 -21
- package/lib/commonStateTypes/pusherActions.d.ts +0 -11
- package/lib/commonStateTypes/pusherActions.js +0 -6
- package/lib/esm/commonStateTypes/cacheOverrideFetchReducer.js +0 -16
- package/lib/esm/commonStateTypes/filterPrimitives.js +0 -20
- package/lib/esm/commonStateTypes/pusherActions.js +0 -3
- package/lib/esm/view/expenseAutomationView/transactionFilterHelpers.js +0 -258
- package/lib/esm/view/expenseAutomationView/types/completedSubTab.js +0 -17
- package/lib/esm/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js +0 -87
- package/lib/view/expenseAutomationView/transactionFilterHelpers.d.ts +0 -66
- package/lib/view/expenseAutomationView/transactionFilterHelpers.js +0 -262
- package/lib/view/expenseAutomationView/types/completedSubTab.d.ts +0 -10
- package/lib/view/expenseAutomationView/types/completedSubTab.js +0 -21
- package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.d.ts +0 -9
- package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js +0 -91
|
@@ -1,90 +1,17 @@
|
|
|
1
|
-
import { createSelector } from '@reduxjs/toolkit';
|
|
2
1
|
import omit from 'lodash/omit';
|
|
3
2
|
import { reduceAllFetchState, reduceAnyFetchState, } from '../../../commonStateTypes/reduceFetchState';
|
|
4
3
|
import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
|
|
5
4
|
import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
|
|
6
5
|
import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
|
|
7
6
|
import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
|
|
8
|
-
import { applyTransactionFilters, } from '../transactionFilterHelpers';
|
|
9
7
|
import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
|
|
10
8
|
import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
|
|
11
9
|
import { getProjectList } from '../../projectList/projectListSelector';
|
|
12
10
|
import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
|
|
13
|
-
// Walks the tab's transactionReviewLocalDataById map and returns
|
|
14
|
-
// `{ [transactionId]: true }` for every transaction that has at least
|
|
15
|
-
// one line whose targeted-fetch is In-Progress. Pulled out as a plain
|
|
16
|
-
// function so each tab's createSelector can share it.
|
|
17
|
-
const computeCategorizationInFlightRecommendations = (transactionReviewLocalDataById) => {
|
|
18
|
-
const result = {};
|
|
19
|
-
if (transactionReviewLocalDataById == null) {
|
|
20
|
-
return result;
|
|
21
|
-
}
|
|
22
|
-
for (const [transactionId, data] of Object.entries(transactionReviewLocalDataById)) {
|
|
23
|
-
const lineItems = Object.values(data.transactionReviewLocalData.lineItemById);
|
|
24
|
-
if (lineItems.some((lineItem) => lineItem.categoryClassRecommendationsFetchState?.fetchState ===
|
|
25
|
-
'In-Progress')) {
|
|
26
|
-
result[transactionId] = true;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
|
-
// Per-tab createSelector instances. Each one is memoized on its OWN tab's
|
|
32
|
-
// transactionReviewLocalDataById reference. Switching tabs A->B->A no
|
|
33
|
-
// longer busts the memo for tab A — the dispatcher below just returns
|
|
34
|
-
// whichever per-tab selector matches the active tab, and reselect keeps
|
|
35
|
-
// the prior result alive as long as the underlying slice ref is stable.
|
|
36
|
-
const getReviewInFlightRecommendationsByTransactionId = createSelector((state) => state.expenseAutomationTransactionsViewState.transactionCategorizationView
|
|
37
|
-
.review.transactionReviewLocalDataById, computeCategorizationInFlightRecommendations);
|
|
38
|
-
const getAutoCategorizedInFlightRecommendationsByTransactionId = createSelector((state) => state.expenseAutomationTransactionsViewState.transactionCategorizationView
|
|
39
|
-
.autoCategorized.transactionReviewLocalDataById, computeCategorizationInFlightRecommendations);
|
|
40
|
-
// Per-transaction "any line is fetching category/class recommendations?"
|
|
41
|
-
// map for the active categorization tab. Dispatches to the per-tab
|
|
42
|
-
// memoized selector above so steady state (no fetches in flight)
|
|
43
|
-
// recomputes only when the active tab's local data changes; tab switches
|
|
44
|
-
// are O(1) cache lookups.
|
|
45
|
-
//
|
|
46
|
-
// `default` guards against the union "lying" at runtime: `TransactionsTab`
|
|
47
|
-
// is produced via `stringToUnion`, which falls back to `s as StringUnion`
|
|
48
|
-
// for unrecognized strings, so an unexpected value can land in state. The
|
|
49
|
-
// downstream `getCategorizationHasInFlightRecommendations` calls
|
|
50
|
-
// `Object.keys` on this result, so we must always return an object.
|
|
51
|
-
export const getCategorizationInFlightRecommendationsByTransactionId = (state) => {
|
|
52
|
-
const tab = state.expenseAutomationTransactionsViewState
|
|
53
|
-
.selectedTransactionCategorizationTab;
|
|
54
|
-
switch (tab) {
|
|
55
|
-
case 'review':
|
|
56
|
-
return getReviewInFlightRecommendationsByTransactionId(state);
|
|
57
|
-
case 'autoCategorized':
|
|
58
|
-
return getAutoCategorizedInFlightRecommendationsByTransactionId(state);
|
|
59
|
-
default:
|
|
60
|
-
return {};
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
// Page-level "any line on the active tab is in flight?" flag. Drives the
|
|
64
|
-
// list-page Save disable.
|
|
65
|
-
export const getCategorizationHasInFlightRecommendations = createSelector(getCategorizationInFlightRecommendationsByTransactionId, (inFlightByTransactionId) => Object.keys(inFlightByTransactionId).length > 0);
|
|
66
|
-
export const toTransactionView = (transaction, transactionLocalData) => {
|
|
67
|
-
return {
|
|
68
|
-
id: transaction.id,
|
|
69
|
-
date: transaction.date,
|
|
70
|
-
amount: transaction.amount,
|
|
71
|
-
vendorName: transaction.vendorName,
|
|
72
|
-
customerName: transaction.customerName,
|
|
73
|
-
vendorId: transaction.vendorId,
|
|
74
|
-
customerId: transaction.customerId,
|
|
75
|
-
description: transaction.description,
|
|
76
|
-
memo: transaction.memo,
|
|
77
|
-
type: transaction.type,
|
|
78
|
-
typeName: transaction.typeName,
|
|
79
|
-
createTime: transaction.createTime,
|
|
80
|
-
transaction: transaction,
|
|
81
|
-
transactionLocalData,
|
|
82
|
-
};
|
|
83
|
-
};
|
|
84
11
|
export function getExpenseAutomationTransactionView(state) {
|
|
85
12
|
const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
|
|
86
|
-
const {
|
|
87
|
-
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId,
|
|
13
|
+
const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
|
|
14
|
+
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
|
|
88
15
|
const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
|
|
89
16
|
const accountList = getAccountList(accountState, accountListState, 'accountList');
|
|
90
17
|
const classList = getClassList(classState, classListState);
|
|
@@ -103,58 +30,20 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
103
30
|
? transactionIdsBySelectedPeriod[monthYearPeriodId]
|
|
104
31
|
: null;
|
|
105
32
|
const transactionIds = transactionIdsForSelectedPeriod ?? [];
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
const transactionLocalDataMap = new Map();
|
|
109
|
-
transactionIds.forEach((transactionId) => {
|
|
33
|
+
const transactionLocalData = transactionIds
|
|
34
|
+
.map((transactionId) => {
|
|
110
35
|
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
111
36
|
if (transactionData != null) {
|
|
112
|
-
|
|
37
|
+
return {
|
|
113
38
|
transactionId,
|
|
114
39
|
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
115
|
-
}
|
|
40
|
+
};
|
|
116
41
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
});
|
|
123
|
-
// Apply TC-specific filters (lives under expenseAutomationView, independent
|
|
124
|
-
// of the Spend Management filter pipeline).
|
|
125
|
-
const filteredTransactionViews = applyTransactionFilters(transactionViews, filters);
|
|
126
|
-
// Convert back to TransactionWithCOT for return
|
|
127
|
-
const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
|
|
128
|
-
// Get transactionLocalData for filtered transactions
|
|
129
|
-
// Also include transactionLocalData for transactions that don't exist in transactionState
|
|
130
|
-
// but have local data (to match original behavior)
|
|
131
|
-
const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
|
|
132
|
-
// Pre-compute the membership set once. The previous implementation called
|
|
133
|
-
// `transactions.some(t => t.id === transactionId)` inside the per-id loop,
|
|
134
|
-
// turning the pipeline into O(n × m) — measurable on tenants with large
|
|
135
|
-
// transaction lists since this selector runs on every Redux dispatch.
|
|
136
|
-
const transactionExistsById = new Set(transactions.map((t) => t.id));
|
|
137
|
-
// `.flatMap` returns `X[]` directly when the callback returns `[]` for the
|
|
138
|
-
// skip case, so we don't need the trailing `.filter((d): d is X => …)` type
|
|
139
|
-
// predicate that the previous `map → filter` pipeline required.
|
|
140
|
-
const filteredTransactionLocalData = transactionIds.flatMap((transactionId) => {
|
|
141
|
-
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
142
|
-
if (transactionData == null) {
|
|
143
|
-
return [];
|
|
144
|
-
}
|
|
145
|
-
// Include if transaction is in filtered results, or if transaction doesn't exist in state
|
|
146
|
-
// (to maintain backward compatibility with tests)
|
|
147
|
-
const transactionExists = transactionExistsById.has(transactionId);
|
|
148
|
-
if (filteredTransactionIds.has(transactionId) || !transactionExists) {
|
|
149
|
-
return [
|
|
150
|
-
{
|
|
151
|
-
transactionId,
|
|
152
|
-
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
153
|
-
},
|
|
154
|
-
];
|
|
155
|
-
}
|
|
156
|
-
return [];
|
|
157
|
-
});
|
|
42
|
+
return null;
|
|
43
|
+
})
|
|
44
|
+
.filter((transaction) => transaction != null);
|
|
45
|
+
const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
|
|
46
|
+
const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
|
|
158
47
|
const monthEndFetchState = monthYearPeriodId != null
|
|
159
48
|
? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
|
|
160
49
|
: { fetchState: 'Not-Started', error: undefined };
|
|
@@ -174,27 +63,10 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
174
63
|
.uiState.totalCount;
|
|
175
64
|
const totalCountByAutoCat = expenseAutomationTransactionsViewState.transactionCategorizationView
|
|
176
65
|
.autoCategorized.uiState.totalCount;
|
|
177
|
-
// Per-(sub-)tab counts powering pagination, in-list "showing X of Y", and
|
|
178
|
-
// any save/refresh round-trips. Sourced from `uiState.totalCount` which
|
|
179
|
-
// mirrors the response's `total_count` for whatever tab/sub-tab the user is
|
|
180
|
-
// viewing (e.g. only the Manual sub-tab rows for Completed → Manual).
|
|
181
66
|
const totalCountByTab = {
|
|
182
67
|
review: monthYearPeriodId != null ? totalCountByReview[monthYearPeriodId] : 0,
|
|
183
68
|
autoCategorized: monthYearPeriodId != null ? totalCountByAutoCat[monthYearPeriodId] : 0,
|
|
184
69
|
};
|
|
185
|
-
// Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
|
|
186
|
-
// listing response and used exclusively by the navbar / tab strip badges.
|
|
187
|
-
// Independent of which Completed sub-tab is active so the badge stays
|
|
188
|
-
// stable across sub-tab switches.
|
|
189
|
-
const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
|
|
190
|
-
const parentTabTotalCountByTab = {
|
|
191
|
-
review: monthYearPeriodId != null
|
|
192
|
-
? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
|
|
193
|
-
: 0,
|
|
194
|
-
autoCategorized: monthYearPeriodId != null
|
|
195
|
-
? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
|
|
196
|
-
: 0,
|
|
197
|
-
};
|
|
198
70
|
const fetchStateByTab = {
|
|
199
71
|
review: {
|
|
200
72
|
fetchState: expenseAutomationTransactionsViewState.transactionCategorizationView
|
|
@@ -214,13 +86,11 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
214
86
|
: [];
|
|
215
87
|
const transactionCompletionStatus = allSteps.find((step) => step.step === 'transaction_categorization')?.completionStatus;
|
|
216
88
|
const completionStatus = transactionCompletionStatus ?? 'incomplete';
|
|
217
|
-
const inFlightCategoryClassRecommendationsByTransactionId = getCategorizationInFlightRecommendationsByTransactionId(state);
|
|
218
|
-
const hasInFlightCategoryClassRecommendations = getCategorizationHasInFlightRecommendations(state);
|
|
219
89
|
return {
|
|
220
90
|
version: 0,
|
|
221
91
|
fetchState: fetchStatus.fetchState,
|
|
222
92
|
error: fetchStatus.error,
|
|
223
|
-
transactions:
|
|
93
|
+
transactions: transactionsWithCOT,
|
|
224
94
|
selectedCheckBoxTransactionIds,
|
|
225
95
|
transactionIdsWithUnsavedData,
|
|
226
96
|
uncategorizedAccounts: uncategorizedIncomeExpense,
|
|
@@ -229,22 +99,18 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
229
99
|
classList: allClasses,
|
|
230
100
|
accountsHierarchyList,
|
|
231
101
|
classHierarchyList,
|
|
232
|
-
hasInFlightCategoryClassRecommendations,
|
|
233
|
-
inFlightCategoryClassRecommendationsByTransactionId,
|
|
234
102
|
isAccountingProjectsEnabled,
|
|
235
103
|
projectList,
|
|
236
|
-
transactionLocalData
|
|
104
|
+
transactionLocalData,
|
|
237
105
|
uiState,
|
|
238
106
|
refreshStatus,
|
|
239
107
|
saveStatus,
|
|
240
108
|
markAsNotMiscategorizedStatus,
|
|
241
109
|
completionStatus,
|
|
242
110
|
totalCountByTab,
|
|
243
|
-
parentTabTotalCountByTab,
|
|
244
111
|
fetchStateByTransactionTabs: fetchStateByTab,
|
|
245
112
|
uploadReceiptStatusById,
|
|
246
113
|
selectedTransactionId,
|
|
247
114
|
selectedTransactionLineId,
|
|
248
|
-
selectedTransactionCategorizationCompletedSubTab,
|
|
249
115
|
};
|
|
250
116
|
}
|
|
@@ -39,6 +39,8 @@ const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
|
|
|
39
39
|
export const toBulkUploadResultsTab = (v) => stringToUnion(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
|
|
40
40
|
const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
|
|
41
41
|
export const toMissingReceiptsTab = (v) => stringToUnion(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
|
|
42
|
+
const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
|
|
43
|
+
export const toCompletedSubTab = (v) => stringToUnion(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
|
|
42
44
|
const MATCH_SOURCES = ['ai', 'manual'];
|
|
43
45
|
export const toMatchSource = (v) => stringToUnion(v.trim().toLowerCase(), MATCH_SOURCES);
|
|
44
46
|
const BULK_UPLOAD_SORT_KEYS = [
|
|
@@ -2,7 +2,6 @@ import { createSelector } from '@reduxjs/toolkit';
|
|
|
2
2
|
import { stripCompareAdditionalBalanceTypes } from '../../commonStateTypes/coaBalance/coaBalanceType';
|
|
3
3
|
import { newBalancesFilter, newBalancesFilterForDateRange, } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
|
|
4
4
|
import { newBalancesFilterClassesView } from '../../commonStateTypes/coaBalance/coaBalancesFilterClassesView';
|
|
5
|
-
import { newBalancesFilterProjectView } from '../../commonStateTypes/coaBalance/coaBalancesFilterProjectView';
|
|
6
5
|
import { getNumberOfPeriods, } from '../../commonStateTypes/dataAvailable';
|
|
7
6
|
import { reduceAnyCompletedFetchState } from '../../commonStateTypes/reduceFetchState';
|
|
8
7
|
import { toTimeframeTick, } from '../../commonStateTypes/timeframeTick';
|
|
@@ -10,6 +9,7 @@ import { extractThisPeriod } from '../../commonStateTypes/viewAndReport/thisPeri
|
|
|
10
9
|
import { getBalanceSheet } from '../balanceSheet/balanceSheetSelector';
|
|
11
10
|
import { getCashFlow } from '../cashFlow/cashFlowSelector';
|
|
12
11
|
import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector';
|
|
12
|
+
import { newBalancesFilterProjectView } from '../../commonStateTypes/coaBalance/coaBalancesFilterProjectView';
|
|
13
13
|
import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
|
|
14
14
|
import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
|
|
15
15
|
import { getProfitAndLossProjectView } from '../profitAndLossProjectView/profitAndLossProjectViewSelector';
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { transformRecommendation, transformRecommendationWithCOT, } from '../../entity/transaction/payloadTypes/transactionPayload';
|
|
2
|
-
import { getActualTransactionID } from '../transactionDetail/transactionDetailState';
|
|
3
2
|
export const getRecommendationFromRecommendationPayload = (payload) => {
|
|
4
3
|
if (payload == null || payload.length === 0) {
|
|
5
4
|
return undefined;
|
|
@@ -38,34 +37,6 @@ export const getRecommendationWithCOTFromRecommendationPayloadWithCOT = (payload
|
|
|
38
37
|
});
|
|
39
38
|
return recommendations;
|
|
40
39
|
};
|
|
41
|
-
// Pluralized URL segment for entity types. Mirrors the legacy
|
|
42
|
-
// fetchEntityRecommendationsByTransactionIdEpic.toEntityTypeURL.
|
|
43
|
-
const toEntityTypeUrlSegment = (entityType) => `${entityType}s`;
|
|
44
|
-
// Build the recommendations URL for a single entity + transaction target.
|
|
45
|
-
// Centralizes the URL shape so the legacy
|
|
46
|
-
// fetchEntityRecommendationsByTransactionIdEpic and the new
|
|
47
|
-
// fetchEntityRecommendationsForLineUpdateEpic stay in lockstep.
|
|
48
|
-
export const buildRecommendationUrl = (accountMicroServiceBaseUrl, entity, amount, transactionDetails, isFetchCOT) => {
|
|
49
|
-
const entityQuery = {
|
|
50
|
-
entity_name: entity.name,
|
|
51
|
-
entity_type: entity.type,
|
|
52
|
-
};
|
|
53
|
-
// Entity-id-null case: server expects entity_name / entity_type query
|
|
54
|
-
// instead of the {entityType}/{qboId}/recommendations path.
|
|
55
|
-
if (entity.qboId === entity.name) {
|
|
56
|
-
return `${accountMicroServiceBaseUrl}/1.0/recommendations?query=${encodeURIComponent(JSON.stringify(entityQuery))}`;
|
|
57
|
-
}
|
|
58
|
-
const query = {
|
|
59
|
-
amount,
|
|
60
|
-
transaction_id: getActualTransactionID(transactionDetails.transactionId.id),
|
|
61
|
-
transaction_type: transactionDetails.transaction.type,
|
|
62
|
-
line_ids: transactionDetails.lineIds,
|
|
63
|
-
};
|
|
64
|
-
if (isFetchCOT === true) {
|
|
65
|
-
query.include_cot = true;
|
|
66
|
-
}
|
|
67
|
-
return `${accountMicroServiceBaseUrl}/1.0/${toEntityTypeUrlSegment(entity.type)}/${entity.qboId}/recommendations?query=${encodeURIComponent(JSON.stringify(query))}`;
|
|
68
|
-
};
|
|
69
40
|
export const getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT = (recommendationPayload, lineIds) => {
|
|
70
41
|
if (recommendationPayload.length === 0) {
|
|
71
42
|
return undefined;
|
|
@@ -33,31 +33,6 @@ const recommendation = createSlice({
|
|
|
33
33
|
};
|
|
34
34
|
},
|
|
35
35
|
},
|
|
36
|
-
// Targeted recommendations fetch fired when the user changes the
|
|
37
|
-
// payee/customer on a single transaction line (or the JE sibling set
|
|
38
|
-
// for that change). Routed by `fetchEntityRecommendationsForLineUpdateEpic`
|
|
39
|
-
// which uses groupBy + switchMap to keep fetches for distinct targets
|
|
40
|
-
// running in parallel while same-target re-fetches still cancel each
|
|
41
|
-
// other. The flowType discriminator selects the categorization vs
|
|
42
|
-
// detail slice for the per-line In-Progress / Completed / Error state.
|
|
43
|
-
fetchEntityRecommendationsForLineUpdate: {
|
|
44
|
-
reducer(draft, action) {
|
|
45
|
-
const { entity } = action.payload;
|
|
46
|
-
const key = getEntityRecommendationKey(entity.type, entity.id);
|
|
47
|
-
// Unconditional flip to In-Progress; the previous variant only
|
|
48
|
-
// seeded when missing, which left stale fetchStates when a prior
|
|
49
|
-
// fetch had already populated the entity entry.
|
|
50
|
-
draft.recommendationByEntity[key] = {
|
|
51
|
-
...(draft.recommendationByEntity[key] ??
|
|
52
|
-
initialEntityRecommendationState),
|
|
53
|
-
fetchState: 'In-Progress',
|
|
54
|
-
error: undefined,
|
|
55
|
-
};
|
|
56
|
-
},
|
|
57
|
-
prepare(args) {
|
|
58
|
-
return { payload: args };
|
|
59
|
-
},
|
|
60
|
-
},
|
|
61
36
|
fetchRecommendationByEntityName: {
|
|
62
37
|
reducer(draft, action) {
|
|
63
38
|
const { entityName, entityType } = action.payload;
|
|
@@ -136,7 +111,7 @@ const recommendation = createSlice({
|
|
|
136
111
|
},
|
|
137
112
|
},
|
|
138
113
|
});
|
|
139
|
-
export const { fetchEntityRecommendationsByTransactionId,
|
|
114
|
+
export const { fetchEntityRecommendationsByTransactionId, fetchRecommendationByEntityName, fetchRecommendationByEntityId, updateRecommendationForEntity, updateRecommendationForEntityFailure, indicateReadyToInitializeRecommendation, clearRecommendation, } = recommendation.actions;
|
|
140
115
|
export default recommendation.reducer;
|
|
141
116
|
const doUpdateRecommendationForEntity = (draft, entityId, entityType, payload) => {
|
|
142
117
|
const key = getEntityRecommendationKey(entityType, entityId);
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createSlice } from '@reduxjs/toolkit';
|
|
2
2
|
import { mapCurrencyPayloadToCurrency } from '../../../../commonPayloadTypes/v2/viewAndReportPayloadv2';
|
|
3
3
|
import { toAmount } from '../../../../commonStateTypes/amount';
|
|
4
|
-
import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
|
|
5
4
|
import { initialCashbackAnalytics, } from './cashbackDetailState';
|
|
6
5
|
export const initialState = {
|
|
7
6
|
fetchState: 'Not-Started',
|
|
@@ -28,10 +27,10 @@ const cashbackDetail = createSlice({
|
|
|
28
27
|
name: 'cashbackDetail',
|
|
29
28
|
initialState,
|
|
30
29
|
reducers: {
|
|
31
|
-
fetchCashbackDetail
|
|
30
|
+
fetchCashbackDetail(draft) {
|
|
32
31
|
draft.fetchState = 'In-Progress';
|
|
33
32
|
draft.error = undefined;
|
|
34
|
-
}
|
|
33
|
+
},
|
|
35
34
|
updateCashbackDetail(draft, action) {
|
|
36
35
|
draft.cashbackByPeriod = toCashbackByPeriod(action.payload);
|
|
37
36
|
draft.cashbackSummary = toCashbackSummary(action.payload);
|
package/lib/esm/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createSlice } from '@reduxjs/toolkit';
|
|
2
2
|
import { toAmount } from '../../../../commonStateTypes/amount';
|
|
3
|
-
import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
|
|
4
3
|
import { toCreditLimitFrequencyCodeType } from '../../../../entity/chargeCard/chargeCard';
|
|
5
4
|
import { toCreditTerm, toRePaymentInfo, } from './chargeCardConfigPayload';
|
|
6
5
|
export const initialState = {
|
|
@@ -31,10 +30,10 @@ const chargeCardConfig = createSlice({
|
|
|
31
30
|
name: 'chargeCardConfig',
|
|
32
31
|
initialState,
|
|
33
32
|
reducers: {
|
|
34
|
-
fetchChargeCardConfig
|
|
33
|
+
fetchChargeCardConfig(draft) {
|
|
35
34
|
draft.fetchState = 'In-Progress';
|
|
36
35
|
draft.error = undefined;
|
|
37
|
-
}
|
|
36
|
+
},
|
|
38
37
|
updateChargeCardConfig(draft, action) {
|
|
39
38
|
const { payload } = action;
|
|
40
39
|
draft.creditLimitFrequency =
|
package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createSlice } from '@reduxjs/toolkit';
|
|
2
2
|
import { mapSortOrderPayloadToSortOrder, } from '../../../../commonPayloadTypes/sortOrderPayload';
|
|
3
|
-
import { addChargeCardTransactionFromPusher, addDeclinedChargeCardTransactionFromPusher, } from '../../../../commonStateTypes/pusherActions';
|
|
4
3
|
import { toAttachment, } from '../../../../entity/transaction/payloadTypes/attachmentPayload';
|
|
5
4
|
import { emptyChargeCardDetail, mapChargeCardTransactionStatisticsPayloadToChargeCardTransactionStatistics, toChargeCardTransactionSortKeyType, } from './chargeCardDetail';
|
|
6
5
|
export const initialState = {
|
|
@@ -65,30 +64,19 @@ const chargeCardDetail = createSlice({
|
|
|
65
64
|
},
|
|
66
65
|
fetchChargeCardTransactionList: {
|
|
67
66
|
reducer(draft, action) {
|
|
68
|
-
const { chargeCardId, pageToken, pageTokenType
|
|
67
|
+
const { chargeCardId, pageToken, pageTokenType } = action.payload;
|
|
69
68
|
const existingCardDetail = draft.detailById[chargeCardId] ?? emptyChargeCardDetail;
|
|
70
|
-
const existingUi = existingCardDetail.transactionList.uiState;
|
|
71
|
-
// cacheOverride=true (Pusher): preserve fetchState, error, and scroll
|
|
72
|
-
// to avoid skeleton flash. Normal fetches reset as before.
|
|
73
69
|
draft.detailById[chargeCardId] = {
|
|
74
70
|
...existingCardDetail,
|
|
75
71
|
transactionList: {
|
|
76
72
|
...existingCardDetail.transactionList,
|
|
77
|
-
fetchState:
|
|
78
|
-
|
|
79
|
-
: 'In-Progress',
|
|
80
|
-
error: cacheOverride
|
|
81
|
-
? existingCardDetail.transactionList.error
|
|
82
|
-
: undefined,
|
|
73
|
+
fetchState: 'In-Progress',
|
|
74
|
+
error: undefined,
|
|
83
75
|
uiState: {
|
|
84
|
-
...
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
? existingUi.scrollYOffset
|
|
89
|
-
: existingUi.pageToken === null
|
|
90
|
-
? 0
|
|
91
|
-
: existingUi.scrollYOffset,
|
|
76
|
+
...existingCardDetail.transactionList.uiState,
|
|
77
|
+
scrollYOffset: existingCardDetail.transactionList.uiState.pageToken === null
|
|
78
|
+
? 0
|
|
79
|
+
: existingCardDetail.transactionList.uiState.scrollYOffset,
|
|
92
80
|
pageToken: pageToken,
|
|
93
81
|
pageTokenType: pageTokenType,
|
|
94
82
|
},
|
|
@@ -105,24 +93,18 @@ const chargeCardDetail = createSlice({
|
|
|
105
93
|
const { chargeCardId, data, cacheOverride } = action.payload;
|
|
106
94
|
const existingCardDetail = draft.detailById[chargeCardId] ?? emptyChargeCardDetail;
|
|
107
95
|
const newTransactionIds = data.transactions.map((tran) => tran.transaction_id);
|
|
108
|
-
const existingIds = existingCardDetail.transactionList.transactionIds;
|
|
109
|
-
// cacheOverride (Pusher): refresh page 1 but keep page 2+ IDs.
|
|
110
|
-
// Normal pagination: append new page, deduped.
|
|
111
|
-
const newIdSet = new Set(newTransactionIds);
|
|
112
|
-
const mergedTransactionIds = cacheOverride
|
|
113
|
-
? [
|
|
114
|
-
...newTransactionIds,
|
|
115
|
-
...existingIds.filter((id) => !newIdSet.has(id)),
|
|
116
|
-
]
|
|
117
|
-
: [
|
|
118
|
-
...existingIds,
|
|
119
|
-
...newTransactionIds.filter((id) => !existingIds.includes(id)),
|
|
120
|
-
];
|
|
121
96
|
draft.detailById[chargeCardId] = {
|
|
122
97
|
...existingCardDetail,
|
|
123
98
|
transactionList: {
|
|
124
99
|
...existingCardDetail.transactionList,
|
|
125
|
-
transactionIds:
|
|
100
|
+
transactionIds: [
|
|
101
|
+
...new Set([
|
|
102
|
+
...(cacheOverride
|
|
103
|
+
? []
|
|
104
|
+
: existingCardDetail.transactionList.transactionIds),
|
|
105
|
+
...newTransactionIds,
|
|
106
|
+
]),
|
|
107
|
+
],
|
|
126
108
|
fetchState: 'Completed',
|
|
127
109
|
error: undefined,
|
|
128
110
|
uiState: {
|
|
@@ -134,12 +116,9 @@ const chargeCardDetail = createSlice({
|
|
|
134
116
|
limit: data.query.limit,
|
|
135
117
|
pageToken: data.query.page_token,
|
|
136
118
|
pageTokenType: data.query.page_token_type,
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
: existingCardDetail.transactionList.uiState.pageToken === null
|
|
141
|
-
? 0
|
|
142
|
-
: existingCardDetail.transactionList.uiState.scrollYOffset,
|
|
119
|
+
scrollYOffset: existingCardDetail.transactionList.uiState.pageToken === null
|
|
120
|
+
? 0
|
|
121
|
+
: existingCardDetail.transactionList.uiState.scrollYOffset,
|
|
143
122
|
},
|
|
144
123
|
},
|
|
145
124
|
};
|
|
@@ -653,22 +632,6 @@ const chargeCardDetail = createSlice({
|
|
|
653
632
|
Object.assign(draft, initialState);
|
|
654
633
|
},
|
|
655
634
|
},
|
|
656
|
-
extraReducers: (builder) => {
|
|
657
|
-
const prependTransaction = (draft, cardId, txId) => {
|
|
658
|
-
const detail = draft.detailById[cardId];
|
|
659
|
-
if (detail != null &&
|
|
660
|
-
!detail.transactionList.transactionIds.includes(txId)) {
|
|
661
|
-
detail.transactionList.transactionIds.unshift(txId);
|
|
662
|
-
}
|
|
663
|
-
};
|
|
664
|
-
builder
|
|
665
|
-
.addCase(addChargeCardTransactionFromPusher, (draft, action) => {
|
|
666
|
-
prependTransaction(draft, action.payload.cardId, action.payload.transaction.transaction_id);
|
|
667
|
-
})
|
|
668
|
-
.addCase(addDeclinedChargeCardTransactionFromPusher, (draft, action) => {
|
|
669
|
-
prependTransaction(draft, action.payload.cardId, action.payload.transaction.transaction_id);
|
|
670
|
-
});
|
|
671
|
-
},
|
|
672
635
|
});
|
|
673
636
|
export const { fetchChargeCardDetailPage, fetchChargeCardDetail, updateChargeCardDetailFetchState, fetchChargeCardTransactionList, updateChargeCardDetailUIState, updateChargeCardTransactionList, updateChargeCardTransactionUploadReceiptsFetchStatus, fetchChargeCardTransactionAttachments, updateChargeCardTransactionIsViewReceiptClicked, updateChargeCardTransactionAttachmentsFailure, updatePhysicalChargeCardAttemptSuccessOrFailure, updatePhysicalChargeCardAttempt, updateDebitCardPinAttempt, updateDebitCardPinAttemptSuccessOrFailure, updateChargeCardTransactionReceiptsShowTickFetchStatus, updateChargeCardTransactionAttachmentsInCardDetail, updateChargeCardTransactionListFailure, updateChargeCardDetail, startCVVActivationWait, completeCVVActivationWait, startDebitCardSetPinWait, completeDebitCardSetPinWait, updateChargeCardDetailUpdateStatus, updateChargeCardSpendLimit, updateChargeCardSpendLimitSuccessOrFailure, updateChargeCardName, updateChargeCardNameSuccessOrFailure, lockChargeCard, lockChargeCardSuccessOrFailure, unlockChargeCard, unlockChargeCardSuccessOrFailure, closeChargeCard, closeChargeCardSuccessOrFailure, fetchDepositAccountLimit, updateDepositAccountLimitFetchStatus, fetchChargeCardTransactionStatistics, updateChargeCardTransactionStatistics, updateChargeCardTransactionStatisticsFetchState, fetchChargeCardsRecurringExpenses, updateChargeCardsRecurringExpenses, updateChargeCardsRecurringExpensesFetchState, sendOtpCardHolder, resendOtpCardHolder, sendOtpCardHolderSuccess, sendOtpCardHolderFailure, verifyOtpCardHolder, verifyOtpCardHolderSuccess, verifyOtpCardHolderFailure, clearChargeCardDetail, } = chargeCardDetail.actions;
|
|
674
637
|
export default chargeCardDetail.reducer;
|
package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailEpic.js
CHANGED
|
@@ -13,24 +13,13 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
|
|
|
13
13
|
const chargeCardAction = [];
|
|
14
14
|
const state = state$.value;
|
|
15
15
|
const chargeCardDetail = recordGet(state.chargeCardDetailState.detailById, chargeCardId, undefined);
|
|
16
|
-
// Skip if a user-triggered fetch is already in-flight (not applicable
|
|
17
|
-
// to cacheOverride/Pusher refreshes, which always proceed).
|
|
18
16
|
if (cacheOverride === true ||
|
|
19
17
|
chargeCardDetail == null ||
|
|
20
18
|
chargeCardDetail.fetchState !== 'In-Progress') {
|
|
21
|
-
// Silent refresh: preserve fetchState to avoid skeleton flash.
|
|
22
|
-
// Discriminate via fetchState (not null-check) because the reducer
|
|
23
|
-
// always creates an entry before the epic runs.
|
|
24
|
-
const isSilentRefresh = cacheOverride === true &&
|
|
25
|
-
chargeCardDetail != null &&
|
|
26
|
-
chargeCardDetail.fetchState !== 'Not-Started';
|
|
27
19
|
chargeCardAction.push(updateChargeCardDetailFetchState({
|
|
28
20
|
chargeCardId,
|
|
29
|
-
isRefreshingViewInBackground:
|
|
30
|
-
fetchState:
|
|
31
|
-
? chargeCardDetail.fetchState
|
|
32
|
-
: 'In-Progress',
|
|
33
|
-
error: isSilentRefresh ? chargeCardDetail.error : undefined,
|
|
21
|
+
isRefreshingViewInBackground: cacheOverride,
|
|
22
|
+
fetchState: 'In-Progress',
|
|
34
23
|
}));
|
|
35
24
|
const query = {
|
|
36
25
|
is_include_card_activation_events: true,
|
|
@@ -48,8 +37,6 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
|
|
|
48
37
|
}));
|
|
49
38
|
}
|
|
50
39
|
else {
|
|
51
|
-
// Surface errors even on silent refresh so the user
|
|
52
|
-
// knows data is stale (follow-up: consider toast instead).
|
|
53
40
|
return of(updateChargeCardDetailFetchState({
|
|
54
41
|
chargeCardId,
|
|
55
42
|
fetchState: 'Error',
|
|
@@ -58,7 +45,6 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
|
|
|
58
45
|
}));
|
|
59
46
|
}
|
|
60
47
|
}), catchError((error) => {
|
|
61
|
-
// Surface network failures even on silent refresh.
|
|
62
48
|
return of(updateChargeCardDetailFetchState({
|
|
63
49
|
chargeCardId,
|
|
64
50
|
fetchState: 'Error',
|
package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailPageEpic.js
CHANGED
|
@@ -15,16 +15,15 @@ export const fetchChargeCardDetailPageEpic = (actions$, state$) => actions$.pipe
|
|
|
15
15
|
? exsitingChargeCardDetail.transactionList.uiState.pageTokenType
|
|
16
16
|
: null;
|
|
17
17
|
if (cacheOverride === true) {
|
|
18
|
-
// Forward cacheOverride to all sub-fetches to prevent skeleton flash.
|
|
19
18
|
chargeCardTransactionListAction.push(fetchChargeCardDetail(chargeCardId, cacheOverride));
|
|
20
19
|
//latest transactions need to be fetched hence removing pageToken and pageTokenType
|
|
21
|
-
chargeCardTransactionListAction.push(fetchChargeCardTransactionList(chargeCardId, null, null
|
|
22
|
-
chargeCardTransactionListAction.push(fetchChargeCardConfig(
|
|
20
|
+
chargeCardTransactionListAction.push(fetchChargeCardTransactionList(chargeCardId, null, null));
|
|
21
|
+
chargeCardTransactionListAction.push(fetchChargeCardConfig());
|
|
23
22
|
if (doFetchCreditAccounts && isCreditCardEnabled) {
|
|
24
|
-
chargeCardTransactionListAction.push(fetchCreditAccount(
|
|
23
|
+
chargeCardTransactionListAction.push(fetchCreditAccount());
|
|
25
24
|
}
|
|
26
25
|
if (doFetchCreditAccounts && isCreditCardEnabled) {
|
|
27
|
-
chargeCardTransactionListAction.push(fetchCreditAccountRepayment(
|
|
26
|
+
chargeCardTransactionListAction.push(fetchCreditAccountRepayment());
|
|
28
27
|
}
|
|
29
28
|
}
|
|
30
29
|
else {
|