Added expandedPanelId to dashboard app state

elastic · Sep 28, 2020 · 6e26252 · 6e26252
1 parent ca48c80
commit 6e26252
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -359,10 +359,6 @@ export class DashboardAppController {
         incomingEmbeddable = undefined;
       }
 
-      let expandedPanelId;
-      if (dashboardContainer && !isErrorEmbeddable(dashboardContainer)) {
-        expandedPanelId = dashboardContainer.getInput().expandedPanelId;
-      }
       const shouldShowEditHelp = getShouldShowEditHelp();
       const shouldShowViewHelp = getShouldShowViewHelp();
       const isEmptyInReadonlyMode = shouldShowUnauthorizedEmptyState();
@@ -384,7 +380,7 @@ export class DashboardAppController {
         lastReloadRequestTime,
         title: dashboardStateManager.getTitle(),
         description: dashboardStateManager.getDescription(),
-        expandedPanelId,
+        expandedPanelId: dashboardStateManager.getExpandedPanelId(),
       };
     };
 

diff --git a/src/plugins/dashboard/public/application/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts
@@ -267,6 +267,10 @@ export class DashboardStateManager {
       this.setFullScreenMode(input.isFullScreenMode);
     }
 
+    if (input.expandedPanelId !== this.getExpandedPanelId()) {
+      this.setExpandedPanelId(input.expandedPanelId);
+    }
+
     if (!_.isEqual(input.query, this.getQuery())) {
       this.setQuery(input.query);
     }
@@ -282,6 +286,14 @@ export class DashboardStateManager {
     this.stateContainer.transitions.set('fullScreenMode', fullScreenMode);
   }
 
+  public getExpandedPanelId() {
+    return this.appState.expandedPanelId;
+  }
+
+  public setExpandedPanelId(expandedPanelId?: string) {
+    this.stateContainer.transitions.set('expandedPanelId', expandedPanelId);
+  }
+
   public setFilters(filters: Filter[]) {
     this.stateContainer.transitions.set('filters', filters);
   }

diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
@@ -89,6 +89,7 @@ export interface DashboardAppState {
   query: Query | string;
   filters: Filter[];
   viewMode: ViewMode;
+  expandedPanelId?: string;
   savedQuery?: string;
 }