diff --git a/public/app/features/dashboard-scene/conditional-rendering/hooks/useConditionalRenderingEditor.tsx b/public/app/features/dashboard-scene/conditional-rendering/hooks/useConditionalRenderingEditor.tsx index 13416c90cef..8d5f66d2f85 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/hooks/useConditionalRenderingEditor.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/hooks/useConditionalRenderingEditor.tsx @@ -17,7 +17,7 @@ function getPlaceholderConditionalRendering(): ConditionalRenderingGroup { export function useConditionalRenderingEditor( conditionalRendering?: ConditionalRenderingGroup, - disabledText?: string + disabledText?: string | React.ReactElement ): OptionsPaneCategoryDescriptor { const title = t('dashboard.conditional-rendering.root.title', 'Show / hide rules'); 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 09ed968bd72..4d75bb57965 100644 --- a/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx +++ b/public/app/features/dashboard-scene/scene/layout-default/DashboardGridItemEditor.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react'; import { SelectableValue } from '@grafana/data'; -import { t } from '@grafana/i18n'; +import { t, Trans } from '@grafana/i18n'; import { config } from '@grafana/runtime'; import { sceneGraph, SceneGridLayout } from '@grafana/scenes'; -import { RadioButtonGroup, Select } from '@grafana/ui'; +import { RadioButtonGroup, Select, TextLink } from '@grafana/ui'; import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; import { RepeatRowSelect2 } from 'app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect'; @@ -57,10 +57,20 @@ export function getDashboardGridItemOptions(gridItem: DashboardGridItem): Option const conditionalRenderingCategory = useConditionalRenderingEditor( undefined, - t( - 'dashboard.conditional-rendering.editor.not-supported-for-custom-grid', - 'Conditional rendering is not supported for the custom grid layout. Switch to auto grid to use conditional rendering.' - ) +