@zeniai/client-epic-state 5.0.90-betaAR7 → 5.0.90-betaAR8

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

@@ -153,14 +153,17 @@ const getLineClassIdentifiersForTransaction = (transaction) => {
     return [];
 };
 /**
- * Type-narrowing guard for the three persisted line shapes that carry an
- * `account` + `class`. Kept as a single helper so the type list stays in
- * one place if a new categorizable line variant is added.
+ * Type-narrowing guard for the three persisted line shapes that extend
+ * `TransactionWithAccountAndClassLine` — they carry an `account` + `class`
+ * AND `vendor` + `customer` as optional per-line fields. Kept as a single
+ * helper so the type list stays in one place if a new categorizable
+ * line variant is added; reused by the category, class, and payee
+ * per-line resolvers below.
  *
- * Typed against the union element produced by indexing `lines[number]` on
- * the broader transaction type — the parameter is permitted to be
- * `undefined` so callers can pass a possibly-sparse `lines` element
- * without an extra null check.
+ * Typed against a structural `{type?: string}` shape rather than the
+ * concrete `Line` union so callers can pass a possibly-sparse element
+ * without an extra null check. The cast to
+ * `TransactionWithAccountAndClassLine` happens at the call sites.
  */
 const isAccountAndClassLine = (line) => line?.type === 'transaction_with_account_and_class_line' ||
     line?.type === 'transaction_with_product_or_service_line' ||
@@ -204,14 +207,108 @@ const resolveClassIdentifier = (classData) => {
     }
     return undefined;
 };
+/**
+ * Resolve a single line's payee name. Vendor wins over customer
+ * (preserved from the single-scalar predecessor — TC transactions are
+ * overwhelmingly expense-side). `isNonEmptyString` so an empty-string
+ * placeholder on `vendor.name` falls through to `customer.name` rather
+ * than shadowing it.
+ */
+const resolveLineLevelPayee = (vendor, customer) => {
+    if (isNonEmptyString(vendor?.name)) {
+        return vendor?.name;
+    }
+    if (isNonEmptyString(customer?.name)) {
+        return customer?.name;
+    }
+    return undefined;
+};
+/**
+ * Per-line payee names for a transaction. Bridges the row's display
+ * logic — Journal Entries (and any future transaction type that
+ * carries vendor/customer per line) put the payee on each line, while
+ * Bills, Expenses, and Checks carry it at the transaction level. The
+ * single-scalar predecessor only consulted the transaction level, so
+ * JE rows whose vendor lived on the line silently missed every payee
+ * filter even though the row visibly displayed the vendor name (the
+ * row's `TransactionCategorizationListRow` already reads
+ * `line.vendor?.name` for non-vendor-typed transactions).
+ *
+ * Source precedence:
+ *   1. localData `lineItemById` — locally-edited per-line vendor or
+ *      customer. Lines with neither field set are dropped from the
+ *      array; if at least one line has a name, that line set drives
+ *      matching (we don't mix line-level localData with the transaction-
+ *      level fallback below).
+ *   2. Persisted `transaction.lines` — per-line vendor or customer on
+ *      the three categorizable line shapes (see `isAccountAndClassLine`).
+ *      Other line types (`linked_transaction_line`, etc.) are skipped.
+ *   3. Transaction-level fallback — localData transaction-level
+ *      vendor → localData transaction-level customer → `transaction.
+ *      vendorName` → `transaction.customerName`. Wrapped in a single-
+ *      element array so the rest of the matcher stays per-line shaped.
+ *
+ * Returns `[]` when every source resolves empty; the caller falls back
+ * to the absent-value contract (only `not_equal` matches; every other
+ * operator excludes).
+ */
+const getLinePayeesForTransaction = (transaction) => {
+    const localData = transaction?.transactionLocalData?.transactionReviewLocalData;
+    // Priority 1: localData line-level vendor / customer
+    if (localData?.lineItemById != null) {
+        const lineItems = Object.values(localData.lineItemById);
+        if (lineItems.length > 0) {
+            const linePayees = lineItems
+                .map((lineItem) => resolveLineLevelPayee(lineItem?.vendor, lineItem?.customer))
+                .filter(isNonEmptyString);
+            if (linePayees.length > 0) {
+                return linePayees;
+            }
+        }
+    }
+    // Priority 2: persisted line-level vendor / customer
+    if (transaction?.transaction?.lines != null &&
+        transaction.transaction.lines.length > 0) {
+        const linePayees = transaction.transaction.lines
+            .map((line) => {
+            if (!isAccountAndClassLine(line)) {
+                return undefined;
+            }
+            const typedLine = line;
+            return resolveLineLevelPayee(typedLine.vendor, typedLine.customer);
+        })
+            .filter(isNonEmptyString);
+        if (linePayees.length > 0) {
+            return linePayees;
+        }
+    }
+    // Priority 3: transaction-level fallback. localData wins over the
+    // top-level fields to keep the existing precedence intact: unsaved
+    // grid edits should drive the filter, not the pre-edit server state.
+    const localVendorName = localData?.vendor?.name;
+    if (isNonEmptyString(localVendorName)) {
+        return [localVendorName];
+    }
+    const localCustomerName = localData?.customer?.name;
+    if (isNonEmptyString(localCustomerName)) {
+        return [localCustomerName];
+    }
+    if (isNonEmptyString(transaction.vendorName)) {
+        return [transaction.vendorName];
+    }
+    if (isNonEmptyString(transaction.customerName)) {
+        return [transaction.customerName];
+    }
+    return [];
+};
 /**
  * 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).
  *
- * NOTE: the `'amount'`, `'category'`, and `'class'` fields are NOT handled
- * here. All three use per-line matching via the corresponding
- * `getLine*ForTransaction` helper and an early-return in
+ * NOTE: the `'amount'`, `'category'`, `'class'`, and `'payee'` fields
+ * are NOT handled here. All four use per-line matching via the
+ * corresponding `getLine*ForTransaction` helper and an early-return in
  * `transactionMatchesCategory` — they would otherwise need to return a
  * non-scalar value that doesn't fit this helper's contract. Cases are
  * preserved so the switch stays exhaustive over `TransactionFilterCategoryField`.
@@ -224,46 +321,9 @@ const getCategoryValueForTransaction = (key, transaction) => {
             return undefined;
         }
         case 'payee': {
-            /*
-             * localData wins over the top-level transaction fields. Two reasons:
-             *
-             *   1. Matches what the row renders. `TransactionCategorizationListRow`
-             *      reads `transaction.transactionReviewLocalData.vendor?.name` as
-             *      its canonical payee source — not `transaction.vendorName`. If
-             *      the user has manually picked a vendor in the grid (still
-             *      unsaved), the row updates immediately but the pre-fix filter
-             *      kept comparing against the stale top-level value, so filtering
-             *      "Acme" against a row the user just relabeled to "Acme" would
-             *      silently exclude it.
-             *
-             *   2. Brings payee in line with the other content-bearing fields.
-             *      After this change, every field that has a localData mirror
-             *      (`amount`, `category`, `class`, `payee`) reads localData
-             *      first. The remaining fields (`payment_account_name`,
-             *      `payment_account_type`) don't have a localData equivalent
-             *      yet — when they do, this precedence becomes the universal
-             *      rule.
-             *
-             * vendor is checked before customer at each level — TC transactions
-             * are overwhelmingly expense-side, so vendor is the common case. A
-             * transaction with both a vendor AND a customer locally set is rare
-             * and the existing behavior (vendor wins) is preserved.
-             */
-            const localData = transaction.transactionLocalData?.transactionReviewLocalData;
-            const localVendorName = localData?.vendor?.name;
-            if (isNonEmptyString(localVendorName)) {
-                return localVendorName;
-            }
-            const localCustomerName = localData?.customer?.name;
-            if (isNonEmptyString(localCustomerName)) {
-                return localCustomerName;
-            }
-            if (isNonEmptyString(transaction.vendorName)) {
-                return transaction.vendorName;
-            }
-            if (isNonEmptyString(transaction.customerName)) {
-                return transaction.customerName;
-            }
+            // Handled per-line in `transactionMatchesCategory` — see
+            // `getLinePayeesForTransaction`. The transaction-level localData /
+            // top-level chain lives inside that helper's priority-3 fallback.
             return undefined;
         }
         case 'payment_account_name': {
@@ -339,6 +399,29 @@ const matchAmount = (amount, category) => {
     return op === 'not_equal' ? !matched : matched;
 };
 const transactionMatchesCategory = (transaction, category) => {
+    if (category.field === 'payee') {
+        // Per-line matching for payee — mirrors the amount / category /
+        // class pattern. The row's display reads `line.vendor?.name` for
+        // non-vendor-typed transactions (Journal Entries, etc.), so the
+        // filter has to look at line-level payee data too or it silently
+        // misses every JE whose vendor lives on the line. See the JSDoc
+        // on `getLinePayeesForTransaction` for the full precedence.
+        //
+        // `not_equal` reads the same way it does for category/class:
+        // "at least one line's payee is NOT one of the filter values".
+        // A JE with lines [Amazon, Acme] matches `payee != Amazon` via
+        // the Acme line; a bill or JE whose every line says "Amazon"
+        // does not match `payee != Amazon`.
+        const linePayees = getLinePayeesForTransaction(transaction);
+        if (linePayees.length === 0) {
+            return category.matchingOperator === 'not_equal';
+        }
+        const filterValuesAsStrings = new Set(category.values.map((v) => v.toString()));
+        return linePayees.some((name) => {
+            const inList = filterValuesAsStrings.has(name);
+            return category.matchingOperator === 'not_equal' ? !inList : inList;
+        });
+    }
     if (category.field === 'category' || category.field === 'class') {
         // Per-line matching for category / class — mirrors the amount
         // pattern below. A multi-line transaction surfaces when ANY of its

package/lib/view/expenseAutomationView/transactionFilterHelpers.js

@@ -156,14 +156,17 @@ const getLineClassIdentifiersForTransaction = (transaction) => {
     return [];
 };
 /**
- * Type-narrowing guard for the three persisted line shapes that carry an
- * `account` + `class`. Kept as a single helper so the type list stays in
- * one place if a new categorizable line variant is added.
+ * Type-narrowing guard for the three persisted line shapes that extend
+ * `TransactionWithAccountAndClassLine` — they carry an `account` + `class`
+ * AND `vendor` + `customer` as optional per-line fields. Kept as a single
+ * helper so the type list stays in one place if a new categorizable
+ * line variant is added; reused by the category, class, and payee
+ * per-line resolvers below.
  *
- * Typed against the union element produced by indexing `lines[number]` on
- * the broader transaction type — the parameter is permitted to be
- * `undefined` so callers can pass a possibly-sparse `lines` element
- * without an extra null check.
+ * Typed against a structural `{type?: string}` shape rather than the
+ * concrete `Line` union so callers can pass a possibly-sparse element
+ * without an extra null check. The cast to
+ * `TransactionWithAccountAndClassLine` happens at the call sites.
  */
 const isAccountAndClassLine = (line) => line?.type === 'transaction_with_account_and_class_line' ||
     line?.type === 'transaction_with_product_or_service_line' ||
@@ -207,14 +210,108 @@ const resolveClassIdentifier = (classData) => {
     }
     return undefined;
 };
+/**
+ * Resolve a single line's payee name. Vendor wins over customer
+ * (preserved from the single-scalar predecessor — TC transactions are
+ * overwhelmingly expense-side). `isNonEmptyString` so an empty-string
+ * placeholder on `vendor.name` falls through to `customer.name` rather
+ * than shadowing it.
+ */
+const resolveLineLevelPayee = (vendor, customer) => {
+    if (isNonEmptyString(vendor?.name)) {
+        return vendor?.name;
+    }
+    if (isNonEmptyString(customer?.name)) {
+        return customer?.name;
+    }
+    return undefined;
+};
+/**
+ * Per-line payee names for a transaction. Bridges the row's display
+ * logic — Journal Entries (and any future transaction type that
+ * carries vendor/customer per line) put the payee on each line, while
+ * Bills, Expenses, and Checks carry it at the transaction level. The
+ * single-scalar predecessor only consulted the transaction level, so
+ * JE rows whose vendor lived on the line silently missed every payee
+ * filter even though the row visibly displayed the vendor name (the
+ * row's `TransactionCategorizationListRow` already reads
+ * `line.vendor?.name` for non-vendor-typed transactions).
+ *
+ * Source precedence:
+ *   1. localData `lineItemById` — locally-edited per-line vendor or
+ *      customer. Lines with neither field set are dropped from the
+ *      array; if at least one line has a name, that line set drives
+ *      matching (we don't mix line-level localData with the transaction-
+ *      level fallback below).
+ *   2. Persisted `transaction.lines` — per-line vendor or customer on
+ *      the three categorizable line shapes (see `isAccountAndClassLine`).
+ *      Other line types (`linked_transaction_line`, etc.) are skipped.
+ *   3. Transaction-level fallback — localData transaction-level
+ *      vendor → localData transaction-level customer → `transaction.
+ *      vendorName` → `transaction.customerName`. Wrapped in a single-
+ *      element array so the rest of the matcher stays per-line shaped.
+ *
+ * Returns `[]` when every source resolves empty; the caller falls back
+ * to the absent-value contract (only `not_equal` matches; every other
+ * operator excludes).
+ */
+const getLinePayeesForTransaction = (transaction) => {
+    const localData = transaction?.transactionLocalData?.transactionReviewLocalData;
+    // Priority 1: localData line-level vendor / customer
+    if (localData?.lineItemById != null) {
+        const lineItems = Object.values(localData.lineItemById);
+        if (lineItems.length > 0) {
+            const linePayees = lineItems
+                .map((lineItem) => resolveLineLevelPayee(lineItem?.vendor, lineItem?.customer))
+                .filter(isNonEmptyString);
+            if (linePayees.length > 0) {
+                return linePayees;
+            }
+        }
+    }
+    // Priority 2: persisted line-level vendor / customer
+    if (transaction?.transaction?.lines != null &&
+        transaction.transaction.lines.length > 0) {
+        const linePayees = transaction.transaction.lines
+            .map((line) => {
+            if (!isAccountAndClassLine(line)) {
+                return undefined;
+            }
+            const typedLine = line;
+            return resolveLineLevelPayee(typedLine.vendor, typedLine.customer);
+        })
+            .filter(isNonEmptyString);
+        if (linePayees.length > 0) {
+            return linePayees;
+        }
+    }
+    // Priority 3: transaction-level fallback. localData wins over the
+    // top-level fields to keep the existing precedence intact: unsaved
+    // grid edits should drive the filter, not the pre-edit server state.
+    const localVendorName = localData?.vendor?.name;
+    if (isNonEmptyString(localVendorName)) {
+        return [localVendorName];
+    }
+    const localCustomerName = localData?.customer?.name;
+    if (isNonEmptyString(localCustomerName)) {
+        return [localCustomerName];
+    }
+    if (isNonEmptyString(transaction.vendorName)) {
+        return [transaction.vendorName];
+    }
+    if (isNonEmptyString(transaction.customerName)) {
+        return [transaction.customerName];
+    }
+    return [];
+};
 /**
  * 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).
  *
- * NOTE: the `'amount'`, `'category'`, and `'class'` fields are NOT handled
- * here. All three use per-line matching via the corresponding
- * `getLine*ForTransaction` helper and an early-return in
+ * NOTE: the `'amount'`, `'category'`, `'class'`, and `'payee'` fields
+ * are NOT handled here. All four use per-line matching via the
+ * corresponding `getLine*ForTransaction` helper and an early-return in
  * `transactionMatchesCategory` — they would otherwise need to return a
  * non-scalar value that doesn't fit this helper's contract. Cases are
  * preserved so the switch stays exhaustive over `TransactionFilterCategoryField`.
@@ -227,46 +324,9 @@ const getCategoryValueForTransaction = (key, transaction) => {
             return undefined;
         }
         case 'payee': {
-            /*
-             * localData wins over the top-level transaction fields. Two reasons:
-             *
-             *   1. Matches what the row renders. `TransactionCategorizationListRow`
-             *      reads `transaction.transactionReviewLocalData.vendor?.name` as
-             *      its canonical payee source — not `transaction.vendorName`. If
-             *      the user has manually picked a vendor in the grid (still
-             *      unsaved), the row updates immediately but the pre-fix filter
-             *      kept comparing against the stale top-level value, so filtering
-             *      "Acme" against a row the user just relabeled to "Acme" would
-             *      silently exclude it.
-             *
-             *   2. Brings payee in line with the other content-bearing fields.
-             *      After this change, every field that has a localData mirror
-             *      (`amount`, `category`, `class`, `payee`) reads localData
-             *      first. The remaining fields (`payment_account_name`,
-             *      `payment_account_type`) don't have a localData equivalent
-             *      yet — when they do, this precedence becomes the universal
-             *      rule.
-             *
-             * vendor is checked before customer at each level — TC transactions
-             * are overwhelmingly expense-side, so vendor is the common case. A
-             * transaction with both a vendor AND a customer locally set is rare
-             * and the existing behavior (vendor wins) is preserved.
-             */
-            const localData = transaction.transactionLocalData?.transactionReviewLocalData;
-            const localVendorName = localData?.vendor?.name;
-            if (isNonEmptyString(localVendorName)) {
-                return localVendorName;
-            }
-            const localCustomerName = localData?.customer?.name;
-            if (isNonEmptyString(localCustomerName)) {
-                return localCustomerName;
-            }
-            if (isNonEmptyString(transaction.vendorName)) {
-                return transaction.vendorName;
-            }
-            if (isNonEmptyString(transaction.customerName)) {
-                return transaction.customerName;
-            }
+            // Handled per-line in `transactionMatchesCategory` — see
+            // `getLinePayeesForTransaction`. The transaction-level localData /
+            // top-level chain lives inside that helper's priority-3 fallback.
             return undefined;
         }
         case 'payment_account_name': {
@@ -342,6 +402,29 @@ const matchAmount = (amount, category) => {
     return op === 'not_equal' ? !matched : matched;
 };
 const transactionMatchesCategory = (transaction, category) => {
+    if (category.field === 'payee') {
+        // Per-line matching for payee — mirrors the amount / category /
+        // class pattern. The row's display reads `line.vendor?.name` for
+        // non-vendor-typed transactions (Journal Entries, etc.), so the
+        // filter has to look at line-level payee data too or it silently
+        // misses every JE whose vendor lives on the line. See the JSDoc
+        // on `getLinePayeesForTransaction` for the full precedence.
+        //
+        // `not_equal` reads the same way it does for category/class:
+        // "at least one line's payee is NOT one of the filter values".
+        // A JE with lines [Amazon, Acme] matches `payee != Amazon` via
+        // the Acme line; a bill or JE whose every line says "Amazon"
+        // does not match `payee != Amazon`.
+        const linePayees = getLinePayeesForTransaction(transaction);
+        if (linePayees.length === 0) {
+            return category.matchingOperator === 'not_equal';
+        }
+        const filterValuesAsStrings = new Set(category.values.map((v) => v.toString()));
+        return linePayees.some((name) => {
+            const inList = filterValuesAsStrings.has(name);
+            return category.matchingOperator === 'not_equal' ? !inList : inList;
+        });
+    }
     if (category.field === 'category' || category.field === 'class') {
         // Per-line matching for category / class — mirrors the amount
         // pattern below. A multi-line transaction surfaces when ANY of its

package/package.json

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