code review

elastic · Jul 5, 2020 · 6e2180d · 6e2180d
1 parent 2d10acf
commit 6e2180d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/plugins/data/common/search/es_search/types.ts b/src/plugins/data/common/search/es_search/types.ts
@@ -22,8 +22,6 @@ import { IKibanaSearchRequest, IKibanaSearchResponse } from '../types';
 export const ES_SEARCH_STRATEGY = 'es';
 
 export type ISearchRequestParams = {
-  body?: any;
-  index?: string;
   trackTotalHits?: boolean;
 } & SearchParams;
 

diff --git a/src/plugins/data/common/utils/abort_utils.ts b/src/plugins/data/common/utils/abort_utils.ts
@@ -39,7 +39,11 @@ export class AbortError extends Error {
 export function toPromise(signal: AbortSignal): Promise<never> {
   return new Promise((resolve, reject) => {
     if (signal.aborted) reject(new AbortError());
-    signal.addEventListener('abort', () => reject(new AbortError()));
+    const abortHandler = () => {
+      signal.removeEventListener('abort', abortHandler);
+      reject(new AbortError());
+    };
+    signal.addEventListener('abort', abortHandler);
   });
 }
 

diff --git a/src/plugins/data/public/search/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor.ts
@@ -18,7 +18,7 @@
  */
 
 import { BehaviorSubject, throwError, timer, Subscription, defer, from, Observable } from 'rxjs';
-import { finalize, filter, catchError } from 'rxjs/operators';
+import { finalize, filter } from 'rxjs/operators';
 import { ApplicationStart, Toast, ToastsStart, CoreStart } from 'kibana/public';
 import { getCombinedSignal, AbortError } from '../../common/utils';
 import { IEsSearchRequest, IEsSearchResponse } from '../../common/search';
@@ -121,7 +121,6 @@ export class SearchInterceptor {
       this.pendingCount$.next(++this.pendingCount);
 
       return this.runSearch(request, combinedSignal).pipe(
-        catchError((e) => throwError(e)),
         finalize(() => {
           this.pendingCount$.next(--this.pendingCount);
           cleanup();