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

Fix: Wrong annotations show on a given dashboard. Correct annotations show on page refresh. #37160 (#37496)

Browse Source
This commit is contained in:
Maria Alexandra 2021-08-04 11:57:27 +02:00 committed by GitHub
parent cdcccfcc53
commit d48febee75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/dashboard/state/initDashboard.test.ts
View File

@ -287,9 +287,4 @@ describeInitScenario('Initializing previously canceled dashboard initialization'
expect(getTimeSrv().init).toBeCalled();
expect(getDashboardQueryRunner().run).toBeCalled();
});
it('Should not initialize other services', () => {
expect(getDashboardSrv().setCurrent).not.toBeCalled();
expect(keybindingSrv.setupDashboardBindings).not.toBeCalled();
});
});

6
public/app/features/dashboard/state/initDashboard.ts
View File

@ -151,6 +151,9 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
const timeSrv: TimeSrv = getTimeSrv();
const dashboardSrv: DashboardSrv = getDashboardSrv();
// legacy srv state, we need this value updated for built-in annotations
dashboardSrv.setCurrent(dashboard);
timeSrv.init(dashboard);
const runner = createDashboardQueryRunner({ dashboard, timeSrv });
runner.run({ dashboard, range: timeSrv.timeRange() });
@ -194,9 +197,6 @@ export function initDashboard(args: InitDashboardArgs): ThunkResult<void> {
updateQueriesWhenComingFromExplore(dispatch, dashboard, panelId, queries);
}
// legacy srv state
dashboardSrv.setCurrent(dashboard);
// send open dashboard event
if (args.routeName !== DashboardRoutes.New) {
emitDashboardViewEvent(dashboard);