Merge branch 'release-0.34.x' of github.com:metabase/metabase into merge-release-0.34.x

frontend/src/metabase/visualizations/lib/renderer_utils.js

@@ -8,7 +8,10 @@ import { datasetContainsNoResults } from "metabase/lib/dataset";
 import { parseTimestamp } from "metabase/lib/time";
 
 import { dimensionIsNumeric } from "./numeric";
-import { dimensionIsTimeseries } from "./timeseries";
+import {
+  dimensionIsTimeseries,
+  dimensionIsExplicitTimeseries,
+} from "./timeseries";
 import { getAvailableCanvasWidth, getAvailableCanvasHeight } from "./utils";
 import { invalidDateWarning, nullDimensionWarning } from "./warnings";
 
@@ -122,7 +125,11 @@ function getParseOptions({ settings, data }) {
   const columnIndex = getColumnIndex({ settings, data });
   return {
     isNumeric: dimensionIsNumeric(data, columnIndex),
-    isTimeseries: dimensionIsTimeseries(data, columnIndex),
+    isTimeseries:
+      // x axis scale is timeseries
+      isTimeseries(settings) ||
+      // column type is timeseries
+      dimensionIsExplicitTimeseries(data, columnIndex),
     isQuantitative: isQuantitative(settings),
     unit: data.cols[columnIndex].unit,
   };

frontend/src/metabase/visualizations/lib/timeseries.js

@@ -21,12 +21,18 @@ const TIMESERIES_UNITS = new Set([
 // investigate the response from a dataset query and determine if the dimension is a timeseries
 export function dimensionIsTimeseries({ cols, rows }, i = 0) {
   return (
-    (isDate(cols[i]) &&
-      (cols[i].unit == null || TIMESERIES_UNITS.has(cols[i].unit))) ||
+    dimensionIsExplicitTimeseries({ cols, rows }, i) ||
     moment(rows[0] && rows[0][i], moment.ISO_8601).isValid()
   );
 }
 
+export function dimensionIsExplicitTimeseries({ cols }, i) {
+  return (
+    isDate(cols[i]) &&
+    (cols[i].unit == null || TIMESERIES_UNITS.has(cols[i].unit))
+  );
+}
+
 // mostly matches
 // https://github.com/mbostock/d3/wiki/Time-Scales
 // https://github.com/mbostock/d3/wiki/Time-Intervals

frontend/test/metabase/visualizations/lib/renderer_utils.unit.spec.js

@@ -98,7 +98,10 @@ describe("getXValues", () => {
       {
         data: {
           rows: [["foo", "2019-09-01T00:00:00Z"]],
-          cols: [{ name: "other" }, { name: "date" }],
+          cols: [
+            { name: "other" },
+            { name: "date", base_type: "type/DateTime" },
+          ],
         },
       },
     ];
@@ -109,10 +112,10 @@ describe("getXValues", () => {
   });
   it("should sort values according to parsed value", () => {
     expect(
-      getXValuesForRows([
-        [["2019-W33"], ["2019-08-13"]],
-        [["2019-08-11"], ["2019-W33"]],
-      ]).map(x => x.format()),
+      getXValuesForRows(
+        [[["2019-W33"], ["2019-08-13"]], [["2019-08-11"], ["2019-W33"]]],
+        { "graph.x_axis.scale": "timeseries" },
+      ).map(x => x.format()),
     ).toEqual([
       "2019-08-11T00:00:00Z",
       "2019-08-12T00:00:00Z",
@@ -175,4 +178,35 @@ describe("getDatas", () => {
     const [{ key: warningKey }] = warn.mock.calls[0];
     expect(warningKey).toBe("NULL_DIMENSION_WARNING");
   });
+
+  it("should not parse timeseries-like data if the scale isn't timeseries", () => {
+    const settings = { "graph.x_axis.scale": "ordinal" };
+    const series = [{ data: { rows: [["2019-01-01"]], cols: [{}] } }];
+    const warn = () => {};
+    const xValues = getDatas({ settings, series }, warn);
+    expect(xValues).toEqual([[["2019-01-01"]]]);
+  });
+
+  it("should parse timeseries-like data if the scale is timeseries", () => {
+    const settings = { "graph.x_axis.scale": "timeseries" };
+    const series = [{ data: { rows: [["2019-01-01"]], cols: [{}] } }];
+    const warn = () => {};
+    const [[[m]]] = getDatas({ settings, series }, warn);
+    expect(moment.isMoment(m)).toBe(true);
+  });
+
+  it("should parse timeseries-like data if column is timeseries", () => {
+    const settings = { "graph.x_axis.scale": "ordinal" };
+    const series = [
+      {
+        data: {
+          rows: [["2019-01-01"]],
+          cols: [{ base_type: "type/DateTime" }],
+        },
+      },
+    ];
+    const warn = () => {};
+    const [[[m]]] = getDatas({ settings, series }, warn);
+    expect(moment.isMoment(m)).toBe(true);
+  });
 });