From bcf850f8bf0b8a6b517e5ad25d7f630b8a4aca52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 11 Oct 2023 15:56:10 +0200 Subject: [PATCH] DashboardScene: Set maxDataPointsFromWidth to true (#76319) * DashboardScene: Set maxDataPointsFromWidth to true * fix --- .../transformSaveModelToScene.test.ts | 14 +++++++------- .../utils/createPanelDataProvider.ts | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts index d2f3d6f1992..3e275ffafb8 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts @@ -13,7 +13,6 @@ import { SceneGridItem, SceneGridLayout, SceneGridRow, - SceneQueryRunner, VizPanel, } from '@grafana/scenes'; import { DashboardCursorSync, defaultDashboard, Panel, RowPanel, VariableType } from '@grafana/schema'; @@ -26,6 +25,7 @@ import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem'; import { PanelTimeRange } from '../scene/PanelTimeRange'; import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior'; import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider'; +import { getQueryRunnerFor } from '../utils/utils'; import dashboard_to_load1 from './testfiles/dashboard_to_load1.json'; import repeatingRowsAndPanelsDashboardJson from './testfiles/repeating_rows_and_panels.json'; @@ -280,12 +280,12 @@ describe('transformSaveModelToScene', () => { expect(vizPanel.state.options).toEqual(panel.options); expect(vizPanel.state.fieldConfig).toEqual(panel.fieldConfig); expect(vizPanel.state.pluginVersion).toBe('1.0.0'); - expect(((vizPanel.state.$data as SceneDataTransformer)?.state.$data as SceneQueryRunner).state.queries).toEqual( - panel.targets - ); - expect( - ((vizPanel.state.$data as SceneDataTransformer)?.state.$data as SceneQueryRunner).state.maxDataPoints - ).toEqual(100); + + const queryRunner = getQueryRunnerFor(vizPanel)!; + expect(queryRunner.state.queries).toEqual(panel.targets); + expect(queryRunner.state.maxDataPoints).toEqual(100); + expect(queryRunner.state.maxDataPointsFromWidth).toEqual(true); + expect((vizPanel.state.$data as SceneDataTransformer)?.state.transformations).toEqual(panel.transformations); }); diff --git a/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts b/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts index 1ee8fc2c44e..12a6d721db2 100644 --- a/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts +++ b/public/app/features/dashboard-scene/utils/createPanelDataProvider.ts @@ -25,6 +25,7 @@ export function createPanelDataProvider(panel: PanelModel): SceneDataProvider | datasource: panel.datasource ?? undefined, queries: panel.targets, maxDataPoints: panel.maxDataPoints ?? undefined, + maxDataPointsFromWidth: true, dataLayerFilter: { panelId: panel.id, },