From c0881cc97045463e6f17641efe971945009557e9 Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Mon, 27 May 2024 12:43:31 +0100
Subject: [PATCH] Dashboards: Detect unsaved folder change (#88293)

---
 .../components/SaveDashboard/SaveDashboardDrawer.tsx         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
index 1e5c0d5dfdf..efd7839824f 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
@@ -18,6 +18,7 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
   const previous = dashboard.getOriginalDashboard();
   const isProvisioned = dashboard.meta.provisioned;
   const isNew = dashboard.version === 0;
+  const hasUnsavedFolderChange = Boolean(dashboard.meta.hasUnsavedFolderChange);
   const [errorIsHandled, setErrorIsHandled] = useState(false);
 
   const data = useMemo<SaveDashboardData>(() => {
@@ -40,9 +41,9 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
       clone,
       diff,
       diffCount,
-      hasChanges: diffCount > 0 && !isNew,
+      hasChanges: (diffCount > 0 || hasUnsavedFolderChange) && !isNew,
     };
-  }, [dashboard, previous, options, isNew]);
+  }, [dashboard, previous, options, isNew, hasUnsavedFolderChange]);
 
   const [showDiff, setShowDiff] = useState(false);
   const { state, onDashboardSave } = useDashboardSave(isCopy);