Skip to content

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

Fix tooltips showing incorrect date ranges for native queries (#76295)

Kevin Kelleher1fbea58471d5
diff --git a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.js b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.js
index a3cf524084b..561e2472230 100644
--- a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.js
@@ -722,39 +722,6 @@ describe("issue 22527", { tags: "@skip" }, () => {
});
});
-describe("issue 25007", () => {
- const questionDetails = {
- name: "11435",
- display: "line",
- native: {
- query: `SELECT dateadd('day', CAST((1 - CASE WHEN ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) = 0 THEN 7 ELSE ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) END) AS long), CAST("PUBLIC"."ORDERS"."CREATED_AT" AS date)) AS "CREATED_AT", count(*) AS "count"
- FROM "PUBLIC"."ORDERS"
- GROUP BY dateadd('day', CAST((1 - CASE WHEN ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) = 0 THEN 7 ELSE ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) END) AS long), CAST("PUBLIC"."ORDERS"."CREATED_AT" AS date))
- ORDER BY dateadd('day', CAST((1 - CASE WHEN ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) = 0 THEN 7 ELSE ((iso_day_of_week("PUBLIC"."ORDERS"."CREATED_AT") + 1) % 7) END) AS long), CAST("PUBLIC"."ORDERS"."CREATED_AT" AS date)) ASC`,
- },
- visualization_settings: {
- "graph.dimensions": ["CREATED_AT"],
- "graph.metrics": ["count"],
- },
- };
-
- const clickLineDot = ({ index } = {}) => {
- // eslint-disable-next-line metabase/no-unsafe-element-filtering
- H.cartesianChartCircle().eq(index).click({ force: true });
- };
-
- beforeEach(() => {
- H.restore();
- cy.signInAsAdmin();
- });
-
- it("should display weeks correctly in tooltips for native questions (metabase#25007)", () => {
- H.createNativeQuestion(questionDetails, { visitQuestion: true });
- clickLineDot({ index: 1 });
- H.echartsTooltip().should("contain", "May 4–10, 2025");
- });
-});
-
describe("issue 25156", () => {
const questionDetails = {
name: "25156",
diff --git a/frontend/src/metabase/visualizations/lib/formatting/date.tsx b/frontend/src/metabase/visualizations/lib/formatting/date.tsx
index 3a6fe55d958..daab66668cb 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/date.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/date.tsx
@@ -1328,7 +1328,8 @@ export function formatDateTimeWithUnit(
if (unit === "week") {
if (
(options.type === "tooltip" || options.type === "cell") &&
- !options.noRange
+ !options.noRange &&
+ options.column?.source !== "native"
) {
// tooltip show range like "January 1 - 7, 2017"
return formatDateTimeRangeWithUnit([String(value)], unit, options);
diff --git a/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx b/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx
index be9fe1e2730..844039714b1 100644
--- a/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/lib/formatting/date.unit.spec.tsx
@@ -219,6 +219,17 @@ describe("formatDateTimeForParameter", () => {
).toEqual("July 7, 2019 – July 13, 2019");
});
+ it("should not format week ranges for native queries (#73005)", () => {
+ expect(
+ formatDateTimeWithUnit("2019-07-07T00:00:00.000Z", "week", {
+ type: "tooltip",
+ column: {
+ source: "native",
+ },
+ }),
+ ).toEqual("July 7, 2019");
+ });
+
it("should always format week ranges according to returned data", () => {
dayjs.locale("es");
dayjs.updateLocale(dayjs.locale(), { weekStart: 0 });