fix dashboard index pattern race condition

elastic · Jul 22, 2020 · 7b86bef · 7b86bef
1 parent 47eaf60
commit 7b86bef
Showing 1 changed file with 45 additions and 32 deletions.
diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -25,8 +25,8 @@ import React, { useState, ReactElement } from 'react';
 import ReactDOM from 'react-dom';
 import angular from 'angular';
 
-import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, pipe, Subscription } from 'rxjs';
+import { filter, map, mapTo, startWith, switchMap } from 'rxjs/operators';
 import { History } from 'history';
 import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public';
 import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
@@ -253,33 +253,40 @@ export class DashboardAppController {
       navActions[TopNavIds.VISUALIZE]();
     };
 
-    const updateIndexPatterns = (container?: DashboardContainer) => {
-      if (!container || isErrorEmbeddable(container)) {
-        return;
-      }
-
-      let panelIndexPatterns: IndexPattern[] = [];
-      Object.values(container.getChildIds()).forEach((id) => {
-        const embeddableInstance = container.getChild(id);
-        if (isErrorEmbeddable(embeddableInstance)) return;
-        const embeddableIndexPatterns = (embeddableInstance.getOutput() as any).indexPatterns;
-        if (!embeddableIndexPatterns) return;
-        panelIndexPatterns.push(...embeddableIndexPatterns);
-      });
-      panelIndexPatterns = uniqBy(panelIndexPatterns, 'id');
-
-      if (panelIndexPatterns && panelIndexPatterns.length > 0) {
-        $scope.$evalAsync(() => {
-          $scope.indexPatterns = panelIndexPatterns;
+    const updateIndexPatternsOperator = pipe(
+      filter((container: DashboardContainer) => !!container && !isErrorEmbeddable(container)),
+      map((container: DashboardContainer) => {
+        let panelIndexPatterns: IndexPattern[] = [];
+        Object.values(container!.getChildIds()).forEach((id) => {
+          const embeddableInstance = container!.getChild(id);
+          if (isErrorEmbeddable(embeddableInstance)) return;
+          const embeddableIndexPatterns = (embeddableInstance.getOutput() as any).indexPatterns;
+          if (!embeddableIndexPatterns) return;
+          panelIndexPatterns.push(...embeddableIndexPatterns);
         });
-      } else {
-        indexPatterns.getDefault().then((defaultIndexPattern) => {
-          $scope.$evalAsync(() => {
-            $scope.indexPatterns = [defaultIndexPattern as IndexPattern];
-          });
+        panelIndexPatterns = uniqBy(panelIndexPatterns, 'id');
+        return panelIndexPatterns;
+      }),
+      switchMap((panelIndexPatterns: IndexPattern[]) => {
+        return new Observable((observer) => {
+          if (panelIndexPatterns && panelIndexPatterns.length > 0) {
+            $scope.$evalAsync(() => {
+              if (observer.closed) return;
+              $scope.indexPatterns = panelIndexPatterns;
+              observer.complete();
+            });
+          } else {
+            indexPatterns.getDefault().then((defaultIndexPattern) => {
+              if (observer.closed) return;
+              $scope.$evalAsync(() => {
+                if (observer.closed) return;
+                $scope.indexPatterns = [defaultIndexPattern as IndexPattern];
+              });
+            });
+          }
         });
-      }
-    };
+      })
+    );
 
     const getEmptyScreenProps = (
       shouldShowEditHelp: boolean,
@@ -384,11 +391,17 @@ export class DashboardAppController {
               ) : null;
             };
 
-            updateIndexPatterns(dashboardContainer);
-
-            outputSubscription = dashboardContainer.getOutput$().subscribe(() => {
-              updateIndexPatterns(dashboardContainer);
-            });
+            outputSubscription = new Subscription();
+            outputSubscription.add(
+              dashboardContainer
+                .getOutput$()
+                .pipe(
+                  mapTo(dashboardContainer),
+                  startWith(dashboardContainer), // to trigger initial index pattern update
+                  updateIndexPatternsOperator
+                )
+                .subscribe()
+            );
 
             inputSubscription = dashboardContainer.getInput$().subscribe(() => {
               let dirty = false;