@@ -78,6 +78,7 @@ import {
7878 Group ,
7979 Indicator ,
8080 List ,
81+ Loader ,
8182 Menu ,
8283 Modal ,
8384 Paper ,
@@ -147,7 +148,10 @@ import { PageHeader } from '@/components/PageHeader';
147148import { PageLayout } from '@/components/PageLayout' ;
148149import { SqlVariablesProvider } from '@/components/SQLEditor/variableCompletions' ;
149150import { TimePicker } from '@/components/TimePicker' ;
150- import { parseTimeRangeInput } from '@/components/TimePicker/utils' ;
151+ import {
152+ parseTimeRangeInput ,
153+ timeRangeInputToSeconds ,
154+ } from '@/components/TimePicker/utils' ;
151155import {
152156 Dashboard ,
153157 type Tile ,
@@ -211,6 +215,7 @@ import {
211215} from './source' ;
212216import {
213217 dateRangeToString ,
218+ parseRelativeTimeQuery ,
214219 useDefaultTimeRange ,
215220 useNewTimeQuery ,
216221} from './timeQuery' ;
@@ -1855,15 +1860,14 @@ function DashboardContainerRow({
18551860
18561861const DEFAULT_INTERVAL = 'Past 1h' ;
18571862
1858- function DBDashboardPage ( { presetConfig } : { presetConfig ?: Dashboard } ) {
1859- const defaultTimeRange = useDefaultTimeRange ( DEFAULT_INTERVAL ) ;
1860- const brandName = useBrandDisplayName ( ) ;
1861- const confirm = useConfirm ( ) ;
1862-
1863- const router = useRouter ( ) ;
1864- const dashboardId = router . query . dashboardId as string | undefined ;
1865- const { enterKioskMode, exitKioskMode, isKioskMode } =
1866- useDashboardKioskMode ( ) ;
1863+ function DBDashboardPage ( {
1864+ dashboardProps,
1865+ defaultTimeInput = DEFAULT_INTERVAL ,
1866+ } : {
1867+ dashboardProps : ReturnType < typeof useDashboard > ;
1868+ defaultTimeInput ?: string ;
1869+ } ) {
1870+ const defaultTimeRange = useDefaultTimeRange ( defaultTimeInput ) ;
18671871
18681872 const {
18691873 dashboard,
@@ -1872,10 +1876,17 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
18721876 isLocalDashboard,
18731877 isFetching : isFetchingDashboard ,
18741878 isSetting : isSavingDashboard ,
1875- } = useDashboard ( {
1876- dashboardId : dashboardId as string | undefined ,
1877- presetConfig,
1878- } ) ;
1879+ } = dashboardProps ;
1880+ const brandName = useBrandDisplayName ( ) ;
1881+ const confirm = useConfirm ( ) ;
1882+ const {
1883+ userPreferences : { isUTC } ,
1884+ } = useUserPreferences ( ) ;
1885+
1886+ const router = useRouter ( ) ;
1887+ const dashboardId = router . query . dashboardId as string | undefined ;
1888+ const { enterKioskMode, exitKioskMode, isKioskMode } =
1889+ useDashboardKioskMode ( ) ;
18791890
18801891 const { data : sources } = useSources ( ) ;
18811892 const { data : connections } = useConnections ( ) ;
@@ -2033,10 +2044,10 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
20332044 } , [ router . isReady , watchedGranularity , granularity , setGranularity ] ) ;
20342045
20352046 const [ displayedTimeInputValue , setDisplayedTimeInputValue ] =
2036- useState ( DEFAULT_INTERVAL ) ;
2047+ useState ( defaultTimeInput ) ;
20372048
20382049 const { searchedTimeRange, onSearch, onTimeRangeSelect } = useNewTimeQuery ( {
2039- initialDisplayValue : DEFAULT_INTERVAL ,
2050+ initialDisplayValue : defaultTimeInput ,
20402051 initialTimeRange : defaultTimeRange ,
20412052 setDisplayedTimeInputValue,
20422053 } ) ;
@@ -2113,6 +2124,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
21132124 dashboard ?. savedQuery ,
21142125 dashboard ?. savedQueryLanguage ,
21152126 dashboard ?. savedFilterValues ,
2127+ dashboard ?. savedDateRange ,
21162128 isLocalDashboard ,
21172129 isFetchingDashboard ,
21182130 router . isReady ,
@@ -2121,6 +2133,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
21212133 setWhere ,
21222134 setWhereLanguage ,
21232135 setFilterValueEntries ,
2136+ onTimeRangeSelect ,
21242137 ] ) ;
21252138
21262139 // Sync changes to the URL params into the form
@@ -2150,18 +2163,30 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
21502163 ? filterValueEntries
21512164 : [ ] ;
21522165
2166+ const currentRelativeDateRange = timeRangeInputToSeconds (
2167+ displayedTimeInputValue ,
2168+ isUTC ,
2169+ ) ;
2170+
21532171 setDashboard (
21542172 produce ( dashboard , draft => {
21552173 draft . savedQuery = currentWhere ;
21562174 draft . savedQueryLanguage = currentWhereLanguage ;
21572175 draft . savedFilterValues = currentFilterValues ;
2176+ // Only supporting relative date range saving ATM
2177+ if ( currentRelativeDateRange ) {
2178+ draft . savedDateRange = {
2179+ type : 'relative' ,
2180+ value : currentRelativeDateRange ,
2181+ } ;
2182+ }
21582183 } ) ,
21592184 ( ) => {
21602185 notifications . show ( {
21612186 color : 'green' ,
21622187 title : 'Query saved and executed' ,
21632188 message :
2164- 'Filter query and dropdown values have been saved with the dashboard' ,
2189+ 'Filter query, dropdown values, and relative time range have been saved with the dashboard' ,
21652190 autoClose : 3000 ,
21662191 } ) ;
21672192 } ,
@@ -2173,6 +2198,8 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
21732198 getValues ,
21742199 filterValueEntries ,
21752200 onSubmit ,
2201+ isUTC ,
2202+ displayedTimeInputValue ,
21762203 ] ) ;
21772204 const handleRemoveSavedQuery = useCallback ( ( ) => {
21782205 if ( ! dashboard || isLocalDashboard ) return ;
@@ -2182,6 +2209,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
21822209 draft . savedQuery = null ;
21832210 draft . savedQueryLanguage = null ;
21842211 draft . savedFilterValues = [ ] ;
2212+ draft . savedDateRange = null ;
21852213 } ) ,
21862214 ( ) => {
21872215 notifications . show ( {
@@ -3484,7 +3512,46 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
34843512 ) ;
34853513}
34863514
3487- const DBDashboardPageDynamic = dynamic ( async ( ) => DBDashboardPage , {
3515+ function DBDashboardPageGuarded ( {
3516+ presetConfig,
3517+ } : {
3518+ presetConfig ?: Dashboard ;
3519+ } ) {
3520+ const router = useRouter ( ) ;
3521+ const dashboardId = router . query . dashboardId as string | undefined ;
3522+ const dashboardProps = useDashboard ( {
3523+ dashboardId : dashboardId as string | undefined ,
3524+ presetConfig,
3525+ } ) ;
3526+ const {
3527+ userPreferences : { isUTC } ,
3528+ } = useUserPreferences ( ) ;
3529+
3530+ const savedDateRange = dashboardProps . dashboard ?. savedDateRange ;
3531+ // Keyed on the saved range, not the render: a relative range re-stringifies
3532+ // to a new value every render, and useNewTimeQuery resets the input on change.
3533+ // Valid URL from/to still win: useNewTimeQuery overwrites the input from them.
3534+ const defaultTimeInput = useMemo ( ( ) => {
3535+ if ( ! savedDateRange ) return undefined ;
3536+ const [ start , end ] =
3537+ savedDateRange . type === 'relative'
3538+ ? parseRelativeTimeQuery ( savedDateRange . value * 1000 )
3539+ : savedDateRange . value . map ( v => new Date ( v ) ) ;
3540+ // TODO: show relative ranges as "Past Xh" via getRelativeInterval
3541+ return dateRangeToString ( [ start , end ] , isUTC ) ;
3542+ } , [ savedDateRange , isUTC ] ) ;
3543+
3544+ if ( ! dashboardProps || ! router . isReady ) return < Loader size = "lg" /> ;
3545+
3546+ return (
3547+ < DBDashboardPage
3548+ dashboardProps = { dashboardProps }
3549+ defaultTimeInput = { defaultTimeInput }
3550+ />
3551+ ) ;
3552+ }
3553+
3554+ const DBDashboardPageDynamic = dynamic ( async ( ) => DBDashboardPageGuarded , {
34883555 ssr : false ,
34893556} ) ;
34903557
0 commit comments