From be8723bd7a9f91c56bf44eaaa4e8ae97d8bb62e3 Mon Sep 17 00:00:00 2001
From: carkom <neilmccreery@yahoo.com>
Date: Mon, 22 Jan 2024 08:50:58 +0000
Subject: [PATCH] updates

---
 .../src/components/reports/ReportOptions.ts   | 13 ++--
 .../src/components/reports/ReportSidebar.jsx  | 28 ++++----
 .../src/components/reports/ReportTopbar.jsx   | 10 +--
 .../src/components/reports/SaveReport.tsx     | 17 +++--
 .../src/components/reports/SaveReportMenu.tsx | 18 ++---
 .../src/components/reports/SaveReportName.tsx |  2 +-
 .../reports/reports/CustomReport.jsx          | 70 +++++++++++--------
 .../loot-core/src/types/models/reports.d.ts   | 16 +++--
 8 files changed, 97 insertions(+), 77 deletions(-)

diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
index a7c0332d1de..35165d237b0 100644
--- a/packages/desktop-client/src/components/reports/ReportOptions.ts
+++ b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -12,19 +12,20 @@ const endDate = monthUtils.currentMonth();
 
 export const defaultReport: CustomReportEntity = {
   id: undefined,
+  name: undefined,
+  startDate,
+  endDate,
+  isDateStatic: false,
+  dateRange: 'Last 6 months',
   mode: 'total',
   groupBy: 'Category',
   balanceType: 'Payment',
   showEmpty: false,
-  showOffBudgetHidden: false,
+  showOffBudget: false,
   showUncategorized: false,
-  graphType: 'BarGraph',
-  startDate,
-  endDate,
   selectedCategories: null,
-  isDateStatic: false,
+  graphType: 'BarGraph',
   conditionsOp: 'and',
-  name: 'Default',
 };
 
 const balanceTypeOptions = [
diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.jsx b/packages/desktop-client/src/components/reports/ReportSidebar.jsx
index a0a3b06797a..bac9e97f1a7 100644
--- a/packages/desktop-client/src/components/reports/ReportSidebar.jsx
+++ b/packages/desktop-client/src/components/reports/ReportSidebar.jsx
@@ -38,10 +38,10 @@ export function ReportSidebar({
   setSelectedCategories,
   onChangeDates,
   onChangeViews,
-  setSavedStatus,
+  onReportChange,
 }) {
   const onSelectRange = cond => {
-    setSavedStatus('changed');
+    onReportChange(null, 'modify');
     setDateRange(cond);
     switch (cond) {
       case 'All time':
@@ -75,7 +75,7 @@ export function ReportSidebar({
   };
 
   const onChangeMode = cond => {
-    setSavedStatus('changed');
+    onReportChange(null, 'modify');
     setMode(cond);
     if (cond === 'time') {
       if (customReportItems.graphType === 'TableGraph') {
@@ -106,7 +106,7 @@ export function ReportSidebar({
   };
 
   const onChangeSplit = cond => {
-    setSavedStatus('changed');
+    onReportChange(null, 'modify');
     setGroupBy(cond);
     if (customReportItems.mode === 'total') {
       if (customReportItems.graphType !== 'TableGraph') {
@@ -124,7 +124,7 @@ export function ReportSidebar({
   };
 
   const onChangeBalanceType = cond => {
-    setSavedStatus('changed');
+    onReportChange(null, 'modify');
     setBalanceType(cond);
   };
 
@@ -258,7 +258,7 @@ export function ReportSidebar({
             value={customReportItems.showEmpty}
             onChange={() => {
               setShowEmpty(!customReportItems.showEmpty);
-              setSavedStatus('changed');
+              onReportChange(null, 'modify');
             }}
           />
           <label
@@ -280,11 +280,11 @@ export function ReportSidebar({
 
           <Checkbox
             id="show-hidden-columns"
-            checked={customReportItems.showOffBudgetHidden}
-            value={customReportItems.showOffBudgetHidden}
+            checked={customReportItems.showOffBudget}
+            value={customReportItems.showOffBudget}
             onChange={() => {
-              setShowOffBudgetHidden(!customReportItems.showOffBudgetHidden);
-              setSavedStatus('changed');
+              setShowOffBudgetHidden(!customReportItems.showOffBudget);
+              onReportChange(null, 'modify');
             }}
           />
           <label
@@ -310,7 +310,7 @@ export function ReportSidebar({
             value={customReportItems.showUncategorized}
             onChange={() => {
               setShowUncategorized(!customReportItems.showUncategorized);
-              setSavedStatus('changed');
+              onReportChange(null, 'modify');
             }}
           />
           <label
@@ -358,7 +358,7 @@ export function ReportSidebar({
                 customReportItems.startDate,
                 customReportItems.endDate,
               );
-              setSavedStatus('changed');
+              onReportChange(null, 'modify');
             }}
           >
             Static
@@ -408,7 +408,7 @@ export function ReportSidebar({
                       customReportItems.endDate,
                     ),
                   );
-                  setSavedStatus('changed');
+                  onReportChange(null, 'modify');
                 }}
                 value={customReportItems.startDate}
                 defaultLabel={monthUtils.format(
@@ -437,7 +437,7 @@ export function ReportSidebar({
                       newValue,
                     ),
                   );
-                  setSavedStatus('changed');
+                  onReportChange(null, 'modify');
                 }}
                 value={customReportItems.endDate}
                 options={allMonths.map(({ name, pretty }) => [name, pretty])}
diff --git a/packages/desktop-client/src/components/reports/ReportTopbar.jsx b/packages/desktop-client/src/components/reports/ReportTopbar.jsx
index f6017541656..526b79865b6 100644
--- a/packages/desktop-client/src/components/reports/ReportTopbar.jsx
+++ b/packages/desktop-client/src/components/reports/ReportTopbar.jsx
@@ -46,7 +46,7 @@ export function ReportTopbar({
         selected={customReportItems.graphType === 'TableGraph'}
         title="Data Table"
         onSelect={() => {
-          setSavedStatus('changed');
+          onReportChange(null, 'modify');
           setGraphType('TableGraph');
           onChangeViews('viewLegend', false);
           setTypeDisabled([]);
@@ -64,7 +64,7 @@ export function ReportTopbar({
           customReportItems.graphType === 'StackedBarGraph'
         }
         onSelect={() => {
-          setSavedStatus('changed');
+          onReportChange(null, 'modify');
           if (customReportItems.mode === 'total') {
             setGraphType('BarGraph');
             if (['Net'].includes(customReportItems.balanceType)) {
@@ -89,7 +89,7 @@ export function ReportTopbar({
         title="Area Graph"
         selected={customReportItems.graphType === 'AreaGraph'}
         onSelect={() => {
-          setSavedStatus('changed');
+          onReportChange(null, 'modify');
           setGraphType('AreaGraph');
           setGroupBy('Month');
           onChangeViews('viewLegend', false);
@@ -104,7 +104,7 @@ export function ReportTopbar({
         title="Donut Graph"
         selected={customReportItems.graphType === 'DonutGraph'}
         onSelect={() => {
-          setSavedStatus('changed');
+          onReportChange(null, 'modify');
           setGraphType('DonutGraph');
           setTypeDisabled(['Net']);
           setBalanceType('Payment');
@@ -126,7 +126,7 @@ export function ReportTopbar({
       <GraphButton
         selected={viewLegend}
         onSelect={() => {
-          setSavedStatus('changed');
+          onReportChange(null, 'modify');
           onChangeViews('viewLegend');
         }}
         style={{ marginRight: 15 }}
diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsx
index 8992da903c6..627bb414585 100644
--- a/packages/desktop-client/src/components/reports/SaveReport.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReport.tsx
@@ -1,6 +1,8 @@
 // @ts-strict-ignore
 import React, { createRef, useState } from 'react';
 
+import { v4 as uuidv4 } from 'uuid';
+
 import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
 import { type CustomReportEntity } from 'loot-core/src/types/models';
 
@@ -49,14 +51,19 @@ export function SaveReport({
 
     if (menuItem === 'save-report') {
       //create new flow
+      /*
       res = await sendCatch('report/create', {
         ...savedReport,
       });
+      */
       savedReport = {
         ...savedReport,
-        id: res.data,
+        id: uuidv4(),
+        name,
       };
-    } else {
+    }
+
+    if (['rename-report', 'update-report'].includes(menuItem)) {
       //rename or update flow
       if (menuItem === 'rename-report') {
         //rename
@@ -66,11 +73,13 @@ export function SaveReport({
         };
       }
       //send update and rename to DB
+      /*
       res = await sendCatch('report/update', {
         ...savedReport,
       });
+      */
     }
-    if (res.error) {
+    if (res) {
       setErr(res.error.message);
       setNameMenuOpen(true);
     } else {
@@ -93,7 +102,7 @@ export function SaveReport({
         break;
       case 'delete-report':
         setMenuOpen(false);
-        await send('report/delete', id);
+        //await send('report/delete', id);
         onResetReports();
         break;
       case 'update-report':
diff --git a/packages/desktop-client/src/components/reports/SaveReportMenu.tsx b/packages/desktop-client/src/components/reports/SaveReportMenu.tsx
index e17795e8738..cc88db4af7d 100644
--- a/packages/desktop-client/src/components/reports/SaveReportMenu.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReportMenu.tsx
@@ -23,58 +23,50 @@ export function SaveReportMenu({
           onMenuSelect(item);
         }}
         items={
-          report.id === null
+          report.id === undefined
             ? [
                 {
                   name: 'save-report',
                   text: 'Save new report',
-                  disabled: true,
                 },
                 {
                   name: 'reset-report',
                   text: 'Reset to default',
-                  disabled: true,
                 },
               ]
             : savedStatus === 'saved'
               ? [
-                  { name: 'rename-report', text: 'Rename', disabled: true },
-                  { name: 'delete-report', text: 'Delete', disabled: true },
+                  { name: 'rename-report', text: 'Rename' },
+                  { name: 'delete-report', text: 'Delete' },
                   Menu.line,
                   {
                     name: 'save-report',
                     text: 'Save new report',
-                    disabled: true,
                   },
                   {
                     name: 'reset-report',
                     text: 'Reset to default',
-                    disabled: true,
                   },
                 ]
               : [
-                  { name: 'rename-report', text: 'Rename', disabled: true },
+                  { name: 'rename-report', text: 'Rename' },
                   {
                     name: 'update-report',
                     text: 'Update report',
-                    disabled: true,
                   },
                   {
                     name: 'reload-report',
                     text: 'Revert changes',
-                    disabled: true,
                   },
-                  { name: 'delete-report', text: 'Delete', disabled: true },
+                  { name: 'delete-report', text: 'Delete' },
                   Menu.line,
                   {
                     name: 'save-report',
                     text: 'Save new report',
-                    disabled: true,
                   },
                   {
                     name: 'reset-report',
                     text: 'Reset to default',
-                    disabled: true,
                   },
                 ]
         }
diff --git a/packages/desktop-client/src/components/reports/SaveReportName.tsx b/packages/desktop-client/src/components/reports/SaveReportName.tsx
index c68f71a3149..c1b97c47c50 100644
--- a/packages/desktop-client/src/components/reports/SaveReportName.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReportName.tsx
@@ -43,7 +43,7 @@ export function SaveReportName({
           >
             <FormField style={{ flex: 1 }}>
               <FormLabel
-                title="Filter Name"
+                title="Report Name"
                 htmlFor="name-field"
                 style={{ userSelect: 'none' }}
               />
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.jsx b/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
index 24013bf3405..751989de163 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
@@ -54,7 +54,9 @@ export function CustomReport() {
   } = useFilters();
 
   const location = useLocation();
-  const loadReport = location.state && (location.state.report ?? defaultState);
+  const loadReport = location.state
+    ? location.state.report ?? defaultReport
+    : defaultReport;
 
   const [allMonths, setAllMonths] = useState(null);
   const [typeDisabled, setTypeDisabled] = useState(['Net']);
@@ -70,20 +72,20 @@ export function CustomReport() {
   const [balanceType, setBalanceType] = useState(loadReport.balanceType);
   const [showEmpty, setShowEmpty] = useState(loadReport.showEmpty);
   const [showOffBudgetHidden, setShowOffBudgetHidden] = useState(
-    loadReport.showOffBudgetHidden,
+    loadReport.showOffBudget,
   );
   const [showUncategorized, setShowUncategorized] = useState(
     loadReport.showUncategorized,
   );
   const [graphType, setGraphType] = useState(loadReport.graphType);
 
-  const [dateRange, setDateRange] = useState('Last 6 months');
+  const [dateRange, setDateRange] = useState(loadReport.dateRange);
   const [dataCheck, setDataCheck] = useState(false);
   const dateRangeLine = ReportOptions.dateRange.length - 3;
 
-  const [report, setReport] = useState(location.state.report ?? []);
+  const [report, setReport] = useState(loadReport);
   const [savedStatus, setSavedStatus] = useState(
-    location.state.report ? 'saved' : 'new',
+    location.state ? (location.state.report ? 'saved' : 'new') : 'new',
   );
   const months = monthUtils.rangeInclusive(startDate, endDate);
 
@@ -197,22 +199,24 @@ export function CustomReport() {
   const data = { ...graphData, groupedData };
   const customReportItems = {
     id: undefined,
+    name: undefined,
+    startDate,
+    endDate,
+    isDateStatic,
+    dateRange,
     mode,
     groupBy,
     balanceType,
     showEmpty,
-    showOffBudgetHidden,
+    showoffBudget: showOffBudgetHidden,
     showUncategorized,
-    graphType,
-    startDate,
-    endDate,
     selectedCategories,
-    isDateStatic,
-    dateRange,
+    graphType,
     filters,
     conditionsOp,
     data,
   };
+
   const [scrollWidth, setScrollWidth] = useState(0);
 
   if (!allMonths || !data) {
@@ -238,18 +242,21 @@ export function CustomReport() {
   };
 
   const onResetReports = () => {
+    setStartDate(defaultReport.startDate);
+    setEndDate(defaultReport.endDate);
+    setIsDateStatic(defaultReport.isDateStatic);
+    setDateRange(defaultReport.dateRange);
     setMode(defaultReport.mode);
     setGroupBy(defaultReport.groupBy);
     setBalanceType(defaultReport.balanceType);
-    setShowEmpty(defaultReport.empty);
-    setShowOffBudgetHidden(defaultReport.hidden);
-    setShowUncategorized(defaultReport.uncat);
+    setShowEmpty(defaultReport.showEmpty);
+    setShowOffBudgetHidden(defaultReport.showOffBudget);
+    setShowUncategorized(defaultReport.showUncategorized);
+    setSelectedCategories(defaultReport.selectedCategories);
     setGraphType(defaultReport.graphType);
-    onApplyFilter(null);
+    onDeleteFilter(...filters);
     onCondOpChange(defaultReport.conditionsOp);
-    setReport([]);
-    setStartDate(defaultReport.start);
-    setEndDate(defaultReport.end);
+    setReport(defaultReport);
     setSavedStatus('new');
   };
 
@@ -259,21 +266,28 @@ export function CustomReport() {
       setReport(savedReport);
     }
 
+    if (type === 'modify') {
+      setSavedStatus('changed');
+      if (report.name.substr(report.name.length - 10) !== '(modified)') {
+        setReport({ ...report, name: report.name + ' (modified)' });
+      }
+    }
+
     if (type === 'reload') {
+      setStartDate(report.startDate);
+      setEndDate(report.endDate);
+      setIsDateStatic(report.isDateStatic);
+      setDateRange(report.dateRange);
       setMode(report.mode);
       setGroupBy(report.groupBy);
       setBalanceType(report.balanceType);
-      setShowEmpty(report.empty);
-      setShowOffBudgetHidden(report.hidden);
-      setShowUncategorized(report.uncat);
+      setShowEmpty(report.showEmpty);
+      setShowOffBudgetHidden(report.showOffBudget);
+      setShowUncategorized(report.showUncategorized);
+      setSelectedCategories(report.selectedCategories);
       setGraphType(report.graphType);
-      onApplyFilter(report.filters);
+      report.filters === [] && onApplyFilter(report.filters);
       onCondOpChange(report.conditionsOp);
-      setStartDate(report.start);
-      setEndDate(report.end);
-    } else {
-      if (savedStatus === 'saved') {
-      }
     }
   };
 
@@ -308,7 +322,7 @@ export function CustomReport() {
           setSelectedCategories={setSelectedCategories}
           onChangeDates={onChangeDates}
           onChangeViews={onChangeViews}
-          setSavedStatus={setSavedStatus}
+          onReportChange={onReportChange}
         />
         <View
           style={{
diff --git a/packages/loot-core/src/types/models/reports.d.ts b/packages/loot-core/src/types/models/reports.d.ts
index 588b475a35d..99297af07d2 100644
--- a/packages/loot-core/src/types/models/reports.d.ts
+++ b/packages/loot-core/src/types/models/reports.d.ts
@@ -1,21 +1,25 @@
+import { CategoryEntity } from './category';
 import { type RuleConditionEntity } from './rule';
 
 export interface CustomReportEntity {
   id: string | undefined;
+  name: string | undefined;
+  startDate: string;
+  endDate: string;
+  isDateStatic: boolean;
+  dateRange: string;
   mode: string;
   groupBy: string;
   balanceType: string;
+  //interval: string;
   showEmpty: boolean;
-  showOffBudgetHidden: boolean;
+  showOffBudget: boolean;
+  showHidden?: boolean;
   showUncategorized: boolean;
+  selectedCategories: CategoryEntity[];
   graphType: string;
-  selectedCategories;
   filters?: RuleConditionEntity[];
   conditionsOp: string;
-  name: string;
-  startDate: string;
-  endDate: string;
-  isDateStatic: boolean;
   data?: GroupedEntity;
   tombstone?: boolean;
 }