error fixes

actualbudget · Dec 7, 2023 · b4e1bff · b4e1bff
1 parent 66764db
commit b4e1bff
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 38 deletions.
diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
@@ -68,7 +68,6 @@ function ChooseGraph({
         style={{ flexGrow: 1 }}
         data={data}
         groupBy={groupBy}
-        showEmpty={showEmpty}
         balanceTypeOp={balanceTypeOp}
       />
     );
@@ -82,7 +81,6 @@ function ChooseGraph({
         style={{ flexGrow: 1 }}
         data={data}
         groupBy={groupBy}
-        showEmpty={showEmpty}
         balanceTypeOp={balanceTypeOp}
       />
     );

diff --git a/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
@@ -133,15 +133,13 @@ type BarGraphProps = {
   data: DataEntity;
   groupBy: string;
   balanceTypeOp: string;
-  showEmpty: boolean;
   compact?: boolean;
 };
 
 function BarGraph({
   style,
   data,
   groupBy,
-  showEmpty,
   balanceTypeOp,
   compact,
 }: BarGraphProps) {
@@ -179,9 +177,7 @@ function BarGraph({
                 width={width}
                 height={height}
                 stackOffset="sign"
-                data={data[splitData].filter(i =>
-                  !showEmpty ? i[balanceTypeOp] !== 0 : true,
-                )}
+                data={data[splitData]}
                 margin={{ top: 0, right: 0, left: 0, bottom: 0 }}
               >
                 {
@@ -219,33 +215,29 @@ function BarGraph({
                   <ReferenceLine y={0} stroke={theme.pageTextLight} />
                 )}
                 <Bar dataKey={val => getVal(val)} stackId="a">
-                  {data[splitData]
-                    .filter(i => (!showEmpty ? i[balanceTypeOp] !== 0 : true))
-                    .map((entry, index) => (
+                  {data[splitData].map((entry, index) => (
+                    <Cell
+                      key={`cell-${index}`}
+                      fill={
+                        yAxis === 'date'
+                          ? balanceTypeOp === 'totalDebts'
+                            ? theme.reportsRed
+                            : theme.reportsBlue
+                          : colorScale[index % colorScale.length]
+                      }
+                      name={entry[yAxis]}
+                    />
+                  ))}
+                </Bar>
+                {yAxis === 'date' && balanceTypeOp === 'totalTotals' && (
+                  <Bar dataKey={'totalDebts'} stackId="a">
+                    {data[splitData].map((entry, index) => (
                       <Cell
                         key={`cell-${index}`}
-                        fill={
-                          yAxis === 'date'
-                            ? balanceTypeOp === 'totalDebts'
-                              ? theme.reportsRed
-                              : theme.reportsBlue
-                            : colorScale[index % colorScale.length]
-                        }
-                        name={entry[yAxis]}
+                        fill={theme.reportsRed}
+                        name={entry.name}
                       />
                     ))}
-                </Bar>
-                {yAxis === 'date' && balanceTypeOp === 'totalTotals' && (
-                  <Bar dataKey={'totalDebts'} stackId="a">
-                    {data[splitData]
-                      .filter(i => (!showEmpty ? i[balanceTypeOp] !== 0 : true))
-                      .map((entry, index) => (
-                        <Cell
-                          key={`cell-${index}`}
-                          fill={theme.reportsRed}
-                          name={entry.name}
-                        />
-                      ))}
                   </Bar>
                 )}
               </BarChart>

diff --git a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
@@ -98,15 +98,13 @@ type DonutGraphProps = {
   data: DataEntity;
   groupBy: string;
   balanceTypeOp: string;
-  showEmpty: boolean;
   compact?: boolean;
 };
 
 function DonutGraph({
   style,
   data,
   groupBy,
-  showEmpty,
   balanceTypeOp,
   compact,
 }: DonutGraphProps) {
@@ -147,9 +145,7 @@ function DonutGraph({
                   dataKey={val => getVal(val)}
                   nameKey={yAxis}
                   isAnimationActive={false}
-                  data={data[splitData].filter(i =>
-                    !showEmpty ? i[balanceTypeOp] !== 0 : true,
-                  )}
+                  data={data[splitData]}
                   innerRadius={Math.min(width, height) * 0.2}
                   fill="#8884d8"
                 >

diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.js b/packages/desktop-client/src/components/reports/reports/CustomReport.js
@@ -114,8 +114,10 @@ export default function CustomReport() {
       selectedCategories,
       filters,
       conditionsOp,
+      showEmpty,
       showOffBudgetHidden,
       showUncategorized,
+      balanceTypeOp,
     });
   }, [
     startDate,
@@ -137,6 +139,7 @@ export default function CustomReport() {
       selectedCategories,
       filters,
       conditionsOp,
+      showEmpty,
       showOffBudgetHidden,
       showUncategorized,
       groupBy,

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/default-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/default-spreadsheet.tsx
@@ -25,6 +25,7 @@ export type createSpreadsheetProps = {
   selectedCategories: CategoryEntity[];
   conditions: RuleConditionEntity[];
   conditionsOp: string;
+  showEmpty: boolean;
   showOffBudgetHidden: boolean;
   showUncategorized: boolean;
   groupBy?: string;
@@ -41,6 +42,7 @@ export default function createSpreadsheet({
   selectedCategories,
   conditions = [],
   conditionsOp,
+  showEmpty,
   showOffBudgetHidden,
   showUncategorized,
   groupBy,
@@ -167,8 +169,10 @@ export default function createSpreadsheet({
     });
 
     setData({
-      data: calcData,
-      monthData,
+      data: calcData.filter(i => (!showEmpty ? i[balanceTypeOp] !== 0 : true)),
+      monthData: monthData.filter(i =>
+        !showEmpty ? i[balanceTypeOp] !== 0 : true,
+      ),
       startDate,
       endDate,
       totalDebts: integerToAmount(totalDebts),

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
@@ -17,8 +17,10 @@ function createGroupedSpreadsheet({
   selectedCategories,
   conditions = [],
   conditionsOp,
+  showEmpty,
   showOffBudgetHidden,
   showUncategorized,
+  balanceTypeOp,
 }: createSpreadsheetProps) {
   const [categoryList, categoryGroup] = categoryLists(
     showOffBudgetHidden,
@@ -140,7 +142,9 @@ function createGroupedSpreadsheet({
         [startDate, endDate],
       );
 
-    setData(groupedData);
+    setData(
+      groupedData.filter(i => (!showEmpty ? i[balanceTypeOp] !== 0 : true)),
+    );
   };
 }