diff --git a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.integration.test.tsx similarity index 91% rename from ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx rename to ui/litellm-dashboard/src/components/shared/advanced_date_picker.integration.test.tsx index 555a7b1a9e2..8abf5299f4c 100644 --- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.test.tsx +++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.integration.test.tsx @@ -339,6 +339,32 @@ describe("AdvancedDatePicker", () => { }); }); + it.each([ + ["Start date", "2025-01-02", new Date(2025, 0, 2), new Date(2025, 0, 31, 23, 59, 59, 999)], + ["End date", "2025-01-30", new Date(2025, 0, 1), new Date(2025, 0, 30, 23, 59, 59, 999)], + ])("requires a cleared %s before applying the edited range", async (label, replacement, from, to) => { + render(); + fireEvent.click(screen.getByRole("button", { expanded: false })); + + const input = screen.getByLabelText(label); + fireEvent.change(input, { target: { value: "" } }); + + expect(screen.getByRole("button", { name: "Apply" })).toBeDisabled(); + expect(screen.getByText("Start and end dates are required")).toBeInTheDocument(); + fireEvent.click(screen.getByRole("button", { name: "Apply" })); + expect(mockOnValueChange).not.toHaveBeenCalled(); + expect(input).toBeInTheDocument(); + + fireEvent.change(input, { target: { value: replacement } }); + expect(screen.queryByText("Start and end dates are required")).not.toBeInTheDocument(); + expect(screen.getByRole("button", { name: "Apply" })).toBeEnabled(); + fireEvent.click(screen.getByRole("button", { name: "Apply" })); + + expect(mockOnValueChange).toHaveBeenNthCalledWith(1, { from, to }, null); + await waitFor(() => expect(mockOnValueChange).toHaveBeenNthCalledWith(2, { from, to }, null)); + expect(screen.queryByLabelText(label)).not.toBeInTheDocument(); + }); + it("should label compact custom date inputs, validate their order and apply the corrected range", async () => { const user = userEvent.setup(); render(); diff --git a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx index a16e50bfaad..c216c3bad7f 100644 --- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx +++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx @@ -67,7 +67,7 @@ const AdvancedDatePicker: React.FC = ({ // Validation logic - simplified for dates only const validateDateRange = useCallback(() => { if (!startDate || !endDate) { - return { isValid: true, error: "" }; + return { isValid: false, error: "Start and end dates are required" }; } const start = moment(startDate, "YYYY-MM-DD");