fixed getIsDirty, used function for disabling save button (#93328) (#…

…93479)
elastic · Mar 3, 2021 · fd3285d · fd3285d
1 parent c344fe3
commit fd3285d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx
@@ -218,7 +218,7 @@ export function DashboardApp({
     );
 
     dashboardStateManager.registerChangeListener(() => {
-      setUnsavedChanges(dashboardStateManager?.hasUnsavedPanelState());
+      setUnsavedChanges(dashboardStateManager.getIsDirty(data.query.timefilter.timefilter));
       // we aren't checking dirty state because there are changes the container needs to know about
       // that won't make the dashboard "dirty" - like a view mode change.
       triggerRefresh$.next();

diff --git a/src/plugins/dashboard/public/application/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts
@@ -558,7 +558,10 @@ export class DashboardStateManager {
     // Filter bar comparison is done manually (see cleanFiltersForComparison for the reason) and time picker
     // changes are not tracked by the state monitor.
     const hasTimeFilterChanged = timeFilter ? this.getFiltersChanged(timeFilter) : false;
-    return this.getIsEditMode() && (this.isDirty || hasTimeFilterChanged);
+    return (
+      this.hasUnsavedPanelState() ||
+      (this.getIsEditMode() && (this.isDirty || hasTimeFilterChanged))
+    );
   }
 
   public getPanels(): SavedDashboardPanel[] {

diff --git a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
@@ -479,7 +479,7 @@ export function DashboardTopNav({
     const topNav = getTopNavConfig(viewMode, dashboardTopNavActions, {
       hideWriteControls: dashboardCapabilities.hideWriteControls,
       isNewDashboard: !savedDashboard.id,
-      isDirty: dashboardStateManager.isDirty,
+      isDirty: dashboardStateManager.getIsDirty(timefilter),
       isSaveInProgress,
     });