@@ -84,7 +84,6 @@ import {
8484 resolveUsageShortcut ,
8585 type UsageMetric ,
8686} from "./usageShortcuts" ;
87- import { useEscapeToGoBack } from "../../hooks/useNavigateBack" ;
8887import { PROVIDER_ORDER , PROVIDER_PRESENTATION } from "./usageProviders" ;
8988import {
9089 readUsageExplorerPreferences ,
@@ -154,7 +153,6 @@ function UsageModelDialogHost({
154153export function UsagePage ( ) {
155154 const [ preferences , setPreferences ] = useState ( readUsagePagePreferences ) ;
156155 const [ explorerPreferences , setExplorerPreferences ] = useState ( readUsageExplorerPreferences ) ;
157- useEscapeToGoBack ( ) ;
158156 const keybindings = useAtomValue ( primaryServerKeybindingsAtom ) ;
159157 const hour12 = usePrimarySettings ( ( settings ) => resolveHour12 ( settings . timestampFormat ) ) ;
160158 const shortcutTitle = (
@@ -182,11 +180,8 @@ export function UsagePage() {
182180 useState < ReadonlySet < EnvironmentId > | null > ( null ) ;
183181 const { range, window : requested } = windowSelection ;
184182 const periodDays = range . kind === "period" ? range . days : null ;
185- // Servers from before week-long hourly reads answer such a span only by day.
186- // Once one does, every environment reads it by day, so totals, the range and
187- // the comparison window all cover the same whole days.
188- // The environments that needed days are remembered per range, so the page
189- // goes back to hours as soon as none of them is selected.
183+ // Older servers require day buckets for long ranges; all selected environments
184+ // must use the same granularity, returning to hours when those servers leave.
190185 const [ daysNeeded , setDaysNeeded ] = useState < {
191186 readonly for : UsageSummaryInput ;
192187 readonly ids : ReadonlySet < EnvironmentId > ;
@@ -757,12 +752,13 @@ function UsageRangePicker({
757752 readonly onChange : ( sinceDay : string , untilDay : string ) => void ;
758753 readonly compact ?: boolean ;
759754} ) {
755+ const [ now , setNow ] = useState ( ( ) => Date . now ( ) ) ;
760756 const today = new Intl . DateTimeFormat ( "en-CA" , {
761757 timeZone : window . timeZone ,
762758 year : "numeric" ,
763759 month : "2-digit" ,
764760 day : "2-digit" ,
765- } ) . format ( new Date ( ) ) ;
761+ } ) . format ( new Date ( now ) ) ;
766762 const [ open , setOpen ] = useState ( false ) ;
767763 const [ since , setSince ] = useState < string > ( window . sinceDay ) ;
768764 const [ until , setUntil ] = useState < string > ( window . untilDay ) ;
@@ -773,6 +769,7 @@ function UsageRangePicker({
773769 onOpenChange = { ( next ) => {
774770 setOpen ( next ) ;
775771 if ( ! next ) return ;
772+ setNow ( Date . now ( ) ) ;
776773 setSince ( window . sinceDay ) ;
777774 setUntil ( window . untilDay ) ;
778775 } }
0 commit comments