@zeniai/client-epic-state 5.0.73 → 5.0.74
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/commonStateTypes/filterPrimitives.d.ts +23 -0
- package/lib/commonStateTypes/filterPrimitives.js +21 -0
- package/lib/entity/account/accountSelector.d.ts +26 -0
- package/lib/entity/account/accountSelector.js +47 -1
- package/lib/entity/account/accountState.d.ts +5 -0
- package/lib/entity/account/accountState.js +11 -4
- package/lib/entity/class/classSelector.d.ts +35 -0
- package/lib/entity/class/classSelector.js +50 -0
- package/lib/esm/commonStateTypes/filterPrimitives.js +20 -0
- package/lib/esm/entity/account/accountSelector.js +46 -1
- package/lib/esm/entity/account/accountState.js +7 -1
- package/lib/esm/entity/class/classSelector.js +48 -0
- package/lib/esm/index.js +10 -4
- package/lib/esm/view/companyHealthMetricView/companyHealthMetricViewSelector.js +1 -1
- package/lib/esm/view/companyView/helpers/cockpitHelpers.js +1 -1
- package/lib/esm/view/companyView/selector/companyManagementViewSelector.js +1 -1
- package/lib/esm/view/companyView/selector/companyPortfolioViewSelector.js +1 -1
- package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js +11 -1
- package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +69 -12
- package/lib/esm/view/expenseAutomationView/transactionFilterHelpers.js +258 -0
- package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js +4 -2
- package/lib/esm/view/subscriptionView/subscriptionViewSelector.js +1 -1
- package/lib/esm/view/taskManager/taskListView/taskListReducer.js +1 -1
- package/lib/index.d.ts +7 -5
- package/lib/index.js +41 -32
- package/lib/view/companyHealthMetricView/companyHealthMetricViewSelector.js +1 -1
- package/lib/view/companyView/helpers/cockpitHelpers.js +1 -1
- package/lib/view/companyView/selector/companyManagementViewSelector.js +1 -1
- package/lib/view/companyView/selector/companyPortfolioViewSelector.js +1 -1
- package/lib/view/companyView/types/cockpitTypes.d.ts +1 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +5 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js +12 -2
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts +4 -1
- package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js +71 -12
- package/lib/view/expenseAutomationView/transactionFilterHelpers.d.ts +66 -0
- package/lib/view/expenseAutomationView/transactionFilterHelpers.js +262 -0
- package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts +2 -0
- package/lib/view/spendManagement/billPay/billList/billListState.d.ts +1 -1
- package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts +1 -1
- package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts +1 -1
- package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts +12 -3
- package/lib/view/spendManagement/spendManagementFilterHelpers.js +4 -2
- package/lib/view/subscriptionView/subscriptionViewSelector.js +1 -1
- package/lib/view/taskManager/taskListView/taskList.d.ts +1 -1
- package/lib/view/taskManager/taskListView/taskListReducer.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared filter primitives — used by both Transaction Categorization and
|
|
3
|
+
* Spend Management filter pipelines.
|
|
4
|
+
*
|
|
5
|
+
* These types are deliberately decoupled from any specific feature group:
|
|
6
|
+
*
|
|
7
|
+
* - `CategoryCombinationOperator` is how a `categories[]` array combines
|
|
8
|
+
* (`AND` ⇒ every category must match; `OR` ⇒ any category matches).
|
|
9
|
+
* - `FilterCategoryType` is the input-type tag a filter category uses to
|
|
10
|
+
* pick its value-picker UI (text autocomplete, user picker, date range,
|
|
11
|
+
* number range, plain dropdown).
|
|
12
|
+
*
|
|
13
|
+
* They used to be redeclared locally in both `transactionFilterHelpers.ts`
|
|
14
|
+
* and `spendManagementFilterHelpers.ts` to keep the feature groups
|
|
15
|
+
* independent. Centralising them here is consistent with Route B (which
|
|
16
|
+
* separated the *matching pipelines*, not the *shared primitive types*) and
|
|
17
|
+
* removes the maintenance trap of two identical type definitions drifting
|
|
18
|
+
* apart over time.
|
|
19
|
+
*/
|
|
20
|
+
/** How `categories[]` combines: AND requires every category to match, OR requires any. */
|
|
21
|
+
export type CategoryCombinationOperator = 'AND' | 'OR';
|
|
22
|
+
/** Input-type tag a filter category uses to pick its value-picker UI. */
|
|
23
|
+
export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Shared filter primitives — used by both Transaction Categorization and
|
|
4
|
+
* Spend Management filter pipelines.
|
|
5
|
+
*
|
|
6
|
+
* These types are deliberately decoupled from any specific feature group:
|
|
7
|
+
*
|
|
8
|
+
* - `CategoryCombinationOperator` is how a `categories[]` array combines
|
|
9
|
+
* (`AND` ⇒ every category must match; `OR` ⇒ any category matches).
|
|
10
|
+
* - `FilterCategoryType` is the input-type tag a filter category uses to
|
|
11
|
+
* pick its value-picker UI (text autocomplete, user picker, date range,
|
|
12
|
+
* number range, plain dropdown).
|
|
13
|
+
*
|
|
14
|
+
* They used to be redeclared locally in both `transactionFilterHelpers.ts`
|
|
15
|
+
* and `spendManagementFilterHelpers.ts` to keep the feature groups
|
|
16
|
+
* independent. Centralising them here is consistent with Route B (which
|
|
17
|
+
* separated the *matching pipelines*, not the *shared primitive types*) and
|
|
18
|
+
* removes the maintenance trap of two identical type definitions drifting
|
|
19
|
+
* apart over time.
|
|
20
|
+
*/
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
@@ -123,3 +123,29 @@ export declare const getAccountsOrdered: (filter: COABalancesFilter, accountStat
|
|
|
123
123
|
export declare const getAccountsByType: (accountState: AccountState, accountTypes: AccountType[]) => Partial<Record<AccountType, Account[]>>;
|
|
124
124
|
export declare const getAccountIdsForTypes: (accountState: AccountState, accountTypes: AccountType[]) => ID[];
|
|
125
125
|
export declare const getAccountIdsForLabels: (accountState: AccountState, labels: string[]) => ID[];
|
|
126
|
+
/**
|
|
127
|
+
* Returns all accounts currently in state (single pass over accountsByKey).
|
|
128
|
+
* Use for dropdowns that need account names and types; map to
|
|
129
|
+
* { accountId, accountName, accountType } as needed.
|
|
130
|
+
*/
|
|
131
|
+
export declare const getAllAccounts: (accountState: AccountState) => Account[];
|
|
132
|
+
export interface AccountFilterOption {
|
|
133
|
+
accountId: ID;
|
|
134
|
+
accountName: string;
|
|
135
|
+
accountType: AccountType;
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
|
|
139
|
+
* all other account types → categoryOptions. Use for payment_account_name and category filter options.
|
|
140
|
+
*
|
|
141
|
+
* Memoised via `createSelector` so the composite `{categoryOptions,
|
|
142
|
+
* paymentAccountNames}` keeps a stable identity across Redux dispatches that
|
|
143
|
+
* don't change account data. Without this, every consumer using
|
|
144
|
+
* `useSelector(state => getTransactionFilterAccountOptions(state.accountState))`
|
|
145
|
+
* would re-render on every dispatch (the inline call returns a fresh outer
|
|
146
|
+
* object each time, defeating reference equality).
|
|
147
|
+
*/
|
|
148
|
+
export declare const getTransactionFilterAccountOptions: (accountState: AccountState) => {
|
|
149
|
+
categoryOptions: AccountFilterOption[];
|
|
150
|
+
paymentAccountNames: AccountFilterOption[];
|
|
151
|
+
};
|
|
@@ -3,9 +3,10 @@ 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.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = void 0;
|
|
6
|
+
exports.getTransactionFilterAccountOptions = exports.getAllAccounts = exports.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = void 0;
|
|
7
7
|
exports.getAccount = getAccount;
|
|
8
8
|
exports.getAccountWithBalance = getAccountWithBalance;
|
|
9
|
+
const toolkit_1 = require("@reduxjs/toolkit");
|
|
9
10
|
const flatMap_1 = __importDefault(require("lodash/flatMap"));
|
|
10
11
|
const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
|
|
11
12
|
const sortBalancesByFreeRangeTotal_1 = require("../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal");
|
|
@@ -192,3 +193,48 @@ const getAccountIdsForLabels = (accountState, labels) => {
|
|
|
192
193
|
return allAccountIdsForLabels;
|
|
193
194
|
};
|
|
194
195
|
exports.getAccountIdsForLabels = getAccountIdsForLabels;
|
|
196
|
+
/**
|
|
197
|
+
* Returns all accounts currently in state (single pass over accountsByKey).
|
|
198
|
+
* Use for dropdowns that need account names and types; map to
|
|
199
|
+
* { accountId, accountName, accountType } as needed.
|
|
200
|
+
*/
|
|
201
|
+
const getAllAccounts = (accountState) => Object.values(accountState.accountsByKey);
|
|
202
|
+
exports.getAllAccounts = getAllAccounts;
|
|
203
|
+
/**
|
|
204
|
+
* Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
|
|
205
|
+
* all other account types → categoryOptions. Use for payment_account_name and category filter options.
|
|
206
|
+
*
|
|
207
|
+
* Memoised via `createSelector` so the composite `{categoryOptions,
|
|
208
|
+
* paymentAccountNames}` keeps a stable identity across Redux dispatches that
|
|
209
|
+
* don't change account data. Without this, every consumer using
|
|
210
|
+
* `useSelector(state => getTransactionFilterAccountOptions(state.accountState))`
|
|
211
|
+
* would re-render on every dispatch (the inline call returns a fresh outer
|
|
212
|
+
* object each time, defeating reference equality).
|
|
213
|
+
*/
|
|
214
|
+
exports.getTransactionFilterAccountOptions = (0, toolkit_1.createSelector)(
|
|
215
|
+
// Key the memo on the underlying `accountsByKey` record rather than on
|
|
216
|
+
// `getAllAccounts` output: the latter returns a fresh `Object.values(...)`
|
|
217
|
+
// array on every call, which would defeat reselect's reference-equality
|
|
218
|
+
// check and re-run the projection on every dispatch.
|
|
219
|
+
[(accountState) => accountState.accountsByKey], (accountsByKey) => {
|
|
220
|
+
const accounts = Object.values(accountsByKey);
|
|
221
|
+
const paymentAccountNames = [];
|
|
222
|
+
const categoryOptions = [];
|
|
223
|
+
for (const account of accounts) {
|
|
224
|
+
if (account.accountType == null) {
|
|
225
|
+
continue;
|
|
226
|
+
}
|
|
227
|
+
const option = {
|
|
228
|
+
accountId: account.accountId,
|
|
229
|
+
accountName: account.accountName,
|
|
230
|
+
accountType: account.accountType,
|
|
231
|
+
};
|
|
232
|
+
if ((0, accountState_1.isPaymentAccountType)(account.accountType)) {
|
|
233
|
+
paymentAccountNames.push(option);
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
categoryOptions.push(option);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
return { categoryOptions, paymentAccountNames };
|
|
240
|
+
});
|
|
@@ -8,9 +8,14 @@ import { RecommendationBase } from '../../commonStateTypes/recommendationBase';
|
|
|
8
8
|
import { Status } from '../../commonStateTypes/status';
|
|
9
9
|
import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
10
10
|
import { ZeniUrl } from '../../zeniUrl';
|
|
11
|
+
export declare const ALL_ACCOUNT_TYPES: readonly ["bank", "credit_card", "expenses", "cogs", "income", "cash_in", "cash_out", "cash_position", "other_income", "other_expense", "accounts_receivable", "other_current_assets", "fixed_assets", "other_assets", "accounts_payable", "other_current_liabilities", "long_term_liabilities", "equity", "current_liabilities", "current_assets"];
|
|
11
12
|
export declare const toAccountType: (v: string) => "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets";
|
|
12
13
|
export type AccountType = ReturnType<typeof toAccountType>;
|
|
13
14
|
export declare const toAccountTypeStrict: (v: string | null | undefined) => AccountType | undefined;
|
|
15
|
+
/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
|
|
16
|
+
export declare const PAYMENT_ACCOUNT_TYPES: readonly ["bank", "credit_card"];
|
|
17
|
+
export type PaymentAccountType = (typeof PAYMENT_ACCOUNT_TYPES)[number];
|
|
18
|
+
export declare function isPaymentAccountType(accountType: AccountType | undefined): accountType is PaymentAccountType;
|
|
14
19
|
export type UncategorizedAccountTypes = 'expense' | 'income';
|
|
15
20
|
declare const toAccountLabel: (v: string) => "prepaid_expenses" | "fixed_assets" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses";
|
|
16
21
|
export type AccountLabel = ReturnType<typeof toAccountLabel>;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toReconciliationAccountSourceStrict = exports.toReconciliationAccountSource = exports.toAccountLabelStrict = exports.toAccountTypeStrict = exports.toAccountType = void 0;
|
|
3
|
+
exports.toReconciliationAccountSourceStrict = exports.toReconciliationAccountSource = exports.toAccountLabelStrict = exports.PAYMENT_ACCOUNT_TYPES = exports.toAccountTypeStrict = exports.toAccountType = exports.ALL_ACCOUNT_TYPES = void 0;
|
|
4
|
+
exports.isPaymentAccountType = isPaymentAccountType;
|
|
4
5
|
exports.getAccountKey = getAccountKey;
|
|
5
6
|
const nestedAccountID_1 = require("../../commonStateTypes/accountView/nestedAccountID");
|
|
6
7
|
const nestedClassID_1 = require("../../commonStateTypes/classesView/nestedClassID");
|
|
7
8
|
const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
|
|
8
|
-
|
|
9
|
+
exports.ALL_ACCOUNT_TYPES = [
|
|
9
10
|
'bank',
|
|
10
11
|
'credit_card',
|
|
11
12
|
'expenses',
|
|
@@ -27,10 +28,16 @@ const ALL_ACCOUNT_TYPES = [
|
|
|
27
28
|
'current_liabilities',
|
|
28
29
|
'current_assets',
|
|
29
30
|
];
|
|
30
|
-
const toAccountType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_ACCOUNT_TYPES);
|
|
31
|
+
const toAccountType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ACCOUNT_TYPES);
|
|
31
32
|
exports.toAccountType = toAccountType;
|
|
32
|
-
const toAccountTypeStrict = (v) => (0, stringToUnion_1.stringToUnionStrict)(v ?? '', ALL_ACCOUNT_TYPES);
|
|
33
|
+
const toAccountTypeStrict = (v) => (0, stringToUnion_1.stringToUnionStrict)(v ?? '', exports.ALL_ACCOUNT_TYPES);
|
|
33
34
|
exports.toAccountTypeStrict = toAccountTypeStrict;
|
|
35
|
+
/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
|
|
36
|
+
exports.PAYMENT_ACCOUNT_TYPES = ['bank', 'credit_card'];
|
|
37
|
+
function isPaymentAccountType(accountType) {
|
|
38
|
+
return (accountType != null &&
|
|
39
|
+
exports.PAYMENT_ACCOUNT_TYPES.includes(accountType));
|
|
40
|
+
}
|
|
34
41
|
const ALL_ACCOUNT_LABELS = [
|
|
35
42
|
'uncategorized_income',
|
|
36
43
|
'uncategorized_expense',
|
|
@@ -5,6 +5,16 @@ import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
|
5
5
|
import { AccountState } from '../account/accountState';
|
|
6
6
|
import { ClassReport } from './classSelectorTypes';
|
|
7
7
|
import { Class, ClassState } from './classState';
|
|
8
|
+
/**
|
|
9
|
+
* Minimal class shape consumed by filter dropdowns. Only the identity and
|
|
10
|
+
* the display label are needed — payload size and prop-type breadth are
|
|
11
|
+
* kept small so consumers can't accidentally rely on `Class` fields that
|
|
12
|
+
* the projection does not carry.
|
|
13
|
+
*/
|
|
14
|
+
export interface ClassFilterOption {
|
|
15
|
+
classId: ID;
|
|
16
|
+
className: string;
|
|
17
|
+
}
|
|
8
18
|
export declare function getClassesByIds(classState: ClassState, id: {
|
|
9
19
|
classIds: ID[];
|
|
10
20
|
reportId: ReportID;
|
|
@@ -20,3 +30,28 @@ export declare function getClassReport(classState: ClassState, accountState: Acc
|
|
|
20
30
|
reportId: ReportID;
|
|
21
31
|
classesViewParentId?: ClassesViewParentID;
|
|
22
32
|
}, filter: COABalancesFilter): ClassReport | undefined;
|
|
33
|
+
/**
|
|
34
|
+
* Returns all classes currently in state (single pass over classesByKey).
|
|
35
|
+
* Use for dropdowns that need class names; map to { classId, className } as needed.
|
|
36
|
+
*/
|
|
37
|
+
export declare function getAllClasses(classState: ClassState): Class[];
|
|
38
|
+
/**
|
|
39
|
+
* Memoised projection of `getAllClasses` to the `{classId, className}` shape
|
|
40
|
+
* expected by filter dropdowns. Consumers should prefer this over inlining a
|
|
41
|
+
* `getAllClasses(...).map(...)` inside `useSelector`: the inline map allocates
|
|
42
|
+
* a fresh array on every Redux dispatch, breaking `useSelector`'s
|
|
43
|
+
* reference-equality optimisation and triggering re-renders on every state
|
|
44
|
+
* change unrelated to class data.
|
|
45
|
+
*
|
|
46
|
+
* Two cleanups happen here, intentionally inside the selector so every
|
|
47
|
+
* consumer benefits uniformly:
|
|
48
|
+
* 1. **Drop entries with a blank `className`.** Soft-deleted classes can
|
|
49
|
+
* retain their classId in state while the human name is blanked, which
|
|
50
|
+
* would otherwise render as an empty row in the filter dropdown.
|
|
51
|
+
* 2. **Dedupe by `classId`.** `classesByKey` is keyed by
|
|
52
|
+
* `${classId}-${reportId}` (see `getClassKey`), so a class loaded under
|
|
53
|
+
* multiple report contexts appears as multiple entries from
|
|
54
|
+
* `Object.values(classesByKey)`. The first non-blank entry per
|
|
55
|
+
* `classId` wins.
|
|
56
|
+
*/
|
|
57
|
+
export declare const getClassFilterOptions: (classState: ClassState) => ClassFilterOption[];
|
|
@@ -3,9 +3,12 @@ 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.getClassFilterOptions = void 0;
|
|
6
7
|
exports.getClassesByIds = getClassesByIds;
|
|
7
8
|
exports.getClassById = getClassById;
|
|
8
9
|
exports.getClassReport = getClassReport;
|
|
10
|
+
exports.getAllClasses = getAllClasses;
|
|
11
|
+
const toolkit_1 = require("@reduxjs/toolkit");
|
|
9
12
|
const get_1 = __importDefault(require("lodash/get"));
|
|
10
13
|
const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
|
|
11
14
|
const accountSelector_1 = require("../account/accountSelector");
|
|
@@ -58,3 +61,50 @@ function getClassReport(classState, accountState, id, filter) {
|
|
|
58
61
|
accounts: accountReport,
|
|
59
62
|
};
|
|
60
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* Returns all classes currently in state (single pass over classesByKey).
|
|
66
|
+
* Use for dropdowns that need class names; map to { classId, className } as needed.
|
|
67
|
+
*/
|
|
68
|
+
function getAllClasses(classState) {
|
|
69
|
+
return Object.values(classState.classesByKey);
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Memoised projection of `getAllClasses` to the `{classId, className}` shape
|
|
73
|
+
* expected by filter dropdowns. Consumers should prefer this over inlining a
|
|
74
|
+
* `getAllClasses(...).map(...)` inside `useSelector`: the inline map allocates
|
|
75
|
+
* a fresh array on every Redux dispatch, breaking `useSelector`'s
|
|
76
|
+
* reference-equality optimisation and triggering re-renders on every state
|
|
77
|
+
* change unrelated to class data.
|
|
78
|
+
*
|
|
79
|
+
* Two cleanups happen here, intentionally inside the selector so every
|
|
80
|
+
* consumer benefits uniformly:
|
|
81
|
+
* 1. **Drop entries with a blank `className`.** Soft-deleted classes can
|
|
82
|
+
* retain their classId in state while the human name is blanked, which
|
|
83
|
+
* would otherwise render as an empty row in the filter dropdown.
|
|
84
|
+
* 2. **Dedupe by `classId`.** `classesByKey` is keyed by
|
|
85
|
+
* `${classId}-${reportId}` (see `getClassKey`), so a class loaded under
|
|
86
|
+
* multiple report contexts appears as multiple entries from
|
|
87
|
+
* `Object.values(classesByKey)`. The first non-blank entry per
|
|
88
|
+
* `classId` wins.
|
|
89
|
+
*/
|
|
90
|
+
exports.getClassFilterOptions = (0, toolkit_1.createSelector)(
|
|
91
|
+
// Key the memo on the underlying `classesByKey` record rather than on
|
|
92
|
+
// `getAllClasses` output: the latter returns a fresh `Object.values(...)`
|
|
93
|
+
// array on every call, which would defeat reselect's reference-equality
|
|
94
|
+
// check and re-run the projection on every dispatch.
|
|
95
|
+
[(classState) => classState.classesByKey], (classesByKey) => {
|
|
96
|
+
const classes = Object.values(classesByKey);
|
|
97
|
+
const seenClassIds = new Set();
|
|
98
|
+
const options = [];
|
|
99
|
+
for (const c of classes) {
|
|
100
|
+
if (c.classId == null || seenClassIds.has(c.classId)) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (c.className == null || c.className.trim() === '') {
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
seenClassIds.add(c.classId);
|
|
107
|
+
options.push({ classId: c.classId, className: c.className });
|
|
108
|
+
}
|
|
109
|
+
return options;
|
|
110
|
+
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared filter primitives — used by both Transaction Categorization and
|
|
3
|
+
* Spend Management filter pipelines.
|
|
4
|
+
*
|
|
5
|
+
* These types are deliberately decoupled from any specific feature group:
|
|
6
|
+
*
|
|
7
|
+
* - `CategoryCombinationOperator` is how a `categories[]` array combines
|
|
8
|
+
* (`AND` ⇒ every category must match; `OR` ⇒ any category matches).
|
|
9
|
+
* - `FilterCategoryType` is the input-type tag a filter category uses to
|
|
10
|
+
* pick its value-picker UI (text autocomplete, user picker, date range,
|
|
11
|
+
* number range, plain dropdown).
|
|
12
|
+
*
|
|
13
|
+
* They used to be redeclared locally in both `transactionFilterHelpers.ts`
|
|
14
|
+
* and `spendManagementFilterHelpers.ts` to keep the feature groups
|
|
15
|
+
* independent. Centralising them here is consistent with Route B (which
|
|
16
|
+
* separated the *matching pipelines*, not the *shared primitive types*) and
|
|
17
|
+
* removes the maintenance trap of two identical type definitions drifting
|
|
18
|
+
* apart over time.
|
|
19
|
+
*/
|
|
20
|
+
export {};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { createSelector } from '@reduxjs/toolkit';
|
|
1
2
|
import flatMap from 'lodash/flatMap';
|
|
2
3
|
import { getCOABalances } from '../../commonStateTypes/coaBalance/coaBalance';
|
|
3
4
|
import { sortComparator } from '../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal';
|
|
4
|
-
import { getAccountKey, } from './accountState';
|
|
5
|
+
import { getAccountKey, isPaymentAccountType, } from './accountState';
|
|
5
6
|
function getCommonAccountFields(accountState, id) {
|
|
6
7
|
const key = getAccountKey(id.reportId, id.accountId, id.classesViewParentId, id.accountsViewParentId, id.projectsViewParentId);
|
|
7
8
|
const account = accountState.accountsByKey[key];
|
|
@@ -179,3 +180,47 @@ export const getAccountIdsForLabels = (accountState, labels) => {
|
|
|
179
180
|
});
|
|
180
181
|
return allAccountIdsForLabels;
|
|
181
182
|
};
|
|
183
|
+
/**
|
|
184
|
+
* Returns all accounts currently in state (single pass over accountsByKey).
|
|
185
|
+
* Use for dropdowns that need account names and types; map to
|
|
186
|
+
* { accountId, accountName, accountType } as needed.
|
|
187
|
+
*/
|
|
188
|
+
export const getAllAccounts = (accountState) => Object.values(accountState.accountsByKey);
|
|
189
|
+
/**
|
|
190
|
+
* Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
|
|
191
|
+
* all other account types → categoryOptions. Use for payment_account_name and category filter options.
|
|
192
|
+
*
|
|
193
|
+
* Memoised via `createSelector` so the composite `{categoryOptions,
|
|
194
|
+
* paymentAccountNames}` keeps a stable identity across Redux dispatches that
|
|
195
|
+
* don't change account data. Without this, every consumer using
|
|
196
|
+
* `useSelector(state => getTransactionFilterAccountOptions(state.accountState))`
|
|
197
|
+
* would re-render on every dispatch (the inline call returns a fresh outer
|
|
198
|
+
* object each time, defeating reference equality).
|
|
199
|
+
*/
|
|
200
|
+
export const getTransactionFilterAccountOptions = createSelector(
|
|
201
|
+
// Key the memo on the underlying `accountsByKey` record rather than on
|
|
202
|
+
// `getAllAccounts` output: the latter returns a fresh `Object.values(...)`
|
|
203
|
+
// array on every call, which would defeat reselect's reference-equality
|
|
204
|
+
// check and re-run the projection on every dispatch.
|
|
205
|
+
[(accountState) => accountState.accountsByKey], (accountsByKey) => {
|
|
206
|
+
const accounts = Object.values(accountsByKey);
|
|
207
|
+
const paymentAccountNames = [];
|
|
208
|
+
const categoryOptions = [];
|
|
209
|
+
for (const account of accounts) {
|
|
210
|
+
if (account.accountType == null) {
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
const option = {
|
|
214
|
+
accountId: account.accountId,
|
|
215
|
+
accountName: account.accountName,
|
|
216
|
+
accountType: account.accountType,
|
|
217
|
+
};
|
|
218
|
+
if (isPaymentAccountType(account.accountType)) {
|
|
219
|
+
paymentAccountNames.push(option);
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
categoryOptions.push(option);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
return { categoryOptions, paymentAccountNames };
|
|
226
|
+
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getNestedAccountIDStr, } from '../../commonStateTypes/accountView/nestedAccountID';
|
|
2
2
|
import { getNestedClassIDStr, } from '../../commonStateTypes/classesView/nestedClassID';
|
|
3
3
|
import { stringToUnion, stringToUnionStrict, } from '../../commonStateTypes/stringToUnion';
|
|
4
|
-
const ALL_ACCOUNT_TYPES = [
|
|
4
|
+
export const ALL_ACCOUNT_TYPES = [
|
|
5
5
|
'bank',
|
|
6
6
|
'credit_card',
|
|
7
7
|
'expenses',
|
|
@@ -25,6 +25,12 @@ const ALL_ACCOUNT_TYPES = [
|
|
|
25
25
|
];
|
|
26
26
|
export const toAccountType = (v) => stringToUnion(v, ALL_ACCOUNT_TYPES);
|
|
27
27
|
export const toAccountTypeStrict = (v) => stringToUnionStrict(v ?? '', ALL_ACCOUNT_TYPES);
|
|
28
|
+
/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
|
|
29
|
+
export const PAYMENT_ACCOUNT_TYPES = ['bank', 'credit_card'];
|
|
30
|
+
export function isPaymentAccountType(accountType) {
|
|
31
|
+
return (accountType != null &&
|
|
32
|
+
PAYMENT_ACCOUNT_TYPES.includes(accountType));
|
|
33
|
+
}
|
|
28
34
|
const ALL_ACCOUNT_LABELS = [
|
|
29
35
|
'uncategorized_income',
|
|
30
36
|
'uncategorized_expense',
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createSelector } from '@reduxjs/toolkit';
|
|
1
2
|
import recordGet from 'lodash/get';
|
|
2
3
|
import { getCOABalances } from '../../commonStateTypes/coaBalance/coaBalance';
|
|
3
4
|
import { getAccount } from '../account/accountSelector';
|
|
@@ -50,3 +51,50 @@ export function getClassReport(classState, accountState, id, filter) {
|
|
|
50
51
|
accounts: accountReport,
|
|
51
52
|
};
|
|
52
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Returns all classes currently in state (single pass over classesByKey).
|
|
56
|
+
* Use for dropdowns that need class names; map to { classId, className } as needed.
|
|
57
|
+
*/
|
|
58
|
+
export function getAllClasses(classState) {
|
|
59
|
+
return Object.values(classState.classesByKey);
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Memoised projection of `getAllClasses` to the `{classId, className}` shape
|
|
63
|
+
* expected by filter dropdowns. Consumers should prefer this over inlining a
|
|
64
|
+
* `getAllClasses(...).map(...)` inside `useSelector`: the inline map allocates
|
|
65
|
+
* a fresh array on every Redux dispatch, breaking `useSelector`'s
|
|
66
|
+
* reference-equality optimisation and triggering re-renders on every state
|
|
67
|
+
* change unrelated to class data.
|
|
68
|
+
*
|
|
69
|
+
* Two cleanups happen here, intentionally inside the selector so every
|
|
70
|
+
* consumer benefits uniformly:
|
|
71
|
+
* 1. **Drop entries with a blank `className`.** Soft-deleted classes can
|
|
72
|
+
* retain their classId in state while the human name is blanked, which
|
|
73
|
+
* would otherwise render as an empty row in the filter dropdown.
|
|
74
|
+
* 2. **Dedupe by `classId`.** `classesByKey` is keyed by
|
|
75
|
+
* `${classId}-${reportId}` (see `getClassKey`), so a class loaded under
|
|
76
|
+
* multiple report contexts appears as multiple entries from
|
|
77
|
+
* `Object.values(classesByKey)`. The first non-blank entry per
|
|
78
|
+
* `classId` wins.
|
|
79
|
+
*/
|
|
80
|
+
export const getClassFilterOptions = createSelector(
|
|
81
|
+
// Key the memo on the underlying `classesByKey` record rather than on
|
|
82
|
+
// `getAllClasses` output: the latter returns a fresh `Object.values(...)`
|
|
83
|
+
// array on every call, which would defeat reselect's reference-equality
|
|
84
|
+
// check and re-run the projection on every dispatch.
|
|
85
|
+
[(classState) => classState.classesByKey], (classesByKey) => {
|
|
86
|
+
const classes = Object.values(classesByKey);
|
|
87
|
+
const seenClassIds = new Set();
|
|
88
|
+
const options = [];
|
|
89
|
+
for (const c of classes) {
|
|
90
|
+
if (c.classId == null || seenClassIds.has(c.classId)) {
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
if (c.className == null || c.className.trim() === '') {
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
seenClassIds.add(c.classId);
|
|
97
|
+
options.push({ classId: c.classId, className: c.className });
|
|
98
|
+
}
|
|
99
|
+
return options;
|
|
100
|
+
});
|
package/lib/esm/index.js
CHANGED
|
@@ -24,6 +24,7 @@ import { mapTimePeriodtoTimeframeTick, toTimePeriod, toTimeframeTick, } from './
|
|
|
24
24
|
import { isAgingReport, isCashFlowOrBalanceSheetReport, isDashboardClassesViewReport, isDashboardReport, isFluxAnalysisOpExReport, isOpExByVendorReport, isPAndLClassesViewReport, isPAndLProjectViewReport, isPAndLReport, } from './commonStateTypes/viewAndReport/reportIDHelper';
|
|
25
25
|
import { toReportFormatStrict, toReportID, } from './commonStateTypes/viewAndReport/viewAndReport';
|
|
26
26
|
import { PAYMENT_BUSINESS_DAYS, filterDays, getNextNthWorkingDay, getPreviousNthWorkingDay, getYearsList, holidaysFormatted, isHoliday, isHolidayToday, } from './commonStateTypes/workingDayHelper';
|
|
27
|
+
import { getAllAccounts, getTransactionFilterAccountOptions, } from './entity/account/accountSelector';
|
|
27
28
|
import { toAccountType, toReconciliationAccountSource, } from './entity/account/accountState';
|
|
28
29
|
import { getAccountGroupKey, toAccountGroupType, } from './entity/accountGroup/accountGroupState';
|
|
29
30
|
/**
|
|
@@ -168,7 +169,7 @@ import { clearExpenseAutomationFluxAnalysisView, fetchFluxAnalysisView, reviewFl
|
|
|
168
169
|
import { clearJeScheduleLocalData as clearExpenseAutomationJEScheduleLocalData, clearExpenseAutomationJESchedulesView, fetchJeSchedulesPage as fetchExpenseAutomationJESchedulesPage, ignoreRecommendedJeSchedule as ignoreExpenseAutomationJESchedule, initializeAccountSettingsView as initializeJeAccountSettingsView, initializeJeScheduleLocalData, removeJeScheduleTransactionKey, retryJeSchedule as retryExpenseAutomationJESchedule, saveAccountSettings as saveJeAccountSettings, saveAccountSettingsLocalData as saveJeAccountSettingsLocalData, updateJESchedulesUIState as updateExpenseAutomationJESchedulesUIState, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, } from './view/expenseAutomationView/reducers/jeSchedulesViewReducer';
|
|
169
170
|
import { acknowledgeBulkUploadConfirmMatchComplete, bulkUploadAutomatchingTimedOut, bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess, clearBulkUpload, clearManualSearchResults, clearMissingReceiptsTabNavigation, confirmBulkUploadMatch, confirmBulkUploadMatchFailure, confirmBulkUploadMatchSuccess, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsFailure, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, fetchMissingReceipts as fetchExpenseAutomationMissingReceipts, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, markMissingReceiptAsDone as markExpenseAutomationMissingReceiptAsDone, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess, setBulkUploadCompletedSubTab, setBulkUploadResultsTab, setBulkUploadSortConfig, setBulkUploadUploadedFileCount, storeBatchDetails, updateBulkUploadProgress, updateMissingReceiptUploadState as updateExpenseAutomationMissingReceiptUploadState, updateMissingReceiptsUIState as updateExpenseAutomationMissingReceiptsUIState, uploadMissingReceiptSuccess as uploadExpenseAutomationMissingReceiptSuccess, } from './view/expenseAutomationView/reducers/missingReceiptsViewReducer';
|
|
170
171
|
import { deleteAccountStatement, excludeAccountFromReconciliation, fetchReconciliation as fetchReconciliationView, includeAccountInReconciliation, saveReconciliationDetail as saveExpenseAutomationReconciliationDetail, saveReconciliationReview as saveExpenseAutomationReconciliationReview, setConnectionInProgressForAccount as setConnectionInProgressForAccountReconciliation, setStatementParseInProgress, updateAccountReconciliationLocalData as updateExpenseAutomationAccountReconciliationLocalData, updateSelectedAccountId as updateExpenseAutomationAccountReconciliationSelectedAccountId, updateSelectedTab as updateExpenseAutomationAccountReconciliationSelectedTab, updateReconListScrollPosition as updateExpenseAutomationReconListScrollPosition, updateReviewTabSortState as updateExpenseAutomationReconReviewTabListSortState, updateReviewTabLocalData as updateExpenseAutomationReconReviewTabLocalData, updateReconcileTabListScrollState as updateExpenseAutomationReconcileTabListScrollState, updateReconcileTabListSortState as updateExpenseAutomationReconcileTabListSortState, updateReconcileTabLocalData as updateExpenseAutomationReconcileTabLocalData, updateSelectedDrawerAccountId as updateExpenseAutomationSelectedDrawerAccountId, updateNodeCollapseState, updateStatementUploadChosen, uploadAccountStatement, } from './view/expenseAutomationView/reducers/reconciliationViewReducer';
|
|
171
|
-
import { backgroundRefetchReviewTab, clearExpenseAutomationTransactionsView, fetchTransactionCategorization, fetchTransactionCategorizationFailure, fetchTransactionCategorizationView, initializeTransactionCategorizationViewLocalData, markTransactionAsNotMiscategorized, saveTransactionCategorization, saveTransactionCategorizationLocalData, setAllItemsToCategoryClassInLocalDataForCategorization, setEntityRecommendationForLineIdsForCategorization, syncTransactionCategorizationFromDetailSave, updateCurrentSelectedTransactionCategorizationTab, updateSelectedCheckboxTransactionIds, updateSelectedCustomerForTransaction, updateSelectedTransactionId, updateSelectedVendorForTransaction, updateTransactionCategorization, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, updateTransactionCategorizationUIState, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } from './view/expenseAutomationView/reducers/transactionsViewReducer';
|
|
172
|
+
import { backgroundRefetchReviewTab, clearExpenseAutomationTransactionsView, fetchTransactionCategorization, fetchTransactionCategorizationFailure, fetchTransactionCategorizationView, initializeTransactionCategorizationViewLocalData, markTransactionAsNotMiscategorized, saveTransactionCategorization, saveTransactionCategorizationLocalData, setAllItemsToCategoryClassInLocalDataForCategorization, setEntityRecommendationForLineIdsForCategorization, syncTransactionCategorizationFromDetailSave, updateCurrentSelectedTransactionCategorizationTab, updateSelectedCheckboxTransactionIds, updateSelectedCustomerForTransaction, updateSelectedTransactionId, updateSelectedVendorForTransaction, updateTransactionCategorization, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, updateTransactionCategorizationUIState, updateTransactionCategorizationUploadReceiptState, updateTransactionFilters, uploadTransactionCategorizationReceiptSuccess, } from './view/expenseAutomationView/reducers/transactionsViewReducer';
|
|
172
173
|
import { getExpenseAutomationFluxAnalysisView } from './view/expenseAutomationView/selectors/fluxAnalysisViewSelector';
|
|
173
174
|
import { getExpenseAutomationReconciliationView, isAccountReconReport, } from './view/expenseAutomationView/selectors/reconciliationViewSelector';
|
|
174
175
|
import { getExpenseAutomationTransactionView } from './view/expenseAutomationView/selectors/transactionCategorizationSelector';
|
|
@@ -336,6 +337,7 @@ import { getRemiBusinessVerificationDetails, getRemiSetupViewDetails, } from './
|
|
|
336
337
|
import { approveOrRejectRemisBulkAction, autoReviewPendingApprovalRemis, cancelOrDeleteRemisBulkAction, clearAllRemisFromBulkActionList, clearRemiBulkActionView, incrementRemiBulkActionProcessedCount, removeRemiFromBulkActionList, reviewDraftRemisBulkAction, submitDraftRemisBulkAction, updateRemisBulkActionList, } from './view/spendManagement/reimbursement/remisBulkActionView/remisBulkActionViewReducer';
|
|
337
338
|
import { getRemisBulkOperationProgress, getRemisBulkReviewView, } from './view/spendManagement/reimbursement/remisBulkActionView/remisBulkActionViewSelector';
|
|
338
339
|
import { hideCreatedByFilter, } from './view/spendManagement/spendManagementFilterHelpers';
|
|
340
|
+
import { TRANSACTION_FILTER_CATEGORIES, applyTransactionFilters, } from './view/expenseAutomationView/transactionFilterHelpers';
|
|
339
341
|
import { acceptTreasuryTerms, clearTreasurySetupView, fetchPortfolioAllocation, fetchTreasuryFunds, fetchTreasurySetupView, updateFundAllocationLocalData, updatePortfolioAllocation, updateTreasuryVideoViewed, } from './view/spendManagement/treasury/treasurySetUp/treasurySetupViewReducer';
|
|
340
342
|
import { getTreasuryBusinessVerificationDetails, getTreasurySetupViewDetails, } from './view/spendManagement/treasury/treasurySetUp/treasurySetupViewSelector';
|
|
341
343
|
import { getTreasuryFundsMaximumYield, } from './view/spendManagement/treasury/treasurySetUp/treasurySetupViewState';
|
|
@@ -448,15 +450,15 @@ export {
|
|
|
448
450
|
BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, DEFAULT_COMPLETED_SUB_TAB, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toCompletedSubTab, toMatchSource, toMissingReceiptsTab, toExpenseAutomationJEScheduleMainTab, toExpenseAutomationJEScheduleSortKey, getExpenseAutomationView, toExpenseAutomationMissingReceiptsSortKey, toExpenseAutomationTransactionsTabKey, toExpenseAutomationViewType, uploadExpenseAutomationMissingReceiptSuccess, markExpenseAutomationMissingReceiptAsDone, fetchAllExpenseAutomationTabs, refreshExpenseAutomationCurrentTab, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, fetchExpenseAutomationMissingReceipts,
|
|
449
451
|
// Bulk Upload Actions
|
|
450
452
|
bulkUploadReceipts, bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, updateBulkUploadProgress, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, setBulkUploadUploadedFileCount, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, fetchFluxAnalysisView, clearExpenseAutomationFluxAnalysisView, updateOperatingExpensesIdsForReview as updateFluxOperatingExpensesIdsForReview, updateSelectedSectionIdsForReview as updateFluxAnalysisSelectedSectionIdsForReview, reviewFluxAnalysisView, updateExpenseAutomationMissingReceiptUploadState, updateExpenseAutomationMissingReceiptsUIState, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, getExpenseAutomationFluxAnalysisView, updateCurrentSelectedView, updateCurrentSelectedPeriod, getExpenseAutomationTransactionView, updateFluxAnalysisViewUIState, updateFluxAnalysisViewPageMetaData, MAX_SELECTION_LIMIT, checkIfAllLineItemsAreCategoryClassFilled, getLineItemsByTransactionIdsFromLocalData, isAnyItemWithUncategorizedExpenseAccount, excludeAccountFromReconciliation, includeAccountInReconciliation, saveExpenseAutomationReconciliationDetail, updateExpenseAutomationReconcileTabListScrollState, updateExpenseAutomationReconReviewTabListSortState, updateExpenseAutomationReconcileTabListSortState, updateExpenseAutomationReconcileTabLocalData, updateExpenseAutomationAccountReconciliationSelectedTab, updateExpenseAutomationAccountReconciliationSelectedAccountId, getExpenseAutomationReconciliationView, fetchReconciliationView, uploadAccountStatementIntoDocumentAI, updateExpenseAutomationReconListScrollPosition, setConnectionInProgressForAccountReconciliation, getAccountReconByAccountIdAndSelectedPeriod, toReconciliationTabsType, isAccountReconReport, updateExpenseAutomationReconReviewTabLocalData, updateExpenseAutomationSelectedDrawerAccountId, saveExpenseAutomationReconciliationReview, updateExpenseAutomationAccountReconciliationLocalData, toReconciliationAccountSource, deleteAccountStatement, uploadAccountStatement, updateNodeCollapseState, updateStatementUploadChosen, isReviewTransactionBankTransferType, isReviewTransactionBillPaymentType, isReviewTransactionCreditCardPaymentType, isReviewTransactionDepositType, isReviewTransactionExpenseType, isReviewTransactionCreditCardCreditType, setStatementParseInProgress, };
|
|
451
|
-
export { fetchTransactionCategorization, fetchTransactionCategorizationView, updateTransactionCategorizationUIState, updateSelectedCheckboxTransactionIds, setEntityRecommendationForLineIdsForCategorization, initializeTransactionCategorizationViewLocalData, setAllItemsToCategoryClassInLocalDataForCategorization, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, clearExpenseAutomationTransactionsView, toTransactionsSortKey, };
|
|
453
|
+
export { fetchTransactionCategorization, fetchTransactionCategorizationView, updateTransactionCategorizationUIState, updateTransactionFilters, updateSelectedCheckboxTransactionIds, setEntityRecommendationForLineIdsForCategorization, initializeTransactionCategorizationViewLocalData, setAllItemsToCategoryClassInLocalDataForCategorization, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, clearExpenseAutomationTransactionsView, toTransactionsSortKey, };
|
|
452
454
|
export { TOP_EX_TIME_PERIODS };
|
|
453
455
|
export { toTimeframeTick, mapTimePeriodtoTimeframeTick, toTimePeriod, toAbsoluteDay, toMonthYearPeriodId, convertToPeriod, };
|
|
454
456
|
export { toVendorSpendTrendFilterTabsTypeStrict, } from './entity/vendorExpense/vendorExpenseSelector';
|
|
455
457
|
export { getNumberOfPeriods };
|
|
456
458
|
export { SCHEDULE_DAYS_OF_MONTH, toScheduleDaysOfMonth, toMonth, toMonthStrict, toQuarter, toQuarterStrict, };
|
|
457
459
|
export { getTenantBaseById, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getTenantsByCheckInDateSelector, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, doSignOut, sendSessionHeartbeat, resetSignInState, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, };
|
|
458
|
-
export { toAccountType, toAccountGroupType, getAccountGroupKey, };
|
|
459
|
-
export { getClassById } from './entity/class/classSelector';
|
|
460
|
+
export { toAccountType, toAccountGroupType, getAccountGroupKey, getAllAccounts, getTransactionFilterAccountOptions, };
|
|
461
|
+
export { getAllClasses, getClassById, getClassFilterOptions, } from './entity/class/classSelector';
|
|
460
462
|
export { getForecast };
|
|
461
463
|
export { getUserName, getUserByUserId, getUsersByUserIds, getAllZeniUsersFromState, } from './entity/user/userSelector';
|
|
462
464
|
export { toUserRoleType, toUserRoleTypeStrict, isFinOpsUserRoleType, hasAdminLevelAccess, hasFullOrAdminLevelAccess, hasReimbursementUserAccess, hasEmployeeLevelAccess, hasBookKeepingAdminLevelAccess, hasBookKeepingUserLevelAccess, isNonZeniRole, hasInvestorBankerLevelAccess, getUserRoleMap, hasOnlyBillPayAccess, hasZeniRoleOrCompanyOfficerAccess, hasSuperAdminLevelAccess, hasBillPayFallbackAdminLevelAccess, hasRemiFallbackAdminLevelAccess, hasOnlyReimbursementAccess, hasOnlyChargeCardAccess, hasOnlyZeniAccountsAccess, isZeniSignedInUser, getUserRoleByUserId, getUserRoleByUserIds, hasChargeCardAccess, hasZeniAccountsAccess, hasTreasuryAccess, hasTreasuryAdminLevelAccess, hasBillPayAccess, hasReimbursementAccess, hasReimbursementAdminLevelAccess, hasBillPayAdminLevelAccess, hasChargeCardAdminLevelAccess, hasSpendManagementAccess, hasSpendManagementAdminLevelAccess, hasZeniAccountsAdminLevelAccess, hasAnyCompanyRole, hasAnyFinOpRole, hasBillPayAccessible, hasReimbursementAccessible, hasZeniAccountsAccessible, hasChargeCardAccessible, hasTreasuryAccessible, hasAICFOAccess, };
|
|
@@ -556,6 +558,10 @@ export { toRemiSubTabType, toRemiSubTabTypeStrict, toRemiTabType, toRemiTabTypeS
|
|
|
556
558
|
export { getClassList, fetchClassList, getProjectList, fetchProjectList, };
|
|
557
559
|
export { fetchBillList, fetchBillListPerTab, updateTab, updateSubTab, updateSelectedBillId, updateBillDetailSaveBillCode, fetchVendorByNameAndParseInvoice, saveBillUpdatesToLocalStore, discardBillUpdatesInLocalStore, saveBillDetail, approveOrRejectBill, updateApprovalStatusOnSuccess, deleteBill, cancelAndDeleteBill, retryOrRefundBill, getBillList, getBillDownloadList, getBillDetailView, checkApproveRejectBtnShowForBill, getBillTransactionDetailKey, fetchBillDetail, fetchEditBillDetailPage, fetchAndUpdateVendorRecommendations, fetchDuplicateBill, clearBillPayReview, getEditBillDetail, getReviewPageBillDetail, fetchBillAndInitializeLocalStore, updateShowAutofill, saveVendorSuccessOrFailure, updateBillListUIState, BILL_PAY_FILTER_CATEGORIES, updateVendorDetailLocalData, resetVendorDetailLocalData, resetVendorSaveStatus, updateContactsInVendorDetailLocalData, updateVendorTabDetailUIState, updateContactsInVendorTabDetailLocalData, updateBillUploadFetchState, updateBillListSearchResult, fetchUserDetails, verifyUser, updateVendorContact, toPaymentToOption, convertAmountToHomeCurrency, fetchVendorAndUpdateBillLocalData, markBillForRetry, updateWithdrawFromAccountId, removeBillFileFromLocalStore, replaceBillFileInLocalStore, updateShouldReplaceBillData, };
|
|
558
560
|
export { hideCreatedByFilter, };
|
|
561
|
+
// Transaction Categorization filter API — lives under Expense Automation,
|
|
562
|
+
// not Spend Management. Kept in a separate re-export block to make the
|
|
563
|
+
// separation visible at the barrel level.
|
|
564
|
+
export { TRANSACTION_FILTER_CATEGORIES, applyTransactionFilters, };
|
|
559
565
|
export { fetchBillPaySetupView, fetchZeniAccountSetupView, enableSetup, getPaymentAccounts, getPlaidLinkToken, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, updateBusinessVerificationDetails, updatePaymentAccount, updatePaymentAccountLoginStatus, updatePaymentAccountStatus, establishPlaidConnection, updateMappedCashAccount, updatePrimaryFundingAccount, acceptBillPayTerms, acceptZeniAccountTerms, acceptBillPayUpdatedTerms, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, clearBillPaySetupView, clearZeniAccountSetupView, sendOtp, resendOtp, verifyOtp, getBillPaySetupViewDetails, getPlaidAccountDetails, getZeniAccountSetupViewDetails, getBusinessVerificationDetails, getBillPayBusinessVerificationDetails, getZeniAccountBusinessVerificationDetails, getTreasuryBusinessVerificationDetails, getCommonSetupViewDetails, getTwoFactorAuthenticationView, getTwoFactorAuthenticationViewForCardUserOnboarding, getTwoFactorAuthenticationViewForChargeCardHolder, };
|
|
560
566
|
export { getApprovalRuleViewDetails, getBankConnectionsSetupViewDetails, getIntegrationsView, };
|
|
561
567
|
export { fetchUserFinancialAccount };
|
|
@@ -291,7 +291,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
|
|
|
291
291
|
const key = currentFilter.field;
|
|
292
292
|
const categoryValue = getCategoryValueForCompany(key, company);
|
|
293
293
|
if (categoryValue == null) {
|
|
294
|
-
if (currentFilter.matchingOperator === '
|
|
294
|
+
if (currentFilter.matchingOperator === 'not_equal') {
|
|
295
295
|
return true;
|
|
296
296
|
}
|
|
297
297
|
return false;
|
|
@@ -48,7 +48,7 @@ export const filterCompanyOnCategoriesWithSingleValue = (categoryValue, currentF
|
|
|
48
48
|
return filterCompanyOnRangeCategoryType(categoryValue, currentFilter);
|
|
49
49
|
}
|
|
50
50
|
// if filter category is not annualRecurringRevenue OR monthlyRecurringRevenue
|
|
51
|
-
if (currentFilter.matchingOperator === '
|
|
51
|
+
if (currentFilter.matchingOperator === 'not_equal') {
|
|
52
52
|
return currentFilter.values.indexOf(categoryValue) === -1;
|
|
53
53
|
}
|
|
54
54
|
return currentFilter.values.indexOf(categoryValue) > -1;
|
|
@@ -150,7 +150,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
|
|
|
150
150
|
const key = currentFilter.field;
|
|
151
151
|
const categoryValue = getCategoryValueForCompany(key, company);
|
|
152
152
|
if (categoryValue == null) {
|
|
153
|
-
if (currentFilter.matchingOperator === '
|
|
153
|
+
if (currentFilter.matchingOperator === 'not_equal') {
|
|
154
154
|
return true;
|
|
155
155
|
}
|
|
156
156
|
return false;
|
|
@@ -116,7 +116,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
|
|
|
116
116
|
const key = currentFilter.field;
|
|
117
117
|
const categoryValue = getCategoryValueForCompany(key, company);
|
|
118
118
|
if (categoryValue == null) {
|
|
119
|
-
if (currentFilter.matchingOperator === '
|
|
119
|
+
if (currentFilter.matchingOperator === 'not_equal') {
|
|
120
120
|
return true;
|
|
121
121
|
}
|
|
122
122
|
return false;
|
|
@@ -28,6 +28,10 @@ export const initialTransactionTabViewState = {
|
|
|
28
28
|
totalCount: {},
|
|
29
29
|
limit: 10,
|
|
30
30
|
},
|
|
31
|
+
filters: {
|
|
32
|
+
categoryCombinationOperator: 'AND',
|
|
33
|
+
categories: [],
|
|
34
|
+
},
|
|
31
35
|
fetchState: 'Not-Started',
|
|
32
36
|
error: undefined,
|
|
33
37
|
hasValidState() {
|
|
@@ -299,6 +303,12 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
299
303
|
uiState.totalCount;
|
|
300
304
|
}
|
|
301
305
|
},
|
|
306
|
+
updateTransactionFilters(draft, action) {
|
|
307
|
+
const { selectedTab, filters } = action.payload;
|
|
308
|
+
// `filters` is non-nullable per the payload type, so no runtime
|
|
309
|
+
// null-check is needed — dropping it removes a dead defensive branch.
|
|
310
|
+
draft.transactionCategorizationView[selectedTab].filters = filters;
|
|
311
|
+
},
|
|
302
312
|
saveTransactionCategorization: {
|
|
303
313
|
prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
|
|
304
314
|
return {
|
|
@@ -929,5 +939,5 @@ const expenseAutomationTransactionsView = createSlice({
|
|
|
929
939
|
},
|
|
930
940
|
},
|
|
931
941
|
});
|
|
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;
|
|
942
|
+
export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, updateTransactionFilters, 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;
|
|
933
943
|
export default expenseAutomationTransactionsView.reducer;
|