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
Unskip and update calendar test + fix date range picker text inputs not in sync with calendar inputs (#64603)
Kamil Mielnika4564a2e12b2
diff --git a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.tsindex db025505de3..206a033d72d 100644--- a/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts+++ b/e2e/test/scenarios/question-reproductions/reproductions.cy.spec.ts@@ -119,11 +119,9 @@ describe("issue 39487", () => {},);- // broken after migration away from filter modal- // see https://github.com/metabase/metabase/issues/55688it(- "calendar has constant size when using date range picker filter (metabase#39487)",- { viewportHeight: 1000, tags: "@skip" },+ "calendar has constant size when using date range picker filter, and text inputs are in sync with the calendar inputs (metabase#39487, metabase#64602)",+ { viewportHeight: 1000 },() => {createTimeSeriesQuestionWithFilter(["between",@@ -141,11 +139,35 @@ describe("issue 39487", () => {cy.findByTestId("filter-pill").click();checkDateRangeFilter();- cy.log("filter modal");+ cy.log("filter dropdown");cy.button(/Filter/).click();- H.modal().findByText("May 1 – Jun 1, 2024").click();+ H.popover().findByText("Created At").click();+ H.popover().findByText("Fixed date range…").click();+ H.popover().within(() => {+ cy.log(+ "changing text input values should navigate the calendars (metabase#64602)",+ );+ cy.findAllByRole("textbox").first().clear().type("2024/05/01");+ cy.findByText("May 2024").should("be.visible");+ cy.findByLabelText("1 May 2024").should(+ "have.attr",+ "data-first-in-range",+ "true",+ );++ cy.findAllByRole("textbox")+ .should("have.length", 2)+ .last()+ .clear()+ .type("2024/06/01");+ cy.findAllByLabelText("1 June 2024")+ .filter(":visible")+ .should("have.length", 1)+ .and("have.attr", "data-last-in-range", "true");+ });+ previousButton().click();checkDateRangeFilter();- H.modal().button("Close").click();+ cy.realPress("Escape");cy.log("filter drill");cy.findByLabelText("Switch to data").click();@@ -153,8 +175,12 @@ describe("issue 39487", () => {H.popover().findByText("Filter by this column").click();H.popover().findByText("Fixed date range…").click();H.popover().findAllByRole("textbox").first().clear().type("2024/05/01");- // eslint-disable-next-line no-unsafe-element-filtering- H.popover().findAllByRole("textbox").last().clear().type("2024/06/01");+ H.popover()+ .findAllByRole("textbox")+ .should("have.length", 2)+ .last()+ .clear()+ .type("2024/06/01");previousButton().click();checkDateRangeFilter();diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsxindex 4cb17955d6e..7144724216f 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx@@ -30,6 +30,7 @@ export function DateRangePickerBody({const [startDate, endDate] = value;const [inProgressDateRange, setInProgressDateRange] =useState<DatesRangeValue | null>(value);+ const [displayedDate, setDisplayedDate] = useState(startDate);const handleRangeChange = (newDateRange: DatesRangeValue) => {const [newStartDate, newEndDate] = newDateRange;@@ -45,19 +46,37 @@ export function DateRangePickerBody({};const handleStartDateChange = (newDate: Date) => {- newDate && onChange([setDatePart(startDate, newDate), endDate]);+ const newStartDate = setDatePart(startDate, newDate);+ onChange([newStartDate, endDate]);+ setInProgressDateRange(null);+ setDisplayedDate(newStartDate);};const handleEndDateChange = (newDate: Date) => {- newDate && onChange([startDate, setDatePart(endDate, newDate)]);+ const newEndDate = setDatePart(endDate, newDate);+ onChange([startDate, newEndDate]);+ setInProgressDateRange(null);+ // substract 1 month because we want the end date to be shown in the 2nd column+ setDisplayedDate(dayjs(newEndDate).subtract(1, "month").toDate());};const handleStartTimeChange = (newTime: Date | null) => {- newTime && onChange([setTimePart(startDate, newTime), endDate]);+ if (newTime) {+ const newStartDate = setTimePart(startDate, newTime);+ onChange([newStartDate, endDate]);+ setInProgressDateRange(null);+ setDisplayedDate(newStartDate);+ }};const handleEndTimeChange = (newTime: Date | null) => {- newTime && onChange([startDate, setTimePart(endDate, newTime)]);+ if (newTime) {+ const newEndDate = setTimePart(endDate, newTime);+ onChange([startDate, newEndDate]);+ setInProgressDateRange(null);+ // substract 1 month because we want the end date to be shown in the 2nd column+ setDisplayedDate(dayjs(newEndDate).subtract(1, "month").toDate());+ }};return (@@ -99,10 +118,11 @@ export function DateRangePickerBody({<DatePickertype="range"value={inProgressDateRange ?? value}- defaultDate={startDate}+ date={displayedDate}numberOfColumns={2}allowSingleDateInRangeonChange={handleRangeChange}+ onDateChange={(value) => setDisplayedDate(dayjs(value).toDate())}/></Stack>);diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsxindex f33a067c38f..e90c7ec0884 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx@@ -52,4 +52,36 @@ describe("DateRangePickerBody", () => {new Date(2020, 1, 8),]);});++ describe("text input synchronization with calendar navigation", () => {+ it("should navigate calendar with start date input (metabase#64602)", async () => {+ setup({+ value: [new Date(2020, 0, 5), new Date(2020, 1, 20)], // Jan 5 - Feb 20+ });++ expect(screen.getByText("January 2020")).toBeInTheDocument();++ const dateInput = screen.getByLabelText("Start date");+ await userEvent.clear(dateInput);+ await userEvent.type(dateInput, "03/15/2020");++ expect(screen.getByText("March 2020")).toBeInTheDocument();+ expect(screen.queryByText("January 2020")).not.toBeInTheDocument();+ });++ it("should navigate calendar with end date input (metabase#64602)", async () => {+ setup({+ value: [new Date(2020, 0, 5), new Date(2020, 1, 20)], // Jan 5 - Feb 20+ });++ expect(screen.getByText("January 2020")).toBeInTheDocument();++ const dateInput = screen.getByLabelText("End date");+ await userEvent.clear(dateInput);+ await userEvent.type(dateInput, "01/15/2019");++ expect(screen.getByText("January 2019")).toBeInTheDocument();+ expect(screen.queryByText("January 2020")).not.toBeInTheDocument();+ });+ });});