fix filters

actualbudget · Dec 9, 2023 · ebead44 · ebead44
1 parent ab9b611
commit ebead44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.js b/packages/desktop-client/src/components/reports/reports/CustomReport.js
@@ -112,7 +112,7 @@ export default function CustomReport() {
       endDate,
       categories,
       selectedCategories,
-      filters,
+      conditions: filters,
       conditionsOp,
       showEmpty,
       showOffBudgetHidden,
@@ -137,7 +137,7 @@ export default function CustomReport() {
       endDate,
       categories,
       selectedCategories,
-      filters,
+      conditions: filters,
       conditionsOp,
       showEmpty,
       showOffBudgetHidden,

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
@@ -60,7 +60,7 @@ export function cashFlowByDate(
     function makeQuery(where) {
       const query = q('transactions')
         .filter({
-          [conditionsOpKey]: [...filters],
+          [conditionsOpKey]: filters,
         })
         .filter({
           $and: [

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts b/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts
@@ -49,7 +49,7 @@ function makeQuery(
     )
     //Apply filters and split by "Group By"
     .filter({
-      [conditionsOpKey]: [...filters],
+      [conditionsOpKey]: filters,
     })
     //Apply month range filters
     .filter({

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/net-worth-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/net-worth-spreadsheet.tsx
@@ -44,7 +44,7 @@ export default function createSpreadsheet(
           runQuery(
             q('transactions')
               .filter({
-                [conditionsOpKey]: [...filters],
+                [conditionsOpKey]: filters,
               })
               .filter({
                 account: acct.id,