Renaming variables for reports files (#2069)

* work * notes * error fixes * updates * card fix * fix filters * splitting PR work * notes * fixes * lint fix * Update upcoming-release-notes/2069.md Co-authored-by: Matiss Janis Aboltins <[email protected]> --------- Co-authored-by: Matiss Janis Aboltins <[email protected]>
actualbudget · Dec 12, 2023 · 8a721bf · 8a721bf
1 parent 36914ab
commit 8a721bf
Show file tree

Hide file tree

Showing 12 changed files with 164 additions and 148 deletions.
diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
@@ -21,7 +21,7 @@ type ChooseGraphProps = {
   graphType: string;
   balanceType: string;
   groupBy: string;
-  empty: boolean;
+  showEmpty: boolean;
   scrollWidth: number;
   setScrollWidth: (value: number) => void;
   months: Month[];
@@ -32,7 +32,7 @@ export function ChooseGraph({
   graphType,
   balanceType,
   groupBy,
-  empty,
+  showEmpty,
   scrollWidth,
   setScrollWidth,
   months,
@@ -104,7 +104,7 @@ export function ChooseGraph({
         >
           <ReportTableList
             data={data}
-            empty={empty}
+            empty={showEmpty}
             monthsCount={months.length}
             balanceTypeOp={ReportOptions.balanceTypeMap.get(balanceType)}
             mode={mode}

diff --git a/packages/desktop-client/src/components/reports/ReportOptions.tsx b/packages/desktop-client/src/components/reports/ReportOptions.tsx
@@ -6,8 +6,8 @@ import {
 } from 'loot-core/src/types/models';
 
 const balanceTypeOptions = [
-  { description: 'Expense', format: 'totalDebts' },
-  { description: 'Income', format: 'totalAssets' },
+  { description: 'Payment', format: 'totalDebts' },
+  { description: 'Deposit', format: 'totalAssets' },
   { description: 'Net', format: 'totalTotals' },
 ];
 
@@ -21,10 +21,11 @@ const groupByOptions = [
 ];
 
 const dateRangeOptions = [
-  { description: '1 month', name: 1 },
-  { description: '3 months', name: 2 },
-  { description: '6 months', name: 5 },
-  { description: '1 year', name: 11 },
+  { description: 'This month', name: 0 },
+  { description: 'Last month', name: 1 },
+  { description: 'Last 3 months', name: 2 },
+  { description: 'Last 6 months', name: 5 },
+  { description: 'Last 12 months', name: 11 },
   { description: 'Year to date', name: 'yearToDate' },
   { description: 'Last year', name: 'lastYear' },
   { description: 'All time', name: 'allMonths' },

diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.js b/packages/desktop-client/src/components/reports/ReportSidebar.js
@@ -46,8 +46,8 @@ function ModeButton({ selected, children, style, onSelect }) {
 }
 
 export function ReportSidebar({
-  start,
-  end,
+  startDate,
+  endDate,
   onChangeDates,
   dateRange,
   setDateRange,
@@ -64,12 +64,12 @@ export function ReportSidebar({
   setBalanceType,
   mode,
   setMode,
-  empty,
-  setEmpty,
-  hidden,
-  setHidden,
-  uncat,
-  setUncat,
+  showEmpty,
+  setShowEmpty,
+  showOffBudgetHidden,
+  setShowOffBudgetHidden,
+  showUncategorized,
+  setShowUncategorized,
   categories,
   selectedCategories,
   setSelectedCategories,
@@ -114,7 +114,7 @@ export function ReportSidebar({
       } else {
         setTypeDisabled(['Net']);
         if (['Net'].includes(balanceType)) {
-          setBalanceType('Expense');
+          setBalanceType('Payment');
         }
       }
       if (graphType === 'BarGraph') {
@@ -144,7 +144,7 @@ export function ReportSidebar({
       }
     }
     if (['Net'].includes(balanceType) && graphType !== 'TableGraph') {
-      setBalanceType('Expense');
+      setBalanceType('Payment');
     }
   };
 
@@ -274,9 +274,9 @@ export function ReportSidebar({
 
           <Checkbox
             id="show-empty-columns"
-            checked={empty}
-            value={empty}
-            onChange={() => setEmpty(!empty)}
+            checked={showEmpty}
+            value={showEmpty}
+            onChange={() => setShowEmpty(!showEmpty)}
           />
           <label
             htmlFor="show-empty-columns"
@@ -297,9 +297,9 @@ export function ReportSidebar({
 
           <Checkbox
             id="show-hidden-columns"
-            checked={hidden}
-            value={hidden}
-            onChange={() => setHidden(!hidden)}
+            checked={showOffBudgetHidden}
+            value={showOffBudgetHidden}
+            onChange={() => setShowOffBudgetHidden(!showOffBudgetHidden)}
           />
           <label
             htmlFor="show-hidden-columns"
@@ -320,9 +320,9 @@ export function ReportSidebar({
 
           <Checkbox
             id="show-uncategorized"
-            checked={uncat}
-            value={uncat}
-            onChange={() => setUncat(!uncat)}
+            checked={showUncategorized}
+            value={showUncategorized}
+            onChange={() => setShowUncategorized(!showUncategorized)}
           />
           <label
             htmlFor="show-uncategorized"
@@ -387,10 +387,10 @@ export function ReportSidebar({
           </Text>
           <Select
             onChange={newValue =>
-              onChangeDates(...validateStart(allMonths, newValue, end))
+              onChangeDates(...validateStart(allMonths, newValue, endDate))
             }
-            value={start}
-            defaultLabel={monthUtils.format(start, 'MMMM, yyyy')}
+            value={startDate}
+            defaultLabel={monthUtils.format(startDate, 'MMMM, yyyy')}
             options={allMonths.map(({ name, pretty }) => [name, pretty])}
           />
         </View>
@@ -406,9 +406,9 @@ export function ReportSidebar({
           </Text>
           <Select
             onChange={newValue =>
-              onChangeDates(...validateEnd(allMonths, start, newValue))
+              onChangeDates(...validateEnd(allMonths, startDate, newValue))
             }
-            value={end}
+            value={endDate}
             options={allMonths.map(({ name, pretty }) => [name, pretty])}
           />
         </View>

diff --git a/packages/desktop-client/src/components/reports/ReportSummary.js b/packages/desktop-client/src/components/reports/ReportSummary.js
@@ -13,13 +13,16 @@ import View from '../common/View';
 import PrivacyFilter from '../PrivacyFilter';
 
 export function ReportSummary({
-  start,
-  end,
+  startDate,
+  endDate,
   data,
   balanceTypeOp,
   monthsCount,
 }) {
-  const net = data.totalDebts > data.totalAssets ? 'EXPENSE' : 'INCOME';
+  const net =
+    Math.abs(data.totalDebts) > Math.abs(data.totalAssets)
+      ? 'PAYMENT'
+      : 'DEPOSIT';
   const average = amountToInteger(data[balanceTypeOp]) / monthsCount;
   return (
     <View
@@ -46,8 +49,8 @@ export function ReportSummary({
             },
           ]}
         >
-          {monthUtils.format(start, 'MMM yyyy')} -{' '}
-          {monthUtils.format(end, 'MMM yyyy')}
+          {monthUtils.format(startDate, 'MMM yyyy')} -{' '}
+          {monthUtils.format(endDate, 'MMM yyyy')}
         </Text>
       </View>
       <View
@@ -72,7 +75,7 @@ export function ReportSummary({
           {balanceTypeOp === 'totalDebts'
             ? 'TOTAL SPENDING'
             : balanceTypeOp === 'totalAssets'
-            ? 'TOTAL INCOME'
+            ? 'TOTAL DEPOSITS'
             : 'NET ' + net}
         </Text>
         <Text
@@ -113,7 +116,7 @@ export function ReportSummary({
           {balanceTypeOp === 'totalDebts'
             ? 'AVERAGE SPENDING'
             : balanceTypeOp === 'totalAssets'
-            ? 'AVERAGE INCOME'
+            ? 'AVERAGE DEPOSIT'
             : 'AVERAGE NET'}
         </Text>
         <Text

diff --git a/packages/desktop-client/src/components/reports/ReportTableHeader.tsx b/packages/desktop-client/src/components/reports/ReportTableHeader.tsx
@@ -73,15 +73,15 @@ export default function ReportTableHeader({
                     minWidth: 85,
                     ...styles.tnum,
                   }}
-                  value={'Assets'}
+                  value={'Deposits'}
                   width="flex"
                 />
                 <Cell
                   style={{
                     minWidth: 85,
                     ...styles.tnum,
                   }}
-                  value={'Debts'}
+                  value={'Payments'}
                   width="flex"
                 />
               </>

diff --git a/packages/desktop-client/src/components/reports/ReportTopbar.js b/packages/desktop-client/src/components/reports/ReportTopbar.js
@@ -59,13 +59,13 @@ export function ReportTopbar({
           if (mode === 'total') {
             setGraphType('BarGraph');
             if (['Net'].includes(balanceType)) {
-              setBalanceType('Expense');
+              setBalanceType('Payment');
             }
             setTypeDisabled(['Month', 'Year'].includes(groupBy) ? [] : ['Net']);
           } else {
             setGraphType('StackedBarGraph');
             setTypeDisabled(['Net']);
-            setBalanceType('Expense');
+            setBalanceType('Payment');
           }
         }}
         style={{ marginRight: 15 }}
@@ -92,7 +92,7 @@ export function ReportTopbar({
         onSelect={() => {
           setGraphType('DonutGraph');
           setTypeDisabled(['Net']);
-          setBalanceType('Expense');
+          setBalanceType('Payment');
         }}
         style={{ marginRight: 15 }}
         disabled={mode === 'total' ? false : true}