The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Rename DatePicker intervals to "past" and "future" (#63993)
Alexander Polyankin16ea0dc1414d
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsxindex 1eaf8130c91..bea8938c879 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx@@ -17,13 +17,13 @@ type FilterListProps = {};const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [- "last",+ "past","current",];const FUTURE_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = ["current",- "next",+ "future",];export function JobFilterList({ params, tags }: FilterListProps) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsxindex 0423dafd056..0eb38aa3c5b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx@@ -23,7 +23,7 @@ import { StatusFilterWidget } from "./StatusFilterWidget";import { TransformFilterWidget } from "./TransformFilterWidget";const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [- "last",+ "past","current",];diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.ts b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.tsindex c8439200322..7ec357fd630 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.ts@@ -14,14 +14,14 @@ export const OPERATOR_OPTIONS: OperatorOption[] = [get label() {return t`Previous`;},- value: "last",+ value: "past",operators: [],},{get label() {return t`Next`;},- value: "next",+ value: "future",operators: [],},{diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.ts b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.tsindex d0dcd4614a0..808a18caaf2 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.ts@@ -36,7 +36,7 @@ export function getOptionType(value: DatePickerValue | undefined): OptionType {if (value.value === 0) {return "current";} else {- return value.value < 0 ? "last" : "next";+ return value.value < 0 ? "past" : "future";}case "exclude":if (value.operator !== "!=") {@@ -61,8 +61,8 @@ export function setOptionType(return value?.type === "specific"? setOperator(value, optionType): getOperatorDefaultValue(optionType);- case "last":- case "next":+ case "past":+ case "future":case "current":return value?.type === "relative"? setDirectionAndCoerceUnit(value, optionType)diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.tsindex ff9d57692c9..ba6da04cbb4 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts@@ -67,8 +67,8 @@ describe("getOptionType", () => {[">", SPECIFIC_VALUES[1]],["<", SPECIFIC_VALUES[2]],["between", SPECIFIC_VALUES[3]],- ["last", RELATIVE_VALUES[0]],- ["next", RELATIVE_VALUES[1]],+ ["past", RELATIVE_VALUES[0]],+ ["future", RELATIVE_VALUES[1]],["current", RELATIVE_VALUES[2]],["none", EXCLUDE_VALUES[0]],["is-null", EXCLUDE_VALUES[1]],@@ -272,11 +272,11 @@ describe("setOptionType", () => {});});- describe("last", () => {+ describe("past", () => {it.each([...SPECIFIC_VALUES, ...EXCLUDE_VALUES])('should return default value for "$operator" operator',(value) => {- expect(setOptionType(value, "last")).toEqual({+ expect(setOptionType(value, "past")).toEqual({type: "relative",value: -30,unit: "day",@@ -300,7 +300,7 @@ describe("setOptionType", () => {value: 0,unit,};- expect(setOptionType(value, "last")).toEqual({+ expect(setOptionType(value, "past")).toEqual({type: "relative",value: -30,unit,@@ -316,13 +316,13 @@ describe("setOptionType", () => {"month","quarter","year",- ])('should preserve "%s" unit and value for "next" value', (unit) => {+ ])('should preserve "%s" unit and value for "future" value', (unit) => {const value: DatePickerValue = {type: "relative",value: 10,unit,};- expect(setOptionType(value, "last")).toEqual({+ expect(setOptionType(value, "past")).toEqual({type: "relative",value: -10,unit,@@ -330,11 +330,11 @@ describe("setOptionType", () => {});});- describe("next", () => {+ describe("future", () => {it.each([...SPECIFIC_VALUES, ...EXCLUDE_VALUES])('should return default value for "$operator" operator',(value) => {- expect(setOptionType(value, "next")).toEqual({+ expect(setOptionType(value, "future")).toEqual({type: "relative",value: 30,unit: "day",@@ -358,7 +358,7 @@ describe("setOptionType", () => {value: 0,unit,};- expect(setOptionType(value, "next")).toEqual({+ expect(setOptionType(value, "future")).toEqual({type: "relative",value: 30,unit,@@ -374,13 +374,13 @@ describe("setOptionType", () => {"month","quarter","year",- ])('should preserve "%s" unit and value for "next" value', (unit) => {+ ])('should preserve "%s" unit and value for "future" value', (unit) => {const value: DatePickerValue = {type: "relative",value: -10,unit,};- expect(setOptionType(value, "next")).toEqual({+ expect(setOptionType(value, "future")).toEqual({type: "relative",value: 10,unit,diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsxindex 3a744542898..85d770db685 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx@@ -67,7 +67,7 @@ describe("DateShortcutPicker", () => {});it("should be able to filter shortcuts based on current and future interval directions", () => {- setup({ availableDirections: ["current", "next"] });+ setup({ availableDirections: ["current", "future"] });expect(screen.getByText("Today")).toBeInTheDocument();expect(screen.queryByText("Yesterday")).not.toBeInTheDocument();expect(screen.queryByText("Previous week")).not.toBeInTheDocument();@@ -75,7 +75,7 @@ describe("DateShortcutPicker", () => {});it("should be able to filter shortcuts based on past and current interval directions", () => {- setup({ availableDirections: ["last", "current"] });+ setup({ availableDirections: ["past", "current"] });expect(screen.getByText("Today")).toBeInTheDocument();expect(screen.getByText("Yesterday")).toBeInTheDocument();expect(screen.getByText("Previous week")).toBeInTheDocument();diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.ts b/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.tsindex a1c05138146..aa6e3883b1a 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.ts@@ -22,7 +22,7 @@ const DAY_WEEK_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Yesterday`;},shortcut: "yesterday",- direction: "last",+ direction: "past",value: {type: "relative",value: -1,@@ -34,7 +34,7 @@ const DAY_WEEK_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous week`;},shortcut: "previous-week",- direction: "last",+ direction: "past",value: {type: "relative",value: -1,@@ -46,7 +46,7 @@ const DAY_WEEK_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous 7 days`;},shortcut: "previous-7-days",- direction: "last",+ direction: "past",value: {type: "relative",value: -7,@@ -58,7 +58,7 @@ const DAY_WEEK_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous 30 days`;},shortcut: "previous-30-days",- direction: "last",+ direction: "past",value: {type: "relative",value: -30,@@ -73,7 +73,7 @@ const MONTH_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous month`;},shortcut: "previous-month",- direction: "last",+ direction: "past",value: {type: "relative",value: -1,@@ -85,7 +85,7 @@ const MONTH_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous 3 months`;},shortcut: "previous-3-months",- direction: "last",+ direction: "past",value: {type: "relative",value: -3,@@ -97,7 +97,7 @@ const MONTH_SHORTCUT_OPTIONS: ShortcutOption[] = [return t`Previous 12 months`;},shortcut: "previous-12-months",- direction: "last",+ direction: "past",value: {type: "relative",value: -12,diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsxindex 45de4e9d675..dd9170b5399 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx@@ -18,7 +18,7 @@ function getDefaultValue(): RelativeDatePickerValue {return {type: "relative",- value: direction === "last" ? -30 : 30,+ value: direction === "past" ? -30 : 30,unit: "day",};}@@ -56,7 +56,7 @@ describe("DateIntervalPicker", () => {jest.setSystemTime(new Date(2020, 0, 1));});- describe.each<RelativeIntervalDirection>(["last", "next"])(+ describe.each<RelativeIntervalDirection>(["past", "future"])("%s",(direction) => {const defaultValue = getDefaultValue(direction);@@ -72,7 +72,7 @@ describe("DateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -20 : 20,+ value: direction === "past" ? -20 : 20,});expect(onSubmit).not.toHaveBeenCalled();@@ -91,7 +91,7 @@ describe("DateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -10 : 10,+ value: direction === "past" ? -10 : 10,});expect(onSubmit).not.toHaveBeenCalled();});@@ -108,7 +108,7 @@ describe("DateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -1 : 1,+ value: direction === "past" ? -1 : 1,});expect(onSubmit).not.toHaveBeenCalled();});@@ -194,7 +194,7 @@ describe("DateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,offsetUnit: "day",- offsetValue: direction === "last" ? -7 : 7,+ offsetValue: direction === "past" ? -7 : 7,options: undefined,});expect(onSubmit).not.toHaveBeenCalled();@@ -206,7 +206,7 @@ describe("DateIntervalPicker", () => {});const rangeText =- direction === "last" ? "Dec 2–31, 2019" : "Jan 2–31, 2020";+ direction === "past" ? "Dec 2–31, 2019" : "Jan 2–31, 2020";expect(screen.getByText(rangeText)).toBeInTheDocument();});@@ -219,7 +219,7 @@ describe("DateIntervalPicker", () => {});const rangeText =- direction === "last" ? "Dec 2, 2019 – Jan 1, 2020" : "Jan 1–31, 2020";+ direction === "past" ? "Dec 2, 2019 – Jan 1, 2020" : "Jan 1–31, 2020";expect(screen.getByText(rangeText)).toBeInTheDocument();});diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsxindex 0bd5a5a0194..97eaca419f6 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx@@ -15,7 +15,7 @@ function getDefaultValue(): RelativeDatePickerValue {return {type: "relative",- value: direction === "last" ? -30 : 30,+ value: direction === "past" ? -30 : 30,unit: "day",};}@@ -45,7 +45,7 @@ describe("SimpleDateIntervalPicker", () => {jest.setSystemTime(new Date(2020, 0, 1));});- describe.each<RelativeIntervalDirection>(["last", "next"])(+ describe.each<RelativeIntervalDirection>(["past", "future"])("%s",(direction) => {const defaultValue = getDefaultValue(direction);@@ -61,7 +61,7 @@ describe("SimpleDateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -20 : 20,+ value: direction === "past" ? -20 : 20,});});@@ -76,7 +76,7 @@ describe("SimpleDateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -10 : 10,+ value: direction === "past" ? -10 : 10,});});@@ -92,7 +92,7 @@ describe("SimpleDateIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -1 : 1,+ value: direction === "past" ? -1 : 1,});});diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsxindex 2592a5e8fa7..cb10ca9c988 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx@@ -18,7 +18,7 @@ function getDefaultValue(): RelativeDatePickerValue {return {type: "relative",- value: direction === "last" ? -30 : 30,+ value: direction === "past" ? -30 : 30,unit: "day",offsetValue: -14,offsetUnit: "day",@@ -62,7 +62,7 @@ describe("DateOffsetIntervalPicker", () => {jest.setSystemTime(new Date(2020, 0, 1));});- describe.each<RelativeIntervalDirection>(["last", "next"])(+ describe.each<RelativeIntervalDirection>(["past", "future"])("%s",(direction) => {const defaultValue = getDefaultValue(direction);@@ -78,7 +78,7 @@ describe("DateOffsetIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -20 : 20,+ value: direction === "past" ? -20 : 20,});expect(onSubmit).not.toHaveBeenCalled();@@ -97,7 +97,7 @@ describe("DateOffsetIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -10 : 10,+ value: direction === "past" ? -10 : 10,});expect(onSubmit).not.toHaveBeenCalled();});@@ -114,7 +114,7 @@ describe("DateOffsetIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- value: direction === "last" ? -1 : 1,+ value: direction === "past" ? -1 : 1,});expect(onSubmit).not.toHaveBeenCalled();});@@ -175,7 +175,7 @@ describe("DateOffsetIntervalPicker", () => {expect(screen.getByText("years")).toBeInTheDocument();expect(screen.queryByText("months")).not.toBeInTheDocument();- const suffix = direction === "last" ? "ago" : "from now";+ const suffix = direction === "past" ? "ago" : "from now";await userEvent.click(screen.getByRole("textbox", { name: "Starting from unit" }),);@@ -195,7 +195,7 @@ describe("DateOffsetIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- offsetValue: direction === "last" ? -20 : 20,+ offsetValue: direction === "past" ? -20 : 20,});expect(onSubmit).not.toHaveBeenCalled();});@@ -211,7 +211,7 @@ describe("DateOffsetIntervalPicker", () => {expect(onChange).toHaveBeenLastCalledWith({...defaultValue,- offsetValue: direction === "last" ? -10 : 10,+ offsetValue: direction === "past" ? -10 : 10,});expect(onSubmit).not.toHaveBeenCalled();});@@ -267,7 +267,7 @@ describe("DateOffsetIntervalPicker", () => {value: defaultValue,});- const unitText = direction === "last" ? "years ago" : "years from now";+ const unitText = direction === "past" ? "years ago" : "years from now";await userEvent.click(screen.getByRole("textbox", { name: "Starting from unit" }),);@@ -309,7 +309,7 @@ describe("DateOffsetIntervalPicker", () => {value: defaultValue,});const rangeText =- direction === "last"+ direction === "past"? "Nov 18 – Dec 17, 2019": "Dec 19, 2019 – Jan 17, 2020";expect(screen.getByText(rangeText)).toBeInTheDocument();diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.tsindex 170d581c2d0..178fe11c894 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts@@ -12,7 +12,7 @@ import { getAvailableTruncationUnits, getDirection } from "../utils";export function getDirectionText(value: RelativeDatePickerValue): string {const direction = getDirection(value);- return direction === "last" ? t`Previous` : t`Next`;+ return direction === "past" ? t`Previous` : t`Next`;}export function setUnit(@@ -73,5 +73,5 @@ function getOffsetUnitText(interval: number,) {const unitText = Lib.describeTemporalUnit(unit, interval).toLowerCase();- return direction === "last" ? t`${unitText} ago` : t`${unitText} from now`;+ return direction === "past" ? t`${unitText} ago` : t`${unitText} from now`;}diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.ts b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.tsindex 1744664ed62..1a8f43973b3 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.ts@@ -6,7 +6,7 @@ export const LAST_TAB: Tab = {get label() {return t`Previous`;},- direction: "last",+ direction: "past",};export const CURRENT_TAB: Tab = {@@ -20,7 +20,7 @@ export const NEXT_TAB: Tab = {get label() {return t`Next`;},- direction: "next",+ direction: "future",};export const TABS = [LAST_TAB, CURRENT_TAB, NEXT_TAB];diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.ts b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.tsindex e01b4acbf19..f26e63293b7 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.ts@@ -34,7 +34,7 @@ export function getDirection(if (value == null || value.value === 0) {return "current";} else {- return value.value < 0 ? "last" : "next";+ return value.value < 0 ? "past" : "future";}}@@ -53,7 +53,7 @@ export function setDirection(: undefined;}- const sign = direction === "last" ? -1 : 1;+ const sign = direction === "past" ? -1 : 1;if (!isIntervalValue(value)) {return {diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.tsindex cb383361632..c9e5a33af56 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts@@ -28,14 +28,14 @@ describe("setDirection", () => {});});- describe("last", () => {+ describe("past", () => {it("should convert a current value", () => {const value: RelativeDatePickerValue = {type: "relative",value: 0,unit: "week",};- expect(setDirection(value, "last")).toEqual({+ expect(setDirection(value, "past")).toEqual({type: "relative",value: -30,unit: "week",@@ -48,7 +48,7 @@ describe("setDirection", () => {value: 20,unit: "year",};- expect(setDirection(value, "last")).toEqual({+ expect(setDirection(value, "past")).toEqual({type: "relative",value: -20,unit: "year",@@ -64,7 +64,7 @@ describe("setDirection", () => {offsetValue: 10,offsetUnit: "month",};- expect(setDirection(value, "last")).toEqual({+ expect(setDirection(value, "past")).toEqual({type: "relative",value: -20,unit: "day",@@ -74,14 +74,14 @@ describe("setDirection", () => {});});- describe("next", () => {+ describe("future", () => {it("should convert a current value", () => {const value: RelativeDatePickerValue = {type: "relative",value: 0,unit: "week",};- expect(setDirection(value, "next")).toEqual({+ expect(setDirection(value, "future")).toEqual({type: "relative",value: 30,unit: "week",@@ -94,7 +94,7 @@ describe("setDirection", () => {value: -20,unit: "year",};- expect(setDirection(value, "next")).toEqual({+ expect(setDirection(value, "future")).toEqual({type: "relative",value: 20,unit: "year",@@ -110,7 +110,7 @@ describe("setDirection", () => {offsetValue: -10,offsetUnit: "month",};- expect(setDirection(value, "next")).toEqual({+ expect(setDirection(value, "future")).toEqual({type: "relative",value: 20,unit: "day",@@ -133,11 +133,11 @@ describe("getDefaultValue", () => {expectedValue: { type: "relative", value: -30, unit: "day" },},{- availableDirections: ["last", "current", "next"],+ availableDirections: ["past", "current", "future"],expectedValue: { type: "relative", value: -30, unit: "day" },},{- availableDirections: ["last", "current"],+ availableDirections: ["past", "current"],expectedValue: { type: "relative", value: -30, unit: "day" },},{@@ -167,32 +167,32 @@ describe("getAvailableTabs", () => {},{initialValue: undefined,- availableDirections: ["current", "next"],+ availableDirections: ["current", "future"],expectedTabs: [CURRENT_TAB, NEXT_TAB],},{initialValue: undefined,- availableDirections: ["last", "current", "next"],+ availableDirections: ["past", "current", "future"],expectedTabs: [LAST_TAB, CURRENT_TAB, NEXT_TAB],},{initialValue: { type: "relative", value: 0, unit: "day" },- availableDirections: ["current", "next"],+ availableDirections: ["current", "future"],expectedTabs: [CURRENT_TAB, NEXT_TAB],},{initialValue: { type: "relative", value: 30, unit: "day" },- availableDirections: ["current", "next"],+ availableDirections: ["current", "future"],expectedTabs: [CURRENT_TAB, NEXT_TAB],},{initialValue: { type: "relative", value: -30, unit: "day" },- availableDirections: ["current", "next"],+ availableDirections: ["current", "future"],expectedTabs: [LAST_TAB, CURRENT_TAB, NEXT_TAB],},{initialValue: { type: "relative", value: -30, unit: "day" },- availableDirections: ["last", "current"],+ availableDirections: ["past", "current"],expectedTabs: [LAST_TAB, CURRENT_TAB],},])(diff --git a/frontend/src/metabase/querying/filters/constants.ts b/frontend/src/metabase/querying/filters/constants.tsindex 9ead449ca47..c4e471dfbaa 100644--- a/frontend/src/metabase/querying/filters/constants.ts+++ b/frontend/src/metabase/querying/filters/constants.ts@@ -50,7 +50,7 @@ export const DATE_PICKER_UNITS = [];export const DATE_PICKER_DIRECTIONS = [- "last" as const,+ "past" as const,"current" as const,- "next" as const,+ "future" as const,];