Made dashboard retain viewmode state in session. This means filters a…

…nd query will be kept over reloads and navigations
elastic · Sep 15, 2021 · a24e286 · a24e286
1 parent d987327
commit a24e286
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -237,27 +237,25 @@ export const useDashboardAppState = ({
         .pipe(debounceTime(DashboardConstants.CHANGE_CHECK_DEBOUNCE))
         .subscribe((states) => {
           const [lastSaved, current] = states;
-          const unsavedChanges =
-            current.viewMode === ViewMode.EDIT ? diffDashboardState(lastSaved, current) : {};
-
-          let savedTimeChanged = false;
+          const unsavedChanges = diffDashboardState(lastSaved, current);
+
+          const savedTimeChanged =
+            lastSaved.timeRestore &&
+            !areTimeRangesEqual(
+              {
+                from: savedDashboard?.timeFrom,
+                to: savedDashboard?.timeTo,
+              },
+              timefilter.getTime()
+            );
 
           /**
-           * changes to the time filter should only be considered 'unsaved changes' when
+           * changes to the dashboard should only be considered 'unsaved changes' when
            * editing the dashboard
            */
-          if (current.viewMode === ViewMode.EDIT) {
-            savedTimeChanged =
-              lastSaved.timeRestore &&
-              !areTimeRangesEqual(
-                {
-                  from: savedDashboard?.timeFrom,
-                  to: savedDashboard?.timeTo,
-                },
-                timefilter.getTime()
-              );
-          }
-          const hasUnsavedChanges = Object.keys(unsavedChanges).length > 0 || savedTimeChanged;
+          const hasUnsavedChanges =
+            current.viewMode === ViewMode.EDIT &&
+            (Object.keys(unsavedChanges).length > 0 || savedTimeChanged);
           setDashboardAppState((s) => ({ ...s, hasUnsavedChanges }));
 
           unsavedChanges.viewMode = current.viewMode; // always push view mode into session store.

diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_storage.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_storage.ts
@@ -11,6 +11,7 @@ import { Storage } from '../../services/kibana_utils';
 import { NotificationsStart } from '../../services/core';
 import { panelStorageErrorStrings } from '../../dashboard_strings';
 import { DashboardState } from '../../types';
+import { ViewMode } from '../../services/embeddable';
 
 export const DASHBOARD_PANELS_UNSAVED_ID = 'unsavedDashboard';
 const DASHBOARD_PANELS_SESSION_KEY = 'dashboardStateManagerPanels';
@@ -69,6 +70,7 @@ export class DashboardSessionStorage {
       const dashboardsWithUnsavedChanges: string[] = [];
       Object.keys(dashboardStatesInSpace).map((dashboardId) => {
         if (
+          dashboardStatesInSpace[dashboardId].viewMode === ViewMode.EDIT &&
           Object.keys(dashboardStatesInSpace[dashboardId]).some(
             (stateKey) => stateKey !== 'viewMode'
           )

diff --git a/test/functional/apps/dashboard/dashboard_filtering.ts b/test/functional/apps/dashboard/dashboard_filtering.ts
@@ -28,8 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardPanelActions = getService('dashboardPanelActions');
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
 
-  // Failing: See https://github.com/elastic/kibana/issues/92522
-  describe.skip('dashboard filtering', function () {
+  describe('dashboard filtering', function () {
     this.tags('includeFirefox');
 
     const populateDashboard = async () => {

diff --git a/test/functional/apps/dashboard/dashboard_unsaved_state.ts b/test/functional/apps/dashboard/dashboard_unsaved_state.ts
@@ -20,8 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   let originalPanelCount = 0;
   let unsavedPanelCount = 0;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/91191
-  describe.skip('dashboard unsaved panels', () => {
+  describe('dashboard unsaved panels', () => {
     before(async () => {
       await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({