@zeniai/client-epic-state 5.0.77 → 5.0.78
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 +10 -11
- package/lib/epic.js +11 -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 +11 -12
- package/lib/esm/index.js +20 -30
- 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/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 +23 -30
- package/lib/index.js +58 -84
- package/lib/reducer.d.ts +2 -2
- package/lib/reducer.js +2 -2
- 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/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,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 {
|
|
@@ -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 { date } from '../../../../zeniDayJS';
|
|
5
4
|
import { initialCreditAcc, initialCreditAccountRepayment, initialDebitCardSummaries, initialResendRevokeCardInvite, toCreditAccountStatusType, } from './chargeCardList';
|
|
6
5
|
export const initialState = {
|
|
@@ -44,10 +43,6 @@ export const initialState = {
|
|
|
44
43
|
revokeCardInvite: initialResendRevokeCardInvite,
|
|
45
44
|
creditAccountRepayment: initialCreditAccountRepayment,
|
|
46
45
|
};
|
|
47
|
-
// Silent-Pusher-refresh contract: when cacheOverride=true, fetch reducers
|
|
48
|
-
// leave fetchState and error unchanged so the list page's reduceFetchState
|
|
49
|
-
// selector stays 'Completed' and doesn't flash ChargeCardListLoading.
|
|
50
|
-
// See createCacheOverrideFetchReducer for details.
|
|
51
46
|
const chargeCardList = createSlice({
|
|
52
47
|
name: 'chargeCardList',
|
|
53
48
|
initialState,
|
|
@@ -67,10 +62,10 @@ const chargeCardList = createSlice({
|
|
|
67
62
|
};
|
|
68
63
|
},
|
|
69
64
|
},
|
|
70
|
-
fetchCreditAccountRepayment
|
|
65
|
+
fetchCreditAccountRepayment(draft) {
|
|
71
66
|
draft.creditAccountRepayment.fetchState = 'In-Progress';
|
|
72
67
|
draft.creditAccountRepayment.error = undefined;
|
|
73
|
-
}
|
|
68
|
+
},
|
|
74
69
|
updateCreditAccountRepaymentAmountAndDate(draft, action) {
|
|
75
70
|
draft.creditAccountRepayment.initiatedRepayments = action.payload.amount;
|
|
76
71
|
draft.creditAccountRepayment.initiatedRepaymentDate = action.payload.date;
|
|
@@ -88,10 +83,10 @@ const chargeCardList = createSlice({
|
|
|
88
83
|
updateRowActionCardId(draft, action) {
|
|
89
84
|
draft.rowActionCardId = action.payload;
|
|
90
85
|
},
|
|
91
|
-
fetchCreditAccount
|
|
86
|
+
fetchCreditAccount(draft) {
|
|
92
87
|
draft.creditAccount.fetchState = 'In-Progress';
|
|
93
88
|
draft.creditAccount.error = undefined;
|
|
94
|
-
}
|
|
89
|
+
},
|
|
95
90
|
updateCreditAccount(draft, action) {
|
|
96
91
|
if (action.payload.length > 0) {
|
|
97
92
|
draft.creditAccount = toCreditAccount(action.payload[0]);
|
|
@@ -104,10 +99,10 @@ const chargeCardList = createSlice({
|
|
|
104
99
|
error: action.payload,
|
|
105
100
|
};
|
|
106
101
|
},
|
|
107
|
-
fetchDebitCardSummary
|
|
102
|
+
fetchDebitCardSummary(draft) {
|
|
108
103
|
draft.debitCardSummaries.fetchState = 'In-Progress';
|
|
109
104
|
draft.debitCardSummaries.error = undefined;
|
|
110
|
-
}
|
|
105
|
+
},
|
|
111
106
|
updateDebitCardSummary(draft, action) {
|
|
112
107
|
draft.debitCardSummaries = toDebitCardSummaries(action.payload);
|
|
113
108
|
},
|
|
@@ -118,10 +113,10 @@ const chargeCardList = createSlice({
|
|
|
118
113
|
error: action.payload,
|
|
119
114
|
};
|
|
120
115
|
},
|
|
121
|
-
fetchChargeCardList
|
|
116
|
+
fetchChargeCardList(draft) {
|
|
122
117
|
draft.fetchState = 'In-Progress';
|
|
123
118
|
draft.error = undefined;
|
|
124
|
-
}
|
|
119
|
+
},
|
|
125
120
|
updateChargeCardList(draft, action) {
|
|
126
121
|
const { cards, unassigned_credit } = action.payload.chargeCardListPayload;
|
|
127
122
|
const newCard = cards.map((card) => card.card_id);
|
|
@@ -157,18 +152,6 @@ const chargeCardList = createSlice({
|
|
|
157
152
|
draft.uiState.scrollYOffset = action.payload.uiState.scrollYOffset;
|
|
158
153
|
}
|
|
159
154
|
},
|
|
160
|
-
updateCreditAccountBalanceFromPusher(draft, action) {
|
|
161
|
-
const { currencyCode, currencySymbol } = action.payload;
|
|
162
|
-
const amt = (v) => v !== undefined ? toAmount(v, currencyCode, currencySymbol) : undefined;
|
|
163
|
-
draft.creditAccount.available =
|
|
164
|
-
amt(action.payload.available) ?? draft.creditAccount.available;
|
|
165
|
-
draft.creditAccount.balance =
|
|
166
|
-
amt(action.payload.balance) ?? draft.creditAccount.balance;
|
|
167
|
-
draft.creditAccount.hold =
|
|
168
|
-
amt(action.payload.hold) ?? draft.creditAccount.hold;
|
|
169
|
-
draft.creditAccount.cashback =
|
|
170
|
-
amt(action.payload.cashback) ?? draft.creditAccount.cashback;
|
|
171
|
-
},
|
|
172
155
|
clearChargeCardList(draft) {
|
|
173
156
|
Object.assign(draft, initialState);
|
|
174
157
|
},
|
|
@@ -324,7 +307,7 @@ const chargeCardList = createSlice({
|
|
|
324
307
|
},
|
|
325
308
|
},
|
|
326
309
|
});
|
|
327
|
-
export const { fetchChargeCardListPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState,
|
|
310
|
+
export const { fetchChargeCardListPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState, clearChargeCardList, resendCardInvite, resendCardInviteSuccess, resendCardInviteFailure, revokeCardInvite, revokeCardInviteSuccess, revokeCardInviteFailure, updateChargeCardsSpendLimit, updateChargeCardsSpendLimitSuccessOrFailure, lockChargeCards, lockChargeCardsSuccessOrFailure, unlockChargeCards, unlockChargeCardsSuccessOrFailure, closeChargeCards, closeChargeCardsSuccessOrFailure, revokeChargeCardsInvite, revokeChargeCardsInviteSuccessOrFailure, } = chargeCardList.actions;
|
|
328
311
|
export default chargeCardList.reducer;
|
|
329
312
|
// helper
|
|
330
313
|
const toCreditAccount = (payload) => ({
|
package/lib/esm/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.js
CHANGED
|
@@ -14,21 +14,18 @@ export const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe(f
|
|
|
14
14
|
const state = state$.value;
|
|
15
15
|
const cashbackDetailState = state.cashbackDetailState;
|
|
16
16
|
if (cacheOverride === true) {
|
|
17
|
-
// Forward cacheOverride to all sub-fetches to prevent skeleton flash.
|
|
18
17
|
if (doFetchCreditAccountsDebitSummaryAndCashback === true) {
|
|
19
18
|
if (isCreditCardEnabled) {
|
|
20
|
-
chargeCardListPageAction.push(fetchCreditAccount(
|
|
21
|
-
chargeCardListPageAction.push(fetchCreditAccountRepayment(
|
|
19
|
+
chargeCardListPageAction.push(fetchCreditAccount());
|
|
20
|
+
chargeCardListPageAction.push(fetchCreditAccountRepayment());
|
|
22
21
|
}
|
|
23
22
|
if (isDebitCardEnabled) {
|
|
24
|
-
chargeCardListPageAction.push(fetchDebitCardSummary(
|
|
23
|
+
chargeCardListPageAction.push(fetchDebitCardSummary());
|
|
25
24
|
}
|
|
26
|
-
chargeCardListPageAction.push(fetchCashbackDetail(
|
|
25
|
+
chargeCardListPageAction.push(fetchCashbackDetail());
|
|
27
26
|
}
|
|
28
|
-
chargeCardListPageAction.push(fetchChargeCardList(
|
|
29
|
-
|
|
30
|
-
chargeCardListPageAction.push(fetchChargeCardConfig(true));
|
|
31
|
-
// These don't participate in the list page's reduceFetchState.
|
|
27
|
+
chargeCardListPageAction.push(fetchChargeCardList());
|
|
28
|
+
chargeCardListPageAction.push(fetchChargeCardConfig());
|
|
32
29
|
chargeCardListPageAction.push(fetchUserListByType('cardHolderCandidate', true));
|
|
33
30
|
chargeCardListPageAction.push(fetchUserListByType('cardAdmin', true));
|
|
34
31
|
chargeCardListPageAction.push(fetchClassList());
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createSlice } from '@reduxjs/toolkit';
|
|
2
|
-
import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
|
|
3
2
|
import { initialChargeCardPaymentHistoryState, } from './chargeCardPaymentHistory';
|
|
4
3
|
export const initialState = initialChargeCardPaymentHistoryState;
|
|
5
4
|
const chargeCardPaymentHistory = createSlice({
|
|
@@ -18,10 +17,10 @@ const chargeCardPaymentHistory = createSlice({
|
|
|
18
17
|
};
|
|
19
18
|
},
|
|
20
19
|
},
|
|
21
|
-
fetchChargeCardPaymentHistory
|
|
20
|
+
fetchChargeCardPaymentHistory(draft) {
|
|
22
21
|
draft.fetchState = 'In-Progress';
|
|
23
22
|
draft.error = undefined;
|
|
24
|
-
}
|
|
23
|
+
},
|
|
25
24
|
updateChargeCardPaymentHistory(draft, action) {
|
|
26
25
|
const payload = action.payload;
|
|
27
26
|
draft.creditAccountId = payload.credit_account_id;
|
|
@@ -8,7 +8,7 @@ export const fetchChargeCardPaymentPageEpic = (actions$, state$) => actions$.pip
|
|
|
8
8
|
const state = state$.value;
|
|
9
9
|
const chargeCardPaymentHistoryState = state.chargeCardPaymentHistoryState;
|
|
10
10
|
if (cacheOverride === true) {
|
|
11
|
-
chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory(
|
|
11
|
+
chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory());
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
14
|
if (chargeCardPaymentHistoryState.fetchState !== 'Completed' &&
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createSlice } from '@reduxjs/toolkit';
|
|
2
|
-
import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
|
|
3
2
|
export const initialState = {
|
|
4
3
|
localData: {
|
|
5
4
|
amount: {
|
|
@@ -18,12 +17,9 @@ const chargeCardRepaymentDetail = createSlice({
|
|
|
18
17
|
name: 'chargeCardRepaymentDetail',
|
|
19
18
|
initialState,
|
|
20
19
|
reducers: {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
fetchChargeCardRepaymentDetail: createCacheOverrideFetchReducer(() => {
|
|
25
|
-
// do nothing
|
|
26
|
-
}),
|
|
20
|
+
fetchChargeCardRepaymentDetail() {
|
|
21
|
+
//do nothing
|
|
22
|
+
},
|
|
27
23
|
updateChargeCardRepaymentLocalStore(draft, action) {
|
|
28
24
|
draft.localData = action.payload;
|
|
29
25
|
},
|
|
@@ -8,8 +8,6 @@ import { getActualPaymentDate } from './helpers';
|
|
|
8
8
|
import { getApproversOrRejectors as getApproversOrRejectorsForReimbursement, } from './reimbursement/remiListView/remiListSelector';
|
|
9
9
|
import { ALL_REMI_TABS, getRemiListKey, } from './reimbursement/remiListView/remiListState';
|
|
10
10
|
//filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
|
|
11
|
-
// Spend Management uses only equal/not_equal — TC amount operators
|
|
12
|
-
// (inBetween, lessThan, greaterThan) live in the TC filter pipeline.
|
|
13
11
|
const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
|
|
14
12
|
let doesItemFallInValueRange = false;
|
|
15
13
|
const filterField = currentFilter.field;
|
|
@@ -43,7 +41,7 @@ const filterItemOnCategoriesWithSingleValue = (categoryValue, currentFilter, ran
|
|
|
43
41
|
return filterItemOnRangeCategoryType(categoryValue, currentFilter);
|
|
44
42
|
}
|
|
45
43
|
// if filter category is not rangeType
|
|
46
|
-
if (currentFilter.matchingOperator === '
|
|
44
|
+
if (currentFilter.matchingOperator === 'not-equal') {
|
|
47
45
|
return currentFilter.values.indexOf(categoryValue.toString()) === -1;
|
|
48
46
|
}
|
|
49
47
|
return currentFilter.values.indexOf(categoryValue.toString()) > -1;
|
|
@@ -117,7 +115,7 @@ export const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredIt
|
|
|
117
115
|
? getCategoryValueForTaskList(key, item)
|
|
118
116
|
: getCategoryValueForPaymentHistory(key, item);
|
|
119
117
|
if (categoryValue == null) {
|
|
120
|
-
if (currentFilter.matchingOperator === '
|
|
118
|
+
if (currentFilter.matchingOperator === 'not-equal') {
|
|
121
119
|
return true;
|
|
122
120
|
}
|
|
123
121
|
return false;
|
|
@@ -208,7 +208,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
|
|
|
208
208
|
const key = currentFilter.field;
|
|
209
209
|
const categoryValue = getCategoryValueForCompany(key, company);
|
|
210
210
|
if (categoryValue == null) {
|
|
211
|
-
if (currentFilter.matchingOperator === '
|
|
211
|
+
if (currentFilter.matchingOperator === 'not-equal') {
|
|
212
212
|
return true;
|
|
213
213
|
}
|
|
214
214
|
return false;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { of } from 'rxjs';
|
|
2
|
-
import { catchError, filter,
|
|
2
|
+
import { catchError, filter, switchMap, mergeMap } from 'rxjs/operators';
|
|
3
3
|
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
4
4
|
import { mapCannedResponsePayloadToCannedResponse, } from '../cannedResponsesPayload';
|
|
5
5
|
import { fetchCannedResponses, updateCannedResponses, updateCannedResponsesFetchStatus, } from '../cannedResponsesReducer';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { of } from 'rxjs';
|
|
2
|
-
import { catchError, filter,
|
|
2
|
+
import { catchError, filter, switchMap, mergeMap } from 'rxjs/operators';
|
|
3
3
|
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
4
4
|
import { fetchCannedResponses, saveCannedResponse, saveCannedResponseFailure, saveCannedResponseSuccess, } from '../cannedResponsesReducer';
|
|
5
5
|
export const saveCannedResponseEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(saveCannedResponse.match), switchMap((action) => {
|
|
@@ -4,7 +4,7 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
|
|
|
4
4
|
import { updateTasks } from '../../../../entity/task/taskReducer';
|
|
5
5
|
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
6
6
|
import { fetchTaskList, removeTaskFromList, } from '../../taskListView/taskListReducer';
|
|
7
|
-
import { snoozeTaskSuccessOrFailure, unsnoozeTask } from '../taskDetailReducer';
|
|
7
|
+
import { snoozeTaskSuccessOrFailure, unsnoozeTask, } from '../taskDetailReducer';
|
|
8
8
|
export const unsnoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(unsnoozeTask.match), mergeMap((action) => handleUnsnoozeTask(action.payload.taskId, zeniAPI)));
|
|
9
9
|
const handleUnsnoozeTask = (taskId, zeniAPI) => {
|
|
10
10
|
const unsnoozeTaskApi$ = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`);
|