From 9e02147d4ca49c4a137dcdaa14d304cb215dcf9a Mon Sep 17 00:00:00 2001
From: Vikrant Gupta <vikrant.thomso@gmail.com>
Date: Tue, 26 Mar 2024 23:54:31 +0530
Subject: [PATCH] fix: [SIG-574]: support __ in the groupBy clause (#4747)

---
 .../filters/GroupByFilter/GroupByFilter.tsx   | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
index 386786f70c..e7b00756f5 100644
--- a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
+++ b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
@@ -1,11 +1,7 @@
 import { Select, Spin } from 'antd';
 import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys';
 // ** Constants
-import {
-	idDivider,
-	QueryBuilderKeys,
-	selectValueDivider,
-} from 'constants/queryBuilder';
+import { idDivider, QueryBuilderKeys } from 'constants/queryBuilder';
 import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
 import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
 import useDebounce from 'hooks/useDebounce';
@@ -83,11 +79,7 @@ export const GroupByFilter = memo(function GroupByFilter({
 								dataType={item.dataType || ''}
 							/>
 						),
-						value: `${transformStringWithPrefix({
-							str: item.key,
-							prefix: item.type || '',
-							condition: !item.isColumn,
-						})}${selectValueDivider}${item.id}`,
+						value: `${item.id}`,
 					})) || [];
 
 				setOptionsData(options);
@@ -135,7 +127,8 @@ export const GroupByFilter = memo(function GroupByFilter({
 			const keys = await getAttributeKeys();
 
 			const groupByValues: BaseAutocompleteData[] = values.map((item) => {
-				const [currentValue, id] = item.value.split(selectValueDivider);
+				const id = item.value;
+				const currentValue = item.value.split(idDivider)[0];
 
 				if (id && id.includes(idDivider)) {
 					const attribute = keys.find((item) => item.id === id);
@@ -174,11 +167,7 @@ export const GroupByFilter = memo(function GroupByFilter({
 						condition: !item.isColumn,
 					}),
 				)}`,
-				value: `${transformStringWithPrefix({
-					str: item.key,
-					prefix: item.type || '',
-					condition: !item.isColumn,
-				})}${selectValueDivider}${item.id}`,
+				value: `${item.id}`,
 			}),
 		);