[Discover] Changes to abort logic

elastic · Aug 10, 2023 · 5d10203 · 5d10203
1 parent a57eafa
commit 5d10203
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/plugins/discover/public/application/main/services/discover_data_state_container.ts b/src/plugins/discover/public/application/main/services/discover_data_state_container.ts
@@ -228,18 +228,18 @@ export function getDataStateContainer({
         useNewFieldsApi: !uiSettings.get(SEARCH_FIELDS_FROM_SOURCE),
       };
 
+      abortController?.abort();
+      abortControllerFetchMore?.abort();
+
       if (options.fetchMore) {
-        abortControllerFetchMore?.abort();
         abortControllerFetchMore = new AbortController();
-
         await fetchMoreDocuments(dataSubjects, {
           abortController: abortControllerFetchMore,
           ...commonFetchDeps,
         });
         return;
       }
 
-      abortController?.abort();
       abortController = new AbortController();
       const prevAutoRefreshDone = autoRefreshDone;