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

DashboardScene: Set maxDataPointsFromWidth to true (#76319)

Browse Source 
* DashboardScene: Set maxDataPointsFromWidth to true

* fix
This commit is contained in:
Torkel Ödegaard 2023-10-11 15:56:10 +02:00 committed by GitHub
parent 05e12e787b
commit bcf850f8bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
View File

@ -13,7 +13,6 @@ import {
SceneGridItem, SceneGridItem,
SceneGridLayout, SceneGridLayout,
SceneGridRow, SceneGridRow,
SceneQueryRunner,
VizPanel, VizPanel,
} from '@grafana/scenes'; } from '@grafana/scenes';
import { DashboardCursorSync, defaultDashboard, Panel, RowPanel, VariableType } from '@grafana/schema'; import { DashboardCursorSync, defaultDashboard, Panel, RowPanel, VariableType } from '@grafana/schema';
@ -26,6 +25,7 @@ import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
import { PanelTimeRange } from '../scene/PanelTimeRange'; import { PanelTimeRange } from '../scene/PanelTimeRange';
import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior'; import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider'; import { ShareQueryDataProvider } from '../scene/ShareQueryDataProvider';
import { getQueryRunnerFor } from '../utils/utils';
import dashboard_to_load1 from './testfiles/dashboard_to_load1.json'; import dashboard_to_load1 from './testfiles/dashboard_to_load1.json';
import repeatingRowsAndPanelsDashboardJson from './testfiles/repeating_rows_and_panels.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.options).toEqual(panel.options);
expect(vizPanel.state.fieldConfig).toEqual(panel.fieldConfig); expect(vizPanel.state.fieldConfig).toEqual(panel.fieldConfig);
expect(vizPanel.state.pluginVersion).toBe('1.0.0'); expect(vizPanel.state.pluginVersion).toBe('1.0.0');
expect(((vizPanel.state.$data as SceneDataTransformer)?.state.$data as SceneQueryRunner).state.queries).toEqual(
panel.targets const queryRunner = getQueryRunnerFor(vizPanel)!;
); expect(queryRunner.state.queries).toEqual(panel.targets);
expect( expect(queryRunner.state.maxDataPoints).toEqual(100);
((vizPanel.state.$data as SceneDataTransformer)?.state.$data as SceneQueryRunner).state.maxDataPoints expect(queryRunner.state.maxDataPointsFromWidth).toEqual(true);
).toEqual(100);
expect((vizPanel.state.$data as SceneDataTransformer)?.state.transformations).toEqual(panel.transformations); expect((vizPanel.state.$data as SceneDataTransformer)?.state.transformations).toEqual(panel.transformations);
}); });

1
public/app/features/dashboard-scene/utils/createPanelDataProvider.ts
View File

@ -25,6 +25,7 @@ export function createPanelDataProvider(panel: PanelModel): SceneDataProvider |
datasource: panel.datasource ?? undefined, datasource: panel.datasource ?? undefined,
queries: panel.targets, queries: panel.targets,
maxDataPoints: panel.maxDataPoints ?? undefined, maxDataPoints: panel.maxDataPoints ?? undefined,
maxDataPointsFromWidth: true,
dataLayerFilter: { dataLayerFilter: {
panelId: panel.id, panelId: panel.id,
}, },