From 6e3048c6fa9a6f4ce0bc92ef86a5787df158c772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 5 Feb 2024 11:17:33 +0100
Subject: [PATCH] DashboardScene: move overlay out from each edit view (#81852)

---
 .../dashboard-scene/scene/DashboardSceneRenderer.tsx       | 7 ++++++-
 .../dashboard-scene/settings/DashboardLinksEditView.tsx    | 2 --
 .../dashboard-scene/settings/GeneralSettingsEditView.tsx   | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
index 0f0403d61f9..7dbe7a8eda9 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
@@ -22,7 +22,12 @@ export function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardS
   const navModel = getNavModel(navIndex, 'dashboards/browse');
 
   if (editview) {
-    return <editview.Component model={editview} />;
+    return (
+      <>
+        <editview.Component model={editview} />
+        {overlay && <overlay.Component model={overlay} />}
+      </>
+    );
   }
 
   return (
diff --git a/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx
index c2f570a6e78..eb3c8ecd018 100644
--- a/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx
+++ b/public/app/features/dashboard-scene/settings/DashboardLinksEditView.tsx
@@ -124,7 +124,6 @@ interface EditLinkViewProps {
 function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }: EditLinkViewProps) {
   const parentTab = pageNav.children!.find((p) => p.active)!;
   parentTab.parentItem = pageNav;
-  const { overlay } = dashboard.useState();
 
   const editLinkPageNav = {
     text: 'Edit link',
@@ -135,7 +134,6 @@ function EditLinkView({ pageNav, link, navModel, dashboard, onChange, onGoBack }
     <Page navModel={navModel} pageNav={editLinkPageNav} layout={PageLayoutType.Standard}>
       <NavToolbarActions dashboard={dashboard} />
       <DashboardLinkForm link={link!} onUpdate={onChange} onGoBack={onGoBack} />
-      {overlay && <overlay.Component model={overlay} />}
     </Page>
   );
 }
diff --git a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
index b6fca750747..fc84309fdc9 100644
--- a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
+++ b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
@@ -148,7 +148,7 @@ export class GeneralSettingsEditView
 
   static Component = ({ model }: SceneComponentProps<GeneralSettingsEditView>) => {
     const { navModel, pageNav } = useDashboardEditPageNav(model.getDashboard(), model.getUrlKey());
-    const { title, description, tags, meta, editable, overlay } = model.getDashboard().useState();
+    const { title, description, tags, meta, editable } = model.getDashboard().useState();
     const { sync: graphTooltip } = model.getCursorSync()?.useState() || {};
     const { timeZone, weekStart, UNSAFE_nowDelay: nowDelay } = model.getTimeRange().useState();
     const { intervals } = model.getRefreshPicker()?.useState() || {};
@@ -260,7 +260,6 @@ export class GeneralSettingsEditView
 
           <Box marginTop={3}>{meta.canDelete && <DeleteDashboardButton />}</Box>
         </div>
-        {overlay && <overlay.Component model={overlay} />}
       </Page>
     );
   };