fix: OU-1214 [Edit Dashboard] - Time range is not persisted when saving

Author: zhuje

web/src/components/dashboards/perses/PersesWrapper.tsx

@@ -394,8 +394,25 @@ function InnerWrapper({ children, project, dashboardName }) {
   const DEFAULT_DASHBOARD_DURATION = '30m';
   const DEFAULT_REFRESH_INTERVAL = '0s';
 
-  const initialTimeRange = useInitialTimeRange(DEFAULT_DASHBOARD_DURATION);
-  const initialRefreshInterval = useInitialRefreshInterval(DEFAULT_REFRESH_INTERVAL);
+  let clearedDashboardResource: DashboardResource | undefined;
+  if (Array.isArray(persesDashboard)) {
+    if (persesDashboard.length === 0) {
+      clearedDashboardResource = undefined;
+    } else {
+      clearedDashboardResource = persesDashboard[0];
+    }
+  } else {
+    clearedDashboardResource = persesDashboard;
+  }
+
+  const dashboardDuration = clearedDashboardResource?.spec?.duration;
+  const dashboardTimeInterval = clearedDashboardResource?.spec?.refreshInterval;
+
+  const effectiveDuration = dashboardDuration || DEFAULT_DASHBOARD_DURATION;
+  const effectiveRefreshInterval = dashboardTimeInterval || DEFAULT_REFRESH_INTERVAL;
+
+  const initialTimeRange = useInitialTimeRange(effectiveDuration);
+  const initialRefreshInterval = useInitialRefreshInterval(effectiveRefreshInterval);
 
   const builtinVariables = useMemo(() => {
     const result = [
@@ -436,17 +453,6 @@ function InnerWrapper({ children, project, dashboardName }) {
     return <LoadingBox />;
   }
 
-  let clearedDashboardResource: DashboardResource | undefined;
-  if (Array.isArray(persesDashboard)) {
-    if (persesDashboard.length === 0) {
-      clearedDashboardResource = undefined;
-    } else {
-      clearedDashboardResource = persesDashboard[0];
-    }
-  } else {
-    clearedDashboardResource = persesDashboard;
-  }
-
   return (
     <TimeRangeProviderWithQueryParams
       initialTimeRange={initialTimeRange}