From 7f05ce3d050e34b480ba6652dd4b6789e7a8633b Mon Sep 17 00:00:00 2001
From: Yevhen Shevchenko <90138953+yeshev@users.noreply.github.com>
Date: Fri, 16 Jun 2023 15:40:54 +0300
Subject: [PATCH] fix: query operator (#2924)

---
 frontend/src/hooks/queryBuilder/useQueryOperations.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/hooks/queryBuilder/useQueryOperations.ts b/frontend/src/hooks/queryBuilder/useQueryOperations.ts
index bbbc12ffd5..b1d2f35c18 100644
--- a/frontend/src/hooks/queryBuilder/useQueryOperations.ts
+++ b/frontend/src/hooks/queryBuilder/useQueryOperations.ts
@@ -132,12 +132,20 @@ export const useQueryOperations: UseQueryOperations = ({ query, index }) => {
 		if (JSON.stringify(operators) === JSON.stringify(initialOperators)) return;
 
 		setOperators(initialOperators);
-		handleChangeOperator(initialOperators[0].value);
+
+		const isCurrentOperatorAvailableInList = initialOperators
+			.map((operator) => operator.value)
+			.includes(aggregateOperator);
+
+		if (!isCurrentOperatorAvailableInList) {
+			handleChangeOperator(initialOperators[0].value);
+		}
 	}, [
 		dataSource,
 		initialDataSource,
 		panelType,
 		operators,
+		aggregateOperator,
 		handleChangeOperator,
 	]);