From 6a3e95913ef091bf97492d98ee2db5a68df1fbb2 Mon Sep 17 00:00:00 2001
From: Ivan Ortega Alba <ivanortegaalba@gmail.com>
Date: Wed, 29 Oct 2025 18:15:16 +0100
Subject: [PATCH] Scenes: Fix timezone not being preserved in links (#112879)

* Scenes: Fix timezone not being preserved in links

* Update E2E
---
 .../dashboard-templating.spec.ts              |  9 ++------
 package.json                                  |  4 ++--
 yarn.lock                                     | 22 +++++++++----------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/e2e-playwright/dashboards-suite/dashboard-templating.spec.ts b/e2e-playwright/dashboards-suite/dashboard-templating.spec.ts
index 1b3f8a326fa..ded0abd61ef 100644
--- a/e2e-playwright/dashboards-suite/dashboard-templating.spec.ts
+++ b/e2e-playwright/dashboards-suite/dashboard-templating.spec.ts
@@ -19,9 +19,7 @@ test.describe(
       // Open dashboard global variables and interpolation
       await gotoDashboardPage({ uid: DASHBOARD_UID });
 
-      // Get the actual timezone from the browser context (should be Pacific/Easter due to test.use)
-      const timeZone = await page.evaluate(() => Intl.DateTimeFormat().resolvedOptions().timeZone);
-      const example = `Example: from=now-6h&to=now&timezone=${encodeURIComponent(timeZone)}`;
+      const example = `Example: from=now-6h&to=now&timezone=browser`;
 
       const expectedItems: string[] = [
         '__dashboard = Templating - Global variables and interpolation',
@@ -68,10 +66,7 @@ test.describe(
 
       // Check link interpolation is working correctly
       const exampleLink = page.locator(`a:has-text("${example}")`);
-      await expect(exampleLink).toHaveAttribute(
-        'href',
-        `https://example.com/?from=now-6h&to=now&timezone=${encodeURIComponent(timeZone)}`
-      );
+      await expect(exampleLink).toHaveAttribute('href', `https://example.com/?from=now-6h&to=now&timezone=browser`);
     });
   }
 );
diff --git a/package.json b/package.json
index f0f0e411591..d74e091448d 100644
--- a/package.json
+++ b/package.json
@@ -296,8 +296,8 @@
     "@grafana/plugin-ui": "^0.10.10",
     "@grafana/prometheus": "workspace:*",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "^6.39.8",
-    "@grafana/scenes-react": "^6.39.8",
+    "@grafana/scenes": "^6.40.1",
+    "@grafana/scenes-react": "^6.40.1",
     "@grafana/schema": "workspace:*",
     "@grafana/sql": "workspace:*",
     "@grafana/ui": "workspace:*",
diff --git a/yarn.lock b/yarn.lock
index 6479a1bc630..7480476abed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3555,11 +3555,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes-react@npm:^6.39.8":
-  version: 6.39.8
-  resolution: "@grafana/scenes-react@npm:6.39.8"
+"@grafana/scenes-react@npm:^6.40.1":
+  version: 6.40.1
+  resolution: "@grafana/scenes-react@npm:6.40.1"
   dependencies:
-    "@grafana/scenes": "npm:6.39.8"
+    "@grafana/scenes": "npm:6.40.1"
     lru-cache: "npm:^10.2.2"
     react-use: "npm:^17.4.0"
   peerDependencies:
@@ -3571,7 +3571,7 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/14f94437976890e5f9f2046be67796612273041f45ac76baace296249630e1189b28838ff6346c4463fa3fabf3e55d34ccbc4ff92a5ece83bf04566d52638c87
+  checksum: 10/4515d53609d7b49e234bbc5c3da8131406c20b8ac0e54b1a5ca3ce3d1d42220ff08db65d31c83c9796188ef9d76e9a24fef170badb793a56b44bbabd31302575
   languageName: node
   linkType: hard
 
@@ -3601,9 +3601,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/scenes@npm:6.39.8, @grafana/scenes@npm:^6.39.8":
-  version: 6.39.8
-  resolution: "@grafana/scenes@npm:6.39.8"
+"@grafana/scenes@npm:6.40.1, @grafana/scenes@npm:^6.40.1":
+  version: 6.40.1
+  resolution: "@grafana/scenes@npm:6.40.1"
   dependencies:
     "@floating-ui/react": "npm:^0.26.16"
     "@leeoniya/ufuzzy": "npm:^1.0.16"
@@ -3623,7 +3623,7 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     react-router-dom: ^6.28.0
-  checksum: 10/0a9ce2dfae242c805463867d65f6dbd434490c764f791bb923af47b3042978ffceccbfe52e79d940b89c1e62f86a39992c10b505eb330dcf73005f69f2c2a444
+  checksum: 10/f3f33d58bca9d05cf8d9527564e2f6bd9f164b44531382972c2b1ed0a54f54e29a6130fcab5797cd5dbba673e5d678ae5d1ef9c01ce6fe7895ee0f0c9408bc10
   languageName: node
   linkType: hard
 
@@ -18832,8 +18832,8 @@ __metadata:
     "@grafana/plugin-ui": "npm:^0.10.10"
     "@grafana/prometheus": "workspace:*"
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": "npm:^6.39.8"
-    "@grafana/scenes-react": "npm:^6.39.8"
+    "@grafana/scenes": "npm:^6.40.1"
+    "@grafana/scenes-react": "npm:^6.40.1"
     "@grafana/schema": "workspace:*"
     "@grafana/sql": "workspace:*"
     "@grafana/test-utils": "workspace:*"