[Discover] Cancel long running request after navigating out from Disc…

…over (#129444) * [Discover] cancel search on navigating out * [Discover] fix abortController reference Co-authored-by: Kibana Machine <[email protected]>
elastic · Apr 12, 2022 · 36e4ddd · 36e4ddd
1 parent 35593dd
commit 36e4ddd
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
@@ -147,7 +147,6 @@ export const useSavedSearch = ({
    * Values that shouldn't trigger re-rendering when changed
    */
   const refs = useRef<{
-    abortController?: AbortController;
     autoRefreshDone?: AutoRefreshDoneFn;
   }>({});
 
@@ -172,19 +171,20 @@ export const useSavedSearch = ({
       searchSource,
       initialFetchStatus,
     });
+    let abortController: AbortController;
 
     const subscription = fetch$.subscribe(async (val) => {
       if (!validateTimeRange(timefilter.getTime(), services.toastNotifications)) {
         return;
       }
       inspectorAdapters.requests.reset();
 
-      refs.current.abortController?.abort();
-      refs.current.abortController = new AbortController();
+      abortController?.abort();
+      abortController = new AbortController();
       const autoRefreshDone = refs.current.autoRefreshDone;
 
       await fetchAll(dataSubjects, searchSource, val === 'reset', {
-        abortController: refs.current.abortController,
+        abortController,
         appStateContainer: stateContainer.appStateContainer,
         data,
         initialFetchStatus,
@@ -205,7 +205,10 @@ export const useSavedSearch = ({
       }
     });
 
-    return () => subscription.unsubscribe();
+    return () => {
+      abortController?.abort();
+      subscription.unsubscribe();
+    };
   }, [
     data,
     data.query.queryString,