@zeniai/client-epic-state 4.19.41 → 4.19.42-betaAR1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/epic.d.ts +3 -1
- package/lib/epic.js +3 -1
- package/lib/esm/epic.js +3 -1
- package/lib/esm/index.js +3 -3
- package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/backgroundRefetchReviewTabEpic.js +101 -0
- package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic.js +28 -0
- package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +27 -1
- package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +57 -8
- package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +137 -1
- package/lib/index.d.ts +5 -5
- package/lib/index.js +32 -29
- package/lib/tsconfig.typecheck.tsbuildinfo +1 -1
- package/lib/view/expenseAutomationView/epics/transactionCategorization/backgroundRefetchReviewTabEpic.d.ts +8 -0
- package/lib/view/expenseAutomationView/epics/transactionCategorization/backgroundRefetchReviewTabEpic.js +105 -0
- package/lib/view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic.d.ts +6 -0
- package/lib/view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic.js +32 -0
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +9 -2
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +28 -2
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +4 -1
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +59 -8
- package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +2 -0
- package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts +43 -4
- package/lib/view/spendManagement/spendManagementFilterHelpers.js +138 -2
- package/package.json +1 -1
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ActionsObservable, StateObservable } from 'redux-observable';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
3
|
+
import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
|
|
4
|
+
import { RootState } from '../../../../reducer';
|
|
5
|
+
import { ZeniAPI } from '../../../../zeniAPI';
|
|
6
|
+
import { backgroundRefetchReviewTab, fetchTransactionCategorizationFailure, fetchTransactionCategorizationSuccess, initializeTransactionCategorizationViewLocalData, updateTotalCountForTransactionCategorization, updateTransactionCategorizationUIState } from '../../reducers/transactionsViewReducer';
|
|
7
|
+
export type ActionType = ReturnType<typeof backgroundRefetchReviewTab> | ReturnType<typeof updateTransactions> | ReturnType<typeof initializeTransactionCategorizationViewLocalData> | ReturnType<typeof fetchTransactionCategorizationFailure> | ReturnType<typeof fetchTransactionCategorizationSuccess> | ReturnType<typeof updateTotalCountForTransactionCategorization> | ReturnType<typeof updateTransactionCategorizationUIState>;
|
|
8
|
+
export declare const backgroundRefetchReviewTabEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.backgroundRefetchReviewTabEpic = void 0;
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
5
|
+
const operators_1 = require("rxjs/operators");
|
|
6
|
+
const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
|
|
7
|
+
const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
|
|
8
|
+
const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
|
|
9
|
+
const responsePayload_1 = require("../../../../responsePayload");
|
|
10
|
+
const transactionCategorizationLocalDataHelper_1 = require("../../helpers/transactionCategorizationLocalDataHelper");
|
|
11
|
+
const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
|
|
12
|
+
const transactionsViewState_1 = require("../../types/transactionsViewState");
|
|
13
|
+
const SELECTED_TAB = 'review';
|
|
14
|
+
const PAGE_SIZE = 25;
|
|
15
|
+
const backgroundRefetchReviewTabEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.backgroundRefetchReviewTab.match), (0, operators_1.switchMap)((action) => {
|
|
16
|
+
const { period, isUncategorizedExpenseCategoryEnabled } = action.payload;
|
|
17
|
+
const state = state$.value;
|
|
18
|
+
const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
|
|
19
|
+
const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
|
|
20
|
+
const reviewUiState = state.expenseAutomationTransactionsViewState
|
|
21
|
+
.transactionCategorizationView.review.uiState;
|
|
22
|
+
const storedPageToken = reviewUiState.pageToken;
|
|
23
|
+
const fetchPage = (pageToken) => {
|
|
24
|
+
const queryParam = {
|
|
25
|
+
start_date: (0, timePeriod_1.toString)(period.start),
|
|
26
|
+
end_date: (0, timePeriod_1.toString)(period.end),
|
|
27
|
+
auto_categorized: false,
|
|
28
|
+
sort_by: (0, transactionsViewState_1.toTransactionsSortKey)(reviewUiState.sortKey),
|
|
29
|
+
sort_order: reviewUiState.sortOrder === 'ascending' ? 'asc' : 'desc',
|
|
30
|
+
page_token: pageToken,
|
|
31
|
+
page_size: PAGE_SIZE,
|
|
32
|
+
search_text: reviewUiState.searchString,
|
|
33
|
+
};
|
|
34
|
+
return zeniAPI.getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`);
|
|
35
|
+
};
|
|
36
|
+
return fetchPage(null).pipe((0, operators_1.expand)((response) => {
|
|
37
|
+
if (!(0, responsePayload_1.isSuccessResponse)(response) || response.data == null) {
|
|
38
|
+
return rxjs_1.EMPTY;
|
|
39
|
+
}
|
|
40
|
+
const nextToken = response.data.next_page_token ?? null;
|
|
41
|
+
if (nextToken == null || nextToken === storedPageToken) {
|
|
42
|
+
return rxjs_1.EMPTY;
|
|
43
|
+
}
|
|
44
|
+
return fetchPage(nextToken);
|
|
45
|
+
}), (0, operators_1.reduce)((acc, response) => {
|
|
46
|
+
if (!(0, responsePayload_1.isSuccessResponse)(response) || response.data == null) {
|
|
47
|
+
return { ...acc, failureStatus: response.status };
|
|
48
|
+
}
|
|
49
|
+
const nextToken = response.data.next_page_token ?? null;
|
|
50
|
+
return {
|
|
51
|
+
...acc,
|
|
52
|
+
allTransactions: [
|
|
53
|
+
...acc.allTransactions,
|
|
54
|
+
...response.data.transactions,
|
|
55
|
+
],
|
|
56
|
+
finalPageToken: nextToken,
|
|
57
|
+
finalStatus: response.status,
|
|
58
|
+
totalCount: response.data.total_count,
|
|
59
|
+
};
|
|
60
|
+
}, {
|
|
61
|
+
allTransactions: [],
|
|
62
|
+
failureStatus: null,
|
|
63
|
+
finalPageToken: null,
|
|
64
|
+
finalStatus: null,
|
|
65
|
+
totalCount: 0,
|
|
66
|
+
}), (0, operators_1.mergeMap)((accumulated) => {
|
|
67
|
+
if (accumulated.failureStatus != null ||
|
|
68
|
+
accumulated.finalStatus == null) {
|
|
69
|
+
return (0, rxjs_1.of)((0, transactionsViewReducer_1.fetchTransactionCategorizationFailure)({
|
|
70
|
+
selectedPeriod,
|
|
71
|
+
selectedTab: SELECTED_TAB,
|
|
72
|
+
status: accumulated.failureStatus ??
|
|
73
|
+
(0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'background refetch review tab received error response'),
|
|
74
|
+
}));
|
|
75
|
+
}
|
|
76
|
+
const transactionIds = accumulated.allTransactions.map((t) => t.transaction_id);
|
|
77
|
+
const lineItemsByTransactionIds = (0, transactionCategorizationLocalDataHelper_1.getLineItemsByTransactionsIdsFromResponse)(accumulated.allTransactions);
|
|
78
|
+
return (0, rxjs_1.from)([
|
|
79
|
+
(0, transactionReducer_1.updateTransactions)(accumulated.allTransactions, (value) => value.transaction_id, 'merge'),
|
|
80
|
+
(0, transactionsViewReducer_1.updateTransactionCategorizationUIState)({
|
|
81
|
+
selectedTab: SELECTED_TAB,
|
|
82
|
+
uiState: {
|
|
83
|
+
pageToken: accumulated.finalPageToken,
|
|
84
|
+
},
|
|
85
|
+
}),
|
|
86
|
+
(0, transactionsViewReducer_1.initializeTransactionCategorizationViewLocalData)(SELECTED_TAB, transactionIds, selectedPeriod, false, accumulated.finalPageToken, accumulated.totalCount, lineItemsByTransactionIds, true, isUncategorizedExpenseCategoryEnabled),
|
|
87
|
+
(0, transactionsViewReducer_1.updateTotalCountForTransactionCategorization)({
|
|
88
|
+
selectedPeriod,
|
|
89
|
+
selectedTab: SELECTED_TAB,
|
|
90
|
+
totalCount: accumulated.totalCount,
|
|
91
|
+
}),
|
|
92
|
+
(0, transactionsViewReducer_1.fetchTransactionCategorizationSuccess)({
|
|
93
|
+
refreshViewInBackground: true,
|
|
94
|
+
selectedTab: SELECTED_TAB,
|
|
95
|
+
status: accumulated.finalStatus,
|
|
96
|
+
}),
|
|
97
|
+
]);
|
|
98
|
+
}), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, transactionsViewReducer_1.fetchTransactionCategorizationFailure)({
|
|
99
|
+
selectedPeriod,
|
|
100
|
+
selectedTab: SELECTED_TAB,
|
|
101
|
+
status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'background refetch review tab REST API call errored out' +
|
|
102
|
+
JSON.stringify(error)),
|
|
103
|
+
}))));
|
|
104
|
+
}));
|
|
105
|
+
exports.backgroundRefetchReviewTabEpic = backgroundRefetchReviewTabEpic;
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ActionsObservable, StateObservable } from 'redux-observable';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
3
|
+
import { RootState } from '../../../../reducer';
|
|
4
|
+
import { backgroundRefetchReviewTab, syncTransactionCategorizationFromDetailSave } from '../../reducers/transactionsViewReducer';
|
|
5
|
+
export type ActionType = ReturnType<typeof syncTransactionCategorizationFromDetailSave> | ReturnType<typeof backgroundRefetchReviewTab>;
|
|
6
|
+
export declare const triggerReviewTabRefetchEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.triggerReviewTabRefetchEpic = void 0;
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
5
|
+
const operators_1 = require("rxjs/operators");
|
|
6
|
+
const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
|
|
7
|
+
const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
|
|
8
|
+
const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
|
|
9
|
+
const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.syncTransactionCategorizationFromDetailSave.match), (0, operators_1.mergeMap)((action) => {
|
|
10
|
+
const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled } = action.payload;
|
|
11
|
+
if (pendingReviewLineIds.length === 0) {
|
|
12
|
+
return rxjs_1.EMPTY;
|
|
13
|
+
}
|
|
14
|
+
const state = state$.value;
|
|
15
|
+
// Only trigger when the transaction was auto-only (not in review tab after reducer ran)
|
|
16
|
+
const reviewLocalData = state.expenseAutomationTransactionsViewState
|
|
17
|
+
.transactionCategorizationView.review
|
|
18
|
+
.transactionReviewLocalDataById[transactionId.id];
|
|
19
|
+
if (reviewLocalData != null) {
|
|
20
|
+
return rxjs_1.EMPTY;
|
|
21
|
+
}
|
|
22
|
+
const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
|
|
23
|
+
const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
|
|
24
|
+
const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);
|
|
25
|
+
const timePeriodStart = (0, timePeriod_1.toAbsoluteDay)(period.start);
|
|
26
|
+
const timePeriodEnd = (0, timePeriod_1.toAbsoluteDay)(period.end);
|
|
27
|
+
if (timePeriodStart == null || timePeriodEnd == null) {
|
|
28
|
+
return rxjs_1.EMPTY;
|
|
29
|
+
}
|
|
30
|
+
return (0, rxjs_1.of)((0, transactionsViewReducer_1.backgroundRefetchReviewTab)({ start: timePeriodStart, end: timePeriodEnd }, isUncategorizedExpenseCategoryEnabled));
|
|
31
|
+
}));
|
|
32
|
+
exports.triggerReviewTabRefetchEpic = triggerReviewTabRefetchEpic;
|
|
@@ -13,6 +13,7 @@ import { ZeniAPIStatus } from '../../../responsePayload';
|
|
|
13
13
|
import { UncategorizedAccounts } from '../../accountList/accountListSelector';
|
|
14
14
|
import { UpdateTransactionCategorizationResponsePayload } from '../payload/transactionCategorizationPayload';
|
|
15
15
|
import { SupportedTransactionCategorization, TransactionSaveUpdates, TransactionsTab, TransactionsTabViewState, TransactionsViewState, TransactionsViewUIState } from '../types/transactionsViewState';
|
|
16
|
+
import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
|
|
16
17
|
export declare const initialTransactionTabViewState: TransactionsTabViewState;
|
|
17
18
|
export declare const initialState: TransactionsViewState;
|
|
18
19
|
export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: boolean | undefined, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
|
|
@@ -28,7 +29,10 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
|
|
|
28
29
|
}, "expenseAutomationTransactionsView/fetchTransactionCategorization", never, never>, updateTransactionCategorizationUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
29
30
|
selectedTab: TransactionsTab;
|
|
30
31
|
uiState: Partial<TransactionsViewUIState>;
|
|
31
|
-
}, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">,
|
|
32
|
+
}, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">, updateTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
33
|
+
filters: TransactionFilters;
|
|
34
|
+
selectedTab: TransactionsTab;
|
|
35
|
+
}, "expenseAutomationTransactionsView/updateTransactionFilters">, initializeTransactionCategorizationViewLocalData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionIds: string[], selectedPeriod: MonthYearPeriod, keepExistingListItems: any, pageToken: PageToken, totalCount: number, lineItemsByTransactionIds: Record<string, string[]>, refreshViewInBackground?: any, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
|
|
32
36
|
selectedTab: "review" | "autoCategorized";
|
|
33
37
|
transactionIds: string[];
|
|
34
38
|
selectedPeriod: MonthYearPeriod;
|
|
@@ -155,6 +159,9 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
|
|
|
155
159
|
pendingReviewLineIds: string[];
|
|
156
160
|
uncategorizedIncomeExpense: UncategorizedAccounts;
|
|
157
161
|
isUncategorizedExpenseCategoryEnabled: boolean | undefined;
|
|
158
|
-
}, "expenseAutomationTransactionsView/syncTransactionCategorizationFromDetailSave", never, never
|
|
162
|
+
}, "expenseAutomationTransactionsView/syncTransactionCategorizationFromDetailSave", never, never>, backgroundRefetchReviewTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
|
|
163
|
+
period: TimePeriod;
|
|
164
|
+
isUncategorizedExpenseCategoryEnabled: boolean | undefined;
|
|
165
|
+
}, "expenseAutomationTransactionsView/backgroundRefetchReviewTab", never, never>;
|
|
159
166
|
declare const _default: import("redux").Reducer<TransactionsViewState>;
|
|
160
167
|
export default _default;
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
var _a;
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
|
|
7
|
+
exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
|
|
8
8
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
9
9
|
const get_1 = __importDefault(require("lodash/get"));
|
|
10
10
|
const uniq_1 = __importDefault(require("lodash/uniq"));
|
|
@@ -34,6 +34,10 @@ exports.initialTransactionTabViewState = {
|
|
|
34
34
|
totalCount: {},
|
|
35
35
|
limit: 10,
|
|
36
36
|
},
|
|
37
|
+
filters: {
|
|
38
|
+
categoryCombinationOperator: 'AND',
|
|
39
|
+
categories: [],
|
|
40
|
+
},
|
|
37
41
|
fetchState: 'Not-Started',
|
|
38
42
|
error: undefined,
|
|
39
43
|
hasValidState() {
|
|
@@ -242,6 +246,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
|
|
|
242
246
|
uiState.totalCount;
|
|
243
247
|
}
|
|
244
248
|
},
|
|
249
|
+
updateTransactionFilters(draft, action) {
|
|
250
|
+
const { selectedTab, filters } = action.payload;
|
|
251
|
+
if (filters != null) {
|
|
252
|
+
draft.transactionCategorizationView[selectedTab].filters = filters;
|
|
253
|
+
}
|
|
254
|
+
},
|
|
245
255
|
saveTransactionCategorization: {
|
|
246
256
|
prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
|
|
247
257
|
return {
|
|
@@ -769,7 +779,23 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
|
|
|
769
779
|
}
|
|
770
780
|
},
|
|
771
781
|
},
|
|
782
|
+
backgroundRefetchReviewTab: {
|
|
783
|
+
prepare(period, isUncategorizedExpenseCategoryEnabled) {
|
|
784
|
+
return {
|
|
785
|
+
payload: {
|
|
786
|
+
period,
|
|
787
|
+
isUncategorizedExpenseCategoryEnabled,
|
|
788
|
+
},
|
|
789
|
+
};
|
|
790
|
+
},
|
|
791
|
+
reducer(draft) {
|
|
792
|
+
draft.transactionCategorizationView.review.refreshStatus = {
|
|
793
|
+
fetchState: 'In-Progress',
|
|
794
|
+
error: undefined,
|
|
795
|
+
};
|
|
796
|
+
},
|
|
797
|
+
},
|
|
772
798
|
},
|
|
773
799
|
});
|
|
774
|
-
_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave;
|
|
800
|
+
_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab;
|
|
775
801
|
exports.default = expenseAutomationTransactionsView.reducer;
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { TransactionWithCOT } from '../../../entity/transaction/stateTypes/transaction';
|
|
1
2
|
import { RootState } from '../../../reducer';
|
|
2
|
-
import {
|
|
3
|
+
import { TransactionView } from '../../spendManagement/spendManagementFilterHelpers';
|
|
4
|
+
import { ExpenseAutomationTransactionViewSelector, TransactionReviewLocalDataSelectorView } from '../selectorTypes/transactionsViewSelectorTypes';
|
|
5
|
+
export declare const toTransactionView: (transaction: TransactionWithCOT, transactionLocalData?: TransactionReviewLocalDataSelectorView) => TransactionView;
|
|
3
6
|
export declare function getExpenseAutomationTransactionView(state: RootState): ExpenseAutomationTransactionViewSelector;
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.toTransactionView = void 0;
|
|
6
7
|
exports.getExpenseAutomationTransactionView = getExpenseAutomationTransactionView;
|
|
7
8
|
const omit_1 = __importDefault(require("lodash/omit"));
|
|
8
9
|
const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
|
|
@@ -10,13 +11,33 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
|
|
|
10
11
|
const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
|
|
11
12
|
const transactionHelper_1 = require("../../../entity/transaction/transactionHelper");
|
|
12
13
|
const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
|
|
14
|
+
const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
|
|
13
15
|
const accountListSelector_1 = require("../../accountList/accountListSelector");
|
|
14
16
|
const classListSelector_1 = require("../../classList/classListSelector");
|
|
15
17
|
const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
|
|
18
|
+
const toTransactionView = (transaction, transactionLocalData) => {
|
|
19
|
+
return {
|
|
20
|
+
id: transaction.id,
|
|
21
|
+
date: transaction.date,
|
|
22
|
+
amount: transaction.amount,
|
|
23
|
+
vendorName: transaction.vendorName,
|
|
24
|
+
customerName: transaction.customerName,
|
|
25
|
+
vendorId: transaction.vendorId,
|
|
26
|
+
customerId: transaction.customerId,
|
|
27
|
+
description: transaction.description,
|
|
28
|
+
memo: transaction.memo,
|
|
29
|
+
type: transaction.type,
|
|
30
|
+
typeName: transaction.typeName,
|
|
31
|
+
createTime: transaction.createTime,
|
|
32
|
+
transaction: transaction,
|
|
33
|
+
transactionLocalData,
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
exports.toTransactionView = toTransactionView;
|
|
16
37
|
function getExpenseAutomationTransactionView(state) {
|
|
17
38
|
const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
|
|
18
39
|
const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
|
|
19
|
-
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
|
|
40
|
+
const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
|
|
20
41
|
const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
|
|
21
42
|
const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
|
|
22
43
|
const classList = (0, classListSelector_1.getClassList)(classState, classListState);
|
|
@@ -33,10 +54,42 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
33
54
|
? transactionIdsBySelectedPeriod[monthYearPeriodId]
|
|
34
55
|
: null;
|
|
35
56
|
const transactionIds = transactionIdsForSelectedPeriod ?? [];
|
|
36
|
-
const
|
|
37
|
-
|
|
57
|
+
const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
|
|
58
|
+
const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
|
|
59
|
+
const transactionLocalDataMap = new Map();
|
|
60
|
+
transactionIds.forEach((transactionId) => {
|
|
38
61
|
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
39
62
|
if (transactionData != null) {
|
|
63
|
+
transactionLocalDataMap.set(transactionId, {
|
|
64
|
+
transactionId,
|
|
65
|
+
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
// Step 2: Convert to TransactionView and apply advanced filters
|
|
70
|
+
const transactionViews = transactionsWithCOT.map((transaction) => {
|
|
71
|
+
const localData = transactionLocalDataMap.get(transaction.id);
|
|
72
|
+
return (0, exports.toTransactionView)(transaction, localData);
|
|
73
|
+
});
|
|
74
|
+
// Apply advanced filters if they exist
|
|
75
|
+
const filteredTransactionViews = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('transaction_categorization', transactionViews, filters);
|
|
76
|
+
// Convert back to TransactionWithCOT for return
|
|
77
|
+
const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
|
|
78
|
+
// Get transactionLocalData for filtered transactions
|
|
79
|
+
// Also include transactionLocalData for transactions that don't exist in transactionState
|
|
80
|
+
// but have local data (to match original behavior)
|
|
81
|
+
const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
|
|
82
|
+
const filteredTransactionLocalData = transactionIds
|
|
83
|
+
.map((transactionId) => {
|
|
84
|
+
const transactionData = transactionReviewLocalDataById[transactionId];
|
|
85
|
+
if (transactionData == null) {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
// Include if transaction is in filtered results, or if transaction doesn't exist in state
|
|
89
|
+
// (to maintain backward compatibility with tests)
|
|
90
|
+
const transactionExists = transactions.some((t) => t.id === transactionId);
|
|
91
|
+
if (filteredTransactionIds.has(transactionId) ||
|
|
92
|
+
!transactionExists) {
|
|
40
93
|
return {
|
|
41
94
|
transactionId,
|
|
42
95
|
transactionReviewLocalData: transactionData.transactionReviewLocalData,
|
|
@@ -44,9 +97,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
44
97
|
}
|
|
45
98
|
return null;
|
|
46
99
|
})
|
|
47
|
-
.filter((
|
|
48
|
-
const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
|
|
49
|
-
const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
|
|
100
|
+
.filter((data) => data != null);
|
|
50
101
|
const fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
|
|
51
102
|
accountList,
|
|
52
103
|
classList,
|
|
@@ -83,7 +134,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
83
134
|
version: 0,
|
|
84
135
|
fetchState: fetchStatus.fetchState,
|
|
85
136
|
error: fetchStatus.error,
|
|
86
|
-
transactions:
|
|
137
|
+
transactions: filteredTransactionsWithCOT,
|
|
87
138
|
selectedCheckBoxTransactionIds,
|
|
88
139
|
transactionIdsWithUnsavedData,
|
|
89
140
|
uncategorizedAccounts: uncategorizedIncomeExpense,
|
|
@@ -92,7 +143,7 @@ function getExpenseAutomationTransactionView(state) {
|
|
|
92
143
|
classList: allClasses,
|
|
93
144
|
accountsHierarchyList,
|
|
94
145
|
classHierarchyList,
|
|
95
|
-
transactionLocalData,
|
|
146
|
+
transactionLocalData: filteredTransactionLocalData,
|
|
96
147
|
uiState,
|
|
97
148
|
refreshStatus,
|
|
98
149
|
saveStatus,
|
|
@@ -14,6 +14,7 @@ import { TransactionCategory, TransactionType } from '../../../entity/transactio
|
|
|
14
14
|
import { VendorBase } from '../../../entity/vendor/vendorState';
|
|
15
15
|
import { ZeniDate } from '../../../zeniDayJS';
|
|
16
16
|
import { EntityRecommendationKey } from '../../recommendation/recommendationState';
|
|
17
|
+
import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
|
|
17
18
|
import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
|
|
18
19
|
export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
|
|
19
20
|
export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
|
|
@@ -89,6 +90,7 @@ export interface SupportedTransactionCategorization {
|
|
|
89
90
|
}
|
|
90
91
|
export declare const initialSupportedTransactionCategorization: SupportedTransactionCategorization;
|
|
91
92
|
export interface TransactionsTabViewState extends FetchedState {
|
|
93
|
+
filters: TransactionFilters;
|
|
92
94
|
markAsNotMiscategorizedStatus: FetchStateAndError;
|
|
93
95
|
refreshStatus: FetchStateAndError;
|
|
94
96
|
saveStatus: FetchStateAndError;
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
+
import { Amount } from '../../commonStateTypes/amount';
|
|
2
|
+
import { ID } from '../../commonStateTypes/common';
|
|
1
3
|
import { TimePeriod } from '../../commonStateTypes/timePeriod';
|
|
2
4
|
import { UserRoleType } from '../../entity/userRole/userRoleType';
|
|
3
5
|
import { RootState } from '../../reducer';
|
|
4
6
|
import { ZeniDate } from '../../zeniDayJS';
|
|
5
7
|
import { TaskListFilterCategoryField, TaskListFilters } from '../taskManager/taskListView/taskList';
|
|
6
8
|
import { TaskWithUserDetails } from '../taskManager/taskListView/taskListSelector';
|
|
9
|
+
import { SupportedTransactionWithCOT } from '../../entity/transaction/transactionState';
|
|
10
|
+
import { TransactionType } from '../../entity/transaction/stateTypes/transactionType';
|
|
11
|
+
import { TransactionReviewLocalDataSelectorView } from '../expenseAutomationView/selectorTypes/transactionsViewSelectorTypes';
|
|
7
12
|
import { BillTransactionView } from './billPay/billList/billListSelector';
|
|
8
13
|
import { BillListViewFilterCategoryField, BillPayFilters } from './billPay/billList/billListState';
|
|
9
14
|
import { ReimbursementView } from './reimbursement/remiListView/remiListSelector';
|
|
10
15
|
import { ReimbursementFilters, RemiListViewFilterCategoryField } from './reimbursement/remiListView/remiListState';
|
|
11
|
-
export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters;
|
|
12
|
-
export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management';
|
|
16
|
+
export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters | TransactionFilters;
|
|
17
|
+
export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management' | 'transaction_categorization';
|
|
13
18
|
export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
|
|
14
19
|
export interface MatchingOperatorDropdownOption {
|
|
15
20
|
label: 'is' | 'is not';
|
|
@@ -31,9 +36,43 @@ export interface TaskFilterCategoryDropdownOption {
|
|
|
31
36
|
multiple?: boolean;
|
|
32
37
|
type?: FilterCategoryType;
|
|
33
38
|
}
|
|
34
|
-
export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption;
|
|
39
|
+
export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption | TransactionFilterCategoryDropdownOption;
|
|
40
|
+
export interface TransactionFilterCategoryDropdownOption {
|
|
41
|
+
value: TransactionFilterCategoryField;
|
|
42
|
+
multiple?: boolean;
|
|
43
|
+
type?: FilterCategoryType;
|
|
44
|
+
}
|
|
45
|
+
export type TransactionFilterEntityType = 'transaction_categorization' | 'customer' | 'vendor' | 'merchant';
|
|
46
|
+
export type TransactionFilterCategoryField = 'payment_account_name' | 'payment_account_type' | 'payee' | 'category' | 'class' | 'amount';
|
|
47
|
+
export declare const TRANSACTION_FILTER_CATEGORIES: TransactionFilterCategoryDropdownOption[];
|
|
48
|
+
export interface TransactionFilters {
|
|
49
|
+
categories: TransactionFilterCategory[];
|
|
50
|
+
categoryCombinationOperator: CategoryCombinationOperator;
|
|
51
|
+
}
|
|
52
|
+
export interface TransactionFilterCategory {
|
|
53
|
+
field: TransactionFilterCategoryField;
|
|
54
|
+
matchingOperator: 'equal' | 'not-equal';
|
|
55
|
+
values: (string | ZeniDate)[];
|
|
56
|
+
valuesCombinationOperator: 'ANY';
|
|
57
|
+
}
|
|
58
|
+
export interface TransactionView {
|
|
59
|
+
amount: Amount;
|
|
60
|
+
createTime: ZeniDate;
|
|
61
|
+
date: ZeniDate;
|
|
62
|
+
description: string;
|
|
63
|
+
id: ID;
|
|
64
|
+
memo: string;
|
|
65
|
+
transaction: SupportedTransactionWithCOT;
|
|
66
|
+
type: TransactionType;
|
|
67
|
+
customerId?: ID;
|
|
68
|
+
customerName?: string;
|
|
69
|
+
transactionLocalData?: TransactionReviewLocalDataSelectorView;
|
|
70
|
+
typeName?: string;
|
|
71
|
+
vendorId?: ID;
|
|
72
|
+
vendorName?: string;
|
|
73
|
+
}
|
|
35
74
|
export type FilterCategoryValueType = string | number | ZeniDate;
|
|
36
|
-
export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails)[];
|
|
75
|
+
export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[] | TransactionView[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters | TransactionFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails | TransactionView)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails | TransactionView)[];
|
|
37
76
|
export declare const isBillListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
|
|
38
77
|
export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
|
|
39
78
|
export declare const hideCreatedByFilter: (userRole: UserRoleType[]) => boolean;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.hideCreatedByFilter = exports.isRemiListDownloadable = exports.isBillListDownloadable = exports.applyAdvancedFiltersOnList = void 0;
|
|
6
|
+
exports.hideCreatedByFilter = exports.isRemiListDownloadable = exports.isBillListDownloadable = exports.applyAdvancedFiltersOnList = exports.TRANSACTION_FILTER_CATEGORIES = void 0;
|
|
7
7
|
const get_1 = __importDefault(require("lodash/get"));
|
|
8
8
|
const userSelector_1 = require("../../entity/user/userSelector");
|
|
9
9
|
const userRoleType_1 = require("../../entity/userRole/userRoleType");
|
|
@@ -13,6 +13,14 @@ const billListState_1 = require("./billPay/billList/billListState");
|
|
|
13
13
|
const helpers_1 = require("./helpers");
|
|
14
14
|
const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
|
|
15
15
|
const remiListState_1 = require("./reimbursement/remiListView/remiListState");
|
|
16
|
+
exports.TRANSACTION_FILTER_CATEGORIES = [
|
|
17
|
+
{ value: 'payment_account_name', type: 'searchAutocomplete' },
|
|
18
|
+
{ value: 'payment_account_type', type: 'dropdown' },
|
|
19
|
+
{ value: 'payee', type: 'searchAutocomplete' },
|
|
20
|
+
{ value: 'category', type: 'dropdown' },
|
|
21
|
+
{ value: 'class', type: 'dropdown' },
|
|
22
|
+
{ value: 'amount', type: 'numberRange' },
|
|
23
|
+
];
|
|
16
24
|
//filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
|
|
17
25
|
const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
|
|
18
26
|
let doesItemFallInValueRange = false;
|
|
@@ -110,7 +118,11 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
|
|
|
110
118
|
? getCategoryValueForBill(key, item)
|
|
111
119
|
: entity === 'reimbursement'
|
|
112
120
|
? getCategoryValueForReimbursement(key, item)
|
|
113
|
-
:
|
|
121
|
+
: entity === 'task_management'
|
|
122
|
+
? getCategoryValueForTaskList(key, item)
|
|
123
|
+
: entity === 'transaction_categorization'
|
|
124
|
+
? getCategoryValueForTransaction(key, item)
|
|
125
|
+
: undefined;
|
|
114
126
|
if (categoryValue == null) {
|
|
115
127
|
if (currentFilter.matchingOperator === 'not-equal') {
|
|
116
128
|
return true;
|
|
@@ -231,6 +243,130 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
|
|
|
231
243
|
return undefined;
|
|
232
244
|
}
|
|
233
245
|
};
|
|
246
|
+
const getCategoryValueForTransaction = (key, transaction) => {
|
|
247
|
+
switch (key) {
|
|
248
|
+
case 'amount': {
|
|
249
|
+
// Get from transactionLocalData line items (preferred) - sum all line item amounts
|
|
250
|
+
const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
|
|
251
|
+
if (localDataForAmount?.lineItemById) {
|
|
252
|
+
const lineItems = Object.values(localDataForAmount.lineItemById);
|
|
253
|
+
if (lineItems.length > 0) {
|
|
254
|
+
// Sum all line item amounts
|
|
255
|
+
const totalAmount = lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
|
|
256
|
+
return totalAmount;
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
// Fallback to transaction-level amount or sum from transaction lines
|
|
260
|
+
if (transaction.transaction.lines && transaction.transaction.lines.length > 0) {
|
|
261
|
+
const totalAmount = transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
|
|
262
|
+
return totalAmount;
|
|
263
|
+
}
|
|
264
|
+
// Final fallback to transaction amount
|
|
265
|
+
return transaction.amount.amount;
|
|
266
|
+
}
|
|
267
|
+
case 'payee': {
|
|
268
|
+
// Priority: vendorName > customerName > from transactionLocalData
|
|
269
|
+
if (transaction.vendorName) {
|
|
270
|
+
return transaction.vendorName;
|
|
271
|
+
}
|
|
272
|
+
if (transaction.customerName) {
|
|
273
|
+
return transaction.customerName;
|
|
274
|
+
}
|
|
275
|
+
// Check transactionLocalData for vendor/customer
|
|
276
|
+
const localData = transaction.transactionLocalData?.transactionReviewLocalData;
|
|
277
|
+
if (localData?.vendor?.name) {
|
|
278
|
+
return localData.vendor.name;
|
|
279
|
+
}
|
|
280
|
+
if (localData?.customer?.name) {
|
|
281
|
+
return localData.customer.name;
|
|
282
|
+
}
|
|
283
|
+
return undefined;
|
|
284
|
+
}
|
|
285
|
+
case 'payment_account_name': {
|
|
286
|
+
// Get from transaction.account or from lines
|
|
287
|
+
if (transaction.transaction.account?.accountName) {
|
|
288
|
+
return transaction.transaction.account.accountName;
|
|
289
|
+
}
|
|
290
|
+
// Get from first line's account
|
|
291
|
+
const firstLine = transaction.transaction.lines?.[0];
|
|
292
|
+
if (firstLine?.type === 'transaction_with_account_and_class_line' ||
|
|
293
|
+
firstLine?.type === 'transaction_with_product_or_service_line' ||
|
|
294
|
+
firstLine?.type === 'journal_entry_transaction_line') {
|
|
295
|
+
const accountLine = firstLine;
|
|
296
|
+
return accountLine.account?.accountName;
|
|
297
|
+
}
|
|
298
|
+
return undefined;
|
|
299
|
+
}
|
|
300
|
+
case 'payment_account_type': {
|
|
301
|
+
// Similar to payment_account_name but for type
|
|
302
|
+
if (transaction.transaction.account?.accountType) {
|
|
303
|
+
return transaction.transaction.account.accountType;
|
|
304
|
+
}
|
|
305
|
+
const firstLineForType = transaction.transaction.lines?.[0];
|
|
306
|
+
if (firstLineForType?.type === 'transaction_with_account_and_class_line' ||
|
|
307
|
+
firstLineForType?.type === 'transaction_with_product_or_service_line' ||
|
|
308
|
+
firstLineForType?.type === 'journal_entry_transaction_line') {
|
|
309
|
+
const accountLineForType = firstLineForType;
|
|
310
|
+
return accountLineForType.account?.accountType;
|
|
311
|
+
}
|
|
312
|
+
return undefined;
|
|
313
|
+
}
|
|
314
|
+
case 'category': {
|
|
315
|
+
// Get from transactionLocalData (preferred) or from transaction lines
|
|
316
|
+
const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
|
|
317
|
+
if (localDataForCategory) {
|
|
318
|
+
// Get category from first line item or most common
|
|
319
|
+
const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
|
|
320
|
+
if (firstLineItem?.account?.accountId) {
|
|
321
|
+
return firstLineItem.account.accountId;
|
|
322
|
+
}
|
|
323
|
+
if (firstLineItem?.account?.qboId) {
|
|
324
|
+
return firstLineItem.account.qboId;
|
|
325
|
+
}
|
|
326
|
+
if (firstLineItem?.account?.accountName) {
|
|
327
|
+
return firstLineItem.account.accountName;
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
// Fallback to transaction lines
|
|
331
|
+
const firstLineForCategory = transaction.transaction.lines?.[0];
|
|
332
|
+
if (firstLineForCategory?.type === 'transaction_with_account_and_class_line' ||
|
|
333
|
+
firstLineForCategory?.type === 'transaction_with_product_or_service_line' ||
|
|
334
|
+
firstLineForCategory?.type === 'journal_entry_transaction_line') {
|
|
335
|
+
const account = firstLineForCategory
|
|
336
|
+
.account;
|
|
337
|
+
return account?.accountId ?? account?.qboId ?? account?.accountName;
|
|
338
|
+
}
|
|
339
|
+
return undefined;
|
|
340
|
+
}
|
|
341
|
+
case 'class': {
|
|
342
|
+
// Similar to category but for class
|
|
343
|
+
const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
|
|
344
|
+
if (localDataForClass) {
|
|
345
|
+
const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
|
|
346
|
+
if (firstLineItemForClass?.class?.classId) {
|
|
347
|
+
return firstLineItemForClass.class.classId;
|
|
348
|
+
}
|
|
349
|
+
if (firstLineItemForClass?.class?.qboId) {
|
|
350
|
+
return firstLineItemForClass.class.qboId;
|
|
351
|
+
}
|
|
352
|
+
if (firstLineItemForClass?.class?.className) {
|
|
353
|
+
return firstLineItemForClass.class.className;
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
const firstLineForClass = transaction.transaction.lines?.[0];
|
|
357
|
+
if (firstLineForClass?.type === 'transaction_with_account_and_class_line' ||
|
|
358
|
+
firstLineForClass?.type === 'transaction_with_product_or_service_line' ||
|
|
359
|
+
firstLineForClass?.type === 'journal_entry_transaction_line') {
|
|
360
|
+
const classData = firstLineForClass
|
|
361
|
+
.class;
|
|
362
|
+
return classData?.classId ?? classData?.qboId ?? classData?.className;
|
|
363
|
+
}
|
|
364
|
+
return undefined;
|
|
365
|
+
}
|
|
366
|
+
default:
|
|
367
|
+
return undefined;
|
|
368
|
+
}
|
|
369
|
+
};
|
|
234
370
|
const isBillListDownloadable = (state, currentTimePeriod) => {
|
|
235
371
|
const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
|
|
236
372
|
const keys = billListState_1.ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, billListState_1.getBillListKey)(currentTimePeriod, tab));
|