From 47b986606ef3957325e3d5bfd220db0a96c7a0c7 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Fri, 5 Jan 2024 04:32:06 -0800
Subject: [PATCH] DashboardScene: Update tracking behavior (#80057)

---
 .../serialization/transformSaveModelToScene.test.ts    |  2 +-
 .../serialization/transformSaveModelToScene.ts         | 10 ++++------
 2 files changed, 5 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 2afc8afe5d5..b20acc17ba7 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
@@ -138,7 +138,7 @@ describe('transformSaveModelToScene', () => {
 
       const scene = createDashboardSceneFromDashboardModel(oldModel);
 
-      expect(scene.state.$behaviors).toHaveLength(3);
+      expect(scene.state.$behaviors).toHaveLength(4);
       expect(scene.state.$behaviors![1]).toBeInstanceOf(behaviors.CursorSync);
       expect((scene.state.$behaviors![1] as behaviors.CursorSync).state.sync).toEqual(DashboardCursorSync.Crosshair);
     });
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
index 41b76ad3f73..540c76baecd 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
@@ -68,10 +68,7 @@ export function transformSaveModelToScene(rsp: DashboardDTO): DashboardScene {
     autoMigrateOldPanels: false,
   });
 
-  const scene = createDashboardSceneFromDashboardModel(oldModel);
-  scene.state.$behaviors?.push(registerDashboardSceneTracking(oldModel, rsp.dashboard.version));
-
-  return scene;
+  return createDashboardSceneFromDashboardModel(oldModel);
 }
 
 export function createSceneObjectsForPanels(oldPanels: PanelModel[]): SceneGridItemLike[] {
@@ -261,6 +258,7 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
       new behaviors.CursorSync({
         sync: oldModel.graphTooltip,
       }),
+      registerDashboardSceneTracking(oldModel),
       registerPanelInteractionsReporter,
     ],
     $data:
@@ -484,11 +482,11 @@ const getLimitedDescriptionReporter = () => {
   };
 };
 
-function registerDashboardSceneTracking(model: DashboardModel, version?: number) {
+function registerDashboardSceneTracking(model: DashboardModel) {
   return () => {
     const unsetDashboardInteractionsScenesContext = DashboardInteractions.setScenesContext();
 
-    trackDashboardLoaded(model, version);
+    trackDashboardLoaded(model, model.version);
 
     return () => {
       unsetDashboardInteractionsScenesContext();