Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix axis labels for timezone naive strings (#80121)

Kevin Kelleherce55f0cdc65c
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Long_Range.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Long_Range.png
index 1668f194c27..b8f3231c8b1 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Long_Range.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Long_Range.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Short_Range.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Short_Range.png
index b6dbd3695a9..d27f005534c 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Short_Range.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Ticks_Native_Week_With_Gap_Short_Range.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Time_X_Scale_Two_Bars_Without_Total.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Time_X_Scale_Two_Bars_Without_Total.png
index d7d8f800555..7c2cae955fb 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Time_X_Scale_Two_Bars_Without_Total.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Time_X_Scale_Two_Bars_Without_Total.png differ
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Two_Bars_With_Total.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Two_Bars_With_Total.png
index 34e13055be9..6ee9fc14fde 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Two_Bars_With_Total.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_WaterfallChart_Two_Bars_With_Total.png differ
diff --git a/frontend/src/metabase/utils/time-dayjs.ts b/frontend/src/metabase/utils/time-dayjs.ts
index 14531f9650e..04790557607 100644
--- a/frontend/src/metabase/utils/time-dayjs.ts
+++ b/frontend/src/metabase/utils/time-dayjs.ts
@@ -62,8 +62,13 @@ const NUMERIC_UNIT_FORMATS: Record<string, (value: number) => Dayjs> = {
year: (value: number) => dayjs().year(value).startOf("year"),
};
-// only attempt to parse the timezone if we're sure we have one (either Z or ±hh:mm or +-hhmm)
-// moment normally interprets the DD in YYYY-MM-DD as an offset :-/
+// either Z or ±hh:mm or ±hhmm
+const EXPLICIT_TIMEZONE_PATTERN = /(Z|[+-]\d\d:?\d\d)$/;
+
+export function hasExplicitTimezone(value: string): boolean {
+ return EXPLICIT_TIMEZONE_PATTERN.test(value);
+}
+
export function parseTimestamp(
value: any,
unit: DatetimeUnit | null = null,
@@ -91,7 +96,7 @@ export function parseTimestamp(
} else {
result = dayjs.utc(value);
}
- } else if (typeof value === "string" && /(Z|[+-]\d\d:?\d\d)$/.test(value)) {
+ } else if (typeof value === "string" && hasExplicitTimezone(value)) {
result = dayjs.parseZone(value);
} else if (unit && unit in TEXT_UNIT_FORMATS && typeof value === "string") {
// Unjustified type cast. FIXME
diff --git a/frontend/src/metabase/utils/time-dayjs.unit.spec.ts b/frontend/src/metabase/utils/time-dayjs.unit.spec.ts
index b93b0c6f5f3..a695e236690 100644
--- a/frontend/src/metabase/utils/time-dayjs.unit.spec.ts
+++ b/frontend/src/metabase/utils/time-dayjs.unit.spec.ts
@@ -1,11 +1,29 @@
import { dayjs } from "metabase/dayjs";
import {
+ hasExplicitTimezone,
parseTime,
parseTimestamp,
timezoneToUTCOffset,
} from "metabase/utils/time-dayjs";
describe("time-dayjs", () => {
+ describe("hasExplicitTimezone", () => {
+ it.each([
+ ["2015-01-01T00:00:00Z", true],
+ ["2015-01-01T00:00:00.000Z", true],
+ ["2015-01-01T00:00:00+09:00", true],
+ ["2015-01-01T00:00:00+0900", true],
+ ["2015-01-01T00:00:00-08:00", true],
+ ["2015-01-01T00:00:00-0800", true],
+ ["2015-01-01", false],
+ ["2015-01-01 00:00:00", false],
+ ["2015-01-01T00:00:00", false],
+ ["2019-W33", false],
+ ])("%s → %s", (value, expected) => {
+ expect(hasExplicitTimezone(value)).toBe(expected);
+ });
+ });
+
describe("parseTimestamp", () => {
afterEach(() => {
dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
index f800fe655f4..b4231edd70f 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
@@ -32,6 +32,7 @@ import type {
} from "metabase/visualizations/echarts/cartesian/model/types";
import {
computeTimeseriesDataInterval,
+ ensureResultsTimezone,
getTimeSeriesIntervalDuration,
getTimezoneOrOffset,
minTimeseriesUnit,
@@ -714,18 +715,19 @@ export function getTimeSeriesXAxisModel(
const xValues = dataset.map((datum) => datum[X_AXIS_DATA_KEY]);
const dimensionColumn = dimensionModel.column;
+ const { timezone, offsetMinutes } = getTimezoneOrOffset(
+ rawSeries,
+ showWarning,
+ );
+ const localize = (value: RowValue) =>
+ ensureResultsTimezone(value, timezone, offsetMinutes);
+
// Based on the actual data compute interval, range, etc.
const timeSeriesInfo = getTimeSeriesXAxisInfo(
- xValues,
- rawSeries,
+ xValues.map(localize), // need to localize so `range` is correct for naive strings
dimensionModel,
- showWarning,
);
- const {
- interval: dataTimeSeriesInterval,
- timezone,
- offsetMinutes,
- } = timeSeriesInfo;
+ const { interval: dataTimeSeriesInterval } = timeSeriesInfo;
const formatter = (value: RowValue, unit?: DateTimeAbsoluteUnit) => {
const formatUnit =
unit ?? getFormatUnit(dimensionColumn, dataTimeSeriesInterval);
@@ -747,7 +749,7 @@ export function getTimeSeriesXAxisModel(
// Although the dataset values are placed in the right place, ticks would look shifted based on where the user is from.
// So as a workaround we enable useUTC option and shift all dates like they are in UTC timezone.
const toEChartsAxisValue = (value: RowValue) => {
- const date = tryGetDate(value);
+ const date = tryGetDate(localize(value));
if (!date) {
return null;
}
@@ -769,6 +771,8 @@ export function getTimeSeriesXAxisModel(
axisType: "time",
toEChartsAxisValue,
fromEChartsAxisValue,
+ timezone,
+ offsetMinutes,
...timeSeriesInfo,
};
}
@@ -949,9 +953,7 @@ const DAY_INTERVAL: TimeSeriesInterval = {
function getTimeSeriesXAxisInfo(
xValues: RowValue[],
- rawSeries: RawSeries,
dimensionModel: DimensionModel,
- showWarning?: ShowWarning,
) {
// We need three pieces of information to define a timeseries range:
// 1. interval - it's really the "unit": month, day, etc
@@ -964,10 +966,6 @@ function getTimeSeriesXAxisInfo(
)
.filter(isNotNull),
);
- const { timezone, offsetMinutes } = getTimezoneOrOffset(
- rawSeries,
- showWarning,
- );
const interval = computeTimeseriesDataInterval(xValues, unit) ?? DAY_INTERVAL;
const range = getXAxisDateRangeFromSortedXAxisValues(xValues);
@@ -998,7 +996,7 @@ function getTimeSeriesXAxisInfo(
);
}
- return { interval, timezone, offsetMinutes, intervalsCount, range, unit };
+ return { interval, intervalsCount, range, unit };
}
export function getScaledMinAndMax(
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
index 9735e05f484..89bd8c5ab9a 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
@@ -12,7 +12,12 @@ import {
getXAxisDateRangeFromSortedXAxisValues,
getXAxisModel,
} from "./axis";
-import type { DimensionModel, SeriesExtents } from "./types";
+import { isTimeSeriesAxis } from "./guards";
+import type {
+ DimensionModel,
+ SeriesExtents,
+ TimeSeriesXAxisModel,
+} from "./types";
describe("computeSplit", () => {
const extents: SeriesExtents = {
@@ -87,6 +92,77 @@ describe("getXAxisModel", () => {
expect(model.formatter("2022-04-01T00:00:00Z")).toBe("April 2022");
});
+
+ describe("timeseries toEChartsAxisValue", () => {
+ const dateColumn = createMockDatetimeColumn({ unit: "hour" });
+
+ const dimensionModel: DimensionModel = {
+ column: dateColumn,
+ columnIndex: 0,
+ columnByCardId: { 1: dateColumn },
+ };
+
+ const settings = createMockVisualizationSettings({
+ "graph.x_axis.scale": "timeseries",
+ });
+
+ const getTimeSeriesModel = (resultsTimezone: string) => {
+ const dataset = [
+ { [X_AXIS_DATA_KEY]: "2025-03-30 00:00:00", "0": 10 },
+ { [X_AXIS_DATA_KEY]: "2025-03-30 01:00:00", "0": 11 },
+ ];
+ const rawSeries = [
+ createMockSingleSeries(
+ { display: "line" },
+ { data: { results_timezone: resultsTimezone } },
+ ),
+ ];
+ // graph.x_axis.scale is timeseries, so the model should be a TimeSeriesXAxisModel
+ const model = getXAxisModel(
+ dimensionModel,
+ rawSeries,
+ dataset,
+ settings,
+ ) as TimeSeriesXAxisModel;
+ expect(isTimeSeriesAxis(model)).toBe(true);
+ return model;
+ };
+
+ it("should preserve timezone-naive datetime wall clock as fake UTC under a named results_timezone (#56580)", () => {
+ const model = getTimeSeriesModel("US/Samoa");
+ expect(model.toEChartsAxisValue("2025-03-30 00:00:00")).toBe(
+ "2025-03-30T00:00:00Z",
+ );
+ });
+
+ it("should preserve timezone-naive date-only wall clock as fake UTC under a named results_timezone (#56580)", () => {
+ const model = getTimeSeriesModel("US/Samoa");
+ expect(model.toEChartsAxisValue("2025-04-01")).toBe(
+ "2025-04-01T00:00:00Z",
+ );
+ });
+
+ it("should preserve timezone-naive wall clock under an offset results_timezone (#56580)", () => {
+ const model = getTimeSeriesModel("+08:00");
+ expect(model.toEChartsAxisValue("2025-03-30 00:00:00")).toBe(
+ "2025-03-30T08:00:00+08:00",
+ );
+ });
+
+ it("should still shift timezone-aware values into fake UTC using a named results_timezone", () => {
+ const model = getTimeSeriesModel("US/Mountain");
+ expect(model.toEChartsAxisValue("2025-03-30T00:00:00-06:00")).toBe(
+ "2025-03-30T00:00:00Z",
+ );
+ });
+
+ it("should still shift timezone-aware values when results_timezone is an offset", () => {
+ const model = getTimeSeriesModel("+08:00");
+ expect(model.toEChartsAxisValue("2025-03-30T00:00:00+08:00")).toBe(
+ "2025-03-30T08:00:00+08:00",
+ );
+ });
+ });
});
describe("getXAxisDateRangeFromSortedXAxisValues", () => {
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/ticks.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/ticks.unit.spec.ts
new file mode 100644
index 00000000000..97a7b9a3b74
--- /dev/null
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/ticks.unit.spec.ts
@@ -0,0 +1,65 @@
+import { createMockChartLayout } from "__support__/echarts";
+import { dayjs } from "metabase/dayjs";
+import { X_AXIS_DATA_KEY } from "metabase/visualizations/echarts/cartesian/constants/dataset";
+import { getXAxisModel } from "metabase/visualizations/echarts/cartesian/model/axis";
+import { isTimeSeriesAxis } from "metabase/visualizations/echarts/cartesian/model/guards";
+import type {
+ DimensionModel,
+ TimeSeriesXAxisModel,
+} from "metabase/visualizations/echarts/cartesian/model/types";
+import {
+ getPadding,
+ getTicksOptions,
+} from "metabase/visualizations/echarts/cartesian/option/ticks";
+import { getTimeSeriesIntervalDuration } from "metabase/visualizations/echarts/cartesian/utils/timeseries";
+import {
+ createMockDatetimeColumn,
+ createMockSingleSeries,
+ createMockVisualizationSettings,
+} from "metabase-types/api/mocks";
+
+describe("getTicksOptions", () => {
+ it("should align padded domain with timezone-naive date-only points under US/Samoa (#56580)", () => {
+ const dateColumn = createMockDatetimeColumn({ unit: "day" });
+ const dimensionModel: DimensionModel = {
+ column: dateColumn,
+ columnIndex: 0,
+ columnByCardId: { 1: dateColumn },
+ };
+ const first = "2025-03-30";
+ const last = "2025-04-01";
+ const dataset = [
+ { [X_AXIS_DATA_KEY]: first, "0": 10 },
+ { [X_AXIS_DATA_KEY]: last, "0": 20 },
+ ];
+ const rawSeries = [
+ createMockSingleSeries(
+ { display: "line" },
+ { data: { results_timezone: "US/Samoa" } },
+ ),
+ ];
+ const settings = createMockVisualizationSettings({
+ "graph.x_axis.scale": "timeseries",
+ });
+
+ // graph.x_axis.scale is timeseries, so the model should be a TimeSeriesXAxisModel
+ const model = getXAxisModel(
+ dimensionModel,
+ rawSeries,
+ dataset,
+ settings,
+ ) as TimeSeriesXAxisModel;
+ expect(isTimeSeriesAxis(model)).toBe(true);
+
+ const { xDomainPadded } = getTicksOptions(model, createMockChartLayout());
+ const padding = getPadding(model.intervalsCount);
+ const intervalMs = getTimeSeriesIntervalDuration(model.interval);
+ const unpaddedMin = xDomainPadded[0] + intervalMs * padding;
+ const unpaddedMax = xDomainPadded[1] - intervalMs * padding;
+
+ expect(unpaddedMin).toBe(dayjs(model.toEChartsAxisValue(first)).valueOf());
+ expect(unpaddedMax).toBe(dayjs(model.toEChartsAxisValue(last)).valueOf());
+ expect(model.toEChartsAxisValue(first)).toBe("2025-03-30T00:00:00Z");
+ expect(model.toEChartsAxisValue(last)).toBe("2025-04-01T00:00:00Z");
+ });
+});
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
index 6fa26a00310..74dc7209513 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.ts
@@ -8,6 +8,7 @@ import type {
TimeSeriesAxisFormatter,
TimeSeriesInterval,
} from "metabase/visualizations/echarts/cartesian/model/types";
+import { isTimezoneNaiveWallClock } from "metabase/visualizations/lib/date-validation";
import {
multipleTimezoneWarning,
unexpectedTimezoneWarning,
@@ -31,6 +32,33 @@ export const tryGetDate = (rowValue: RowValue): Dayjs | null => {
return date.isValid() ? date : null;
};
+/**
+ * Attach results_timezone to timezone-naive wall-clock strings so they parse as
+ * the intended local instant. Aware strings and non-strings are returned unchanged.
+ */
+export function ensureResultsTimezone(
+ value: RowValue,
+ timezone?: string,
+ offsetMinutes?: number,
+): RowValue {
+ if (typeof value !== "string" || !isTimezoneNaiveWallClock(value)) {
+ return value;
+ }
+
+ if (offsetMinutes != null) {
+ return dayjs
+ .utc(value)
+ .utcOffset(offsetMinutes, true)
+ .format("YYYY-MM-DDTHH:mm:ssZ");
+ }
+
+ if (timezone) {
+ return dayjs.tz(value, timezone).format("YYYY-MM-DDTHH:mm:ssZ");
+ }
+
+ return dayjs.utc(value).format("YYYY-MM-DDTHH:mm:ss[Z]");
+}
+
export const msToDays = (ms: number) => ms / (24 * 60 * 60 * 1000);
// mostly matches
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
index 4c1bedff088..ddd9a77d753 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/utils/timeseries.unit.spec.ts
@@ -1,5 +1,5 @@
+import { createMockChartLayout } from "__support__/echarts";
import { dayjs } from "metabase/dayjs";
-import type { ChartLayout } from "metabase/visualizations/echarts/cartesian/layout/types";
import type {
CartesianChartDateTimeAbsoluteUnit,
TimeSeriesInterval,
@@ -7,6 +7,7 @@ import type {
import {
computeTimeseriesDataInterval,
computeTimeseriesTicksInterval,
+ ensureResultsTimezone,
expectedTickCount,
getTimezoneOrOffset,
normalizeDate,
@@ -26,30 +27,6 @@ import {
import { getVisualizationTransformed } from "../../../lib/registry";
-function createMockChartMeasurements(
- outerWidth: number,
- xTickWidth: number,
-): ChartLayout {
- return {
- boundaryWidth: 0,
- ticksDimensions: {
- getXTickWidth: () => xTickWidth,
- yTicksWidthLeft: 0,
- yTicksWidthRight: 0,
- xTicksHeight: 0,
- xTickWidthCap: 0,
- firstXTickWidth: 0,
- lastXTickWidth: 0,
- },
- padding: { top: 0, bottom: 0, left: 0, right: 0 },
- bounds: { top: 0, bottom: 0, left: 0, right: 0 },
- outerHeight: 0,
- outerWidth,
- axisEnabledSetting: true,
- panelGap: 0,
- };
-}
-
registerVisualizations();
function computeDefinedTimeseriesDataInterval(
@@ -430,7 +407,10 @@ describe("visualization.lib.timeseries", () => {
const { unit, count } = computeTimeseriesTicksInterval(
xDomain,
xInterval,
- createMockChartMeasurements(outerWidth, xTickWidth),
+ createMockChartLayout({
+ outerWidth,
+ ticksDimensions: { getXTickWidth: () => xTickWidth },
+ }),
mockFormatter,
);
expect(unit).toBe(expectedUnit);
@@ -440,6 +420,56 @@ describe("visualization.lib.timeseries", () => {
);
});
+ describe("ensureResultsTimezone", () => {
+ it("should leave timezone-aware strings unchanged", () => {
+ expect(ensureResultsTimezone("2025-03-30T00:00:00Z", "US/Samoa")).toBe(
+ "2025-03-30T00:00:00Z",
+ );
+ expect(
+ ensureResultsTimezone("2025-03-30T00:00:00+08:00", "US/Samoa"),
+ ).toBe("2025-03-30T00:00:00+08:00");
+ });
+
+ it("should leave week and ordinal dates unchanged", () => {
+ expect(ensureResultsTimezone("2019-W33", "US/Samoa")).toBe("2019-W33");
+ expect(ensureResultsTimezone("2024-365", "US/Samoa")).toBe("2024-365");
+ });
+
+ it("should leave non-strings unchanged", () => {
+ expect(ensureResultsTimezone(null, "US/Samoa")).toBe(null);
+ expect(ensureResultsTimezone(1711843200000, "US/Samoa")).toBe(
+ 1711843200000,
+ );
+ });
+
+ it("should attach a named results_timezone while preserving wall clock", () => {
+ expect(ensureResultsTimezone("2025-04-01", "US/Samoa")).toBe(
+ "2025-04-01T00:00:00-11:00",
+ );
+ expect(ensureResultsTimezone("2025-03-30 00:00:00", "US/Samoa")).toBe(
+ "2025-03-30T00:00:00-11:00",
+ );
+ expect(ensureResultsTimezone("2025-03-30T00:00:00", "US/Samoa")).toBe(
+ "2025-03-30T00:00:00-11:00",
+ );
+ expect(ensureResultsTimezone("20250401", "US/Samoa")).toBe(
+ "2025-04-01T00:00:00-11:00",
+ );
+ });
+
+ it("should attach an offset results_timezone while preserving wall clock", () => {
+ expect(ensureResultsTimezone("2025-03-30 00:00:00", undefined, 480)).toBe(
+ "2025-03-30T00:00:00+08:00",
+ );
+ });
+
+ it("should fall back to UTC when neither timezone nor offset is provided", () => {
+ expect(ensureResultsTimezone("2025-03-30 00:00:00")).toBe(
+ "2025-03-30T00:00:00Z",
+ );
+ });
+ });
+
describe("getTimezoneOrOffset", () => {
const showWarningMock = jest.fn();
const createTimezoneSeries = ({
diff --git a/frontend/src/metabase/visualizations/lib/date-validation.ts b/frontend/src/metabase/visualizations/lib/date-validation.ts
index c1ba73d33e4..9dba9fa9d37 100644
--- a/frontend/src/metabase/visualizations/lib/date-validation.ts
+++ b/frontend/src/metabase/visualizations/lib/date-validation.ts
@@ -1,5 +1,7 @@
// based on https://github.com/Garbee/Iso8601/blob/main/src/index.ts
+import { hasExplicitTimezone } from "metabase/utils/time-dayjs";
+
/**
* Years are represented from the gregorian calendar only
* as 0000 to 9999. (If anyone has to worry about after 9999
@@ -155,3 +157,20 @@ export function isValidIso8601(value: string | number): boolean {
compactDatePattern.test(stringValue)
);
}
+
+/**
+ * Wall-clock date/datetime strings without a timezone designator.
+ * Excludes week (`2019-W33`) and ordinal (`2024-365`) forms
+ */
+export function isTimezoneNaiveWallClock(value: string): boolean {
+ if (hasExplicitTimezone(value)) {
+ return false;
+ }
+
+ return (
+ iso8601Date.test(value) ||
+ isIso8601DateTime.test(value) ||
+ isSpaceSeparatedDateTime.test(value) ||
+ compactDatePattern.test(value)
+ );
+}
diff --git a/frontend/src/metabase/visualizations/lib/date-validation.unit.spec.ts b/frontend/src/metabase/visualizations/lib/date-validation.unit.spec.ts
index 511d7833a91..750344bb52e 100644
--- a/frontend/src/metabase/visualizations/lib/date-validation.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/lib/date-validation.unit.spec.ts
@@ -1,4 +1,23 @@
-import { isValidIso8601 } from "metabase/visualizations/lib/date-validation";
+import {
+ isTimezoneNaiveWallClock,
+ isValidIso8601,
+} from "metabase/visualizations/lib/date-validation";
+
+describe("isTimezoneNaiveWallClock", () => {
+ it.each([
+ ["2025-04-01", true],
+ ["2025-03-30 00:00:00", true],
+ ["2025-03-30T00:00:00", true],
+ ["20250401", true],
+ ["2025-03-30T00:00:00Z", false],
+ ["2025-03-30T00:00:00+08:00", false],
+ ["2025-03-30T00:00:00-11:00", false],
+ ["2019-W33", false],
+ ["2024-365", false],
+ ])("%s → %s", (value, expected) => {
+ expect(isTimezoneNaiveWallClock(value)).toBe(expected);
+ });
+});
describe("isValidIso8601", () => {
// examples from https://en.wikipedia.org/wiki/ISO_8601
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx
index 5533974a7a6..d51e0e97c03 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx
@@ -1,31 +1,12 @@
import type { EChartsType } from "echarts/core";
+import { createMockChartLayout } from "__support__/echarts";
import { renderWithProviders, screen } from "__support__/ui";
-import type { ChartLayout } from "metabase/visualizations/echarts/cartesian/layout/types";
import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import { createMockTimelineEvent } from "metabase-types/api/mocks";
import { TimelineEventsBand } from "./TimelineEventsBand";
-const createChartLayout = (): ChartLayout => ({
- padding: { top: 10, left: 50, bottom: 40, right: 10 },
- bounds: { top: 10, left: 50, bottom: 160, right: 450 },
- boundaryWidth: 400,
- outerWidth: 500,
- outerHeight: 200,
- axisEnabledSetting: true,
- panelGap: 0,
- ticksDimensions: {
- yTicksWidthLeft: 0,
- yTicksWidthRight: 0,
- xTicksHeight: 40,
- xTickWidthCap: 0,
- firstXTickWidth: 0,
- lastXTickWidth: 0,
- getXTickWidth: () => 0,
- },
-});
-
const createChartInstance = (
pixelByDate: Record<string, number>,
): EChartsType =>
@@ -71,7 +52,14 @@ const setup = (opts: SetupOpts = {}) => {
chartInstance={chartInstance}
chartSize={{ width: 500, height: 200 }}
timelineEventsModel={model}
- chartLayout={createChartLayout()}
+ chartLayout={createMockChartLayout({
+ padding: { top: 10, left: 50, bottom: 40, right: 10 },
+ bounds: { top: 10, left: 50, bottom: 160, right: 450 },
+ boundaryWidth: 400,
+ outerWidth: 500,
+ outerHeight: 200,
+ ticksDimensions: { xTicksHeight: 40, getXTickWidth: () => 0 },
+ })}
xAxisIndex={0}
selectedTimelineEventIds={opts.selectedTimelineEventIds}
/>,
diff --git a/frontend/test/__support__/echarts.ts b/frontend/test/__support__/echarts.ts
index 18353d8d26a..a1ecc3a9261 100644
--- a/frontend/test/__support__/echarts.ts
+++ b/frontend/test/__support__/echarts.ts
@@ -1,10 +1,50 @@
+import type {
+ ChartBoundsCoords,
+ ChartLayout,
+ TicksDimensions,
+} from "metabase/visualizations/echarts/cartesian/layout/types";
import type {
BaseCartesianChartModel,
BreakoutSeriesModel,
SeriesModel,
} from "metabase/visualizations/echarts/cartesian/model/types";
+import type { Padding } from "metabase/visualizations/types";
import { createMockCard, createMockColumn } from "metabase-types/api/mocks";
+type MockChartLayoutOpts = Partial<
+ Omit<ChartLayout, "ticksDimensions" | "padding" | "bounds">
+> & {
+ ticksDimensions?: Partial<TicksDimensions>;
+ padding?: Partial<Padding>;
+ bounds?: Partial<ChartBoundsCoords>;
+};
+
+export const createMockChartLayout = (
+ opts: MockChartLayoutOpts = {},
+): ChartLayout => {
+ const { ticksDimensions, padding, bounds, ...rest } = opts;
+ return {
+ boundaryWidth: 0,
+ outerHeight: 0,
+ outerWidth: 800,
+ padding: { top: 0, left: 0, bottom: 0, right: 0, ...padding },
+ bounds: { top: 0, left: 0, bottom: 0, right: 0, ...bounds },
+ ticksDimensions: {
+ yTicksWidthLeft: 0,
+ yTicksWidthRight: 0,
+ xTicksHeight: 0,
+ xTickWidthCap: 0,
+ firstXTickWidth: 0,
+ lastXTickWidth: 0,
+ getXTickWidth: () => 40,
+ ...ticksDimensions,
+ },
+ axisEnabledSetting: true,
+ panelGap: 0,
+ ...rest,
+ };
+};
+
export const createMockSeriesModel = (
opts?: Partial<SeriesModel>,
): SeriesModel => {