@zeniai/client-epic-state 5.0.55-betaAR1 → 5.0.55-betaAR3

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hideCreatedByFilter = exports.isRemiListDownloadable = exports.isBillListDownloadable = exports.applyAdvancedFiltersOnList = void 0;
+exports.hideCreatedByFilter = exports.isRemiListDownloadable = exports.isBillListDownloadable = exports.applyAdvancedFiltersOnList = exports.TRANSACTION_FILTER_CATEGORIES = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const userSelector_1 = require("../../entity/user/userSelector");
 const userRoleType_1 = require("../../entity/userRole/userRoleType");
@@ -13,28 +13,81 @@ const billListState_1 = require("./billPay/billList/billListState");
 const helpers_1 = require("./helpers");
 const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
 const remiListState_1 = require("./reimbursement/remiListView/remiListState");
+exports.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' },
+];
 //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
+// For amount: supports new transaction_categorization operators (inBetween, lessThan, greaterThan) and
+// backward compatibility for old format values: ["1000<->5000"] with matchingOperator "equal".
+// Other entities (bill_pay, reimbursement, etc.) use only equal/not-equal and are unchanged.
 const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
     let doesItemFallInValueRange = false;
     const filterField = currentFilter.field;
     if (filterField === 'amount') {
-        for (const filterValue of currentFilter.values) {
-            const currentValue = parseInt(valueForItem.toString());
-            const lowerValue = parseInt(filterValue?.toString()?.split('<->')[0] ?? '');
-            const higherValue = parseInt(filterValue?.toString()?.split('<->')[1] ?? '');
-            if (currentValue >= lowerValue && currentValue <= higherValue) {
-                doesItemFallInValueRange = true;
+        const currentValue = Number(valueForItem);
+        const op = currentFilter.matchingOperator;
+        const values = currentFilter.values;
+        if (op === 'inBetween') {
+            // New format: values = [min, max] (expense automation transaction_categorization only)
+            if (values.length >= 2) {
+                const min = Number(values[0]);
+                const max = Number(values[1]);
+                doesItemFallInValueRange = currentValue >= min && currentValue <= max;
             }
         }
-    }
-    else {
-        const currentValue = valueForItem;
-        const lowerValue = currentFilter.values[0];
-        const higherValue = currentFilter.values[1];
-        if (currentValue.isSameOrAfter(lowerValue) &&
-            currentValue.isSameOrBefore(higherValue)) {
-            doesItemFallInValueRange = true;
+        else if (op === 'lessThan') {
+            if (values.length >= 1) {
+                const threshold = Number(values[0]);
+                doesItemFallInValueRange = currentValue < threshold;
+            }
+        }
+        else if (op === 'greaterThan') {
+            if (values.length >= 1) {
+                const threshold = Number(values[0]);
+                doesItemFallInValueRange = currentValue > threshold;
+            }
+        }
+        else if (op === 'equal' &&
+            values.length === 1 &&
+            String(values[0]).includes('<->')) {
+            // Backward compatibility: old format ["1000<->5000"] with matchingOperator "equal"
+            const parts = String(values[0]).split('<->');
+            const lowerValue = Number(parts[0] ?? '');
+            const higherValue = Number(parts[1] ?? '');
+            doesItemFallInValueRange =
+                currentValue >= lowerValue && currentValue <= higherValue;
+        }
+        else if (op === 'equal' && values.length === 1) {
+            // New format: exact match on single value (expense automation)
+            const val = Number(values[0]);
+            doesItemFallInValueRange = currentValue === val;
+        }
+        else {
+            // Existing logic for equal/not-equal (bill_pay, reimbursement, etc. or multiple range values)
+            for (const filterValue of values) {
+                const lowerValue = Number.parseInt(filterValue?.toString()?.split('<->')[0] ?? '', 10);
+                const higherValue = Number.parseInt(filterValue?.toString()?.split('<->')[1] ?? '', 10);
+                if (currentValue >= lowerValue && currentValue <= higherValue) {
+                    doesItemFallInValueRange = true;
+                }
+            }
         }
+        return op === 'not-equal'
+            ? !doesItemFallInValueRange
+            : doesItemFallInValueRange;
+    }
+    // Date range and other range fields (unchanged for other entities)
+    const currentValue = valueForItem;
+    const lowerValue = currentFilter.values[0];
+    const higherValue = currentFilter.values[1];
+    if (currentValue.isSameOrAfter(lowerValue) &&
+        currentValue.isSameOrBefore(higherValue)) {
+        doesItemFallInValueRange = true;
     }
     return currentFilter.matchingOperator === 'equal'
         ? doesItemFallInValueRange
@@ -119,7 +172,11 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
                 ? getCategoryValueForReimbursement(key, item)
                 : entity === 'task_management'
                     ? getCategoryValueForTaskList(key, item)
-                    : getCategoryValueForPaymentHistory(key, item);
+                    : entity === 'transaction_categorization'
+                        ? getCategoryValueForTransaction(key, item)
+                        : entity === 'charge_card_payment_history'
+                            ? getCategoryValueForPaymentHistory(key, item)
+                            : undefined;
         if (categoryValue == null) {
             if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
@@ -241,6 +298,119 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
             return undefined;
     }
 };
+const getCategoryValueForTransaction = (key, transaction) => {
+    switch (key) {
+        case 'amount': {
+            // Get from transactionLocalData line items (preferred) - sum all line item amounts
+            const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForAmount?.lineItemById) {
+                const lineItems = Object.values(localDataForAmount.lineItemById);
+                if (lineItems.length > 0) {
+                    // Sum all line item amounts
+                    const totalAmount = lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
+                    return totalAmount;
+                }
+            }
+            // Fallback to transaction-level amount or sum from transaction lines
+            if (transaction.transaction.lines &&
+                transaction.transaction.lines.length > 0) {
+                const totalAmount = transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
+                return totalAmount;
+            }
+            // Final fallback to transaction 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 = 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 the value the row renders: TransactionCategorizationListRow reads
+            // `currentTransaction?.account?.accountName` for the Payment Account Name
+            // column. Returning the same field here keeps filter-match parity with the
+            // visible cell, so any row a user can see is also a row the filter can match.
+            return transaction.transaction.account?.accountName;
+        }
+        case 'payment_account_type': {
+            // Compare against the raw `paymentType` enum (e.g. "credit_card", "check",
+            // "cash"). The same enum is what TransactionCategorizationListRow uses for
+            // its icon switch on line ~1675, and it's what the dropdown options emit
+            // as `value`. Display labels come from each account's `paymentTypeName`
+            // field (populated by mapAccountBasePayloadToAccountBase from the backend
+            // payload) — no client-side label map required.
+            return transaction.transaction.paymentType;
+        }
+        case 'category': {
+            // Get from transactionLocalData (preferred) or from transaction lines
+            const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForCategory) {
+                // Get category from first line item or most common
+                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;
+                }
+            }
+            // Fallback to transaction lines
+            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': {
+            // Similar to category but for 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;
+    }
+};
 const getCategoryValueForPaymentHistory = (key, repayment) => {
     switch (key) {
         case 'repaymentDate':

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

@@ -50,15 +50,15 @@ export interface TaskFilterCategory {
 }
 export type TaskListFilterCategoryField = 'status' | 'dueDate' | 'assignee' | 'creationDate' | 'priority' | 'tag';
 export declare const TASK_LIST_GROUP_BY_KEYS: readonly ["groupName", "status", "dueDate", "assignee", "priority", "tag"];
-export declare const toTaskListGroupByKeyType: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee";
-export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "priority" | "dueDate" | "groupName" | "tag" | "assignee" | undefined;
+export declare const toTaskListGroupByKeyType: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee";
+export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "dueDate" | "groupName" | "tag" | "priority" | "assignee" | undefined;
 export declare type TaskGroupKey = ReturnType<typeof toTaskListGroupByKeyType>;
 export interface TaskListUIState extends SpendManagementUIState {
     groupByKey: TaskGroupKey;
     searchText: string;
     sortKey: TaskListViewSortKey;
 }
-declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "priority" | "dueDate" | "tag" | "timeSpent" | "assignee" | "creationDate" | "visibility";
+declare const toTaskListSortKeyType: (v: string) => "status" | "name" | "dueDate" | "tag" | "priority" | "timeSpent" | "assignee" | "creationDate" | "visibility";
 export declare type TaskListViewSortKey = ReturnType<typeof toTaskListSortKeyType>;
 export declare const TASK_LIST_FILTER_CATEGORIES: TaskListFilterCategoryOption[];
 interface TaskListFilterCategoryOption {

package/package.json

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