Reset fetch result when retrying useFetch (#6552)

hypothesis · Aug 12, 2024 · 613ffc8 · 613ffc8
1 parent adf4c6a
commit 613ffc8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lms/static/scripts/frontend_apps/utils/fetch.ts b/lms/static/scripts/frontend_apps/utils/fetch.ts
@@ -69,13 +69,15 @@ export function useFetch<T = unknown>(
       controller.abort();
       setResult(r => ({ ...r, error: null, isLoading: false, data: newValue }));
     };
-    setResult({
-      data: null,
-      error: null,
-      isLoading: key !== null,
-      mutate,
-      retry: () => null,
-    });
+    const resetResult = () =>
+      setResult({
+        data: null,
+        error: null,
+        isLoading: key !== null,
+        mutate,
+        retry: () => null,
+      });
+    resetResult();
 
     if (!key) {
       return undefined;
@@ -87,6 +89,7 @@ export function useFetch<T = unknown>(
 
     const fetcher = lastFetcher.current;
     const doFetch = () => {
+      resetResult();
       fetcher(controller.signal)
         .then(data => {
           if (!controller.signal.aborted) {

diff --git a/lms/static/scripts/frontend_apps/utils/test/fetch-test.js b/lms/static/scripts/frontend_apps/utils/test/fetch-test.js
@@ -204,6 +204,7 @@ describe('useFetch', () => {
       fail = false;
       retry(wrapper);
 
+      assert.equal(getResultText(wrapper), 'Loading');
       await waitForFetch(wrapper);
       assert.equal(getResultText(wrapper), 'Data: OK');
     });