From 3ce3ed7e5295212c6afe06af70f4efa4fbfada8d Mon Sep 17 00:00:00 2001
From: Henri Rabalais <henri.j.rabalais@gmail.com>
Date: Mon, 27 Jul 2026 12:36:25 -0400
Subject: [PATCH] [dataquery] clear operator when the filter field changes

---
 .../jsx/definefilters.addfiltermodal.tsx         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index 93fb18f235..8dd3dd2cca 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -148,13 +148,15 @@ function AddFilterModal(props: {
       <h3>{t('Criteria', {ns: 'dataquery'})}</h3>
       <div style={{display: 'flex'}}>
         <div style={{width: '20%'}}>
-          <FilterableSelectGroup groups={
-            {'Operators': getOperatorOptions(fieldDictionary, t)}
-          }
-          onChange={(value: string, operator: string) => {
-            setOp(operator as Operators);
-          }}
-          placeholder={t('Select an operator', {ns: 'dataquery'})}
+          <FilterableSelectGroup
+            key={fieldname}
+            groups={
+              {'Operators': getOperatorOptions(fieldDictionary, t)}
+            }
+            onChange={(value: string, operator: string) => {
+              setOp(operator as Operators);
+            }}
+            placeholder={t('Select an operator', {ns: 'dataquery'})}
           />
         </div>
         <div style={{width: '80%'}}>{valueSelect}</div>