From 4ab256c1327549ef34df629892a10bc7478b9398 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 4 Aug 2021 11:25:15 +0100
Subject: [PATCH] [v8.1.x] Fix: Wrong annotations show on a given dashboard.
 Correct annotations show on page refresh. #37160 (#37530)

(cherry picked from commit d48febee7575f8172bd6d615a639b96c9252dd9d)

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
---
 public/app/features/dashboard/state/initDashboard.test.ts | 5 -----
 public/app/features/dashboard/state/initDashboard.ts      | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts
index f08ed3ff1d4..3cfc660e293 100644
--- a/public/app/features/dashboard/state/initDashboard.test.ts
+++ b/public/app/features/dashboard/state/initDashboard.test.ts
@@ -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();
-  });
 });
diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts
index bb5daa3506f..4d144fe81e1 100644
--- a/public/app/features/dashboard/state/initDashboard.ts
+++ b/public/app/features/dashboard/state/initDashboard.ts
@@ -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);