From 7ff97586be00d683fcade55a16950de98588a733 Mon Sep 17 00:00:00 2001
From: SagarRajput-7 <sagar@signoz.io>
Date: Thu, 26 Jun 2025 13:20:03 +0530
Subject: [PATCH] fix: added metricName to the metric where clause keys api

---
 frontend/src/api/querySuggestions/getKeySuggestions.ts      | 4 +++-
 .../MerticsAggregateSection/MetricsAggregateSection.tsx     | 1 -
 .../QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx      | 3 ++-
 .../src/hooks/querySuggestions/useGetQueryKeySuggestions.ts | 6 ++++--
 frontend/src/types/api/querySuggestions/types.ts            | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/api/querySuggestions/getKeySuggestions.ts b/frontend/src/api/querySuggestions/getKeySuggestions.ts
index 293defaf76ef..83ddc3d9ccb8 100644
--- a/frontend/src/api/querySuggestions/getKeySuggestions.ts
+++ b/frontend/src/api/querySuggestions/getKeySuggestions.ts
@@ -8,4 +8,6 @@ import {
 export const getKeySuggestions = (
 	props: QueryKeyRequestProps,
 ): Promise<AxiosResponse<QueryKeySuggestionsResponseProps>> =>
-	axios.get(`/fields/keys?signal=${props.signal}&name=${props.name}`);
+	axios.get(
+		`/fields/keys?signal=${props.signal}&name=${props.name}&metricName=${props.metricName}`,
+	);
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx
index b645167c7fb2..55e2cff21242 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx
@@ -37,7 +37,6 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
 	});
 
 	useEffect(() => {
-		console.log('query', query);
 		setAggregationOptions([
 			{
 				func: query.spaceAggregation || 'count',
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
index b30ba6de4789..40854293b9be 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
@@ -144,6 +144,7 @@ function QuerySearch({
 		const response = await getKeySuggestions({
 			signal: dataSource,
 			name: searchText || '',
+			metricName: queryData.aggregateAttribute.key ?? undefined,
 		});
 
 		if (response.data.data) {
@@ -158,7 +159,7 @@ function QuerySearch({
 		setKeySuggestions([]);
 		fetchKeySuggestions();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [dataSource]);
+	}, [dataSource, queryData.aggregateAttribute.key]);
 
 	// Add a state for tracking editing mode
 	const [editingMode, setEditingMode] = useState<
diff --git a/frontend/src/hooks/querySuggestions/useGetQueryKeySuggestions.ts b/frontend/src/hooks/querySuggestions/useGetQueryKeySuggestions.ts
index 85fb7914e504..6bef302bb9f7 100644
--- a/frontend/src/hooks/querySuggestions/useGetQueryKeySuggestions.ts
+++ b/frontend/src/hooks/querySuggestions/useGetQueryKeySuggestions.ts
@@ -6,14 +6,16 @@ import { QueryKeySuggestionsResponseProps } from 'types/api/querySuggestions/typ
 export const useGetQueryKeySuggestions = ({
 	signal,
 	name,
+	metricName,
 }: {
 	signal: string;
 	name: string;
+	metricName?: string;
 }): UseQueryResult<
 	AxiosResponse<QueryKeySuggestionsResponseProps>,
 	AxiosError
 > =>
 	useQuery<AxiosResponse<QueryKeySuggestionsResponseProps>, AxiosError>({
-		queryKey: ['queryKeySuggestions', signal, name],
-		queryFn: () => getKeySuggestions({ signal, name }),
+		queryKey: ['queryKeySuggestions', signal, name, metricName],
+		queryFn: () => getKeySuggestions({ signal, name, metricName }),
 	});
diff --git a/frontend/src/types/api/querySuggestions/types.ts b/frontend/src/types/api/querySuggestions/types.ts
index 219692a0a9d5..a0b26c22c52e 100644
--- a/frontend/src/types/api/querySuggestions/types.ts
+++ b/frontend/src/types/api/querySuggestions/types.ts
@@ -23,6 +23,7 @@ export interface QueryKeySuggestionsResponseProps {
 export interface QueryKeyRequestProps {
 	signal: string;
 	name: string;
+	metricName?: string;
 }
 
 export interface QueryKeyValueSuggestionsProps {