A local-first personal finance app
:recycle: (reports) improve useReports data fetching hook to return loading state (#3198)
Matiss Janis Aboltinsa2e434a1fbc3
diff --git a/packages/desktop-client/src/components/autocomplete/ReportAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/ReportAutocomplete.tsxindex d3183133ba..d989604f38 100644--- a/packages/desktop-client/src/components/autocomplete/ReportAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/ReportAutocomplete.tsx@@ -14,7 +14,7 @@ export function ReportAutocomplete({embedded,...props}: ReportAutocompleteProps) {- const reports = useReports() || [];+ const { data: reports } = useReports();return (<Autocompletediff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsxindex 34fb1b17ac..a2a71ef832 100644--- a/packages/desktop-client/src/components/reports/Overview.tsx+++ b/packages/desktop-client/src/components/reports/Overview.tsx@@ -21,7 +21,7 @@ import { NetWorthCard } from './reports/NetWorthCard';import { SpendingCard } from './reports/SpendingCard';export function Overview() {- const customReports = useReports();+ const { data: customReports } = useReports();const { isNarrowWidth } = useResponsive();const location = useLocation();diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsxindex 185919f0e8..e961d8e2d1 100644--- a/packages/desktop-client/src/components/reports/SaveReport.tsx+++ b/packages/desktop-client/src/components/reports/SaveReport.tsx@@ -34,7 +34,7 @@ export function SaveReport({savedStatus,onReportChange,}: SaveReportProps) {- const listReports = useReports();+ const { data: listReports } = useReports();const triggerRef = useRef(null);const [deleteMenuOpen, setDeleteMenuOpen] = useState(false);const [nameMenuOpen, setNameMenuOpen] = useState(false);diff --git a/packages/desktop-client/src/components/util/GenericInput.jsx b/packages/desktop-client/src/components/util/GenericInput.jsxindex f0152fa236..ed59442c0a 100644--- a/packages/desktop-client/src/components/util/GenericInput.jsx+++ b/packages/desktop-client/src/components/util/GenericInput.jsx@@ -34,7 +34,7 @@ export function GenericInput({onChange,}) {const { grouped: categoryGroups } = useCategories();- const savedReports = useReports();+ const { data: savedReports } = useReports();const saved = useSelector(state => state.queries.saved);const dateFormat = useDateFormat() || 'MM/dd/yyyy';diff --git a/packages/loot-core/src/client/data-hooks/reports.ts b/packages/loot-core/src/client/data-hooks/reports.tsindex 6930861462..49662402b3 100644--- a/packages/loot-core/src/client/data-hooks/reports.ts+++ b/packages/loot-core/src/client/data-hooks/reports.ts@@ -35,9 +35,10 @@ function toJS(rows: CustomReportData[]) {return reports;}-export function useReports(): CustomReportEntity[] {- const reports: CustomReportEntity[] = toJS(- useLiveQuery(() => q('custom_reports').select('*'), []) || [],+export function useReports() {+ const queryData = useLiveQuery<CustomReportData[]>(+ () => q('custom_reports').select('*'),+ [],);// Sort reports by alphabetical order@@ -51,5 +52,11 @@ export function useReports(): CustomReportEntity[] {);}- return useMemo(() => sort(reports), [reports]);+ return useMemo(+ () => ({+ isLoading: queryData === null,+ data: sort(toJS(queryData || [])),+ }),+ [queryData],+ );}diff --git a/upcoming-release-notes/3198.md b/upcoming-release-notes/3198.mdnew file mode 100644index 0000000000..0e682ecc04--- /dev/null+++ b/upcoming-release-notes/3198.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Reports: improve `useReports` data fetching hook to return the loading state.