From da74619a46cf117f9cdfd2542f7fc1e1a9194aac Mon Sep 17 00:00:00 2001
From: Vikrant Gupta <vikrant.thomso@gmail.com>
Date: Thu, 23 May 2024 22:43:11 +0530
Subject: [PATCH] fix: cursor resetting in dropdown causing wrong query
 selection (#5063)

---
 frontend/src/hooks/queryBuilder/useAutoComplete.ts | 1 +
 frontend/src/hooks/queryBuilder/useOptions.ts      | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/frontend/src/hooks/queryBuilder/useAutoComplete.ts b/frontend/src/hooks/queryBuilder/useAutoComplete.ts
index 6ac51eb45d..8872b2dc02 100644
--- a/frontend/src/hooks/queryBuilder/useAutoComplete.ts
+++ b/frontend/src/hooks/queryBuilder/useAutoComplete.ts
@@ -126,6 +126,7 @@ export const useAutoComplete = (
 		isExist,
 		results,
 		result,
+		isFetching,
 		whereClauseConfig,
 	);
 
diff --git a/frontend/src/hooks/queryBuilder/useOptions.ts b/frontend/src/hooks/queryBuilder/useOptions.ts
index 322934372c..f050d19f82 100644
--- a/frontend/src/hooks/queryBuilder/useOptions.ts
+++ b/frontend/src/hooks/queryBuilder/useOptions.ts
@@ -23,6 +23,7 @@ export const useOptions = (
 	isExist: boolean,
 	results: string[],
 	result: string[],
+	isFetching: boolean,
 	whereClauseConfig?: WhereClauseConfig,
 ): Option[] => {
 	const [options, setOptions] = useState<Option[]>([]);
@@ -138,6 +139,9 @@ export const useOptions = (
 		if (newOptions.length > 0) {
 			setOptions(newOptions);
 		}
+		if (isFetching) {
+			setOptions([]);
+		}
 	}, [
 		whereClauseConfig,
 		getKeyOpValue,
@@ -154,6 +158,7 @@ export const useOptions = (
 		searchValue,
 		getKeyOperatorOptions,
 		getOptionsWithValidOperator,
+		isFetching,
 	]);
 
 	return useMemo(