Skip to content

A local-first personal finance app

[Maintenance] Converting dateRange and useReport to tsx (#2007)

Ameek Singh6bfd9586e0ac
diff --git a/packages/desktop-client/src/components/reports/DateRange.js b/packages/desktop-client/src/components/reports/DateRange.tsx
similarity index 60%
rename from packages/desktop-client/src/components/reports/DateRange.js
rename to packages/desktop-client/src/components/reports/DateRange.tsx
index 2e2ba1234e..df3d6eb50e 100644
--- a/packages/desktop-client/src/components/reports/DateRange.js
+++ b/packages/desktop-client/src/components/reports/DateRange.tsx
@@ -1,16 +1,24 @@
-import React from 'react';
+import React, { type ReactElement } from 'react';
import * as d from 'date-fns';
import { theme } from '../../style';
import Block from '../common/Block';
-function DateRange({ start, end }) {
- start = d.parseISO(start);
- end = d.parseISO(end);
+type DateRangeProps = {
+ start: string;
+ end: string;
+};
- let content;
- if (start.getYear() !== end.getYear()) {
+function DateRange({
+ start: startProp,
+ end: endProp,
+}: DateRangeProps): ReactElement {
+ const start = d.parseISO(startProp);
+ const end = d.parseISO(endProp);
+
+ let content: string | ReactElement;
+ if (start.getFullYear() !== end.getFullYear()) {
content = (
<div>
{d.format(start, 'MMM yyyy')} - {d.format(end, 'MMM yyyy')}
diff --git a/packages/desktop-client/src/components/reports/useReport.js b/packages/desktop-client/src/components/reports/useReport.tsx
similarity index 61%
rename from packages/desktop-client/src/components/reports/useReport.js
rename to packages/desktop-client/src/components/reports/useReport.tsx
index 15d5a3fb98..0e010d1351 100644
--- a/packages/desktop-client/src/components/reports/useReport.js
+++ b/packages/desktop-client/src/components/reports/useReport.tsx
@@ -1,8 +1,14 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, type SetStateAction } from 'react';
import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
-function useReport(sheetName, getData) {
+function useReport(
+ sheetName: string,
+ getData: (
+ spreadsheet: ReturnType<typeof useSpreadsheet>,
+ setData: (results: unknown) => SetStateAction<unknown>,
+ ) => Promise<void>,
+) {
const spreadsheet = useSpreadsheet();
const [results, setResults] = useState(null);
@@ -15,7 +21,6 @@ function useReport(sheetName, getData) {
cleanup?.();
};
}, [getData]);
-
return results;
}
diff --git a/upcoming-release-notes/2007.md b/upcoming-release-notes/2007.md
new file mode 100644
index 0000000000..cb0aa92f92
--- /dev/null
+++ b/upcoming-release-notes/2007.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [ameekSinghUniversityAcc]
+---
+
+Migrating the DateRange and UseReport files to typescript