set loading state on error

actualbudget · Oct 19, 2024 · 5ed9bf7 · 5ed9bf7
1 parent 0f4d947
commit 5ed9bf7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/packages/loot-core/src/client/data-hooks/schedules.tsx b/packages/loot-core/src/client/data-hooks/schedules.tsx
@@ -81,23 +81,25 @@ export function useSchedules({
     let isUnmounted = false;
 
     setError(undefined);
-    setIsLoading(!!query);
 
     if (!query) {
       return;
     }
 
-    if (query.state.table !== 'schedules') {
-      setError(new Error('Query must be a schedules query.'));
-      return;
-    }
-
     function onError(error: Error) {
       if (!isUnmounted) {
         setError(error);
+        setIsLoading(false);
       }
     }
 
+    if (query.state.table !== 'schedules') {
+      onError(new Error('Query must be a schedules query.'));
+      return;
+    }
+
+    setIsLoading(true);
+
     scheduleQueryRef.current = liveQuery<ScheduleEntity>(query, {
       onData: async schedules => {
         statusQueryRef.current = loadStatuses(
@@ -131,11 +133,9 @@ export function useSchedules({
 
 type SchedulesContextValue = UseSchedulesResult;
 
-const SchedulesContext = createContext<SchedulesContextValue>({
-  isLoading: false,
-  schedules: [],
-  statuses: new Map(),
-});
+const SchedulesContext = createContext<SchedulesContextValue | undefined>(
+  undefined,
+);
 
 type SchedulesProviderProps = PropsWithChildren<{
   query?: UseSchedulesProps['query'];
@@ -151,7 +151,13 @@ export function SchedulesProvider({ query, children }: SchedulesProviderProps) {
 }
 
 export function useCachedSchedules() {
-  return useContext(SchedulesContext);
+  const context = useContext(SchedulesContext);
+  if (!context) {
+    throw new Error(
+      'useCachedSchedules must be used within a SchedulesProvider',
+    );
+  }
+  return context;
 }
 
 export function accountSchedulesQuery(

diff --git a/packages/loot-core/src/client/data-hooks/transactions.ts b/packages/loot-core/src/client/data-hooks/transactions.ts
@@ -51,29 +51,33 @@ export function useTransactions({
     let isUnmounted = false;
 
     setError(undefined);
-    setIsLoading(!!query);
 
     if (!query) {
       return;
     }
 
+    function onError(error: Error) {
+      if (!isUnmounted) {
+        setError(error);
+        setIsLoading(false);
+      }
+    }
+
     if (query.state.table !== 'transactions') {
-      setError(new Error('Query must be a transactions query.'));
+      onError(new Error('Query must be a transactions query.'));
       return;
     }
 
+    setIsLoading(true);
+
     pagedQueryRef.current = pagedQuery<TransactionEntity>(query, {
       onData: data => {
         if (!isUnmounted) {
           setTransactions(data);
           setIsLoading(false);
         }
       },
-      onError: error => {
-        if (!isUnmounted) {
-          setError(error);
-        }
-      },
+      onError,
       options: { pageCount: optionsRef.current.pageCount },
     });
 
@@ -163,13 +167,14 @@ export function usePreviewTransactions(): UsePreviewTransactionsResult {
             ),
           }));
 
-          setIsLoading(false);
           setPreviewTransactions(ungroupTransactions(withDefaults));
+          setIsLoading(false);
         }
       })
       .catch(error => {
         if (!isUnmounted) {
           setError(error);
+          setIsLoading(false);
         }
       });