From e0df371a8d9e361a746fdc26b84f2e1beb05a2eb Mon Sep 17 00:00:00 2001
From: Vikrant Gupta <vikrant.thomso@gmail.com>
Date: Wed, 14 Feb 2024 14:00:17 +0530
Subject: [PATCH] fix: added missing updated time on first load for back
 navigation (#4544)

* fix: added missing updated time on first load for back navigation

* fix: cleanup console
---
 .../TopNav/DateTimeSelection/index.tsx        |  1 -
 .../TopNav/DateTimeSelectionV2/index.tsx      | 43 +++++++++++++------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/frontend/src/container/TopNav/DateTimeSelection/index.tsx b/frontend/src/container/TopNav/DateTimeSelection/index.tsx
index cc01b389e4..614e977a12 100644
--- a/frontend/src/container/TopNav/DateTimeSelection/index.tsx
+++ b/frontend/src/container/TopNav/DateTimeSelection/index.tsx
@@ -258,7 +258,6 @@ function DateTimeSelection({
 	};
 
 	const onCustomDateHandler = (dateTimeRange: DateTimeRangeType): void => {
-		console.log('dateTimeRange', dateTimeRange);
 		if (dateTimeRange !== null) {
 			const [startTimeMoment, endTimeMoment] = dateTimeRange;
 			if (startTimeMoment && endTimeMoment) {
diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx
index c169b6a9e7..157397f026 100644
--- a/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx
+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx
@@ -211,17 +211,19 @@ function DateTimeSelection({
 			const routesObject = JSON.parse(routes || '{}');
 			const selectedTime = routesObject[pathName];
 
-			let parsedSelectedTime: TimeRange;
-			try {
-				parsedSelectedTime = JSON.parse(selectedTime);
-			} catch {
-				parsedSelectedTime = selectedTime;
-			}
-			if (isObject(parsedSelectedTime)) {
-				return 'custom';
-			}
+			if (selectedTime) {
+				let parsedSelectedTime: TimeRange;
+				try {
+					parsedSelectedTime = JSON.parse(selectedTime);
+				} catch {
+					parsedSelectedTime = selectedTime;
+				}
+				if (isObject(parsedSelectedTime)) {
+					return 'custom';
+				}
 
-			return selectedTime;
+				return selectedTime;
+			}
 		}
 
 		return defaultSelectedOption;
@@ -333,8 +335,14 @@ function DateTimeSelection({
 				);
 
 				if (!isLogsExplorerPage) {
-					urlQuery.set(QueryParams.startTime, startTimeMoment.toString());
-					urlQuery.set(QueryParams.endTime, endTimeMoment.toString());
+					urlQuery.set(
+						QueryParams.startTime,
+						startTimeMoment?.toDate().getTime().toString(),
+					);
+					urlQuery.set(
+						QueryParams.endTime,
+						endTimeMoment?.toDate().getTime().toString(),
+					);
 					const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
 					history.replace(generatedUrl);
 				}
@@ -382,6 +390,17 @@ function DateTimeSelection({
 		setRefreshButtonHidden(updatedTime === 'custom');
 
 		updateTimeInterval(updatedTime, [preStartTime, preEndTime]);
+
+		if (updatedTime !== 'custom') {
+			const { minTime, maxTime } = GetMinMax(updatedTime);
+			urlQuery.set(QueryParams.startTime, minTime.toString());
+			urlQuery.set(QueryParams.endTime, maxTime.toString());
+		} else {
+			urlQuery.set(QueryParams.startTime, preStartTime.toString());
+			urlQuery.set(QueryParams.endTime, preEndTime.toString());
+		}
+		const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
+		history.replace(generatedUrl);
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [location.pathname, updateTimeInterval, globalTimeLoading]);