From 862305d5cec781d9574de06579fdd6b508c46337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 19 Mar 2024 16:40:49 +0100
Subject: [PATCH] DashboardScene: Only update/replace location for normal
 dashboard route (#84747)

---
 .../dashboard-scene/pages/DashboardScenePageStateManager.ts   | 4 +++-
 public/app/types/dashboard.ts                                 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
index 6fc3934e65e..8b79f18fb4d 100644
--- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
+++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
@@ -80,14 +80,16 @@ export class DashboardScenePageStateManager extends StateManagerBase<DashboardSc
           break;
         default:
           rsp = await dashboardLoaderSrv.loadDashboard('db', '', uid);
+
           if (route === DashboardRoutes.Embedded) {
             rsp.meta.isEmbedded = true;
           }
       }
 
-      if (rsp.meta.url && route !== DashboardRoutes.Embedded) {
+      if (rsp.meta.url && route === DashboardRoutes.Normal) {
         const dashboardUrl = locationUtil.stripBaseFromUrl(rsp.meta.url);
         const currentPath = locationService.getLocation().pathname;
+
         if (dashboardUrl !== currentPath) {
           // Spread current location to persist search params used for navigation
           locationService.replace({
diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboard.ts
index 91f38f13631..828557e4329 100644
--- a/public/app/types/dashboard.ts
+++ b/public/app/types/dashboard.ts
@@ -96,6 +96,7 @@ export enum DashboardRoutes {
   Scripted = 'scripted-dashboard',
   Public = 'public-dashboard',
   Embedded = 'embedded-dashboard',
+  Report = 'report-dashboard',
 }
 
 export enum DashboardInitPhase {