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 {