Clean up abort controller

elastic · Jul 19, 2024 · 9e24c2d · 9e24c2d
1 parent 78c2f60
commit 9e24c2d
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/plugins/discover/public/embeddable/initialize_fetch.ts b/src/plugins/discover/public/embeddable/initialize_fetch.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { BehaviorSubject, combineLatest, lastValueFrom, switchMap } from 'rxjs';
+import { BehaviorSubject, combineLatest, lastValueFrom, switchMap, tap } from 'rxjs';
 
 import { KibanaExecutionContext } from '@kbn/core/types';
 import {
@@ -91,22 +91,24 @@ export function initializeFetch({
   discoverServices: DiscoverServices;
 }) {
   const requestAdapter = new RequestAdapter();
-  let abortController = new AbortController();
+  let abortController: AbortController | undefined;
 
   const fetchSubscription = combineLatest([fetch$(api), api.savedSearch$, api.dataViews])
     .pipe(
+      tap(() => {
+        // abort any in-progress requests
+        if (abortController) {
+          abortController.abort();
+          abortController = undefined;
+        }
+      }),
       switchMap(async ([fetchContext, savedSearch, dataViews]) => {
         const dataView = dataViews?.length ? dataViews[0] : undefined;
         api.blockingError.next(undefined);
         if (!dataView || !savedSearch.searchSource) {
           return;
         }
 
-        // Abort any in-progress requests
-        const currentAbortController = new AbortController();
-        abortController.abort();
-        abortController = currentAbortController;
-
         const useNewFieldsApi = !discoverServices.uiSettings.get(SEARCH_FIELDS_FROM_SOURCE, false);
         updateSearchSource(
           discoverServices,
@@ -126,6 +128,7 @@ export function initializeFetch({
 
         try {
           api.dataLoading.next(true);
+
           // Log request to inspector
           requestAdapter.reset();
           await discoverServices.profilesManager.resolveDataSourceProfile({
@@ -138,6 +141,10 @@ export function initializeFetch({
             query: searchSourceQuery,
           });
 
+          // Get new abort controller
+          const currentAbortController = new AbortController();
+          abortController = currentAbortController;
+
           const esqlMode = isEsqlMode(savedSearch);
           if (
             esqlMode &&