Fixing abort error on dashboard (elastic#61279)

ppisljar · Mar 26, 2020 · d9d725f · d9d725f
1 parent b9e6ed4
commit d9d725f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/...acy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts b/...acy/core_plugins/visualizations/public/np_ready/public/embeddable/visualize_embeddable.ts
@@ -91,6 +91,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   private domNode: any;
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
   private autoRefreshFetchSubscription: Subscription;
+  private abortController?: AbortController;
 
   constructor(
     timefilter: TimefilterContract,
@@ -327,9 +328,14 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       },
       uiState: this.vis.uiState,
     };
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+    this.abortController = new AbortController();
     this.expression = await buildPipeline(this.vis, {
       timefilter: this.timefilter,
       timeRange: this.timeRange,
+      abortSignal: this.abortController!.signal,
     });
 
     if (this.handler) {

diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -490,6 +490,7 @@ export const buildPipeline = async (
   params: {
     timefilter: TimefilterContract;
     timeRange?: any;
+    abortSignal?: AbortSignal;
   }
 ) => {
   const { indexPattern, searchSource } = vis.data;

diff --git a/src/plugins/expressions/public/render_error_handler.ts b/src/plugins/expressions/public/render_error_handler.ts
@@ -27,6 +27,11 @@ export const renderErrorHandler: RenderErrorHandlerFnType = (
   error: RenderError,
   handlers: IInterpreterRenderHandlers
 ) => {
+  if (error.name === 'AbortError') {
+    handlers.done();
+    return;
+  }
+
   getNotifications().toasts.addError(error, {
     title: i18n.translate('expressions.defaultErrorRenderer.errorTitle', {
       defaultMessage: 'Error in visualisation',