IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

PanelEdit: Fixes issue with repeat options (#96260)

Browse Source
This commit is contained in:
Torkel Ödegaard 2024-11-12 12:01:08 +01:00 committed by GitHub
parent 7090fd5b34
commit 8a1bbe7517
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/dashboard-scene/panel-edit/PanelOptions.tsx
View File

@ -25,7 +25,13 @@ interface Props {
export const PanelOptions = React.memo<Props>(({ panel, searchQuery, listMode, data }) => { export const PanelOptions = React.memo<Props>(({ panel, searchQuery, listMode, data }) => {
const { options, fieldConfig, _pluginInstanceState } = panel.useState(); const { options, fieldConfig, _pluginInstanceState } = panel.useState();
const panelFrameOptions = useMemo(() => getPanelFrameCategory2(panel), [panel]); const layoutElement = panel.parent!;
const layoutElementState = layoutElement.useState();
const panelFrameOptions = useMemo(
() => getPanelFrameCategory2(panel, layoutElementState),
[panel, layoutElementState]
);
const visualizationOptions = useMemo(() => { const visualizationOptions = useMemo(() => {
const plugin = panel.getPlugin(); const plugin = panel.getPlugin();

7
public/app/features/dashboard-scene/panel-edit/getPanelFrameOptions.tsx
View File

@ -1,7 +1,7 @@
import { SelectableValue } from '@grafana/data'; import { SelectableValue } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { SceneTimeRangeLike, VizPanel } from '@grafana/scenes'; import { SceneObjectState, SceneTimeRangeLike, VizPanel } from '@grafana/scenes';
import { DataLinksInlineEditor, Input, TextArea, Switch, RadioButtonGroup, Select } from '@grafana/ui'; import { DataLinksInlineEditor, Input, TextArea, Switch, RadioButtonGroup, Select } from '@grafana/ui';
import { GenAIPanelDescriptionButton } from 'app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton'; import { GenAIPanelDescriptionButton } from 'app/features/dashboard/components/GenAI/GenAIPanelDescriptionButton';
import { GenAIPanelTitleButton } from 'app/features/dashboard/components/GenAI/GenAIPanelTitleButton'; import { GenAIPanelTitleButton } from 'app/features/dashboard/components/GenAI/GenAIPanelTitleButton';
@ -17,7 +17,10 @@ import { vizPanelToPanel, transformSceneToSaveModel } from '../serialization/tra
import { dashboardSceneGraph } from '../utils/dashboardSceneGraph'; import { dashboardSceneGraph } from '../utils/dashboardSceneGraph';
import { getDashboardSceneFor } from '../utils/utils'; import { getDashboardSceneFor } from '../utils/utils';
export function getPanelFrameCategory2(panel: VizPanel): OptionsPaneCategoryDescriptor { export function getPanelFrameCategory2(
panel: VizPanel,
layoutElementState: SceneObjectState
): OptionsPaneCategoryDescriptor {
const descriptor = new OptionsPaneCategoryDescriptor({ const descriptor = new OptionsPaneCategoryDescriptor({
title: 'Panel options', title: 'Panel options',
id: 'Panel options', id: 'Panel options',