From f532014e2773b9ed525bae97d586ccd255e1554a Mon Sep 17 00:00:00 2001
From: ahrefabhi <ahrefabhi@gmail.com>
Date: Mon, 14 Jul 2025 11:41:45 +0530
Subject: [PATCH] fix: added fix for spanscopeselector

---
 .../QueryBuilderSearchV2/SpanScopeSelector.tsx        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx
index 287d06a27311..3b27a178e594 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx
@@ -1,4 +1,5 @@
 import { Select } from 'antd';
+import { removeKeysFromExpression } from 'components/QueryBuilderV2/utils';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { cloneDeep } from 'lodash-es';
 import { useEffect, useState } from 'react';
@@ -119,8 +120,18 @@ function SpanScopeSelector({
 			return [...nonScopeFilters, ...newScopeFilter];
 		};
 
+		const keysToRemove = Object.values(SPAN_FILTER_CONFIG)
+			.map((config) => config?.key)
+			.filter((key): key is string => typeof key === 'string');
+
 		newQuery.builder.queryData = newQuery.builder.queryData.map((item) => ({
 			...item,
+			filter: {
+				expression: removeKeysFromExpression(
+					item.filter?.expression ?? '',
+					keysToRemove,
+				),
+			},
 			filters: {
 				...item.filters,
 				items: getUpdatedFilters(