Merge remote-tracking branch 'origin/develop' into fe-new-schema-logs-changes

frontend/src/container/LogsExplorerViews/index.tsx

@@ -134,6 +134,9 @@ function LogsExplorerViews({
 	const [logs, setLogs] = useState<ILog[]>([]);
 	const [requestData, setRequestData] = useState<Query | null>(null);
 	const [showFormatMenuItems, setShowFormatMenuItems] = useState(false);
+	const [lastLogLineTimestamp, setLastLogLineTimestamp] = useState<
+		string | number
+	>();
 	const [queryId, setQueryId] = useState<string>(v4());
 	const [queryStats, setQueryStats] = useState<WsDataEvent>();
 
@@ -260,12 +263,22 @@ function LogsExplorerViews({
 					start: timeRange.start,
 					end: timeRange.end,
 				}),
+			lastLogLineTimestamp:
+				requestData?.builder?.queryData[0]?.orderBy?.[0]?.columnName ===
+					'timestamp' &&
+				requestData?.builder?.queryData[0]?.orderBy?.[0]?.order === 'desc'
+					? lastLogLineTimestamp
+					: undefined,
 		},
 		undefined,
 		listQueryKeyRef,
 		{},
 	);
 
+	useEffect(() => {
+		setLastLogLineTimestamp(undefined);
+	}, [data]);
+
 	const getRequestData = useCallback(
 		(
 			query: Query | null,
@@ -334,6 +347,8 @@ function LogsExplorerViews({
 				pageSize: nextPageSize,
 			});
 
+			setLastLogLineTimestamp(lastLog?.timestamp);
+
 			setPage((prevPage) => prevPage + 1);
 
 			setRequestData(newRequestData);

frontend/src/lib/dashboard/prepareQueryRangePayload.ts

@@ -1,6 +1,7 @@
 import getStartEndRangeTime from 'lib/getStartEndRangeTime';
 import getStep from 'lib/getStep';
 import { mapQueryDataToApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataToApi';
+import { isUndefined } from 'lodash-es';
 import store from 'store';
 import { QueryRangePayload } from 'types/api/metrics/getQueryRange';
 import { EQueryType } from 'types/common/dashboard';
@@ -24,7 +25,11 @@ export const prepareQueryRangePayload = ({
 	fillGaps = false,
 }: GetQueryResultsProps): PrepareQueryRangePayload => {
 	let legendMap: Record<string, string> = {};
-	const { allowSelectedIntervalForStepGen, ...restParams } = params;
+	const {
+		allowSelectedIntervalForStepGen,
+		lastLogLineTimestamp,
+		...restParams
+	} = params;
 
 	const compositeQuery: QueryRangePayload['compositeQuery'] = {
 		queryType: query.queryType,
@@ -90,9 +95,13 @@ export const prepareQueryRangePayload = ({
 		interval: globalSelectedInterval,
 	});
 
+	const endLogTimeStamp = !isUndefined(lastLogLineTimestamp)
+		? new Date(lastLogLineTimestamp as any)?.getTime()
+		: undefined;
+
 	const queryPayload: QueryRangePayload = {
 		start: parseInt(start, 10) * 1e3,
-		end: parseInt(end, 10) * 1e3,
+		end: endLogTimeStamp || parseInt(end, 10) * 1e3,
 		step: getStep({
 			start: allowSelectedIntervalForStepGen
 				? start