Skip to content
Snippets Groups Projects
Commit 5816da9c authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix drill through timezone being UTC instead of same as clicked dimension

parent cff83512
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@ import inflection from "inflection";
import { mbqlEq } from "metabase/lib/query/util";
import { formatTimeWithUnit } from "metabase/lib/formatting";
import { parseTimestamp } from "metabase/lib/time";
export const DATETIME_UNITS = [
// "default",
......@@ -139,7 +140,7 @@ export function generateTimeIntervalDescription(n, unit) {
export function generateTimeValueDescription(value, bucketing) {
if (typeof value === "string") {
let m = moment(value);
const m = parseTimestamp(value, bucketing);
if (bucketing) {
return formatTimeWithUnit(value, bucketing);
} else if (m.hours() || m.minutes()) {
......
......@@ -104,13 +104,13 @@ export const filter = (card, operator, column, value) => {
return newCard;
};
const drillFilter = (card, value, column) => {
export const drillFilter = (card, value, column) => {
let filter;
if (isDate(column)) {
filter = [
"=",
["datetime-field", getFieldRefFromColumn(column), "as", column.unit],
parseTimestamp(value, column.unit).toISOString(),
parseTimestamp(value, column.unit).format(),
];
} else {
const range = rangeForValue(value, column);
......
/* eslint-disable flowtype/require-valid-file-annotation */
import { drillFilter } from "metabase/qb/lib/actions";
import moment from "moment";
describe("actions", () => {
describe("drillFilter", () => {
it("should add the filter with the same timezone", () => {
const newCard = drillFilter(
{
dataset_query: {
type: "query",
query: {},
},
},
moment("2018-04-27T00:00:00.000+02:00"),
{
base_type: "type/DateTime",
id: 123,
unit: "day",
},
);
expect(newCard.dataset_query.query).toEqual({
filter: [
"=",
["datetime-field", ["field-id", 123], "as", "day"],
"2018-04-27T00:00:00+02:00",
],
});
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment