From affe6a40aa3ec4fefd9da51ac1bea7d68bc5c462 Mon Sep 17 00:00:00 2001
From: Ian <5356223+eminemead@users.noreply.github.com>
Date: Thu, 27 Aug 2026 08:16:44 +0800
Subject: [PATCH] fix(chat): inherit explore timezone for charts without
 time_zone

Explain charts omit time_zone and were binned in UTC. Resolve the same explore default as dashboards, keeping an explicit spec zone authoritative and falling back to UTC when no explore is available.
---
 .../core/messages/chart/ChartBlock.svelte     | 47 ++++++++++++++-----
 .../core/messages/chart/chart-block.spec.ts   | 41 ++++++++++++++++
 .../chat/core/messages/chart/chart-block.ts   | 24 +++++++++-
 .../get-rill-default-explore-state.spec.ts    | 37 +++++++++++++++
 .../stores/get-rill-default-explore-state.ts  |  5 +-
 5 files changed, 139 insertions(+), 15 deletions(-)
 create mode 100644 web-common/src/features/chat/core/messages/chart/chart-block.spec.ts
 create mode 100644 web-common/src/features/dashboards/stores/get-rill-default-explore-state.spec.ts

diff --git a/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte b/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
index 73ab0c15fa3e..8c6f51eb852f 100644
--- a/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
+++ b/web-common/src/features/chat/core/messages/chart/ChartBlock.svelte
@@ -5,10 +5,12 @@
 <script lang="ts">
   import { page } from "$app/stores";
   import { ChartContainer } from "@rilldata/web-common/features/components/charts";
+  import { useGetExploresForMetricsView } from "@rilldata/web-common/features/dashboards/selectors";
   import {
     ResourceKind,
     useResource,
   } from "@rilldata/web-common/features/entity-management/resource-selectors";
+  import { selectBestDashboard } from "@rilldata/web-common/features/explore-mappers/explore-validation";
   import { mapResolverExpressionToV1Expression } from "@rilldata/web-common/features/explore-mappers/map-metrics-resolver-query-to-dashboard";
   import { Theme } from "@rilldata/web-common/features/themes/theme";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
@@ -17,7 +19,7 @@
   import { readable } from "svelte/store";
   import type { V1Tool } from "../../../../../runtime-client";
   import ToolCall from "../tools/ToolCall.svelte";
-  import type { ChartBlock } from "./chart-block";
+  import { resolveChartTimeZone, type ChartBlock } from "./chart-block";
 
   export let block: ChartBlock;
   export let tools: V1Tool[] | undefined = undefined;
@@ -33,17 +35,34 @@
 
   $: spec = readable(chartSpec);
 
+  $: explicitTimeZone =
+    typeof chartSpec.time_range?.time_zone === "string" &&
+    chartSpec.time_range.time_zone
+      ? chartSpec.time_range.time_zone
+      : undefined;
+
+  $: exploresQuery = useGetExploresForMetricsView(
+    runtimeClient,
+    chartSpec.metrics_view ?? "",
+  );
+  $: exploreSpec = selectBestDashboard($exploresQuery.data ?? [])?.explore
+    ?.state?.validSpec;
+  $: timeZone = resolveChartTimeZone(explicitTimeZone, exploreSpec);
+  // Wait for explore lookup when the spec omits time_zone so we don't
+  // briefly query UTC and then refetch after inheritance resolves.
+  $: timezoneReady = !!explicitTimeZone || !$exploresQuery.isLoading;
+
   // Extract time range from the chart spec or use defaults
   $: timeRange = chartSpec.time_range
     ? {
         start: chartSpec.time_range.start,
         end: chartSpec.time_range.end,
-        timeZone: chartSpec.time_range.time_zone || "UTC",
+        timeZone,
       }
     : {
         start: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString(),
         end: new Date().toISOString(),
-        timeZone: "UTC",
+        timeZone,
       };
 
   $: comparisonTimeRange = chartSpec.comparison_time_range
@@ -113,16 +132,18 @@
   />
 
   <div class="chart-container">
-    <ChartContainer
-      chartType={block.chartType}
-      {spec}
-      {timeAndFilterStore}
-      {project}
-      theme={$themeQuery?.data}
-      showExploreLink
-      {organization}
-      themeMode="light"
-    />
+    {#if timezoneReady}
+      <ChartContainer
+        chartType={block.chartType}
+        {spec}
+        {timeAndFilterStore}
+        {project}
+        theme={$themeQuery?.data}
+        showExploreLink
+        {organization}
+        themeMode="light"
+      />
+    {/if}
   </div>
 </div>
 
diff --git a/web-common/src/features/chat/core/messages/chart/chart-block.spec.ts b/web-common/src/features/chat/core/messages/chart/chart-block.spec.ts
new file mode 100644
index 000000000000..c8bda8dc93a0
--- /dev/null
+++ b/web-common/src/features/chat/core/messages/chart/chart-block.spec.ts
@@ -0,0 +1,41 @@
+import { resolveChartTimeZone } from "@rilldata/web-common/features/chat/core/messages/chart/chart-block";
+import type { V1ExploreSpec } from "@rilldata/web-common/runtime-client";
+import { describe, expect, it } from "vitest";
+
+describe("resolveChartTimeZone", () => {
+  const shanghaiExplore: V1ExploreSpec = {
+    timeZones: ["Asia/Shanghai", "UTC"],
+  };
+
+  it("keeps an explicit spec time_zone authoritative", () => {
+    expect(resolveChartTimeZone("America/New_York", shanghaiExplore)).toBe(
+      "America/New_York",
+    );
+  });
+
+  it("inherits the explore default when the spec omits time_zone", () => {
+    expect(resolveChartTimeZone(undefined, shanghaiExplore)).toBe(
+      "Asia/Shanghai",
+    );
+  });
+
+  it("inherits defaultPreset.timezone when that is the explore default", () => {
+    const explore: V1ExploreSpec = {
+      defaultPreset: { timezone: "Europe/Paris" },
+      timeZones: ["UTC"],
+    };
+    expect(resolveChartTimeZone(undefined, explore)).toBe("Europe/Paris");
+  });
+
+  it("falls back to UTC when the explore lists no time zones", () => {
+    expect(resolveChartTimeZone(undefined, {})).toBe("UTC");
+  });
+
+  it("falls back to UTC when explore context is absent", () => {
+    expect(resolveChartTimeZone(undefined, undefined)).toBe("UTC");
+  });
+
+  it("does not treat an empty spec time_zone as explicit", () => {
+    expect(resolveChartTimeZone("", shanghaiExplore)).toBe("Asia/Shanghai");
+  });
+});
diff --git a/web-common/src/features/chat/core/messages/chart/chart-block.ts b/web-common/src/features/chat/core/messages/chart/chart-block.ts
index 798a6542365e..237a9fbe6d07 100644
--- a/web-common/src/features/chat/core/messages/chart/chart-block.ts
+++ b/web-common/src/features/chat/core/messages/chart/chart-block.ts
@@ -1,5 +1,10 @@
 import type { ChartType } from "@rilldata/web-common/features/components/charts";
-import type { V1Message } from "@rilldata/web-common/runtime-client";
+import { getDefaultTimeZone } from "@rilldata/web-common/features/dashboards/stores/get-rill-default-explore-state";
+import { getUTCIANA } from "@rilldata/web-common/lib/time/timezone";
+import type {
+  V1ExploreSpec,
+  V1Message,
+} from "@rilldata/web-common/runtime-client";
 import { MessageContentType } from "../../types";
 
 // =============================================================================
@@ -53,6 +58,23 @@ export function createChartBlock(
   };
 }
 
+/**
+ * Resolves the timezone used to bin and label a chat chart.
+ *
+ * Explicit `time_range.time_zone` in the spec is authoritative.
+ * Otherwise inherit the explore default (`defaultPreset.timezone`, else
+ * `timeZones[0]`, else UTC). Missing explore context (embed, still loading,
+ * no dashboard for the metrics view) degrades to UTC.
+ */
+export function resolveChartTimeZone(
+  explicitTimeZone: string | undefined,
+  explore: V1ExploreSpec | undefined,
+): string {
+  if (explicitTimeZone) return explicitTimeZone;
+  if (!explore) return getUTCIANA();
+  return getDefaultTimeZone(explore);
+}
+
 // =============================================================================
 // HELPERS
 // =============================================================================
diff --git a/web-common/src/features/dashboards/stores/get-rill-default-explore-state.spec.ts b/web-common/src/features/dashboards/stores/get-rill-default-explore-state.spec.ts
new file mode 100644
index 000000000000..2140c9aac196
--- /dev/null
+++ b/web-common/src/features/dashboards/stores/get-rill-default-explore-state.spec.ts
@@ -0,0 +1,37 @@
+import { getDefaultTimeZone } from "@rilldata/web-common/features/dashboards/stores/get-rill-default-explore-state";
+import { DEFAULT_TIMEZONES } from "@rilldata/web-common/lib/time/config";
+import { getLocalIANA } from "@rilldata/web-common/lib/time/timezone";
+import type { V1ExploreSpec } from "@rilldata/web-common/runtime-client";
+import { describe, expect, it } from "vitest";
+
+describe("getDefaultTimeZone", () => {
+  it("uses defaultPreset.timezone over timeZones[0]", () => {
+    const explore: V1ExploreSpec = {
+      defaultPreset: { timezone: "Asia/Shanghai" },
+      timeZones: ["UTC", "Asia/Shanghai"],
+    };
+    expect(getDefaultTimeZone(explore)).toBe("Asia/Shanghai");
+  });
+
+  it("uses the first explore time zone when no preset timezone is set", () => {
+    const explore: V1ExploreSpec = {
+      timeZones: ["America/Los_Angeles", "UTC"],
+    };
+    expect(getDefaultTimeZone(explore)).toBe("America/Los_Angeles");
+  });
+
+  it("falls back to DEFAULT_TIMEZONES[0] when the explore lists none", () => {
+    expect(getDefaultTimeZone({})).toBe(DEFAULT_TIMEZONES[0]);
+    expect(DEFAULT_TIMEZONES[0]).toBe("UTC");
+  });
+
+  it("resolves Local to the browser IANA zone", () => {
+    const explore: V1ExploreSpec = { timeZones: ["Local"] };
+    expect(getDefaultTimeZone(explore)).toBe(getLocalIANA());
+  });
+
+  it("falls back to UTC for an invalid IANA zone", () => {
+    const explore: V1ExploreSpec = { timeZones: ["Not/A_Timezone"] };
+    expect(getDefaultTimeZone(explore)).toBe("UTC");
+  });
+});
diff --git a/web-common/src/features/dashboards/stores/get-rill-default-explore-state.ts b/web-common/src/features/dashboards/stores/get-rill-default-explore-state.ts
index 25394b35e76d..4981a4d7e8a5 100644
--- a/web-common/src/features/dashboards/stores/get-rill-default-explore-state.ts
+++ b/web-common/src/features/dashboards/stores/get-rill-default-explore-state.ts
@@ -246,7 +246,10 @@ export function getGrainForRange(
 }
 
 export function getDefaultTimeZone(explore: V1ExploreSpec) {
-  const preference = explore.timeZones?.[0] ?? DEFAULT_TIMEZONES[0];
+  const preference =
+    explore.defaultPreset?.timezone ||
+    explore.timeZones?.[0] ||
+    DEFAULT_TIMEZONES[0];
 
   if (preference === "Local") {
     return getLocalIANA();