fix: fix the issue of saved view overriding query for logs and traces…

… for builder type query

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -114,6 +114,7 @@ function ExplorerOptions({
 		panelType,
 		isStagedQueryUpdated,
 		redirectWithQueryBuilderData,
+		isDefaultQuery,
 	} = useQueryBuilder();
 
 	const handleSaveViewModalToggle = (): void => {
@@ -480,6 +481,11 @@ function ExplorerOptions({
 	] = useState(false);
 
 	useEffect(() => {
+		// If the query is not the default query, don't set the recently used saved view
+		if (!isDefaultQuery({ currentQuery, sourcePage: sourcepage })) {
+			return;
+		}
+
 		const parsedPreservedView = JSON.parse(
 			localStorage.getItem(PRESERVED_VIEW_LOCAL_STORAGE_KEY) || '{}',
 		);
@@ -501,12 +507,18 @@ function ExplorerOptions({
 			setIsRecentlyUsedSavedViewSelected(false);
 		}
 
-		return (): void => clearTimeout(timeoutId);
+		// eslint-disable-next-line consistent-return
+		return (): void => {
+			clearTimeout(timeoutId);
+		};
 	}, [
 		PRESERVED_VIEW_LOCAL_STORAGE_KEY,
 		PRESERVED_VIEW_TYPE,
+		currentQuery,
+		isDefaultQuery,
 		isRecentlyUsedSavedViewSelected,
 		onMenuItemSelectHandler,
+		sourcepage,
 		viewKey,
 		viewName,
 		viewsData?.data?.data,

frontend/src/providers/QueryBuilder.tsx

@@ -53,6 +53,7 @@ import { ViewProps } from 'types/api/saveViews/types';
 import { EQueryType } from 'types/common/dashboard';
 import {
 	DataSource,
+	IsDefaultQueryProps,
 	QueryBuilderContextType,
 	QueryBuilderData,
 } from 'types/common/queryBuilder';
@@ -87,6 +88,7 @@ export const QueryBuilderContext = createContext<QueryBuilderContextType>({
 	initQueryBuilderData: () => {},
 	handleOnUnitsChange: () => {},
 	isStagedQueryUpdated: () => false,
+	isDefaultQuery: () => false,
 });
 
 export function QueryBuilderProvider({
@@ -249,6 +251,66 @@ export function QueryBuilderProvider({
 		[getElementWithActualOperator],
 	);
 
+	const isDefaultQuery = useCallback(
+		({ currentQuery, sourcePage }: IsDefaultQueryProps): boolean => {
+			// Get default query with updated operators
+			const defaultQuery = updateAllQueriesOperators(
+				initialQueriesMap[sourcePage],
+				PANEL_TYPES.LIST,
+				sourcePage,
+			);
+
+			// Early return if query types don't match
+			if (currentQuery.queryType !== defaultQuery.queryType) {
+				return false;
+			}
+
+			// Only compare builder queries
+			if (currentQuery.queryType !== EQueryType.QUERY_BUILDER) {
+				return false;
+			}
+
+			const defaultBuilderData = defaultQuery.builder
+				.queryData[0] as IBuilderQuery;
+
+			const currentBuilderData = currentQuery.builder
+				.queryData[0] as IBuilderQuery;
+
+			// Check if filters have same operator and length
+			const isFiltersEqual =
+				currentBuilderData.filters.op === defaultBuilderData.filters.op &&
+				currentBuilderData.filters.items.length ===
+					defaultBuilderData.filters.items.length;
+
+			// Compare builder data fields
+			const fieldsMatch =
+				currentBuilderData.dataSource === defaultBuilderData.dataSource &&
+				currentBuilderData.queryName === defaultBuilderData.queryName &&
+				currentBuilderData.aggregateOperator ===
+					defaultBuilderData.aggregateOperator &&
+				currentBuilderData.timeAggregation === defaultBuilderData.timeAggregation &&
+				currentBuilderData.spaceAggregation ===
+					defaultBuilderData.spaceAggregation &&
+				currentBuilderData.expression === defaultBuilderData.expression &&
+				currentBuilderData.disabled === defaultBuilderData.disabled &&
+				currentBuilderData.stepInterval === defaultBuilderData.stepInterval &&
+				currentBuilderData.reduceTo === defaultBuilderData.reduceTo &&
+				currentBuilderData.legend === defaultBuilderData.legend;
+
+			// Compare array fields
+			const arrayFieldsMatch =
+				isFiltersEqual &&
+				JSON.stringify(currentBuilderData.functions) ===
+					JSON.stringify(defaultBuilderData.functions) &&
+				JSON.stringify(currentBuilderData.having) ===
+					JSON.stringify(defaultBuilderData.having) &&
+				JSON.stringify(currentBuilderData.groupBy) ===
+					JSON.stringify(defaultBuilderData.groupBy);
+
+			return fieldsMatch && arrayFieldsMatch;
+		},
+		[updateAllQueriesOperators],
+	);
 	const updateQueriesData = useCallback(
 		<T extends keyof QueryBuilderData>(
 			query: Query,
@@ -883,6 +945,7 @@ export function QueryBuilderProvider({
 			handleRunQuery,
 			resetQuery,
 			updateAllQueriesOperators,
+			isDefaultQuery,
 			updateQueriesData,
 			initQueryBuilderData,
 			handleOnUnitsChange,
@@ -909,6 +972,7 @@ export function QueryBuilderProvider({
 			redirectWithQueryBuilderData,
 			handleRunQuery,
 			updateAllQueriesOperators,
+			isDefaultQuery,
 			updateQueriesData,
 			initQueryBuilderData,
 			handleOnUnitsChange,

frontend/src/types/common/queryBuilder.ts

@@ -247,9 +247,15 @@ export type QueryBuilderContextType = {
 		viewData: ViewProps[] | undefined,
 		viewKey: string,
 	) => boolean;
+	isDefaultQuery: (props: IsDefaultQueryProps) => boolean;
 };
 
 export type QueryAdditionalFilter = {
 	field: keyof IBuilderQuery;
 	text: string;
 };
+
+export type IsDefaultQueryProps = {
+	currentQuery: Query;
+	sourcePage: DataSource;
+};