@zeniai/client-epic-state 5.0.66-betaAR6 → 5.0.66-betaJK2

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

@@ -3,7 +3,6 @@ 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");
@@ -11,34 +10,14 @@ 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 transactionFilterHelpers_1 = require("../transactionFilterHelpers");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const projectListSelector_1 = require("../../projectList/projectListSelector");
 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) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = 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);
@@ -57,53 +36,20 @@ function getExpenseAutomationTransactionView(state) {
         ? transactionIdsBySelectedPeriod[monthYearPeriodId]
         : null;
     const transactionIds = transactionIdsForSelectedPeriod ?? [];
-    const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
-    const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
-    const transactionLocalDataMap = new Map();
-    transactionIds.forEach((transactionId) => {
+    const transactionLocalData = transactionIds
+        .map((transactionId) => {
         const transactionData = transactionReviewLocalDataById[transactionId];
         if (transactionData != null) {
-            transactionLocalDataMap.set(transactionId, {
+            return {
                 transactionId,
                 transactionReviewLocalData: transactionData.transactionReviewLocalData,
-            });
+            };
         }
-    });
-    // Step 2: Convert to TransactionView and apply advanced filters
-    const transactionViews = transactionsWithCOT.map((transaction) => {
-        const localData = transactionLocalDataMap.get(transaction.id);
-        return (0, exports.toTransactionView)(transaction, localData);
-    });
-    // Apply TC-specific filters (lives under expenseAutomationView, independent
-    // of the Spend Management filter pipeline).
-    const filteredTransactionViews = (0, transactionFilterHelpers_1.applyTransactionFilters)(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));
-    // `.flatMap` returns `X[]` directly when the callback returns `[]` for the
-    // skip case, so we don't need the trailing `.filter((d): d is X => …)` type
-    // predicate that the previous `map → filter` pipeline required.
-    const filteredTransactionLocalData = transactionIds.flatMap((transactionId) => {
-        const transactionData = transactionReviewLocalDataById[transactionId];
-        if (transactionData == null) {
-            return [];
-        }
-        // 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 [];
-    });
+        return null;
+    })
+        .filter((transaction) => transaction != null);
+    const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
+    const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
     const monthEndFetchState = monthYearPeriodId != null
         ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
         : { fetchState: 'Not-Started', error: undefined };
@@ -167,7 +113,7 @@ function getExpenseAutomationTransactionView(state) {
         version: 0,
         fetchState: fetchStatus.fetchState,
         error: fetchStatus.error,
-        transactions: filteredTransactionsWithCOT,
+        transactions: transactionsWithCOT,
         selectedCheckBoxTransactionIds,
         transactionIdsWithUnsavedData,
         uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -178,7 +124,7 @@ function getExpenseAutomationTransactionView(state) {
         classHierarchyList,
         isAccountingProjectsEnabled,
         projectList,
-        transactionLocalData: filteredTransactionLocalData,
+        transactionLocalData,
         uiState,
         refreshStatus,
         saveStatus,

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

@@ -16,7 +16,6 @@ import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
-import { TransactionFilters } from '../transactionFilterHelpers';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
 import { CompletedSubTab } from './completedSubTab';
 export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "project" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
@@ -94,7 +93,6 @@ 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/billPay/billList/billListState.d.ts

@@ -45,7 +45,7 @@ export interface BillPayFilters {
 }
 export interface BillPayFilterCategory {
     field: BillListViewFilterCategoryField;
-    matchingOperator: 'equal' | 'not_equal';
+    matchingOperator: 'equal' | 'not-equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts

@@ -36,7 +36,7 @@ export interface PaymentHistoryFilters {
 }
 export interface PaymentHistoryFilterCategory {
     field: PaymentHistoryFilterCategoryField;
-    matchingOperator: 'equal' | 'not_equal';
+    matchingOperator: 'equal' | 'not-equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts

@@ -46,7 +46,7 @@ export interface ReimbursementFilters {
 }
 export interface ReimbursementFilterCategory {
     field: RemiListViewFilterCategoryField;
-    matchingOperator: 'equal' | 'not_equal';
+    matchingOperator: 'equal' | 'not-equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

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

@@ -15,7 +15,7 @@ export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'ta
 export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
 export interface MatchingOperatorDropdownOption {
     label: 'is' | 'is not';
-    value: 'equal' | 'not_equal';
+    value: 'equal' | 'not-equal';
 }
 export type CategoryCombinationOperator = 'AND' | 'OR';
 export interface BillPayFilterCategoryDropdownOption {

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -14,8 +14,6 @@ const helpers_1 = require("./helpers");
 const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
 const remiListState_1 = require("./reimbursement/remiListView/remiListState");
 //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
-// Spend Management uses only equal/not_equal — TC amount operators
-// (inBetween, lessThan, greaterThan) live in the TC filter pipeline.
 const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
     let doesItemFallInValueRange = false;
     const filterField = currentFilter.field;
@@ -49,7 +47,7 @@ const filterItemOnCategoriesWithSingleValue = (categoryValue, currentFilter, ran
         return filterItemOnRangeCategoryType(categoryValue, currentFilter);
     }
     // if filter category is not rangeType
-    if (currentFilter.matchingOperator === 'not_equal') {
+    if (currentFilter.matchingOperator === 'not-equal') {
         return currentFilter.values.indexOf(categoryValue.toString()) === -1;
     }
     return currentFilter.values.indexOf(categoryValue.toString()) > -1;
@@ -123,7 +121,7 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
                     ? getCategoryValueForTaskList(key, item)
                     : getCategoryValueForPaymentHistory(key, item);
         if (categoryValue == null) {
-            if (currentFilter.matchingOperator === 'not_equal') {
+            if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
             }
             return false;

package/lib/view/subscriptionView/subscriptionViewSelector.js

@@ -217,7 +217,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
         const key = currentFilter.field;
         const categoryValue = getCategoryValueForCompany(key, company);
         if (categoryValue == null) {
-            if (currentFilter.matchingOperator === 'not_equal') {
+            if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
             }
             return false;

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -44,7 +44,7 @@ export interface TaskListFilters {
 }
 export interface TaskFilterCategory {
     field: TaskListFilterCategoryField;
-    matchingOperator: 'equal' | 'not_equal';
+    matchingOperator: 'equal' | 'not-equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

package/lib/view/taskManager/taskListView/taskListReducer.js

@@ -70,7 +70,7 @@ exports.initialState = {
         categories: [
             {
                 field: 'status',
-                matchingOperator: 'not_equal',
+                matchingOperator: 'not-equal',
                 values: ['resolved'],
                 valuesCombinationOperator: 'ANY',
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.66-betaAR6",
+  "version": "5.0.66-betaJK2",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",

package/lib/esm/view/expenseAutomationView/transactionFilterHelpers.js

@@ -1,193 +0,0 @@
-export const TRANSACTION_FILTER_CATEGORIES = [
-    { value: 'payment_account_name', type: 'dropdown' },
-    { value: 'payment_account_type', type: 'dropdown' },
-    { value: 'payee', type: 'searchAutocomplete' },
-    { value: 'category', type: 'dropdown' },
-    { value: 'class', type: 'dropdown' },
-    { value: 'amount', type: 'numberRange' },
-];
-/**
- * Resolve the comparable value for a transaction against a given filter field.
- * Returns undefined when the transaction doesn't carry the field — callers
- * decide whether absence counts as a match (for 'not_equal' it does).
- */
-const getCategoryValueForTransaction = (key, transaction) => {
-    switch (key) {
-        case 'amount': {
-            // Prefer transactionLocalData line items (sum). Fall back to lines on
-            // the transaction itself. Final fallback: transaction-level amount.
-            const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForAmount?.lineItemById) {
-                const lineItems = Object.values(localDataForAmount.lineItemById);
-                if (lineItems.length > 0) {
-                    return lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
-                }
-            }
-            if (transaction.transaction.lines &&
-                transaction.transaction.lines.length > 0) {
-                return transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
-            }
-            return transaction.amount.amount;
-        }
-        case 'payee': {
-            if (transaction.vendorName) {
-                return transaction.vendorName;
-            }
-            if (transaction.customerName) {
-                return transaction.customerName;
-            }
-            const localData = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localData?.vendor?.name) {
-                return localData.vendor.name;
-            }
-            if (localData?.customer?.name) {
-                return localData.customer.name;
-            }
-            return undefined;
-        }
-        case 'payment_account_name': {
-            // Match what TransactionCategorizationListRow renders for the cell.
-            return transaction.transaction.account?.accountName;
-        }
-        case 'payment_account_type': {
-            // Raw `paymentType` enum ("credit_card" / "check" / "cash"). Dropdown
-            // option values use the same enum; row uses `paymentTypeName` for the
-            // human label.
-            return transaction.transaction.paymentType;
-        }
-        case 'category': {
-            const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForCategory) {
-                const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
-                if (firstLineItem?.account?.accountId) {
-                    return firstLineItem.account.accountId;
-                }
-                if (firstLineItem?.account?.qboId) {
-                    return firstLineItem.account.qboId;
-                }
-                if (firstLineItem?.account?.accountName) {
-                    return firstLineItem.account.accountName;
-                }
-            }
-            const firstLineForCategory = transaction.transaction.lines?.[0];
-            if (firstLineForCategory?.type ===
-                'transaction_with_account_and_class_line' ||
-                firstLineForCategory?.type ===
-                    'transaction_with_product_or_service_line' ||
-                firstLineForCategory?.type === 'journal_entry_transaction_line') {
-                const account = firstLineForCategory.account;
-                return account?.accountId ?? account?.qboId ?? account?.accountName;
-            }
-            return undefined;
-        }
-        case 'class': {
-            const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForClass) {
-                const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
-                if (firstLineItemForClass?.class?.classId) {
-                    return firstLineItemForClass.class.classId;
-                }
-                if (firstLineItemForClass?.class?.qboId) {
-                    return firstLineItemForClass.class.qboId;
-                }
-                if (firstLineItemForClass?.class?.className) {
-                    return firstLineItemForClass.class.className;
-                }
-            }
-            const firstLineForClass = transaction.transaction.lines?.[0];
-            if (firstLineForClass?.type === 'transaction_with_account_and_class_line' ||
-                firstLineForClass?.type ===
-                    'transaction_with_product_or_service_line' ||
-                firstLineForClass?.type === 'journal_entry_transaction_line') {
-                const classData = firstLineForClass.class;
-                return classData?.classId ?? classData?.qboId ?? classData?.className;
-            }
-            return undefined;
-        }
-        default:
-            return undefined;
-    }
-};
-/**
- * TC-only amount matcher. Supports all five operators TC defines, including
- * the legacy "1000<->5000" range-string form (kept for backward compatibility
- * with persisted filter state that may still contain that encoding).
- *
- * The `'equal' | 'not_equal'` branches share the same underlying comparison;
- * the trailing `return op === 'not_equal' ? !matched : matched` line inverts
- * the result for `not_equal`. Without `'not_equal'` listed alongside
- * `'equal'` in the predicate, `matched` would stay `false` for every row and
- * the inversion would silently flip to `true` — turning the "not equal to X"
- * filter into a no-op that includes every transaction.
- */
-const matchAmount = (amount, category) => {
-    const op = category.matchingOperator;
-    const values = category.values;
-    let matched = false;
-    if (op === 'in_between') {
-        if (values.length >= 2) {
-            const min = Number(values[0]);
-            const max = Number(values[1]);
-            matched = amount >= min && amount <= max;
-        }
-    }
-    else if (op === 'less_than') {
-        if (values.length >= 1) {
-            matched = amount < Number(values[0]);
-        }
-    }
-    else if (op === 'greater_than') {
-        if (values.length >= 1) {
-            matched = amount > Number(values[0]);
-        }
-    }
-    else if ((op === 'equal' || op === 'not_equal') &&
-        values.length === 1 &&
-        String(values[0]).includes('<->')) {
-        // Backward compatibility: ["1000<->5000"] with matchingOperator "equal".
-        const parts = String(values[0]).split('<->');
-        matched =
-            amount >= Number(parts[0] ?? '') && amount <= Number(parts[1] ?? '');
-    }
-    else if ((op === 'equal' || op === 'not_equal') && values.length === 1) {
-        matched = amount === Number(values[0]);
-    }
-    return op === 'not_equal' ? !matched : matched;
-};
-const transactionMatchesCategory = (transaction, category) => {
-    const value = getCategoryValueForTransaction(category.field, transaction);
-    if (value == null) {
-        // Absent values count as a match only under 'not_equal'.
-        return category.matchingOperator === 'not_equal';
-    }
-    if (category.field === 'amount') {
-        return matchAmount(Number(value), category);
-    }
-    const valueStr = value.toString();
-    const valueInList = category.values.some((v) => v.toString() === valueStr);
-    return category.matchingOperator === 'not_equal' ? !valueInList : valueInList;
-};
-/**
- * TC-only equivalent of `applyAdvancedFiltersOnList`. Filters a list of
- * `TransactionView` items against a `TransactionFilters` object using the
- * AND/OR combination semantics from `categoryCombinationOperator`.
- *
- * Independent of `view/spendManagement` — keeps the TC filter pipeline cleanly
- * inside the Expense Automation feature group.
- */
-export const applyTransactionFilters = (transactions, filters) => {
-    if (filters?.categories == null || filters.categories.length === 0) {
-        return transactions;
-    }
-    const activeCategories = filters.categories.filter((c) => c.field != null && c.values.length > 0);
-    if (activeCategories.length === 0) {
-        return transactions;
-    }
-    const op = filters.categoryCombinationOperator;
-    return transactions.filter((txn) => {
-        if (op === 'AND') {
-            return activeCategories.every((cat) => transactionMatchesCategory(txn, cat));
-        }
-        return activeCategories.some((cat) => transactionMatchesCategory(txn, cat));
-    });
-};