From c4f6e3c710eec8f2cfee7591251b86f42bca8bf0 Mon Sep 17 00:00:00 2001
From: Bogdan Matei <bogdan.matei@grafana.com>
Date: Mon, 1 Sep 2025 13:14:58 +0300
Subject: [PATCH] Dashboard: Only show Conditional Rendering on Custom Grid
 when FF is enabled (#110390)

---
 .../scene/layout-default/DashboardGridItemEditor.tsx     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
index d51b58d52dd..fcbe1c9d193 100644
--- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
+import { config } from '@grafana/runtime';
 import { sceneGraph, SceneGridLayout } from '@grafana/scenes';
 import { RadioButtonGroup, Select } from '@grafana/ui';
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
@@ -62,7 +63,13 @@ export function getDashboardGridItemOptions(gridItem: DashboardGridItem): Option
     )
   );
 
-  return [repeatCategory, conditionalRenderingCategory];
+  const options = [repeatCategory];
+
+  if (config.featureToggles.dashboardNewLayouts) {
+    options.push(conditionalRenderingCategory);
+  }
+
+  return options;
 }
 
 interface OptionComponentProps {