GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-18 07:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: added missing updated time on first load for back navigation (#4544)

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

* fix: cleanup console
This commit is contained in:
Vikrant Gupta 2024-02-14 14:00:17 +05:30 committed by GitHub
parent cfea51d9ee
commit e0df371a8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/container/TopNav/DateTimeSelection/index.tsx
View File

@ -258,7 +258,6 @@ function DateTimeSelection({
}; };
const onCustomDateHandler = (dateTimeRange: DateTimeRangeType): void => { const onCustomDateHandler = (dateTimeRange: DateTimeRangeType): void => {
console.log('dateTimeRange', dateTimeRange);
if (dateTimeRange !== null) { if (dateTimeRange !== null) {
const [startTimeMoment, endTimeMoment] = dateTimeRange; const [startTimeMoment, endTimeMoment] = dateTimeRange;
if (startTimeMoment && endTimeMoment) { if (startTimeMoment && endTimeMoment) {

43
frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx
View File

@ -211,17 +211,19 @@ function DateTimeSelection({
const routesObject = JSON.parse(routes || '{}'); const routesObject = JSON.parse(routes || '{}');
const selectedTime = routesObject[pathName]; const selectedTime = routesObject[pathName];
let parsedSelectedTime: TimeRange; if (selectedTime) {
try { let parsedSelectedTime: TimeRange;
parsedSelectedTime = JSON.parse(selectedTime); try {
} catch { parsedSelectedTime = JSON.parse(selectedTime);
parsedSelectedTime = selectedTime; } catch {
} parsedSelectedTime = selectedTime;
if (isObject(parsedSelectedTime)) { }
return 'custom'; if (isObject(parsedSelectedTime)) {
} return 'custom';
}
return selectedTime; return selectedTime;
}
} }
return defaultSelectedOption; return defaultSelectedOption;
@ -333,8 +335,14 @@ function DateTimeSelection({
); );
if (!isLogsExplorerPage) { if (!isLogsExplorerPage) {
urlQuery.set(QueryParams.startTime, startTimeMoment.toString()); urlQuery.set(
urlQuery.set(QueryParams.endTime, endTimeMoment.toString()); QueryParams.startTime,
startTimeMoment?.toDate().getTime().toString(),
);
urlQuery.set(
QueryParams.endTime,
endTimeMoment?.toDate().getTime().toString(),
);
const generatedUrl = `${location.pathname}?${urlQuery.toString()}`; const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
history.replace(generatedUrl); history.replace(generatedUrl);
} }
@ -382,6 +390,17 @@ function DateTimeSelection({
setRefreshButtonHidden(updatedTime === 'custom'); setRefreshButtonHidden(updatedTime === 'custom');
updateTimeInterval(updatedTime, [preStartTime, preEndTime]); 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 // eslint-disable-next-line react-hooks/exhaustive-deps
}, [location.pathname, updateTimeInterval, globalTimeLoading]); }, [location.pathname, updateTimeInterval, globalTimeLoading]);