@zeniai/client-epic-state 4.19.24-betaAR11 → 4.19.24-betaAR13

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts

@@ -13,6 +13,7 @@ import { ZeniAPIStatus } from '../../../responsePayload';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { UpdateTransactionCategorizationResponsePayload } from '../payload/transactionCategorizationPayload';
 import { SupportedTransactionCategorization, TransactionSaveUpdates, TransactionsTab, TransactionsTabViewState, TransactionsViewState, TransactionsViewUIState } from '../types/transactionsViewState';
+import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
 export declare const initialTransactionTabViewState: TransactionsTabViewState;
 export declare const initialState: TransactionsViewState;
 export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: boolean | undefined, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
@@ -28,7 +29,10 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
 }, "expenseAutomationTransactionsView/fetchTransactionCategorization", never, never>, updateTransactionCategorizationUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedTab: TransactionsTab;
     uiState: Partial<TransactionsViewUIState>;
-}, "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], {
+}, "expenseAutomationTransactionsView/updateTransactionCategorizationUIState">, updateTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    filters: TransactionFilters;
+    selectedTab: TransactionsTab;
+}, "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], {
     selectedTab: "review" | "autoCategorized";
     transactionIds: string[];
     selectedPeriod: MonthYearPeriod;

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -34,6 +34,10 @@ exports.initialTransactionTabViewState = {
         totalCount: {},
         limit: 10,
     },
+    filters: {
+        categoryCombinationOperator: 'AND',
+        categories: [],
+    },
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {
@@ -230,6 +234,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                     uiState.totalCount;
             }
         },
+        updateTransactionFilters(draft, action) {
+            const { selectedTab, filters } = action.payload;
+            if (filters != null) {
+                draft.transactionCategorizationView[selectedTab].filters = filters;
+            }
+        },
         saveTransactionCategorization: {
             prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
                 return {
@@ -653,5 +663,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_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;
+_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.default = expenseAutomationTransactionsView.reducer;

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.d.ts

@@ -1,3 +1,6 @@
+import { TransactionWithCOT } from '../../../entity/transaction/stateTypes/transaction';
 import { RootState } from '../../../reducer';
-import { ExpenseAutomationTransactionViewSelector } from '../selectorTypes/transactionsViewSelectorTypes';
+import { TransactionView } from '../../spendManagement/spendManagementFilterHelpers';
+import { ExpenseAutomationTransactionViewSelector, TransactionReviewLocalDataSelectorView } from '../selectorTypes/transactionsViewSelectorTypes';
+export declare const toTransactionView: (transaction: TransactionWithCOT, transactionLocalData?: TransactionReviewLocalDataSelectorView) => TransactionView;
 export declare function getExpenseAutomationTransactionView(state: RootState): ExpenseAutomationTransactionViewSelector;

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toTransactionView = void 0;
 exports.getExpenseAutomationTransactionView = getExpenseAutomationTransactionView;
 const omit_1 = __importDefault(require("lodash/omit"));
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
@@ -10,14 +11,34 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionHelper_1 = require("../../../entity/transaction/transactionHelper");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
+const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
+const toTransactionView = (transaction, transactionLocalData) => {
+    return {
+        id: transaction.id,
+        date: transaction.date,
+        amount: transaction.amount,
+        vendorName: transaction.vendorName,
+        customerName: transaction.customerName,
+        vendorId: transaction.vendorId,
+        customerId: transaction.customerId,
+        description: transaction.description,
+        memo: transaction.memo,
+        type: transaction.type,
+        typeName: transaction.typeName,
+        createTime: transaction.createTime,
+        transaction: transaction,
+        transactionLocalData,
+    };
+};
+exports.toTransactionView = toTransactionView;
 function getExpenseAutomationTransactionView(state) {
     var _a, _b, _c;
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -34,48 +55,82 @@ function getExpenseAutomationTransactionView(state) {
         ? transactionIdsBySelectedPeriod[monthYearPeriodId]
         : null;
     const transactionIds = transactionIdsForSelectedPeriod !== null && transactionIdsForSelectedPeriod !== void 0 ? transactionIdsForSelectedPeriod : [];
+    const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
+    const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
+    // Apply search first, then filters
+    // Step 1: Apply search filter
     const searchString = (_b = (_a = uiState.searchString) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase()) !== null && _b !== void 0 ? _b : '';
-    const transactionLocalData = transactionIds
-        .map((transactionId) => {
+    const transactionLocalDataMap = new Map();
+    transactionIds.forEach((transactionId) => {
         const transactionData = transactionReviewLocalDataById[transactionId];
         if (transactionData != null) {
-            return {
+            transactionLocalDataMap.set(transactionId, {
                 transactionId,
                 transactionReviewLocalData: transactionData.transactionReviewLocalData,
-            };
+            });
         }
-        return null;
-    })
-        .filter((transaction) => {
+    });
+    // Filter transactions by search string
+    const transactionsAfterSearch = transactionsWithCOT.filter((transaction) => {
         var _a, _b, _c, _d, _e;
-        if (transaction == null) {
-            return false;
+        if (searchString === '') {
+            return true;
         }
-        // Apply search filter if searchString is not empty
-        if (searchString !== '') {
-            const { transactionReviewLocalData } = transaction;
-            // Check vendorDetails.name
-            const vendorNameMatch = (_c = (_b = (_a = transactionReviewLocalData.vendorDetails) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes(searchString)) !== null && _c !== void 0 ? _c : false;
-            // Check memo
-            const memoMatch = (_e = (_d = transactionReviewLocalData.memo) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes(searchString)) !== null && _e !== void 0 ? _e : false;
-            // Check lineItemById - iterate through all line items
-            const lineItemMatch = Object.values(transactionReviewLocalData.lineItemById).some((lineItem) => {
-                var _a, _b;
-                // Check amount (convert number to string)
-                const amountMatch = lineItem.amount.amount
-                    .toString()
-                    .toLowerCase()
-                    .includes(searchString);
-                // Check transactionId
-                const transactionIdMatch = (_b = (_a = lineItem.transactionId) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(searchString)) !== null && _b !== void 0 ? _b : false;
-                return amountMatch || transactionIdMatch;
-            });
-            return vendorNameMatch || memoMatch || lineItemMatch;
+        const localData = transactionLocalDataMap.get(transaction.id);
+        if (localData == null) {
+            return false;
         }
-        return true; // Include all if no search string
+        const { transactionReviewLocalData } = localData;
+        // Check vendorDetails.name
+        const vendorNameMatch = (_c = (_b = (_a = transactionReviewLocalData.vendorDetails) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes(searchString)) !== null && _c !== void 0 ? _c : false;
+        // Check memo
+        const memoMatch = (_e = (_d = transactionReviewLocalData.memo) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes(searchString)) !== null && _e !== void 0 ? _e : false;
+        // Check lineItemById - iterate through all line items
+        const lineItemMatch = Object.values(transactionReviewLocalData.lineItemById).some((lineItem) => {
+            var _a, _b;
+            // Check amount (convert number to string)
+            const amountMatch = lineItem.amount.amount
+                .toString()
+                .toLowerCase()
+                .includes(searchString);
+            // Check transactionId
+            const transactionIdMatch = (_b = (_a = lineItem.transactionId) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(searchString)) !== null && _b !== void 0 ? _b : false;
+            return amountMatch || transactionIdMatch;
+        });
+        return vendorNameMatch || memoMatch || lineItemMatch;
     });
-    const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
-    const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
+    // Step 2: Convert to TransactionView and apply advanced filters
+    const transactionViews = transactionsAfterSearch.map((transaction) => {
+        const localData = transactionLocalDataMap.get(transaction.id);
+        return (0, exports.toTransactionView)(transaction, localData);
+    });
+    // Apply advanced filters if they exist
+    const filteredTransactionViews = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('transaction_categorization', transactionViews, filters);
+    // Convert back to TransactionWithCOT for return
+    const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
+    // Get transactionLocalData for filtered transactions
+    // Also include transactionLocalData for transactions that don't exist in transactionState
+    // but have local data (to match original behavior)
+    const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
+    const filteredTransactionLocalData = transactionIds
+        .map((transactionId) => {
+        const transactionData = transactionReviewLocalDataById[transactionId];
+        if (transactionData == null) {
+            return null;
+        }
+        // Include if transaction is in filtered results, or if transaction doesn't exist in state
+        // (to maintain backward compatibility with tests)
+        const transactionExists = transactions.some((t) => t.id === transactionId);
+        if (filteredTransactionIds.has(transactionId) ||
+            !transactionExists) {
+            return {
+                transactionId,
+                transactionReviewLocalData: transactionData.transactionReviewLocalData,
+            };
+        }
+        return null;
+    })
+        .filter((data) => data != null);
     const fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
         accountList,
         classList,
@@ -112,7 +167,7 @@ function getExpenseAutomationTransactionView(state) {
         version: 0,
         fetchState: fetchStatus.fetchState,
         error: fetchStatus.error,
-        transactions: transactionsWithCOT,
+        transactions: filteredTransactionsWithCOT,
         selectedCheckBoxTransactionIds,
         transactionIdsWithUnsavedData,
         uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -121,7 +176,7 @@ function getExpenseAutomationTransactionView(state) {
         classList: allClasses,
         accountsHierarchyList,
         classHierarchyList,
-        transactionLocalData,
+        transactionLocalData: filteredTransactionLocalData,
         uiState,
         refreshStatus,
         saveStatus,

package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts

@@ -14,6 +14,7 @@ import { TransactionCategory, TransactionType } from '../../../entity/transactio
 import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
+import { TransactionFilters } from '../../spendManagement/spendManagementFilterHelpers';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
 export declare const toTransactionsSortKey: (v: string) => "date" | "vendor" | "amount" | "category" | "class" | "memo" | "transaction_type";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
@@ -89,6 +90,7 @@ export interface SupportedTransactionCategorization {
 }
 export declare const initialSupportedTransactionCategorization: SupportedTransactionCategorization;
 export interface TransactionsTabViewState extends FetchedState {
+    filters: TransactionFilters;
     markAsNotMiscategorizedStatus: FetchStateAndError;
     refreshStatus: FetchStateAndError;
     saveStatus: FetchStateAndError;

package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts

@@ -1,9 +1,14 @@
+import { Amount } from '../../commonStateTypes/amount';
+import { ID } from '../../commonStateTypes/common';
 import { TimePeriod } from '../../commonStateTypes/timePeriod';
 import { UserRoleType } from '../../entity/userRole/userRoleType';
 import { RootState } from '../../reducer';
 import { ZeniDate } from '../../zeniDayJS';
 import { TaskListFilterCategoryField, TaskListFilters } from '../taskManager/taskListView/taskList';
 import { TaskWithUserDetails } from '../taskManager/taskListView/taskListSelector';
+import { SupportedTransactionWithCOT } from '../../entity/transaction/transactionState';
+import { TransactionType } from '../../entity/transaction/stateTypes/transactionType';
+import { TransactionReviewLocalDataSelectorView } from '../expenseAutomationView/selectorTypes/transactionsViewSelectorTypes';
 import { BillTransactionView } from './billPay/billList/billListSelector';
 import { BillListViewFilterCategoryField, BillPayFilters } from './billPay/billList/billListState';
 import { ReimbursementView } from './reimbursement/remiListView/remiListSelector';
@@ -50,8 +55,24 @@ export interface TransactionFilterCategory {
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }
+export interface TransactionView {
+    amount: Amount;
+    createTime: ZeniDate;
+    date: ZeniDate;
+    description: string;
+    id: ID;
+    memo: string;
+    transaction: SupportedTransactionWithCOT;
+    type: TransactionType;
+    customerId?: ID;
+    customerName?: string;
+    transactionLocalData?: TransactionReviewLocalDataSelectorView;
+    typeName?: string;
+    vendorId?: ID;
+    vendorName?: string;
+}
 export type FilterCategoryValueType = string | number | ZeniDate;
-export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails)[];
+export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[] | TransactionView[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters | TransactionFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails | TransactionView)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails | TransactionView)[];
 export declare const isBillListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
 export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
 export declare const hideCreatedByFilter: (userRole: UserRoleType[]) => boolean;

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -119,7 +119,11 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
             ? getCategoryValueForBill(key, item)
             : entity === 'reimbursement'
                 ? getCategoryValueForReimbursement(key, item)
-                : getCategoryValueForTaskList(key, item);
+                : entity === 'task_management'
+                    ? getCategoryValueForTaskList(key, item)
+                    : entity === 'transaction_categorization'
+                        ? getCategoryValueForTransaction(key, item)
+                        : undefined;
         if (categoryValue == null) {
             if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
@@ -139,6 +143,7 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
                 'dueDate',
                 'creationDate',
                 'receiptDate',
+                'date',
             ]);
         }
     });
@@ -242,6 +247,114 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
             return undefined;
     }
 };
+const getCategoryValueForTransaction = (key, transaction) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+    switch (key) {
+        case 'amount':
+            return transaction.amount.amount;
+        case 'payee': {
+            // Priority: vendorName > customerName > from transactionLocalData
+            if (transaction.vendorName) {
+                return transaction.vendorName;
+            }
+            if (transaction.customerName) {
+                return transaction.customerName;
+            }
+            // Check transactionLocalData for vendor/customer
+            const localData = (_a = transaction.transactionLocalData) === null || _a === void 0 ? void 0 : _a.transactionReviewLocalData;
+            if ((_b = localData === null || localData === void 0 ? void 0 : localData.vendor) === null || _b === void 0 ? void 0 : _b.name) {
+                return localData.vendor.name;
+            }
+            if ((_c = localData === null || localData === void 0 ? void 0 : localData.customer) === null || _c === void 0 ? void 0 : _c.name) {
+                return localData.customer.name;
+            }
+            return undefined;
+        }
+        case 'payment_account_name': {
+            // Get from transaction.account or from lines
+            if ((_d = transaction.transaction.account) === null || _d === void 0 ? void 0 : _d.accountName) {
+                return transaction.transaction.account.accountName;
+            }
+            // Get from first line's account
+            const firstLine = (_e = transaction.transaction.lines) === null || _e === void 0 ? void 0 : _e[0];
+            if ((firstLine === null || firstLine === void 0 ? void 0 : firstLine.type) === 'transaction_with_account_and_class_line' ||
+                (firstLine === null || firstLine === void 0 ? void 0 : firstLine.type) === 'transaction_with_product_or_service_line' ||
+                (firstLine === null || firstLine === void 0 ? void 0 : firstLine.type) === 'journal_entry_transaction_line') {
+                const accountLine = firstLine;
+                return (_f = accountLine.account) === null || _f === void 0 ? void 0 : _f.accountName;
+            }
+            return undefined;
+        }
+        case 'payment_account_type': {
+            // Similar to payment_account_name but for type
+            if ((_g = transaction.transaction.account) === null || _g === void 0 ? void 0 : _g.accountType) {
+                return transaction.transaction.account.accountType;
+            }
+            const firstLineForType = (_h = transaction.transaction.lines) === null || _h === void 0 ? void 0 : _h[0];
+            if ((firstLineForType === null || firstLineForType === void 0 ? void 0 : firstLineForType.type) === 'transaction_with_account_and_class_line' ||
+                (firstLineForType === null || firstLineForType === void 0 ? void 0 : firstLineForType.type) === 'transaction_with_product_or_service_line' ||
+                (firstLineForType === null || firstLineForType === void 0 ? void 0 : firstLineForType.type) === 'journal_entry_transaction_line') {
+                const accountLineForType = firstLineForType;
+                return (_j = accountLineForType.account) === null || _j === void 0 ? void 0 : _j.accountType;
+            }
+            return undefined;
+        }
+        case 'category': {
+            // Get from transactionLocalData (preferred) or from transaction lines
+            const localDataForCategory = (_k = transaction.transactionLocalData) === null || _k === void 0 ? void 0 : _k.transactionReviewLocalData;
+            if (localDataForCategory) {
+                // Get category from first line item or most common
+                const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
+                if ((_l = firstLineItem === null || firstLineItem === void 0 ? void 0 : firstLineItem.account) === null || _l === void 0 ? void 0 : _l.accountId) {
+                    return firstLineItem.account.accountId;
+                }
+                if ((_m = firstLineItem === null || firstLineItem === void 0 ? void 0 : firstLineItem.account) === null || _m === void 0 ? void 0 : _m.qboId) {
+                    return firstLineItem.account.qboId;
+                }
+                if ((_o = firstLineItem === null || firstLineItem === void 0 ? void 0 : firstLineItem.account) === null || _o === void 0 ? void 0 : _o.accountName) {
+                    return firstLineItem.account.accountName;
+                }
+            }
+            // Fallback to transaction lines
+            const firstLineForCategory = (_p = transaction.transaction.lines) === null || _p === void 0 ? void 0 : _p[0];
+            if ((firstLineForCategory === null || firstLineForCategory === void 0 ? void 0 : firstLineForCategory.type) === 'transaction_with_account_and_class_line' ||
+                (firstLineForCategory === null || firstLineForCategory === void 0 ? void 0 : firstLineForCategory.type) === 'transaction_with_product_or_service_line' ||
+                (firstLineForCategory === null || firstLineForCategory === void 0 ? void 0 : firstLineForCategory.type) === 'journal_entry_transaction_line') {
+                const account = firstLineForCategory
+                    .account;
+                return (_r = (_q = account === null || account === void 0 ? void 0 : account.accountId) !== null && _q !== void 0 ? _q : account === null || account === void 0 ? void 0 : account.qboId) !== null && _r !== void 0 ? _r : account === null || account === void 0 ? void 0 : account.accountName;
+            }
+            return undefined;
+        }
+        case 'class': {
+            // Similar to category but for class
+            const localDataForClass = (_s = transaction.transactionLocalData) === null || _s === void 0 ? void 0 : _s.transactionReviewLocalData;
+            if (localDataForClass) {
+                const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
+                if ((_t = firstLineItemForClass === null || firstLineItemForClass === void 0 ? void 0 : firstLineItemForClass.class) === null || _t === void 0 ? void 0 : _t.classId) {
+                    return firstLineItemForClass.class.classId;
+                }
+                if ((_u = firstLineItemForClass === null || firstLineItemForClass === void 0 ? void 0 : firstLineItemForClass.class) === null || _u === void 0 ? void 0 : _u.qboId) {
+                    return firstLineItemForClass.class.qboId;
+                }
+                if ((_v = firstLineItemForClass === null || firstLineItemForClass === void 0 ? void 0 : firstLineItemForClass.class) === null || _v === void 0 ? void 0 : _v.className) {
+                    return firstLineItemForClass.class.className;
+                }
+            }
+            const firstLineForClass = (_w = transaction.transaction.lines) === null || _w === void 0 ? void 0 : _w[0];
+            if ((firstLineForClass === null || firstLineForClass === void 0 ? void 0 : firstLineForClass.type) === 'transaction_with_account_and_class_line' ||
+                (firstLineForClass === null || firstLineForClass === void 0 ? void 0 : firstLineForClass.type) === 'transaction_with_product_or_service_line' ||
+                (firstLineForClass === null || firstLineForClass === void 0 ? void 0 : firstLineForClass.type) === 'journal_entry_transaction_line') {
+                const classData = firstLineForClass
+                    .class;
+                return (_y = (_x = classData === null || classData === void 0 ? void 0 : classData.classId) !== null && _x !== void 0 ? _x : classData === null || classData === void 0 ? void 0 : classData.qboId) !== null && _y !== void 0 ? _y : classData === null || classData === void 0 ? void 0 : classData.className;
+            }
+            return undefined;
+        }
+        default:
+            return undefined;
+    }
+};
 const isBillListDownloadable = (state, currentTimePeriod) => {
     const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
     const keys = billListState_1.ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, billListState_1.getBillListKey)(currentTimePeriod, tab));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.24-betaAR11",
+  "version": "4.19.24-betaAR13",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",