typecheck fixes

actualbudget · Jan 22, 2024 · d49d3dd · d49d3dd
1 parent 6c395cb
commit d49d3dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -6,9 +6,16 @@ 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,
@@ -23,9 +30,9 @@ export const defaultReport: CustomReportEntity = {
   showEmpty: false,
   showOffBudget: false,
   showUncategorized: false,
-  selectedCategories: null,
+  selectedCategories: selectAll,
   graphType: 'BarGraph',
-  conditions: null,
+  conditions: [],
   conditionsOp: 'and',
 };
 

diff --git a/packages/desktop-client/src/components/reports/SaveReportMenu.tsx b/packages/desktop-client/src/components/reports/SaveReportMenu.tsx
@@ -13,7 +13,7 @@ export function SaveReportMenu({
 }: {
   report: CustomReportEntity;
   onClose: () => void;
-  onMenuSelect: (item) => void;
+  onMenuSelect: (item: string) => void;
   savedStatus: string;
 }) {
   return (

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, { useEffect } from 'react';
+import React, { RefObject, useEffect } from 'react';
 
 import { theme } from '../../style';
 import { Button } from '../common/Button';
@@ -11,10 +11,10 @@ import { FormField, FormLabel } from '../forms';
 type SaveReportNameProps = {
   onClose: () => void;
   menuItem: string;
-  onNameChange;
-  inputRef;
+  onNameChange: (name: string) => void;
+  inputRef: RefObject<HTMLInputElement>;
   onAddUpdate: () => void;
-  err;
+  err: string;
 };
 
 export function SaveReportName({

diff --git a/packages/loot-core/src/server/reports/app.ts b/packages/loot-core/src/server/reports/app.ts
@@ -42,7 +42,7 @@ const reportModel = {
 };
 
 async function reportNameExists(
-  name: string,
+  name: string | undefined,
   reportId: string | undefined,
   newItem: boolean,
 ) {