fixes bug that split transactions are not filtered properly in transa…

…ctions page
hoiekim · Jan 19, 2025 · 3c6d45c · 3c6d45c
1 parent 3ca1947
commit 3c6d45c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 35 deletions.
diff --git a/src/client/components/TransactionsTable/TransactionRow.tsx b/src/client/components/TransactionsTable/TransactionRow.tsx
@@ -147,7 +147,6 @@ const TransactionRow = ({ transaction }: Props) => {
         split_transaction_id: id,
         label: labelQuery,
       });
-      return;
     } else {
       response = await call.post("/api/transaction", {
         transaction_id: id,

diff --git a/src/client/pages/TransactionsPage/index.tsx b/src/client/pages/TransactionsPage/index.tsx
@@ -33,25 +33,6 @@ const TransactionsPage = () => {
     category_id = incomingParams.get("category_id") || "";
   }
 
-  const transactionsArray = useMemo(() => {
-    const result: Transaction[] = [];
-    transactions.forEach((e) => {
-      const hidden = accounts.get(e.account_id)?.hide;
-      const transactionDate = new Date(e.authorized_date || e.date);
-      const within = viewDate.has(transactionDate);
-      if (hidden || !within) return;
-
-      if (option === "unsorted") {
-        if (!e.label.category_id) result.push(e);
-      } else if (option === "income") {
-        if (e.amount < 0) result.push(e);
-      } else {
-        result.push(e);
-      }
-    });
-    return result;
-  }, [transactions, accounts, viewDate, option]);
-
   const filteredTransactions = useMemo(() => {
     const filters: DeepPartial<Transaction> = {};
     if (account_id) filters.account_id = account_id;
@@ -63,36 +44,67 @@ const TransactionsPage = () => {
       if (!filters.label) filters.label = {};
       filters.label.category_id = category_id;
     }
-    return transactionsArray.filter((e) => {
+    return transactions.filter((e) => {
+      const hidden = accounts.get(e.account_id)?.hide;
+      const transactionDate = new Date(e.authorized_date || e.date);
+      const within = viewDate.has(transactionDate);
+      if (hidden || !within) return false;
+
+      if (option === "unsorted") {
+        if (e.label.category_id) return false;
+      } else if (option === "income") {
+        if (e.amount > 0) return false;
+      }
+
       if (!e.label.budget_id) {
         const account = accounts.get(e.account_id);
         if (account?.label.budget_id === budget_id) return true;
       }
       return isSubset(e, filters);
     });
-  }, [transactionsArray, accounts, account_id, budget_id, category_id]);
+  }, [transactions, accounts, viewDate, option, account_id, budget_id, category_id]);
 
   const filteredSplitTransactionsArray = useMemo(() => {
-    const result: SplitTransaction[] = [];
-    splitTransactions.forEach((e) => {
+    return splitTransactions.filter((e) => {
       const parentTransaction = transactions.get(e.transaction_id);
-      if (!parentTransaction) return;
+      if (!parentTransaction) return false;
+
       const parentAccount = accounts.get(parentTransaction.account_id);
-      if (!parentAccount) return;
+      if (!parentAccount) return false;
+
+      const hidden = parentAccount.hide;
+      const transactionDate = new Date(e.date);
+      const within = viewDate.has(transactionDate);
+      if (hidden || !within) return false;
+
+      if (option === "unsorted") {
+        if (e.label.category_id) return false;
+      } else if (option === "income") {
+        if (e.amount > 0) return false;
+      }
       if (account_id) {
-        if (parentAccount.account_id !== account_id) return;
+        if (parentAccount.account_id !== account_id) return false;
       }
       if (budget_id) {
-        if (!e.label.budget_id && parentAccount.label.budget_id !== budget_id) return;
-        if (e.label.budget_id !== budget_id) return;
+        if (!e.label.budget_id && parentAccount.label.budget_id !== budget_id) return false;
+        if (e.label.budget_id !== budget_id) return false;
       }
       if (category_id) {
-        if (e.label.category_id !== category_id) return;
+        if (e.label.category_id !== category_id) return false;
       }
-      result.push(e);
+
+      return true;
     });
-    return result;
-  }, [transactions, splitTransactions, accounts, account_id, budget_id, category_id]);
+  }, [
+    transactions,
+    splitTransactions,
+    accounts,
+    viewDate,
+    option,
+    account_id,
+    budget_id,
+    category_id,
+  ]);
 
   const transactionsToDisplay: (Transaction | SplitTransaction)[] = useMemo(() => {
     return [...filteredTransactions, ...filteredSplitTransactionsArray].sort((a, b) => {

diff --git a/src/common/dictionaries.ts b/src/common/dictionaries.ts
@@ -36,8 +36,12 @@ export class Dictionary<T = any> extends Map<string, T> {
     return undefined;
   };
 
-  filter = (predicate: (value: T, index: number, array: T[]) => void) => {
-    return this.toArray().filter(predicate);
+  filter = (predicate: (value: T, index: number) => boolean) => {
+    const result: T[] = [];
+    this.forEach((v, k) => {
+      if (predicate(v, Number(k))) result.push(v);
+    });
+    return result;
   };
 
   filterBy = (input: Partial<T>) => {