Skip to content
Snippets Groups Projects
Commit 1b19a33f authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #2303 from metabase/fix-date-parsing 

Fix date parsing
parents eddeac51 543ae954
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
frontend/src/lib/formatting.js
+ 3
− 5
View file @ 1b19a33f
......@@ -5,6 +5,7 @@ import Humanize from "humanize";
import React from "react";
import { isDate } from "metabase/lib/schema_metadata";
import { parseTimestamp } from "metabase/lib/time";
const PRECISION_NUMBER_FORMATTER = d3.format(".2r");
const FIXED_NUMBER_FORMATTER = d3.format(",.f");
......@@ -48,10 +49,7 @@ function formatMajorMinor(major, minor, options = {}) {
}
function formatTimeWithUnit(value, unit, options = {}) {
let m = moment.parseZone(value);
if (options.utcOffset != null) {
m.utcOffset(options.utcOffset);
}
let m = parseTimestamp(value);
switch (unit) {
case "hour": // 12 AM - January 1, 2015
return formatMajorMinor(m.format("h A"), m.format("MMMM D, YYYY"), options);
......@@ -93,7 +91,7 @@ export function formatValue(value, options = {}) {
} else if (column && column.unit != null) {
return formatTimeWithUnit(value, column.unit, options);
} else if (isDate(column) || moment.isDate(value) || moment.isMoment(value) || moment(value, ["YYYY-MM-DD'T'HH:mm:ss.SSSZ"], true).isValid()) {
return moment.parseZone(value).format("LLLL");
return parseTimestamp(value).format("LLLL");
} else if (typeof value === "string") {
return value;
} else if (typeof value === "number") {
......
frontend/src/lib/time.js 0 → 100644
+ 13
− 0
View file @ 1b19a33f
import moment from "moment";
// only attempt to parse the timezone if we're sure we have one (either Z or ±hh:mm)
// moment normally interprets the DD in YYYY-MM-DD as an offset :-/
export function parseTimestamp(value) {
if (moment.isMoment(value)) {
return value;
} else if (typeof value === "string" && /(Z|[+-]\d\d:\d\d)$/.test(value)) {
return moment.parseZone(value);
} else {
return moment.utc(value);
}
}
frontend/src/visualizations/lib/CardRenderer.js
+ 7
− 18
View file @ 1b19a33f
......@@ -26,6 +26,7 @@ import { determineSeriesIndexFromElement } from "./tooltip";
import { colorShades } from "./utils";
import { formatValue } from "metabase/lib/formatting";
import { parseTimestamp } from "metabase/lib/time";
const MIN_PIXELS_PER_TICK = { x: 100, y: 32 };
const BAR_PADDING_RATIO = 0.2;
......@@ -79,7 +80,7 @@ function applyChartBoundary(chart, element) {
function applyChartTimeseriesXAxis(chart, settings, series, xValues) {
// setup an x-axis where the dimension is a timeseries
const dimensionColumn = series[0].data.cols[0];
let dimensionColumn = series[0].data.cols[0];
let unit = minTimeseriesUnit(series.map(s => s.data.cols[0].unit));
......@@ -89,7 +90,6 @@ function applyChartTimeseriesXAxis(chart, settings, series, xValues) {
// compute the domain
let xDomain = d3.extent(xValues);
let utcOffset = xDomain[0].utcOffset();
if (settings.xAxis.labels_enabled) {
chart.xAxisLabel(settings.xAxis.title_text || getFriendlyName(dimensionColumn));
......@@ -97,22 +97,12 @@ function applyChartTimeseriesXAxis(chart, settings, series, xValues) {
if (settings.xAxis.axis_enabled) {
chart.renderVerticalGridLines(settings.xAxis.gridLine_enabled);
if (dimensionColumn && dimensionColumn.unit) {
// need to pass the utcOffset here since d3.time returns Dates not Moments and thus doesn't propagate the offset
chart.xAxis().tickFormat(d => formatValue(d, { column: dimensionColumn, utcOffset: utcOffset }));
} else {
chart.xAxis().tickFormat(d3.time.format.multi([
[".%L", (d) => d.getMilliseconds()],
[":%S", (d) => d.getSeconds()],
["%I:%M", (d) => d.getMinutes()],
["%I %p", (d) => d.getHours()],
["%a %d", (d) => d.getDay() && d.getDate() != 1],
["%b %d", (d) => d.getDate() != 1],
["%B", (d) => d.getMonth()], // default "%B"
["%Y", () => true] // default "%Y"
]));
if (dimensionColumn.unit == null) {
dimensionColumn = { ...dimensionColumn, unit: dataInterval.interval };
}
chart.xAxis().tickFormat(d => formatValue(d, { column: dimensionColumn }));
// Compute a sane interval to display based on the data granularity, domain, and chart width
tickInterval = computeTimeseriesTicksInterval(xValues, unit, chart.width(), MIN_PIXELS_PER_TICK.x);
chart.xAxis().ticks(d3.time[tickInterval.interval], tickInterval.count);
......@@ -459,8 +449,7 @@ export let CardRenderer = {
let datas = series.map((s, index) =>
s.data.rows.map(row => [
// use parseZone to retain the report timezone
(isTimeseries) ? moment.parseZone(row[0]) : row[0],
(isTimeseries) ? parseTimestamp(row[0]) : row[0],
...row.slice(1)
])
);
......
frontend/src/visualizations/lib/timeseries.js
+ 22
− 21
View file @ 1b19a33f
......@@ -2,6 +2,7 @@ import d3 from "d3";
import moment from "moment";
import { isDate } from "metabase/lib/schema_metadata";
import { parseTimestamp } from "metabase/lib/time";
const TIMESERIES_UNITS = new Set([
"minute",
......@@ -28,27 +29,27 @@ export function dimensionIsTimeseries({ cols, rows }) {
// NOTE: smaller modulos within an interval type must be multiples of larger ones (e.x. can't do both 2 days and 7 days i.e. week)
const TIMESERIES_INTERVALS = [
{ interval: "ms", count: 1, testFn: (d) => 0 }, // (0) millisecond
{ interval: "second", count: 1, testFn: (d) => moment.utc(d).milliseconds() }, // (1) 1 second
{ interval: "second", count: 5, testFn: (d) => moment.utc(d).seconds() % 5 }, // (2) 5 seconds
{ interval: "second", count: 15, testFn: (d) => moment.utc(d).seconds() % 15 }, // (3) 15 seconds
{ interval: "second", count: 30, testFn: (d) => moment.utc(d).seconds() % 30 }, // (4) 30 seconds
{ interval: "minute", count: 1, testFn: (d) => moment.utc(d).seconds() }, // (5) 1 minute
{ interval: "minute", count: 5, testFn: (d) => moment.utc(d).minutes() % 5 }, // (6) 5 minutes
{ interval: "minute", count: 15, testFn: (d) => moment.utc(d).minutes() % 15 }, // (7) 15 minutes
{ interval: "minute", count: 30, testFn: (d) => moment.utc(d).minutes() % 30 }, // (8) 30 minutes
{ interval: "hour", count: 1, testFn: (d) => moment.utc(d).minutes() }, // (9) 1 hour
{ interval: "hour", count: 3, testFn: (d) => moment.utc(d).hours() % 3 }, // (10) 3 hours
{ interval: "hour", count: 6, testFn: (d) => moment.utc(d).hours() % 6 }, // (11) 6 hours
{ interval: "hour", count: 12, testFn: (d) => moment.utc(d).hours() % 12 }, // (12) 12 hours
{ interval: "day", count: 1, testFn: (d) => moment.utc(d).hours() }, // (13) 1 day
{ interval: "week", count: 1, testFn: (d) => moment.utc(d).date() % 7 }, // (14) 7 days / 1 week
{ interval: "month", count: 1, testFn: (d) => moment.utc(d).date() }, // (15) 1 months
{ interval: "month", count: 3, testFn: (d) => moment.utc(d).month() % 3 }, // (16) 3 months / 1 quarter
{ interval: "year", count: 1, testFn: (d) => moment.utc(d).month() }, // (17) 1 year
{ interval: "year", count: 5, testFn: (d) => moment.utc(d).year() % 5 }, // (18) 5 year
{ interval: "year", count: 10, testFn: (d) => moment.utc(d).year() % 10 }, // (19) 10 year
{ interval: "year", count: 50, testFn: (d) => moment.utc(d).year() % 50 }, // (20) 50 year
{ interval: "year", count: 100, testFn: (d) => moment.utc(d).year() % 100 } // (21) 100 year
{ interval: "second", count: 1, testFn: (d) => parseTimestamp(d).milliseconds() }, // (1) 1 second
{ interval: "second", count: 5, testFn: (d) => parseTimestamp(d).seconds() % 5 }, // (2) 5 seconds
{ interval: "second", count: 15, testFn: (d) => parseTimestamp(d).seconds() % 15 }, // (3) 15 seconds
{ interval: "second", count: 30, testFn: (d) => parseTimestamp(d).seconds() % 30 }, // (4) 30 seconds
{ interval: "minute", count: 1, testFn: (d) => parseTimestamp(d).seconds() }, // (5) 1 minute
{ interval: "minute", count: 5, testFn: (d) => parseTimestamp(d).minutes() % 5 }, // (6) 5 minutes
{ interval: "minute", count: 15, testFn: (d) => parseTimestamp(d).minutes() % 15 }, // (7) 15 minutes
{ interval: "minute", count: 30, testFn: (d) => parseTimestamp(d).minutes() % 30 }, // (8) 30 minutes
{ interval: "hour", count: 1, testFn: (d) => parseTimestamp(d).minutes() }, // (9) 1 hour
{ interval: "hour", count: 3, testFn: (d) => parseTimestamp(d).hours() % 3 }, // (10) 3 hours
{ interval: "hour", count: 6, testFn: (d) => parseTimestamp(d).hours() % 6 }, // (11) 6 hours
{ interval: "hour", count: 12, testFn: (d) => parseTimestamp(d).hours() % 12 }, // (12) 12 hours
{ interval: "day", count: 1, testFn: (d) => parseTimestamp(d).hours() }, // (13) 1 day
{ interval: "week", count: 1, testFn: (d) => parseTimestamp(d).date() % 7 }, // (14) 7 days / 1 week
{ interval: "month", count: 1, testFn: (d) => parseTimestamp(d).date() }, // (15) 1 months
{ interval: "month", count: 3, testFn: (d) => parseTimestamp(d).month() % 3 }, // (16) 3 months / 1 quarter
{ interval: "year", count: 1, testFn: (d) => parseTimestamp(d).month() }, // (17) 1 year
{ interval: "year", count: 5, testFn: (d) => parseTimestamp(d).year() % 5 }, // (18) 5 year
{ interval: "year", count: 10, testFn: (d) => parseTimestamp(d).year() % 10 }, // (19) 10 year
{ interval: "year", count: 50, testFn: (d) => parseTimestamp(d).year() % 50 }, // (20) 50 year
{ interval: "year", count: 100, testFn: (d) => parseTimestamp(d).year() % 100 } // (21) 100 year
];
// mapping from Metabase "unit" to d3 intervals above
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment