From e0b15bb72ded139545e98fbc6da80e3bb266373f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 3 Apr 2025 12:32:47 +0200
Subject: [PATCH] Dashboard: Hide canvas actions in old grid if
 dashboardNewLayouts is disabled (#103338)

---
 .../scene/layout-default/DefaultGridLayoutManager.tsx          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx
index 82f13c6ffc7..fc2f48fa6f1 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx
@@ -533,6 +533,7 @@ function DefaultGridLayoutManagerRenderer({ model }: SceneComponentProps<Default
   const dashboard = useDashboard(model);
   const { isEditing } = dashboard.useState();
   const styles = useStyles2(getStyles);
+  const showCanvasActions = isEditing && config.featureToggles.dashboardNewLayouts;
 
   // If we are top level layout and we have no children, show empty state
   if (model.parent === dashboard && children.length === 0) {
@@ -544,7 +545,7 @@ function DefaultGridLayoutManagerRenderer({ model }: SceneComponentProps<Default
   return (
     <div className={cx(styles.container, isEditing && styles.containerEditing)}>
       {model.state.grid.Component && <model.state.grid.Component model={model.state.grid} />}
-      {isEditing && (
+      {showCanvasActions && (
         <div className={styles.actionsWrapper}>
           <CanvasGridAddActions layoutManager={model} />
         </div>