From 57cb5b9e7f35639b2f17d110de56f0da743e5bce Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 6 Feb 2019 12:24:42 -0800
Subject: [PATCH] Change date filter formatting from 'past' to 'previous'
---
frontend/src/metabase/lib/query_time.js | 4 ++--
frontend/test/metabase/lib/query_time.unit.spec.js | 8 ++++----
.../metabase/modes/TimeseriesFilterWidget.unit.spec.jsx | 4 ++--
.../query_builder/components/FieldList.e2e.spec.js | 2 +-
.../components/dataref/SegmentPane.e2e.spec.js | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/frontend/src/metabase/lib/query_time.js b/frontend/src/metabase/lib/query_time.js
index 6214837c820..a96c514d8bb 100644
--- a/frontend/src/metabase/lib/query_time.js
+++ b/frontend/src/metabase/lib/query_time.js
@@ -132,11 +132,11 @@ export function generateTimeIntervalDescription(n, unit) {
return [t`Next ${formatBucketing(unit)}`];
case "last":
case -1:
- return [t`Last ${formatBucketing(unit)}`];
+ return [t`Previous ${formatBucketing(unit)}`];
}
if (n < 0) {
- return [t`Past ${-n} ${formatBucketing(unit, -n)}`];
+ return [t`Previous ${-n} ${formatBucketing(unit, -n)}`];
} else if (n > 0) {
return [t`Next ${n} ${formatBucketing(unit, n)}`];
} else {
diff --git a/frontend/test/metabase/lib/query_time.unit.spec.js b/frontend/test/metabase/lib/query_time.unit.spec.js
index 1c9a879ddc1..020d4328c73 100644
--- a/frontend/test/metabase/lib/query_time.unit.spec.js
+++ b/frontend/test/metabase/lib/query_time.unit.spec.js
@@ -98,7 +98,7 @@ describe("query_time", () => {
-30,
"day",
]),
- ).toEqual(["Past 30 Days"]);
+ ).toEqual(["Previous 30 Days"]);
expect(
generateTimeFilterValuesDescriptions([
"time-interval",
@@ -106,7 +106,7 @@ describe("query_time", () => {
1,
"month",
]),
- ).toEqual(["Next 1 Month"]);
+ ).toEqual(["Next Month"]);
expect(
generateTimeFilterValuesDescriptions([
"time-interval",
@@ -130,7 +130,7 @@ describe("query_time", () => {
-1,
"month",
]),
- ).toEqual(["Past 1 Month"]);
+ ).toEqual(["Previous Month"]);
expect(
generateTimeFilterValuesDescriptions([
"time-interval",
@@ -138,7 +138,7 @@ describe("query_time", () => {
-2,
"month",
]),
- ).toEqual(["Past 2 Months"]);
+ ).toEqual(["Previous 2 Months"]);
});
it("should format 'time-interval' short names correctly", () => {
expect(
diff --git a/frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx b/frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx
index e500733986b..94819a8c79c 100644
--- a/frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx
+++ b/frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx
@@ -34,14 +34,14 @@ describe("TimeseriesFilterWidget", () => {
const widget = mount(getTimeseriesFilterWidget(questionWithoutFilter));
expect(widget.find(".AdminSelect-content").text()).toBe("All Time");
});
- it("should display 'Past 30 Days' text if that filter is selected", () => {
+ it("should display 'Previous 30 Days' text if that filter is selected", () => {
const questionWithFilter = questionWithoutFilter
.query()
.addFilter(["time-interval", ["field-id", 1], -30, "day"])
.question();
const widget = mount(getTimeseriesFilterWidget(questionWithFilter));
- expect(widget.find(".AdminSelect-content").text()).toBe("Past 30 Days");
+ expect(widget.find(".AdminSelect-content").text()).toBe("Previous 30 Days");
});
it("should display 'Is Empty' text if that filter is selected", () => {
const questionWithFilter = questionWithoutFilter
diff --git a/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js b/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
index 049627d6786..d36cf498f30 100644
--- a/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
+++ b/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
@@ -121,6 +121,6 @@ describe("FieldList", () => {
.last()
.text(),
// eslint-disable-next-line no-irregular-whitespace
- ).toMatch(/Created AtPast 300 Days/);
+ ).toMatch(/Created AtPrevious 300 Days/);
});
});
diff --git a/frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js b/frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js
index 755242c705e..ebb6284122c 100644
--- a/frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js
+++ b/frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js
@@ -76,7 +76,7 @@ describe("SegmentPane", () => {
.find(DataReference)
.find(QueryDefinition);
// eslint-disable-next-line no-irregular-whitespace
- expect(queryDefinition.text()).toMatch(/Created AtPast 300 Days/);
+ expect(queryDefinition.text()).toMatch(/Created AtPrevious 300 Days/);
});
it("lets you apply the filter to your current query", async () => {
--
GitLab