merge fixes

actualbudget · Feb 3, 2024 · da0f587 · da0f587
1 parent 2d5151b
commit da0f587
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 20 deletions.
diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
@@ -412,4 +412,4 @@ export function FilterEditor({ field, op, value, options, onSave, onClose }) {
       }}
     />
   );
-}
+}
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -6,16 +6,9 @@ import {
   type CategoryGroupEntity,
   type PayeeEntity,
 } from 'loot-core/src/types/models';
-import { useCategories } from '../../hooks/useCategories';
 
 const startDate = monthUtils.subMonths(monthUtils.currentMonth(), 5);
 const endDate = monthUtils.currentMonth();
-const categories = useCategories();
-const selectAll: CategoryEntity[] = [];
-categories.grouped.map(categoryGroup =>
-  categoryGroup.categories &&
-  categoryGroup.categories.map(category => selectAll.push(category)),
-);
 
 export const defaultReport: CustomReportEntity = {
   id: undefined,

diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.jsx b/packages/desktop-client/src/components/reports/ReportSidebar.jsx
@@ -279,18 +279,18 @@ export function ReportSidebar({
                       setShowHiddenCategories(
                         !customReportItems.showHiddenCategories,
                       );
-					  onReportChange(null, 'modify');
+                      onReportChange(null, 'modify');
                     } else if (type === 'show-off-budget') {
                       setShowOffBudget(!customReportItems.showOffBudget);
-					  onReportChange(null, 'modify');
+                      onReportChange(null, 'modify');
                     } else if (type === 'show-empty-items') {
                       setShowEmpty(!customReportItems.showEmpty);
-					  onReportChange(null, 'modify');
+                      onReportChange(null, 'modify');
                     } else if (type === 'show-uncategorized') {
                       setShowUncategorized(
                         !customReportItems.showUncategorized,
                       );
-					  onReportChange(null, 'modify');
+                      onReportChange(null, 'modify');
                     }
                   }}
                   items={[

diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsx
@@ -3,7 +3,7 @@ import React, { createRef, useState } from 'react';
 
 import { v4 as uuidv4 } from 'uuid';
 
-import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
+//import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
 import { type CustomReportEntity } from 'loot-core/src/types/models';
 
 import { SvgExpandArrow } from '../../icons/v0';
@@ -35,7 +35,6 @@ export function SaveReport({
   const [err, setErr] = useState(null);
   const [name, setName] = useState(report.name);
   const inputRef = createRef<HTMLInputElement>();
-  const id = report.id;
 
   const onAddUpdate = async () => {
     let savedReport: CustomReportEntity;
@@ -61,7 +60,6 @@ export function SaveReport({
     }
 
     if (menuItem === 'rename-report') {
-      //rename or update flow
       //rename
       savedReport = {
         ...report,

diff --git a/packages/desktop-client/src/components/reports/SaveReportName.tsx b/packages/desktop-client/src/components/reports/SaveReportName.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useEffect } from 'react';
+import React, { type RefObject, useEffect } from 'react';
 
 import { theme } from '../../style';
 import { Button } from '../common/Button';

diff --git a/packages/loot-core/src/client/data-hooks/reports.ts b/packages/loot-core/src/client/data-hooks/reports.ts
@@ -31,9 +31,11 @@ export function useReports(): CustomReportEntity[] {
   /** Sort reports by alphabetical order */
   function sort(reports: CustomReportEntity[]) {
     return reports.sort((a, b) =>
-      a.name
-        .trim()
-        .localeCompare(b.name.trim(), undefined, { ignorePunctuation: true }),
+      a.name && b.name
+        ? a.name.trim().localeCompare(b.name.trim(), undefined, {
+            ignorePunctuation: true,
+          })
+        : 0,
     );
   }
 

diff --git a/packages/loot-core/src/types/models/reports.d.ts b/packages/loot-core/src/types/models/reports.d.ts
@@ -3,7 +3,7 @@ import { type RuleConditionEntity } from './rule';
 
 export interface CustomReportEntity {
   id: string | undefined;
-  name: string;
+  name: string | undefined;
   startDate: string;
   endDate: string;
   isDateStatic: boolean;
-Original file line number
+Diff line change
@@ Expand Up @@
           }}
         />
       );
-    }
+    }