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: Fixes issue with dashboard starting with auto refresh set (#93756)

Browse Source
This commit is contained in:
Torkel Ödegaard 2024-09-25 20:14:52 +02:00 committed by GitHub
parent b68d9630fb
commit 57ab354139
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
View File

@ -280,7 +280,7 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
], ],
"preload": false, "preload": false,
"refresh": "", "refresh": "",
"schemaVersion": 39, "schemaVersion": 40,
"tags": [ "tags": [
"templating", "templating",
"gdev", "gdev",
@ -548,7 +548,7 @@ exports[`transformSceneToSaveModel Given a simple scene with custom settings Sho
], ],
"preload": false, "preload": false,
"refresh": "5m", "refresh": "5m",
"schemaVersion": 39, "schemaVersion": 40,
"tags": [ "tags": [
"tag1", "tag1",
"tag2", "tag2",
@ -906,7 +906,7 @@ exports[`transformSceneToSaveModel Given a simple scene with variables Should tr
], ],
"preload": false, "preload": false,
"refresh": "", "refresh": "",
"schemaVersion": 39, "schemaVersion": 40,
"tags": [ "tags": [
"gdev", "gdev",
"graph-ng", "graph-ng",

15
public/app/features/dashboard/state/DashboardMigrator.test.ts
View File

@ -2413,6 +2413,21 @@ describe('when migrating table cell display mode to cell options', () => {
}); });
}); });
describe('when migrating variable refresh to on dashboard load', () => {
let model: DashboardModel;
beforeEach(() => {
model = new DashboardModel({
//@ts-ignore
refresh: false,
});
});
it('should migrate to empty string', () => {
expect(model.refresh).toBe('');
});
});
function createRow(options: any, panelDescriptions: any[]) { function createRow(options: any, panelDescriptions: any[]) {
const PANEL_HEIGHT_STEP = GRID_CELL_HEIGHT + GRID_CELL_VMARGIN; const PANEL_HEIGHT_STEP = GRID_CELL_HEIGHT + GRID_CELL_VMARGIN;
const { collapse, showTitle, title, repeat, repeatIteration } = options; const { collapse, showTitle, title, repeat, repeatIteration } = options;

9
public/app/features/dashboard/state/DashboardMigrator.ts
View File

@ -81,7 +81,7 @@ type PanelSchemeUpgradeHandler = (panel: PanelModel) => PanelModel;
* kinds/dashboard/dashboard_kind.cue * kinds/dashboard/dashboard_kind.cue
* Example PR: #87712 * Example PR: #87712
*/ */
export const DASHBOARD_SCHEMA_VERSION = 39; export const DASHBOARD_SCHEMA_VERSION = 40;
export class DashboardMigrator { export class DashboardMigrator {
dashboard: DashboardModel; dashboard: DashboardModel;
@ -904,6 +904,13 @@ export class DashboardMigrator {
}); });
} }
if (oldVersion < 40) {
// In old ashboards refresh property can be a boolean
if (typeof this.dashboard.refresh !== 'string') {
this.dashboard.refresh = '';
}
}
/** /**
* -==- Add migration here -==- * -==- Add migration here -==-
* Your migration should go below the previous * Your migration should go below the previous