@zeniai/client-epic-state 5.0.69-betaML51 → 5.0.69-betaML6
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/epic.d.ts +2 -1
- package/lib/epic.js +2 -1
- package/lib/esm/epic.js +2 -1
- package/lib/esm/index.js +6 -6
- package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js +21 -1
- package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +117 -14
- package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +31 -0
- package/lib/esm/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js +83 -0
- package/lib/esm/view/recommendation/recommendationHelper.js +29 -0
- package/lib/esm/view/recommendation/recommendationReducer.js +36 -1
- package/lib/esm/view/transactionDetail/transactionDetailReducer.js +94 -1
- package/lib/esm/view/transactionDetail/transactionDetailSelector.js +22 -0
- package/lib/index.d.ts +7 -6
- package/lib/index.js +35 -32
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts +1 -0
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js +23 -2
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +14 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +117 -14
- package/lib/view/expenseAutomationView/selectorTypes/transactionsViewSelectorTypes.d.ts +2 -0
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +3 -0
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +32 -0
- package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +1 -0
- package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.d.ts +9 -0
- package/lib/view/recommendation/fetchEntityRecommendationsForLineUpdateEpic.js +87 -0
- package/lib/view/recommendation/recommendationHelper.d.ts +9 -0
- package/lib/view/recommendation/recommendationHelper.js +31 -1
- package/lib/view/recommendation/recommendationReducer.d.ts +18 -1
- package/lib/view/recommendation/recommendationReducer.js +37 -2
- package/lib/view/transactionDetail/transactionDetailReducer.d.ts +11 -1
- package/lib/view/transactionDetail/transactionDetailReducer.js +95 -2
- package/lib/view/transactionDetail/transactionDetailSelector.d.ts +2 -0
- package/lib/view/transactionDetail/transactionDetailSelector.js +24 -1
- package/lib/view/transactionDetail/transactionDetailTypes.d.ts +1 -0
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ import recordGet from 'lodash/get';
|
|
|
3
3
|
import uniq from 'lodash/uniq';
|
|
4
4
|
import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
|
|
5
5
|
import { isVendorTransaction } from '../../../entity/transaction/stateTypes/vendorTransaction';
|
|
6
|
-
import {
|
|
6
|
+
import { filterAutoTabLineItems, mergeTabSpecificLineItems, removeTransactionFromTabView, setEntityRecommendationForLineIdInLocalData, shouldAutoSelectAndAdd, toSetAllLineItemsToCategoryClass, toTransactionDetailLocalData, } from '../helpers/transactionCategorizationLocalDataHelper';
|
|
7
7
|
import { DEFAULT_COMPLETED_SUB_TAB, } from '../types/completedSubTab';
|
|
8
8
|
export const initialTransactionTabViewState = {
|
|
9
9
|
saveStatus: {
|
|
@@ -420,12 +420,9 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
420
420
|
const selectedCheckBoxTransactionIds = draft.transactionCategorizationView[selectedTab]
|
|
421
421
|
.selectedCheckBoxTransactionIds;
|
|
422
422
|
if (selectedTransaction != null &&
|
|
423
|
-
|
|
424
|
-
selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
|
|
425
|
-
selectedCheckBoxTransactionIds.includes(transactionId) === false) {
|
|
423
|
+
shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
|
|
426
424
|
draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
|
|
427
|
-
...
|
|
428
|
-
.selectedCheckBoxTransactionIds,
|
|
425
|
+
...selectedCheckBoxTransactionIds,
|
|
429
426
|
transactionId,
|
|
430
427
|
];
|
|
431
428
|
}
|
|
@@ -508,9 +505,26 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
508
505
|
const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
|
|
509
506
|
.transactionReviewLocalDataById, transactionId.id, undefined);
|
|
510
507
|
if (transactionLocalData != null) {
|
|
508
|
+
const newLocalData = setEntityRecommendationForLineIdInLocalData(draft.transactionCategorizationView[selectedTab], transaction, transactionLocalData.transactionReviewLocalData, entity, lineIds, uncategorizedAccounts, action.payload.recommendationWithCOTByLineId, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
|
|
509
|
+
// Release the per-line fetch flag for every line this fetch
|
|
510
|
+
// covered. Done in-place on the freshly returned local data
|
|
511
|
+
// (the helper produces a new mutable object), before we write
|
|
512
|
+
// it back to the draft.
|
|
513
|
+
lineIds.forEach((lineId) => {
|
|
514
|
+
const lineItem = newLocalData.lineItemById[lineId];
|
|
515
|
+
if (lineItem != null) {
|
|
516
|
+
newLocalData.lineItemById[lineId] = {
|
|
517
|
+
...lineItem,
|
|
518
|
+
categoryClassRecommendationsFetchState: {
|
|
519
|
+
fetchState: 'Completed',
|
|
520
|
+
error: undefined,
|
|
521
|
+
},
|
|
522
|
+
};
|
|
523
|
+
}
|
|
524
|
+
});
|
|
511
525
|
draft.transactionCategorizationView[selectedTab].transactionReviewLocalDataById[transaction.id] = {
|
|
512
526
|
transactionId: transaction.id,
|
|
513
|
-
transactionReviewLocalData:
|
|
527
|
+
transactionReviewLocalData: newLocalData,
|
|
514
528
|
};
|
|
515
529
|
// Mark transaction as dirty (autofill happened)
|
|
516
530
|
if (!draft.transactionCategorizationView[selectedTab].transactionIdsWithUnsavedData.includes(transaction.id)) {
|
|
@@ -523,6 +537,99 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
523
537
|
}
|
|
524
538
|
},
|
|
525
539
|
},
|
|
540
|
+
// Start arm of the line-update recommendations fetch. Flips covered
|
|
541
|
+
// lines to In-Progress AND removes the transaction from
|
|
542
|
+
// selectedCheckBoxTransactionIds — the row is unchecked + disabled
|
|
543
|
+
// until either the success arm (recheck if limit allows) or the
|
|
544
|
+
// failure arm releases the per-line flag.
|
|
545
|
+
markCategoryClassRecommendationsInProgressForCategorization: {
|
|
546
|
+
reducer(draft, action) {
|
|
547
|
+
const { selectedTab, transactionId, lineIds } = action.payload;
|
|
548
|
+
const tab = draft.transactionCategorizationView[selectedTab];
|
|
549
|
+
const transactionLocalData = recordGet(tab.transactionReviewLocalDataById, transactionId.id, undefined);
|
|
550
|
+
if (transactionLocalData != null) {
|
|
551
|
+
lineIds.forEach((lineId) => {
|
|
552
|
+
const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
|
|
553
|
+
if (lineItem != null) {
|
|
554
|
+
transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
|
|
555
|
+
...lineItem,
|
|
556
|
+
categoryClassRecommendationsFetchState: {
|
|
557
|
+
fetchState: 'In-Progress',
|
|
558
|
+
error: undefined,
|
|
559
|
+
},
|
|
560
|
+
};
|
|
561
|
+
}
|
|
562
|
+
});
|
|
563
|
+
}
|
|
564
|
+
// Uncheck on fetch start: the row's existing category/class are
|
|
565
|
+
// stale after a payee change, so we drop the auto-selection until
|
|
566
|
+
// fresh recommendations land.
|
|
567
|
+
if (tab.selectedCheckBoxTransactionIds.includes(transactionId.id)) {
|
|
568
|
+
tab.selectedCheckBoxTransactionIds =
|
|
569
|
+
tab.selectedCheckBoxTransactionIds.filter((id) => id !== transactionId.id);
|
|
570
|
+
}
|
|
571
|
+
},
|
|
572
|
+
prepare(selectedTab, transactionId, lineIds) {
|
|
573
|
+
return { payload: { selectedTab, transactionId, lineIds } };
|
|
574
|
+
},
|
|
575
|
+
},
|
|
576
|
+
// Completed arm. Used by the epic when the HTTP call succeeds but the
|
|
577
|
+
// server returned no per-line recommendations — we still need to
|
|
578
|
+
// release the In-Progress flag so the skeleton resolves. Successful
|
|
579
|
+
// responses with recommendations go through
|
|
580
|
+
// setEntityRecommendationForLineIdsForCategorization instead (which
|
|
581
|
+
// also flips the lines to Completed).
|
|
582
|
+
markCategoryClassRecommendationsCompletedForCategorization: {
|
|
583
|
+
reducer(draft, action) {
|
|
584
|
+
const { selectedTab, transactionId, lineIds } = action.payload;
|
|
585
|
+
const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
|
|
586
|
+
.transactionReviewLocalDataById, transactionId.id, undefined);
|
|
587
|
+
if (transactionLocalData != null) {
|
|
588
|
+
lineIds.forEach((lineId) => {
|
|
589
|
+
const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
|
|
590
|
+
if (lineItem != null) {
|
|
591
|
+
transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
|
|
592
|
+
...lineItem,
|
|
593
|
+
categoryClassRecommendationsFetchState: {
|
|
594
|
+
fetchState: 'Completed',
|
|
595
|
+
error: undefined,
|
|
596
|
+
},
|
|
597
|
+
};
|
|
598
|
+
}
|
|
599
|
+
});
|
|
600
|
+
}
|
|
601
|
+
},
|
|
602
|
+
prepare(selectedTab, transactionId, lineIds) {
|
|
603
|
+
return { payload: { selectedTab, transactionId, lineIds } };
|
|
604
|
+
},
|
|
605
|
+
},
|
|
606
|
+
// Failure arm. Flips covered lines to Error so the skeleton resolves
|
|
607
|
+
// and downstream UI can react to the failure. The transaction stays
|
|
608
|
+
// unchecked from the start-arm action.
|
|
609
|
+
markCategoryClassRecommendationsFailureForCategorization: {
|
|
610
|
+
reducer(draft, action) {
|
|
611
|
+
const { selectedTab, transactionId, lineIds, error } = action.payload;
|
|
612
|
+
const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
|
|
613
|
+
.transactionReviewLocalDataById, transactionId.id, undefined);
|
|
614
|
+
if (transactionLocalData != null) {
|
|
615
|
+
lineIds.forEach((lineId) => {
|
|
616
|
+
const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
|
|
617
|
+
if (lineItem != null) {
|
|
618
|
+
transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
|
|
619
|
+
...lineItem,
|
|
620
|
+
categoryClassRecommendationsFetchState: {
|
|
621
|
+
fetchState: 'Error',
|
|
622
|
+
error,
|
|
623
|
+
},
|
|
624
|
+
};
|
|
625
|
+
}
|
|
626
|
+
});
|
|
627
|
+
}
|
|
628
|
+
},
|
|
629
|
+
prepare(selectedTab, transactionId, lineIds, error) {
|
|
630
|
+
return { payload: { selectedTab, transactionId, lineIds, error } };
|
|
631
|
+
},
|
|
632
|
+
},
|
|
526
633
|
fetchTransactionCategorizationSuccess(draft, action) {
|
|
527
634
|
const { selectedTab, refreshViewInBackground } = action.payload;
|
|
528
635
|
if (draft.transactionCategorizationView[selectedTab].fetchState ===
|
|
@@ -618,9 +725,7 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
618
725
|
.selectedCheckBoxTransactionIds;
|
|
619
726
|
if (newTransactionLocalData.customer != null &&
|
|
620
727
|
newTransactionLocalData.customer.id != null &&
|
|
621
|
-
|
|
622
|
-
selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
|
|
623
|
-
selectedCheckBoxTransactionIds.includes(transactionId) === false) {
|
|
728
|
+
shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
|
|
624
729
|
draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
|
|
625
730
|
...selectedCheckBoxTransactionIds,
|
|
626
731
|
transactionId,
|
|
@@ -694,9 +799,7 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
694
799
|
.selectedCheckBoxTransactionIds;
|
|
695
800
|
if (newTransactionLocalData.vendor != null &&
|
|
696
801
|
newTransactionLocalData.vendor.id != null &&
|
|
697
|
-
|
|
698
|
-
selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
|
|
699
|
-
selectedCheckBoxTransactionIds.includes(transactionId) === false) {
|
|
802
|
+
shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
|
|
700
803
|
draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
|
|
701
804
|
...selectedCheckBoxTransactionIds,
|
|
702
805
|
transactionId,
|
|
@@ -929,5 +1032,5 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
929
1032
|
},
|
|
930
1033
|
},
|
|
931
1034
|
});
|
|
932
|
-
export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, updateParentTotalCountForTab, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
|
|
1035
|
+
export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, updateParentTotalCountForTab, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, markCategoryClassRecommendationsInProgressForCategorization, markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
|
|
933
1036
|
export default expenseAutomationTransactionsView.reducer;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createSelector } from '@reduxjs/toolkit';
|
|
1
2
|
import omit from 'lodash/omit';
|
|
2
3
|
import { reduceAllFetchState, reduceAnyFetchState, } from '../../../commonStateTypes/reduceFetchState';
|
|
3
4
|
import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
|
|
@@ -8,6 +9,32 @@ import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts
|
|
|
8
9
|
import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
|
|
9
10
|
import { getProjectList } from '../../projectList/projectListSelector';
|
|
10
11
|
import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
|
|
12
|
+
// Per-transaction "any line is fetching category/class recommendations?"
|
|
13
|
+
// map for the active categorization tab. Memoized on the active tab's
|
|
14
|
+
// transactionReviewLocalDataById reference, so steady state (no fetches
|
|
15
|
+
// in flight) recomputes only when local data changes — and the row-table
|
|
16
|
+
// can read a single map lookup per row instead of re-iterating the
|
|
17
|
+
// row's lineItemById in the render path.
|
|
18
|
+
export const getCategorizationInFlightRecommendationsByTransactionId = createSelector((state) => {
|
|
19
|
+
const view = state.expenseAutomationTransactionsViewState;
|
|
20
|
+
return view.transactionCategorizationView[view.selectedTransactionCategorizationTab]?.transactionReviewLocalDataById;
|
|
21
|
+
}, (transactionReviewLocalDataById) => {
|
|
22
|
+
const result = {};
|
|
23
|
+
if (transactionReviewLocalDataById == null) {
|
|
24
|
+
return result;
|
|
25
|
+
}
|
|
26
|
+
for (const [transactionId, data] of Object.entries(transactionReviewLocalDataById)) {
|
|
27
|
+
const lineItems = Object.values(data.transactionReviewLocalData.lineItemById);
|
|
28
|
+
if (lineItems.some((lineItem) => lineItem.categoryClassRecommendationsFetchState?.fetchState ===
|
|
29
|
+
'In-Progress')) {
|
|
30
|
+
result[transactionId] = true;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
});
|
|
35
|
+
// Page-level "any line on the active tab is in flight?" flag. Drives the
|
|
36
|
+
// list-page Save disable.
|
|
37
|
+
export const getCategorizationHasInFlightRecommendations = createSelector(getCategorizationInFlightRecommendationsByTransactionId, (inFlightByTransactionId) => Object.keys(inFlightByTransactionId).length > 0);
|
|
11
38
|
export function getExpenseAutomationTransactionView(state) {
|
|
12
39
|
const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
|
|
13
40
|
const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
|
|
@@ -103,6 +130,8 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
103
130
|
: [];
|
|
104
131
|
const transactionCompletionStatus = allSteps.find((step) => step.step === 'transaction_categorization')?.completionStatus;
|
|
105
132
|
const completionStatus = transactionCompletionStatus ?? 'incomplete';
|
|
133
|
+
const inFlightCategoryClassRecommendationsByTransactionId = getCategorizationInFlightRecommendationsByTransactionId(state);
|
|
134
|
+
const hasInFlightCategoryClassRecommendations = getCategorizationHasInFlightRecommendations(state);
|
|
106
135
|
return {
|
|
107
136
|
version: 0,
|
|
108
137
|
fetchState: fetchStatus.fetchState,
|
|
@@ -116,6 +145,8 @@ export function getExpenseAutomationTransactionView(state) {
|
|
|
116
145
|
classList: allClasses,
|
|
117
146
|
accountsHierarchyList,
|
|
118
147
|
classHierarchyList,
|
|
148
|
+
hasInFlightCategoryClassRecommendations,
|
|
149
|
+
inFlightCategoryClassRecommendationsByTransactionId,
|
|
119
150
|
isAccountingProjectsEnabled,
|
|
120
151
|
projectList,
|
|
121
152
|
transactionLocalData,
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { concat, of, timer } from 'rxjs';
|
|
2
|
+
import { catchError, debounce, filter, groupBy, mergeMap, switchMap, } from 'rxjs/operators';
|
|
3
|
+
import { getIsAccountingClassesEnabled } from '../../entity/tenant/tenantSelector';
|
|
4
|
+
import { getTransactionWithCOT, getTransactionWithCOTFromRecommendations, } from '../../entity/transaction/transactionHelper';
|
|
5
|
+
import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
|
|
6
|
+
import { getUncategorizedAccounts } from '../accountList/accountListSelector';
|
|
7
|
+
import { markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, markCategoryClassRecommendationsInProgressForCategorization, setEntityRecommendationForLineIdsForCategorization, } from '../expenseAutomationView/reducers/transactionsViewReducer';
|
|
8
|
+
import { markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, setEntityRecommendationForLineIdsForTransactionDetail, } from '../transactionDetail/transactionDetailReducer';
|
|
9
|
+
import { buildRecommendationUrl, getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT, } from './recommendationHelper';
|
|
10
|
+
import { fetchEntityRecommendationsForLineUpdate } from './recommendationReducer';
|
|
11
|
+
// Close the per-target groupBy bucket after this much idle time so inactive
|
|
12
|
+
// groups don't accumulate forever (each group holds a Subject + a chain of
|
|
13
|
+
// active subscribers; without a duration selector groupBy retains them for
|
|
14
|
+
// the lifetime of the source observable, which is the lifetime of the app).
|
|
15
|
+
// Picked at 60s to leave a generous window for re-fetches on the same
|
|
16
|
+
// payee/transaction/line target while still bounding memory.
|
|
17
|
+
const GROUP_INACTIVITY_TIMEOUT_MS = 60000;
|
|
18
|
+
// Build the groupBy key. Same flow + same transaction + same line set
|
|
19
|
+
// share a target so switchMap can cancel an in-flight prior fetch. Use
|
|
20
|
+
// NUL (\u0000) as separator because it can never appear in transaction
|
|
21
|
+
// or line ids (vs the `|` used in an earlier WIP which collides with
|
|
22
|
+
// pipe-delimited synthetic ids).
|
|
23
|
+
const SEPARATOR = '\u0000';
|
|
24
|
+
const toGroupKey = (flowType, transactionId, lineIds) => `${flowType}${SEPARATOR}${transactionId}${SEPARATOR}${[...lineIds]
|
|
25
|
+
.sort((a, b) => a.localeCompare(b))
|
|
26
|
+
.join(SEPARATOR)}`;
|
|
27
|
+
// Targeted recommendations fetch that drives the per-line skeleton, the
|
|
28
|
+
// list-page row-checkbox uncheck/recheck, and the page-level Save
|
|
29
|
+
// disable.
|
|
30
|
+
//
|
|
31
|
+
// Concurrency model:
|
|
32
|
+
// - groupBy by (flowType, transactionId, sorted lineIds) so distinct
|
|
33
|
+
// targets run in parallel.
|
|
34
|
+
// - inside each group, switchMap so a re-fetch on the SAME target
|
|
35
|
+
// cancels any prior in-flight request for that target.
|
|
36
|
+
// - groupBy duration selector closes idle groups to bound memory.
|
|
37
|
+
export const fetchEntityRecommendationsForLineUpdateEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchEntityRecommendationsForLineUpdate.match), groupBy((action) => toGroupKey(action.payload.flowType, action.payload.transactionDetails.transactionId.id, action.payload.transactionDetails.lineIds), undefined, (group$) => group$.pipe(debounce(() => timer(GROUP_INACTIVITY_TIMEOUT_MS)))), mergeMap((group$) => group$.pipe(switchMap((action) => {
|
|
38
|
+
const { entity, amount, transactionDetails, flowType, selectedTab, isFetchCOT, isUncategorizedExpenseCategoryEnabled, } = action.payload;
|
|
39
|
+
const { transactionId, transaction, lineIds } = transactionDetails;
|
|
40
|
+
// Synchronously emit the start arm so the per-line skeleton +
|
|
41
|
+
// row uncheck happen before the HTTP request begins.
|
|
42
|
+
const startAction = flowType === 'categorization' && selectedTab != null
|
|
43
|
+
? markCategoryClassRecommendationsInProgressForCategorization(selectedTab, transactionId, lineIds)
|
|
44
|
+
: markCategoryClassRecommendationsInProgressForTransactionDetail(transactionId, lineIds);
|
|
45
|
+
const url = buildRecommendationUrl(zeniAPI.apiEndPoints.accountMicroServiceBaseUrl, entity, amount, transactionDetails, isFetchCOT === true);
|
|
46
|
+
const httpStream$ = zeniAPI
|
|
47
|
+
.getJSON(url)
|
|
48
|
+
.pipe(mergeMap((response) => {
|
|
49
|
+
if (!isSuccessResponse(response) || response.data == null) {
|
|
50
|
+
return of(flowType === 'categorization' && selectedTab != null
|
|
51
|
+
? markCategoryClassRecommendationsFailureForCategorization(selectedTab, transactionId, lineIds, response.status)
|
|
52
|
+
: markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, response.status));
|
|
53
|
+
}
|
|
54
|
+
const recommendationWithCOTByLineId = getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT(response.data.recommendations, lineIds);
|
|
55
|
+
// HTTP 200 with no per-line recommendations: NOT an error.
|
|
56
|
+
// Flip lines to Completed so the skeleton resolves and
|
|
57
|
+
// downstream UI can treat this as "we tried, nothing to
|
|
58
|
+
// apply".
|
|
59
|
+
if (recommendationWithCOTByLineId == null) {
|
|
60
|
+
return of(flowType === 'categorization' && selectedTab != null
|
|
61
|
+
? markCategoryClassRecommendationsCompletedForCategorization(selectedTab, transactionId, lineIds)
|
|
62
|
+
: markCategoryClassRecommendationsCompletedForTransactionDetail(transactionId, lineIds));
|
|
63
|
+
}
|
|
64
|
+
const transactionWithCOT = isFetchCOT === true
|
|
65
|
+
? getTransactionWithCOTFromRecommendations(transaction, recommendationWithCOTByLineId)
|
|
66
|
+
: getTransactionWithCOT(transaction);
|
|
67
|
+
const uncategorizedIncomeExpense = getUncategorizedAccounts(state$.value.accountState, state$.value.accountListState, 'accountList');
|
|
68
|
+
if (flowType === 'categorization' && selectedTab != null) {
|
|
69
|
+
return of(setEntityRecommendationForLineIdsForCategorization(selectedTab, transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled, getIsAccountingClassesEnabled(state$.value)));
|
|
70
|
+
}
|
|
71
|
+
return of(setEntityRecommendationForLineIdsForTransactionDetail(transactionId, transactionWithCOT, lineIds, entity, amount, recommendationWithCOTByLineId, uncategorizedIncomeExpense));
|
|
72
|
+
}), catchError((error) => {
|
|
73
|
+
const errorMessage = 'fetchEntityRecommendationsForLineUpdate failed: ' +
|
|
74
|
+
(error instanceof Error
|
|
75
|
+
? error.message
|
|
76
|
+
: JSON.stringify(error));
|
|
77
|
+
const status = createZeniAPIStatus('Unexpected Error', errorMessage);
|
|
78
|
+
return of(flowType === 'categorization' && selectedTab != null
|
|
79
|
+
? markCategoryClassRecommendationsFailureForCategorization(selectedTab, transactionId, lineIds, status)
|
|
80
|
+
: markCategoryClassRecommendationsFailureForTransactionDetail(transactionId, lineIds, status));
|
|
81
|
+
}));
|
|
82
|
+
return concat(of(startAction), httpStream$);
|
|
83
|
+
}))));
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { transformRecommendation, transformRecommendationWithCOT, } from '../../entity/transaction/payloadTypes/transactionPayload';
|
|
2
|
+
import { getActualTransactionID } from '../transactionDetail/transactionDetailState';
|
|
2
3
|
export const getRecommendationFromRecommendationPayload = (payload) => {
|
|
3
4
|
if (payload == null || payload.length === 0) {
|
|
4
5
|
return undefined;
|
|
@@ -37,6 +38,34 @@ export const getRecommendationWithCOTFromRecommendationPayloadWithCOT = (payload
|
|
|
37
38
|
});
|
|
38
39
|
return recommendations;
|
|
39
40
|
};
|
|
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
|
+
};
|
|
40
69
|
export const getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT = (recommendationPayload, lineIds) => {
|
|
41
70
|
if (recommendationPayload.length === 0) {
|
|
42
71
|
return undefined;
|
|
@@ -33,6 +33,41 @@ 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(entity, amount, transactionDetails, flowType, selectedTab, isFetchCOT = false, isUncategorizedExpenseCategoryEnabled) {
|
|
58
|
+
return {
|
|
59
|
+
payload: {
|
|
60
|
+
entity,
|
|
61
|
+
amount,
|
|
62
|
+
transactionDetails,
|
|
63
|
+
flowType,
|
|
64
|
+
selectedTab,
|
|
65
|
+
isFetchCOT,
|
|
66
|
+
isUncategorizedExpenseCategoryEnabled,
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
},
|
|
70
|
+
},
|
|
36
71
|
fetchRecommendationByEntityName: {
|
|
37
72
|
reducer(draft, action) {
|
|
38
73
|
const { entityName, entityType } = action.payload;
|
|
@@ -111,7 +146,7 @@ const recommendation = createSlice({
|
|
|
111
146
|
},
|
|
112
147
|
},
|
|
113
148
|
});
|
|
114
|
-
export const { fetchEntityRecommendationsByTransactionId, fetchRecommendationByEntityName, fetchRecommendationByEntityId, updateRecommendationForEntity, updateRecommendationForEntityFailure, indicateReadyToInitializeRecommendation, clearRecommendation, } = recommendation.actions;
|
|
149
|
+
export const { fetchEntityRecommendationsByTransactionId, fetchEntityRecommendationsForLineUpdate, fetchRecommendationByEntityName, fetchRecommendationByEntityId, updateRecommendationForEntity, updateRecommendationForEntityFailure, indicateReadyToInitializeRecommendation, clearRecommendation, } = recommendation.actions;
|
|
115
150
|
export default recommendation.reducer;
|
|
116
151
|
const doUpdateRecommendationForEntity = (draft, entityId, entityType, payload) => {
|
|
117
152
|
const key = getEntityRecommendationKey(entityType, entityId);
|
|
@@ -365,6 +365,21 @@ const transactionDetail = createSlice({
|
|
|
365
365
|
const detail = recordGet(draft.transactionDetailById, key, undefined);
|
|
366
366
|
if (detail != null) {
|
|
367
367
|
const newLocalData = setEntityRecommendationForLineIdInLocalData(transaction, detail.transactionDetailLocalData, action.payload.entity, lineIds, uncategorizedIncomeExpense, recommendationWithCOTByLineId);
|
|
368
|
+
// Release the per-line fetch flag for every line this fetch
|
|
369
|
+
// covered so the inline skeleton resolves and the page-level
|
|
370
|
+
// Save button can re-enable.
|
|
371
|
+
lineIds.forEach((lineId) => {
|
|
372
|
+
const lineItem = newLocalData.lineItemById[lineId];
|
|
373
|
+
if (lineItem != null) {
|
|
374
|
+
newLocalData.lineItemById[lineId] = {
|
|
375
|
+
...lineItem,
|
|
376
|
+
categoryClassRecommendationsFetchState: {
|
|
377
|
+
fetchState: 'Completed',
|
|
378
|
+
error: undefined,
|
|
379
|
+
},
|
|
380
|
+
};
|
|
381
|
+
}
|
|
382
|
+
});
|
|
368
383
|
draft.transactionDetailById[key] = {
|
|
369
384
|
...detail,
|
|
370
385
|
transactionDetailLocalData: newLocalData,
|
|
@@ -385,6 +400,84 @@ const transactionDetail = createSlice({
|
|
|
385
400
|
};
|
|
386
401
|
},
|
|
387
402
|
},
|
|
403
|
+
// Start arm of the line-update recommendations fetch for the detail
|
|
404
|
+
// page. Flips covered lines to In-Progress; detail page has no
|
|
405
|
+
// checkbox, so no auto-uncheck side effect.
|
|
406
|
+
markCategoryClassRecommendationsInProgressForTransactionDetail: {
|
|
407
|
+
reducer(draft, action) {
|
|
408
|
+
const { transactionId, lineIds } = action.payload;
|
|
409
|
+
const key = getTransactionDetailKey(transactionId);
|
|
410
|
+
const detail = recordGet(draft.transactionDetailById, key, undefined);
|
|
411
|
+
if (detail != null) {
|
|
412
|
+
lineIds.forEach((lineId) => {
|
|
413
|
+
const lineItem = detail.transactionDetailLocalData.lineItemById[lineId];
|
|
414
|
+
if (lineItem != null) {
|
|
415
|
+
detail.transactionDetailLocalData.lineItemById[lineId] = {
|
|
416
|
+
...lineItem,
|
|
417
|
+
categoryClassRecommendationsFetchState: {
|
|
418
|
+
fetchState: 'In-Progress',
|
|
419
|
+
error: undefined,
|
|
420
|
+
},
|
|
421
|
+
};
|
|
422
|
+
}
|
|
423
|
+
});
|
|
424
|
+
}
|
|
425
|
+
},
|
|
426
|
+
prepare(transactionId, lineIds) {
|
|
427
|
+
return { payload: { transactionId, lineIds } };
|
|
428
|
+
},
|
|
429
|
+
},
|
|
430
|
+
// Completed arm. Used when the HTTP call succeeded but the server
|
|
431
|
+
// returned no per-line recommendations — still need to release the
|
|
432
|
+
// In-Progress flag.
|
|
433
|
+
markCategoryClassRecommendationsCompletedForTransactionDetail: {
|
|
434
|
+
reducer(draft, action) {
|
|
435
|
+
const { transactionId, lineIds } = action.payload;
|
|
436
|
+
const key = getTransactionDetailKey(transactionId);
|
|
437
|
+
const detail = recordGet(draft.transactionDetailById, key, undefined);
|
|
438
|
+
if (detail != null) {
|
|
439
|
+
lineIds.forEach((lineId) => {
|
|
440
|
+
const lineItem = detail.transactionDetailLocalData.lineItemById[lineId];
|
|
441
|
+
if (lineItem != null) {
|
|
442
|
+
detail.transactionDetailLocalData.lineItemById[lineId] = {
|
|
443
|
+
...lineItem,
|
|
444
|
+
categoryClassRecommendationsFetchState: {
|
|
445
|
+
fetchState: 'Completed',
|
|
446
|
+
error: undefined,
|
|
447
|
+
},
|
|
448
|
+
};
|
|
449
|
+
}
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
},
|
|
453
|
+
prepare(transactionId, lineIds) {
|
|
454
|
+
return { payload: { transactionId, lineIds } };
|
|
455
|
+
},
|
|
456
|
+
},
|
|
457
|
+
markCategoryClassRecommendationsFailureForTransactionDetail: {
|
|
458
|
+
reducer(draft, action) {
|
|
459
|
+
const { transactionId, lineIds, error } = action.payload;
|
|
460
|
+
const key = getTransactionDetailKey(transactionId);
|
|
461
|
+
const detail = recordGet(draft.transactionDetailById, key, undefined);
|
|
462
|
+
if (detail != null) {
|
|
463
|
+
lineIds.forEach((lineId) => {
|
|
464
|
+
const lineItem = detail.transactionDetailLocalData.lineItemById[lineId];
|
|
465
|
+
if (lineItem != null) {
|
|
466
|
+
detail.transactionDetailLocalData.lineItemById[lineId] = {
|
|
467
|
+
...lineItem,
|
|
468
|
+
categoryClassRecommendationsFetchState: {
|
|
469
|
+
fetchState: 'Error',
|
|
470
|
+
error,
|
|
471
|
+
},
|
|
472
|
+
};
|
|
473
|
+
}
|
|
474
|
+
});
|
|
475
|
+
}
|
|
476
|
+
},
|
|
477
|
+
prepare(transactionId, lineIds, error) {
|
|
478
|
+
return { payload: { transactionId, lineIds, error } };
|
|
479
|
+
},
|
|
480
|
+
},
|
|
388
481
|
removeEntityRecommendationForLineIdForTransactionDetail: {
|
|
389
482
|
reducer(draft, action) {
|
|
390
483
|
const { transaction, lineId } = action.payload;
|
|
@@ -656,7 +749,7 @@ const transactionDetail = createSlice({
|
|
|
656
749
|
},
|
|
657
750
|
},
|
|
658
751
|
});
|
|
659
|
-
export const { downloadAccountingProviderAttachment, downloadAccountingProviderAttachmentSuccess, downloadAccountingProviderAttachmentFailure, fetchTransactionDetail, updateTransactionDetailFetchState, removeTransactionDetail, clearTransactionDetail, uploadMissingAttachmentSuccess, updateTransactionDetail, updateTransactionDetailSaveStatus, clearTransactionDetailSaveStatus, markTransactionAsNotMiscategorized, deleteTransactionAttachment, deleteTransactionAttachmentFailure, deleteTransactionAttachmentSuccess, updateStatusForTransactionNotMiscategorizedUpdate, updateStatusConsolidatedSaveTransactionDetail, updateTransactionStateIfUpdateActionNotAllowed, saveTransactionDetail, initializeTransactionDetailLocalData, saveTransactionDetailLocalData, clearTransactionDetailLocalData, resetLineItemsCategoryClassInLocalData, setAllLineItemsToCategoryClassInLocalData, setAllLineItemsLocalDataIsUpdateAllChecked, setEntityRecommendationForLineIdsForTransactionDetail, removeEntityRecommendationForLineIdForTransactionDetail, updateSelectedVendor, updateSelectedCustomer, resetVendor, resetSelectedCustomer, updateLocalDataWithTransactionsUpdateWithVendorCheckbox, updateVendorToAllLineItems, resetAllLineItemsToVendor, updateLatestSelectedEntity, updateVendorBulkRecommendationsFetchStatus, setIsVendorUpdateAllChecked, } = transactionDetail.actions;
|
|
752
|
+
export const { downloadAccountingProviderAttachment, downloadAccountingProviderAttachmentSuccess, downloadAccountingProviderAttachmentFailure, fetchTransactionDetail, updateTransactionDetailFetchState, removeTransactionDetail, clearTransactionDetail, uploadMissingAttachmentSuccess, updateTransactionDetail, updateTransactionDetailSaveStatus, clearTransactionDetailSaveStatus, markTransactionAsNotMiscategorized, deleteTransactionAttachment, deleteTransactionAttachmentFailure, deleteTransactionAttachmentSuccess, updateStatusForTransactionNotMiscategorizedUpdate, updateStatusConsolidatedSaveTransactionDetail, updateTransactionStateIfUpdateActionNotAllowed, saveTransactionDetail, initializeTransactionDetailLocalData, saveTransactionDetailLocalData, clearTransactionDetailLocalData, resetLineItemsCategoryClassInLocalData, setAllLineItemsToCategoryClassInLocalData, setAllLineItemsLocalDataIsUpdateAllChecked, setEntityRecommendationForLineIdsForTransactionDetail, markCategoryClassRecommendationsInProgressForTransactionDetail, markCategoryClassRecommendationsCompletedForTransactionDetail, markCategoryClassRecommendationsFailureForTransactionDetail, removeEntityRecommendationForLineIdForTransactionDetail, updateSelectedVendor, updateSelectedCustomer, resetVendor, resetSelectedCustomer, updateLocalDataWithTransactionsUpdateWithVendorCheckbox, updateVendorToAllLineItems, resetAllLineItemsToVendor, updateLatestSelectedEntity, updateVendorBulkRecommendationsFetchStatus, setIsVendorUpdateAllChecked, } = transactionDetail.actions;
|
|
660
753
|
export default transactionDetail.reducer;
|
|
661
754
|
function getUpdatedEntityLocalData(detail, updates, entity, resetRecommendations, type) {
|
|
662
755
|
const key = type === 'customer' ? 'customerUpdates' : 'vendorUpdates';
|
|
@@ -10,6 +10,26 @@ import { getAccountList, getNestedAccountListHierarchy, } from '../accountList/a
|
|
|
10
10
|
import { getClassList, getNestedClassListHierarchy, } from '../classList/classListSelector';
|
|
11
11
|
import { getProjectList, } from '../projectList/projectListSelector';
|
|
12
12
|
import { getAllLinkedTransactions, getTransactionDetailKey, initialSupportedTransactionDetail, } from './transactionDetailState';
|
|
13
|
+
// "Any line on this transaction is fetching category/class recommendations?"
|
|
14
|
+
// Inlined as a plain function because the upstream selector
|
|
15
|
+
// `getTransactionDetail` is also un-memoized and the iteration is O(lines)
|
|
16
|
+
// — typically <10. Exported standalone so consumers that only need the
|
|
17
|
+
// flag (e.g. footer save-disable) can avoid materializing the whole
|
|
18
|
+
// detail report.
|
|
19
|
+
export const getDetailInFlightRecommendations = (state, transactionId) => {
|
|
20
|
+
const detailKey = getTransactionDetailKey(transactionId);
|
|
21
|
+
const detail = recordGet(state.transactionDetailState.transactionDetailById, detailKey, undefined);
|
|
22
|
+
if (detail == null) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
for (const lineItem of Object.values(detail.transactionDetailLocalData.lineItemById)) {
|
|
26
|
+
if (lineItem.categoryClassRecommendationsFetchState?.fetchState ===
|
|
27
|
+
'In-Progress') {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return false;
|
|
32
|
+
};
|
|
13
33
|
export const getTransactionDetail = (state, transactionId, fetchLinkedTransactions = true) => {
|
|
14
34
|
const { transactionDetailState, transactionState, vendorState, vendorListState, accountState, classState, classListState, accountListState, projectState, projectListState, } = state;
|
|
15
35
|
const detailKey = getTransactionDetailKey(transactionId);
|
|
@@ -78,6 +98,7 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
|
|
|
78
98
|
: [];
|
|
79
99
|
const transactionDetailAnyUpdateStatus = reduceUpdateFetchStates(transactionDetail);
|
|
80
100
|
const vendors = getVendorsByVendorIds(vendorState, vendorListState.vendorIds);
|
|
101
|
+
const hasInFlightCategoryClassRecommendations = getDetailInFlightRecommendations(state, transactionId);
|
|
81
102
|
return {
|
|
82
103
|
reportId: 'transaction_detail',
|
|
83
104
|
reportTitle: 'Transaction Detail',
|
|
@@ -93,6 +114,7 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
|
|
|
93
114
|
classHierarchyList,
|
|
94
115
|
accountsHierarchyList,
|
|
95
116
|
classList: classList,
|
|
117
|
+
hasInFlightCategoryClassRecommendations,
|
|
96
118
|
isAccountingClassesEnabled,
|
|
97
119
|
isAccountingProjectsEnabled,
|
|
98
120
|
projectList,
|