Skip to content
Snippets Groups Projects
Unverified Commit 81e57ded authored by Alexander Polyankin's avatar Alexander Polyankin Committed by GitHub
Browse files

Fix adding a time in legacy date picker (#49121)

* Fix adding a time in legacy date picker

* Fix the test
parent 7d4bfaae
No related branches found
No related tags found
No related merge requests found
...@@ -240,9 +240,9 @@ describe("DatePicker", () => { ...@@ -240,9 +240,9 @@ describe("DatePicker", () => {
describe("Specific Dates", () => { describe("Specific Dates", () => {
const singleDateOperators = [ const singleDateOperators = [
["=", "on"], ["=", "On"],
["<", "before"], ["<", "Before"],
[">", "after"], [">", "After"],
]; ];
singleDateOperators.forEach(([operator, description]) => { singleDateOperators.forEach(([operator, description]) => {
...@@ -265,6 +265,21 @@ describe("DatePicker", () => { ...@@ -265,6 +265,21 @@ describe("DatePicker", () => {
"2020-05-21", "2020-05-21",
]); ]);
}); });
it(`can add time to a specific ${description} date filter`, async () => {
const filter = createDateFilter(operator, "2020-05-01");
const onChange = jest.fn();
render(
<DatePickerStateWrapper filter={filter} onChange={onChange} />,
);
await userEvent.click(screen.getByText("Add a time"));
expect(onChange.mock.lastCall[0]).toStrictEqual([
operator,
CREATED_AT_FIELD,
"2020-05-01T12:30:00",
]);
});
}); });
it("can set a between date filter", async () => { it("can set a between date filter", async () => {
...@@ -289,6 +304,21 @@ describe("DatePicker", () => { ...@@ -289,6 +304,21 @@ describe("DatePicker", () => {
]); ]);
}); });
it("can add time to a between date filter", async () => {
const filter = createDateFilter("between", "2020-04-01", "2020-05-01");
const onChange = jest.fn();
render(<DatePickerStateWrapper filter={filter} onChange={onChange} />);
await userEvent.click(screen.getByText("Add a time"));
expect(onChange.mock.lastCall[0]).toStrictEqual([
"between",
CREATED_AT_FIELD,
"2020-04-01T12:30:00",
"2020-05-01T12:30:00",
]);
});
it("can navigate between months on the calendar using arrows", async () => { it("can navigate between months on the calendar using arrows", async () => {
render(<DatePickerStateWrapper filter={filter} />); render(<DatePickerStateWrapper filter={filter} />);
await userEvent.click(screen.getByText(/specific/i)); await userEvent.click(screen.getByText(/specific/i));
......
...@@ -62,7 +62,7 @@ const DatePickerFooter: React.FC<React.PropsWithChildren<Props>> = ({ ...@@ -62,7 +62,7 @@ const DatePickerFooter: React.FC<React.PropsWithChildren<Props>> = ({
operator, operator,
field, field,
start, start,
operator === "between" && !end ? start : end, ...(operator === "between" ? [end ?? start] : []),
]); ]);
} }
}; };
......
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