From 2b5d2f0061948fb1aa4fca35a08083e74d9680ae Mon Sep 17 00:00:00 2001
From: Yunus M <myounis.ar@live.com>
Date: Wed, 14 May 2025 13:16:49 +0530
Subject: [PATCH] fix: show operator suggestions only on manual trigger or
 valid key

---
 .../QueryAggregation/QueryAggregationSelect.tsx   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
index b92cbbf8af56..84e60ad59821 100644
--- a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
@@ -8,8 +8,10 @@ import './QueryAggregation.styles.scss';
 
 import {
 	autocompletion,
+	closeCompletion,
 	Completion,
 	CompletionContext,
+	completionKeymap,
 	CompletionResult,
 } from '@codemirror/autocomplete';
 import { javascript } from '@codemirror/lang-javascript';
@@ -18,6 +20,7 @@ import { copilot } from '@uiw/codemirror-theme-copilot';
 import CodeMirror, {
 	Decoration,
 	EditorView,
+	keymap,
 	ViewPlugin,
 	ViewUpdate,
 } from '@uiw/react-codemirror';
@@ -313,8 +316,11 @@ function QueryAggregationSelect(): JSX.Element {
 							};
 						}
 
-						// Otherwise, always show function suggestions
+						// Otherwise, show operator suggestions only if a valid word is present or manually triggered
 						const word = context.matchBefore(/[\w\d_]+/);
+						if (!word && !context.explicit) {
+							return null;
+						}
 						return {
 							from: word ? word.from : context.pos,
 							options: operatorCompletions,
@@ -341,6 +347,13 @@ function QueryAggregationSelect(): JSX.Element {
 					chipPlugin,
 					aggregatorAutocomplete,
 					javascript({ jsx: false, typescript: false }),
+					keymap.of([
+						...completionKeymap,
+						{
+							key: 'Escape',
+							run: closeCompletion,
+						},
+					]),
 				]}
 				placeholder="Type aggregator functions like sum(), count_distinct(...), etc."
 				basicSetup={{