@zeniai/client-epic-state 5.0.64-beta1ND → 5.0.64-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.
Files changed (26) hide show
  1. package/lib/entity/account/accountSelector.d.ts +20 -1
  2. package/lib/entity/account/accountSelector.js +35 -1
  3. package/lib/entity/account/accountState.d.ts +5 -0
  4. package/lib/entity/account/accountState.js +11 -4
  5. package/lib/entity/class/classSelector.d.ts +5 -0
  6. package/lib/entity/class/classSelector.js +8 -0
  7. package/lib/esm/entity/account/accountSelector.js +33 -1
  8. package/lib/esm/entity/account/accountState.js +7 -1
  9. package/lib/esm/entity/class/classSelector.js +7 -0
  10. package/lib/esm/index.js +10 -4
  11. package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +11 -1
  12. package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +58 -8
  13. package/lib/esm/view/expenseAutomationView/transactionFilterHelpers.js +186 -0
  14. package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +2 -0
  15. package/lib/index.d.ts +7 -5
  16. package/lib/index.js +41 -33
  17. package/lib/tsconfig.typecheck.tsbuildinfo +1 -0
  18. package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +5 -1
  19. package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +12 -2
  20. package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +4 -1
  21. package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +60 -8
  22. package/lib/view/expenseAutomationView/transactionFilterHelpers.d.ts +65 -0
  23. package/lib/view/expenseAutomationView/transactionFilterHelpers.js +190 -0
  24. package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +2 -0
  25. package/lib/view/spendManagement/spendManagementFilterHelpers.js +2 -0
  26. package/package.json +3 -7
@@ -14,6 +14,7 @@ import { ZeniAPIStatus } from '../../../responsePayload';
14
14
  import { UncategorizedAccounts } from '../../accountList/accountListSelector';
15
15
  import { UpdateTransactionCategorizationResponsePayload } from '../payload/transactionCategorizationPayload';
16
16
  import { SupportedTransactionCategorization, TransactionSaveUpdates, TransactionsTab, TransactionsTabViewState, TransactionsViewState, TransactionsViewUIState } from '../types/transactionsViewState';
17
+ import { TransactionFilters } from '../transactionFilterHelpers';
17
18
  export declare const initialTransactionTabViewState: TransactionsTabViewState;
18
19
  export declare const initialState: TransactionsViewState;
19
20
  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], {
@@ -29,7 +30,10 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
29
30
  }, "expenseAutomationTransactionsView/fetchTransactionCategorization", never, never>, updateTransactionCategorizationUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
30
31
  selectedTab: TransactionsTab;
31
32
  uiState: Partial<TransactionsViewUIState>;
32
- }, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">, 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], {
33
+ }, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">, updateTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
34
+ filters: TransactionFilters;
35
+ selectedTab: TransactionsTab;
36
+ }, "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], {
33
37
  selectedTab: "review" | "autoCategorized";
34
38
  transactionIds: string[];
35
39
  selectedPeriod: MonthYearPeriod;
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  var _a;
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
7
+ exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = 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() {
@@ -243,6 +247,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
243
247
  uiState.totalCount;
244
248
  }
245
249
  },
250
+ updateTransactionFilters(draft, action) {
251
+ const { selectedTab, filters } = action.payload;
252
+ if (filters != null) {
253
+ draft.transactionCategorizationView[selectedTab].filters = filters;
254
+ }
255
+ },
246
256
  saveTransactionCategorization: {
247
257
  prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
248
258
  return {
@@ -810,5 +820,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
810
820
  },
811
821
  },
812
822
  });
813
- _a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
823
+ _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, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
814
824
  exports.default = expenseAutomationTransactionsView.reducer;
@@ -1,3 +1,6 @@
1
+ import { TransactionWithCOT } from '../../../entity/transaction/stateTypes/transaction';
1
2
  import { RootState } from '../../../reducer';
2
- import { ExpenseAutomationTransactionViewSelector } from '../selectorTypes/transactionsViewSelectorTypes';
3
+ import { TransactionView } from '../transactionFilterHelpers';
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,14 +11,34 @@ 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 transactionFilterHelpers_1 = require("../transactionFilterHelpers");
13
15
  const accountListSelector_1 = require("../../accountList/accountListSelector");
14
16
  const classListSelector_1 = require("../../classList/classListSelector");
15
17
  const projectListSelector_1 = require("../../projectList/projectListSelector");
16
18
  const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
19
+ const toTransactionView = (transaction, transactionLocalData) => {
20
+ return {
21
+ id: transaction.id,
22
+ date: transaction.date,
23
+ amount: transaction.amount,
24
+ vendorName: transaction.vendorName,
25
+ customerName: transaction.customerName,
26
+ vendorId: transaction.vendorId,
27
+ customerId: transaction.customerId,
28
+ description: transaction.description,
29
+ memo: transaction.memo,
30
+ type: transaction.type,
31
+ typeName: transaction.typeName,
32
+ createTime: transaction.createTime,
33
+ transaction: transaction,
34
+ transactionLocalData,
35
+ };
36
+ };
37
+ exports.toTransactionView = toTransactionView;
17
38
  function getExpenseAutomationTransactionView(state) {
18
39
  const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
19
40
  const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
20
- const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
41
+ const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
21
42
  const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
22
43
  const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
23
44
  const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -36,10 +57,43 @@ function getExpenseAutomationTransactionView(state) {
36
57
  ? transactionIdsBySelectedPeriod[monthYearPeriodId]
37
58
  : null;
38
59
  const transactionIds = transactionIdsForSelectedPeriod ?? [];
39
- const transactionLocalData = transactionIds
40
- .map((transactionId) => {
60
+ const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
61
+ const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
62
+ const transactionLocalDataMap = new Map();
63
+ transactionIds.forEach((transactionId) => {
41
64
  const transactionData = transactionReviewLocalDataById[transactionId];
42
65
  if (transactionData != null) {
66
+ transactionLocalDataMap.set(transactionId, {
67
+ transactionId,
68
+ transactionReviewLocalData: transactionData.transactionReviewLocalData,
69
+ });
70
+ }
71
+ });
72
+ // Step 2: Convert to TransactionView and apply advanced filters
73
+ const transactionViews = transactionsWithCOT.map((transaction) => {
74
+ const localData = transactionLocalDataMap.get(transaction.id);
75
+ return (0, exports.toTransactionView)(transaction, localData);
76
+ });
77
+ // Apply TC-specific filters (lives under expenseAutomationView, independent
78
+ // of the Spend Management filter pipeline).
79
+ const filteredTransactionViews = (0, transactionFilterHelpers_1.applyTransactionFilters)(transactionViews, filters);
80
+ // Convert back to TransactionWithCOT for return
81
+ const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
82
+ // Get transactionLocalData for filtered transactions
83
+ // Also include transactionLocalData for transactions that don't exist in transactionState
84
+ // but have local data (to match original behavior)
85
+ const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
86
+ const filteredTransactionLocalData = transactionIds
87
+ .map((transactionId) => {
88
+ const transactionData = transactionReviewLocalDataById[transactionId];
89
+ if (transactionData == null) {
90
+ return null;
91
+ }
92
+ // Include if transaction is in filtered results, or if transaction doesn't exist in state
93
+ // (to maintain backward compatibility with tests)
94
+ const transactionExists = transactions.some((t) => t.id === transactionId);
95
+ if (filteredTransactionIds.has(transactionId) ||
96
+ !transactionExists) {
43
97
  return {
44
98
  transactionId,
45
99
  transactionReviewLocalData: transactionData.transactionReviewLocalData,
@@ -47,9 +101,7 @@ function getExpenseAutomationTransactionView(state) {
47
101
  }
48
102
  return null;
49
103
  })
50
- .filter((transaction) => transaction != null);
51
- const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
52
- const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
104
+ .filter((data) => data != null);
53
105
  const monthEndFetchState = monthYearPeriodId != null
54
106
  ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
55
107
  : { fetchState: 'Not-Started', error: undefined };
@@ -96,7 +148,7 @@ function getExpenseAutomationTransactionView(state) {
96
148
  version: 0,
97
149
  fetchState: fetchStatus.fetchState,
98
150
  error: fetchStatus.error,
99
- transactions: transactionsWithCOT,
151
+ transactions: filteredTransactionsWithCOT,
100
152
  selectedCheckBoxTransactionIds,
101
153
  transactionIdsWithUnsavedData,
102
154
  uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -107,7 +159,7 @@ function getExpenseAutomationTransactionView(state) {
107
159
  classHierarchyList,
108
160
  isAccountingProjectsEnabled,
109
161
  projectList,
110
- transactionLocalData,
162
+ transactionLocalData: filteredTransactionLocalData,
111
163
  uiState,
112
164
  refreshStatus,
113
165
  saveStatus,
@@ -0,0 +1,65 @@
1
+ /**
2
+ * Filter machinery for the Transaction Categorization feature inside
3
+ * Expense Automation. Intentionally self-contained — does NOT import anything
4
+ * from `view/spendManagement/*`, because Transaction Categorization is not a
5
+ * Spend Management product. Generic primitives (`CategoryCombinationOperator`,
6
+ * `FilterCategoryType`) are redeclared locally rather than imported across the
7
+ * feature boundary; their definitions happen to coincide with the
8
+ * spend-management equivalents, which is fine — they're the same primitive
9
+ * concept used independently by both feature groups.
10
+ */
11
+ import { Amount } from '../../commonStateTypes/amount';
12
+ import { ID } from '../../commonStateTypes/common';
13
+ import { TransactionType } from '../../entity/transaction/stateTypes/transactionType';
14
+ import { SupportedTransactionWithCOT } from '../../entity/transaction/transactionState';
15
+ import { ZeniDate } from '../../zeniDayJS';
16
+ import { TransactionReviewLocalDataSelectorView } from './selectorTypes/transactionsViewSelectorTypes';
17
+ /** Local copy of the generic combination operator — independent of SM. */
18
+ export type CategoryCombinationOperator = 'AND' | 'OR';
19
+ /** Local copy of the generic filter category-input type — independent of SM. */
20
+ export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
21
+ export type TransactionFilterEntityType = 'transaction_categorization' | 'customer' | 'vendor' | 'merchant';
22
+ export type TransactionFilterCategoryField = 'payment_account_name' | 'payment_account_type' | 'payee' | 'category' | 'class' | 'amount';
23
+ export interface TransactionFilterCategoryDropdownOption {
24
+ value: TransactionFilterCategoryField;
25
+ multiple?: boolean;
26
+ type?: FilterCategoryType;
27
+ }
28
+ export declare const TRANSACTION_FILTER_CATEGORIES: TransactionFilterCategoryDropdownOption[];
29
+ /** Amount filter operators for transaction_categorization. */
30
+ export type TransactionFilterAmountMatchingOperator = 'equal' | 'not-equal' | 'lessThan' | 'greaterThan' | 'inBetween';
31
+ export interface TransactionFilterCategory {
32
+ field: TransactionFilterCategoryField;
33
+ matchingOperator: TransactionFilterAmountMatchingOperator;
34
+ values: (string | number)[];
35
+ valuesCombinationOperator: 'ANY';
36
+ }
37
+ export interface TransactionFilters {
38
+ categories: TransactionFilterCategory[];
39
+ categoryCombinationOperator: CategoryCombinationOperator;
40
+ }
41
+ export interface TransactionView {
42
+ amount: Amount;
43
+ createTime: ZeniDate;
44
+ date: ZeniDate;
45
+ description: string;
46
+ id: ID;
47
+ memo: string;
48
+ transaction: SupportedTransactionWithCOT;
49
+ type: TransactionType;
50
+ customerId?: ID;
51
+ customerName?: string;
52
+ transactionLocalData?: TransactionReviewLocalDataSelectorView;
53
+ typeName?: string;
54
+ vendorId?: ID;
55
+ vendorName?: string;
56
+ }
57
+ /**
58
+ * TC-only equivalent of `applyAdvancedFiltersOnList`. Filters a list of
59
+ * `TransactionView` items against a `TransactionFilters` object using the
60
+ * AND/OR combination semantics from `categoryCombinationOperator`.
61
+ *
62
+ * Independent of `view/spendManagement` — keeps the TC filter pipeline cleanly
63
+ * inside the Expense Automation feature group.
64
+ */
65
+ export declare const applyTransactionFilters: (transactions: TransactionView[], filters?: TransactionFilters) => TransactionView[];
@@ -0,0 +1,190 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.applyTransactionFilters = exports.TRANSACTION_FILTER_CATEGORIES = void 0;
4
+ exports.TRANSACTION_FILTER_CATEGORIES = [
5
+ { value: 'payment_account_name', type: 'dropdown' },
6
+ { value: 'payment_account_type', type: 'dropdown' },
7
+ { value: 'payee', type: 'searchAutocomplete' },
8
+ { value: 'category', type: 'dropdown' },
9
+ { value: 'class', type: 'dropdown' },
10
+ { value: 'amount', type: 'numberRange' },
11
+ ];
12
+ /**
13
+ * Resolve the comparable value for a transaction against a given filter field.
14
+ * Returns undefined when the transaction doesn't carry the field — callers
15
+ * decide whether absence counts as a match (for 'not-equal' it does).
16
+ */
17
+ const getCategoryValueForTransaction = (key, transaction) => {
18
+ switch (key) {
19
+ case 'amount': {
20
+ // Prefer transactionLocalData line items (sum). Fall back to lines on
21
+ // the transaction itself. Final fallback: transaction-level amount.
22
+ const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
23
+ if (localDataForAmount?.lineItemById) {
24
+ const lineItems = Object.values(localDataForAmount.lineItemById);
25
+ if (lineItems.length > 0) {
26
+ return lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
27
+ }
28
+ }
29
+ if (transaction.transaction.lines &&
30
+ transaction.transaction.lines.length > 0) {
31
+ return transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
32
+ }
33
+ return transaction.amount.amount;
34
+ }
35
+ case 'payee': {
36
+ if (transaction.vendorName) {
37
+ return transaction.vendorName;
38
+ }
39
+ if (transaction.customerName) {
40
+ return transaction.customerName;
41
+ }
42
+ const localData = transaction.transactionLocalData?.transactionReviewLocalData;
43
+ if (localData?.vendor?.name) {
44
+ return localData.vendor.name;
45
+ }
46
+ if (localData?.customer?.name) {
47
+ return localData.customer.name;
48
+ }
49
+ return undefined;
50
+ }
51
+ case 'payment_account_name': {
52
+ // Match what TransactionCategorizationListRow renders for the cell.
53
+ return transaction.transaction.account?.accountName;
54
+ }
55
+ case 'payment_account_type': {
56
+ // Raw `paymentType` enum ("credit_card" / "check" / "cash"). Dropdown
57
+ // option values use the same enum; row uses `paymentTypeName` for the
58
+ // human label.
59
+ return transaction.transaction.paymentType;
60
+ }
61
+ case 'category': {
62
+ const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
63
+ if (localDataForCategory) {
64
+ const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
65
+ if (firstLineItem?.account?.accountId) {
66
+ return firstLineItem.account.accountId;
67
+ }
68
+ if (firstLineItem?.account?.qboId) {
69
+ return firstLineItem.account.qboId;
70
+ }
71
+ if (firstLineItem?.account?.accountName) {
72
+ return firstLineItem.account.accountName;
73
+ }
74
+ }
75
+ const firstLineForCategory = transaction.transaction.lines?.[0];
76
+ if (firstLineForCategory?.type ===
77
+ 'transaction_with_account_and_class_line' ||
78
+ firstLineForCategory?.type ===
79
+ 'transaction_with_product_or_service_line' ||
80
+ firstLineForCategory?.type === 'journal_entry_transaction_line') {
81
+ const account = firstLineForCategory.account;
82
+ return account?.accountId ?? account?.qboId ?? account?.accountName;
83
+ }
84
+ return undefined;
85
+ }
86
+ case 'class': {
87
+ const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
88
+ if (localDataForClass) {
89
+ const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
90
+ if (firstLineItemForClass?.class?.classId) {
91
+ return firstLineItemForClass.class.classId;
92
+ }
93
+ if (firstLineItemForClass?.class?.qboId) {
94
+ return firstLineItemForClass.class.qboId;
95
+ }
96
+ if (firstLineItemForClass?.class?.className) {
97
+ return firstLineItemForClass.class.className;
98
+ }
99
+ }
100
+ const firstLineForClass = transaction.transaction.lines?.[0];
101
+ if (firstLineForClass?.type === 'transaction_with_account_and_class_line' ||
102
+ firstLineForClass?.type ===
103
+ 'transaction_with_product_or_service_line' ||
104
+ firstLineForClass?.type === 'journal_entry_transaction_line') {
105
+ const classData = firstLineForClass.class;
106
+ return classData?.classId ?? classData?.qboId ?? classData?.className;
107
+ }
108
+ return undefined;
109
+ }
110
+ default:
111
+ return undefined;
112
+ }
113
+ };
114
+ /**
115
+ * TC-only amount matcher. Supports all five operators TC defines, including
116
+ * the legacy "1000<->5000" range-string form (kept for backward compatibility
117
+ * with persisted filter state that may still contain that encoding).
118
+ */
119
+ const matchAmount = (amount, category) => {
120
+ const op = category.matchingOperator;
121
+ const values = category.values;
122
+ let matched = false;
123
+ if (op === 'inBetween') {
124
+ if (values.length >= 2) {
125
+ const min = Number(values[0]);
126
+ const max = Number(values[1]);
127
+ matched = amount >= min && amount <= max;
128
+ }
129
+ }
130
+ else if (op === 'lessThan') {
131
+ if (values.length >= 1) {
132
+ matched = amount < Number(values[0]);
133
+ }
134
+ }
135
+ else if (op === 'greaterThan') {
136
+ if (values.length >= 1) {
137
+ matched = amount > Number(values[0]);
138
+ }
139
+ }
140
+ else if (op === 'equal' &&
141
+ values.length === 1 &&
142
+ String(values[0]).includes('<->')) {
143
+ // Backward compatibility: ["1000<->5000"] with matchingOperator "equal".
144
+ const parts = String(values[0]).split('<->');
145
+ matched =
146
+ amount >= Number(parts[0] ?? '') && amount <= Number(parts[1] ?? '');
147
+ }
148
+ else if (op === 'equal' && values.length === 1) {
149
+ matched = amount === Number(values[0]);
150
+ }
151
+ return op === 'not-equal' ? !matched : matched;
152
+ };
153
+ const transactionMatchesCategory = (transaction, category) => {
154
+ const value = getCategoryValueForTransaction(category.field, transaction);
155
+ if (value == null) {
156
+ // Absent values count as a match only under 'not-equal'.
157
+ return category.matchingOperator === 'not-equal';
158
+ }
159
+ if (category.field === 'amount') {
160
+ return matchAmount(Number(value), category);
161
+ }
162
+ const valueStr = value.toString();
163
+ const valueInList = category.values.some((v) => v.toString() === valueStr);
164
+ return category.matchingOperator === 'not-equal' ? !valueInList : valueInList;
165
+ };
166
+ /**
167
+ * TC-only equivalent of `applyAdvancedFiltersOnList`. Filters a list of
168
+ * `TransactionView` items against a `TransactionFilters` object using the
169
+ * AND/OR combination semantics from `categoryCombinationOperator`.
170
+ *
171
+ * Independent of `view/spendManagement` — keeps the TC filter pipeline cleanly
172
+ * inside the Expense Automation feature group.
173
+ */
174
+ const applyTransactionFilters = (transactions, filters) => {
175
+ if (filters?.categories == null || filters.categories.length === 0) {
176
+ return transactions;
177
+ }
178
+ const activeCategories = filters.categories.filter((c) => c.field != null && c.values.length > 0);
179
+ if (activeCategories.length === 0) {
180
+ return transactions;
181
+ }
182
+ const op = filters.categoryCombinationOperator;
183
+ return transactions.filter((txn) => {
184
+ if (op === 'AND') {
185
+ return activeCategories.every((cat) => transactionMatchesCategory(txn, cat));
186
+ }
187
+ return activeCategories.some((cat) => transactionMatchesCategory(txn, cat));
188
+ });
189
+ };
190
+ exports.applyTransactionFilters = applyTransactionFilters;
@@ -15,6 +15,7 @@ import { TransactionCategory, TransactionType } from '../../../entity/transactio
15
15
  import { VendorBase } from '../../../entity/vendor/vendorState';
16
16
  import { ZeniDate } from '../../../zeniDayJS';
17
17
  import { EntityRecommendationKey } from '../../recommendation/recommendationState';
18
+ import { TransactionFilters } from '../transactionFilterHelpers';
18
19
  import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
19
20
  export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "project" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
20
21
  export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
@@ -91,6 +92,7 @@ export interface SupportedTransactionCategorization {
91
92
  }
92
93
  export declare const initialSupportedTransactionCategorization: SupportedTransactionCategorization;
93
94
  export interface TransactionsTabViewState extends FetchedState {
95
+ filters: TransactionFilters;
94
96
  markAsNotMiscategorizedStatus: FetchStateAndError;
95
97
  refreshStatus: FetchStateAndError;
96
98
  saveStatus: FetchStateAndError;
@@ -14,6 +14,8 @@ const helpers_1 = require("./helpers");
14
14
  const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
15
15
  const remiListState_1 = require("./reimbursement/remiListView/remiListState");
16
16
  //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
17
+ // Spend Management uses only equal/not-equal — TC amount operators
18
+ // (inBetween, lessThan, greaterThan) live in the TC filter pipeline.
17
19
  const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
18
20
  let doesItemFallInValueRange = false;
19
21
  const filterField = currentFilter.field;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zeniai/client-epic-state",
3
- "version": "5.0.64-beta1ND",
3
+ "version": "5.0.64-betaAR1",
4
4
  "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib/esm/index.js",
@@ -106,16 +106,12 @@
106
106
  "scripts": {
107
107
  "clean": "rimraf lib",
108
108
  "test:typecheck": "echo 'Typechecking test files...' && NODE_OPTIONS=--max-old-space-size=4096 time tsc -p tsconfig.typecheck.json",
109
- "test:typecheck-modified-files": "chmod +x ./scripts/tsc-modified-files.sh && ./scripts/tsc-modified-files.sh master tsconfig.typecheck.json",
110
- "test": "pnpm lint-modified-files && pnpm test:typecheck-modified-files && vitest run --typecheck",
109
+ "test": "pnpm test:typecheck && vitest run --typecheck",
111
110
  "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
112
- "lint-modified-files": "chmod +x ./scripts/lint-modified-files.sh && ./scripts/lint-modified-files.sh",
113
- "tsc-modified-files": "chmod +x ./scripts/tsc-modified-files.sh && ./scripts/tsc-modified-files.sh",
114
- "typecheck": "tsc --noEmit",
115
111
  "find-dead-code": "ts-prune | grep -v '(used in module)'",
116
112
  "find-unused-exports": "ts-unused-exports ./tsconfig.json",
117
113
  "circular-dependency": "npx madge --circular --extensions ts ./src",
118
- "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint on modified files...' && pnpm lint-modified-files\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
114
+ "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
119
115
  "only-build": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc && tsc -p tsconfig.esm.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
120
116
  "only-build-dev": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc -p tsconfig.dev.json && tsc -p tsconfig.esm.dev.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
121
117
  "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",