diff --git a/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.test.tsx b/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.test.tsx index 35dbea503a0..2b164ac3e37 100644 --- a/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.test.tsx +++ b/ui/litellm-dashboard/src/components/UsagePage/components/UsagePageView.test.tsx @@ -856,7 +856,7 @@ describe("UsagePage", () => { expect.any(Date), expect.any(Date), "user-123", - 0, + expect.any(Number), ); }); }); @@ -937,7 +937,7 @@ describe("UsagePage", () => { expect.any(Date), 1, null, - 0, + expect.any(Number), ); // Verify second page call @@ -947,7 +947,7 @@ describe("UsagePage", () => { expect.any(Date), 2, null, - 0, + expect.any(Number), ); }); }); 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 636782df73d..fa3a9f30546 100644 --- a/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx +++ b/ui/litellm-dashboard/src/components/shared/advanced_date_picker.tsx @@ -127,6 +127,7 @@ const AdvancedDatePicker: React.FC = ({ const [isOpen, setIsOpen] = useState(false); const [tempValue, setTempValue] = useState(value); + const [tempTimezone, setTempTimezone] = useState(timezoneOffset); const [selectedOption, setSelectedOption] = useState(null); // Custom date inputs only - removed time inputs @@ -294,6 +295,11 @@ const AdvancedDatePicker: React.FC = ({ const handleApply = () => { if (tempValue.from && tempValue.to && validation.isValid) { + // Commit timezone change on Apply, not on every dropdown selection + if (onTimezoneChange && tempTimezone !== undefined) { + onTimezoneChange(tempTimezone); + } + // First call with immediate value for UI responsiveness onValueChange(tempValue); @@ -313,6 +319,7 @@ const AdvancedDatePicker: React.FC = ({ const handleCancel = () => { // Reset to original value setTempValue(value); + setTempTimezone(timezoneOffset); // Reset form inputs if (value.from) { @@ -406,8 +413,8 @@ const AdvancedDatePicker: React.FC = ({