From 55edc6c1e00e0c0ec8be78354d91892c0cf0f6dc Mon Sep 17 00:00:00 2001
From: arnav-makkar <arnavmakkar080505@gmail.com>
Date: Sun, 25 Jan 2026 17:29:44 +0530
Subject: [PATCH 1/4] fixed add criteria box

---
 modules/dataquery/jsx/definefilters.addfiltermodal.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index 93fb18f235..26a26f9eeb 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -282,15 +282,15 @@ function AddFilterModal(props: {
     }
     );
   return (
-    <Modal title={t('Add criteria', {ns: 'dataquery'})}
+    <Modal title={t('Add Condition', {ns: 'dataquery'})}
       show={true}
       throwWarning={true}
       onClose={props.closeModal}
       onSubmit={submitPromise}>
       <div style={{width: '100%', padding: '1em'}}>
-        <h3>{t('Field', {ns: 'dataquery', count: 1})}</h3>
         <div style={{display: 'flex', width: '100%'}}>
           <div style={{width: '40%'}}>
+            <h3>{t('Category', {ns: 'dataquery', count: 1})}</h3>
             <FilterableSelectGroup
               groups={props.categories.categories}
               mapGroupName={(key) => props.categories.modules[key]}
@@ -305,6 +305,7 @@ function AddFilterModal(props: {
             />
           </div>
           <div style={{width: '100%'}}>
+            <h3>{t('Field', {ns: 'dataquery', count: 1})}</h3>
             {fieldSelect}
           </div>
         </div>

From 84db646e14d46c574b9524d5b8a06e77bc9035f5 Mon Sep 17 00:00:00 2001
From: arnav-makkar <arnavmakkar080505@gmail.com>
Date: Tue, 3 Feb 2026 13:30:19 +0530
Subject: [PATCH 2/4] removed redundancy, ui improvements

---
 .../jsx/definefilters.addfiltermodal.tsx      | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index 26a26f9eeb..bb312ad565 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -145,9 +145,11 @@ function AddFilterModal(props: {
     }
 
     criteriaSelect = <div>
-      <h3>{t('Criteria', {ns: 'dataquery'})}</h3>
+      <h4 style={{color: '#003d68', fontWeight: 'normal'}}>
+        {t('Criteria', {ns: 'dataquery'})}
+      </h4>
       <div style={{display: 'flex'}}>
-        <div style={{width: '20%'}}>
+        <div style={{width: '40%'}}>
           <FilterableSelectGroup groups={
             {'Operators': getOperatorOptions(fieldDictionary, t)}
           }
@@ -157,14 +159,15 @@ function AddFilterModal(props: {
           placeholder={t('Select an operator', {ns: 'dataquery'})}
           />
         </div>
-        <div style={{width: '80%'}}>{valueSelect}</div>
+        <div style={{width: '60%'}}>{valueSelect}</div>
       </div>
     </div>;
 
     if (fieldDictionary.scope == 'session' && fieldDictionary.visits) {
       visitSelect = <div onClick={(e) => e.stopPropagation()}>
-        <h3>{t('for at least one of the following visits',
-          {ns: 'dataquery'})}</h3>
+        <h4 style={{color: '#003d68', fontWeight: 'normal'}}>
+            {t('Visits', {ns: 'dataquery'})}
+        </h4>
         <VisitList
           t={t}
           options={fieldDictionary.visits}
@@ -282,7 +285,9 @@ function AddFilterModal(props: {
     }
     );
   return (
-    <Modal title={t('Add Condition', {ns: 'dataquery'})}
+    <Modal title={<span style={{color: '#003d68'}}>
+      {t('Add Condition', {ns: 'dataquery'})}
+    </span>}
       show={true}
       throwWarning={true}
       onClose={props.closeModal}
@@ -290,7 +295,6 @@ function AddFilterModal(props: {
       <div style={{width: '100%', padding: '1em'}}>
         <div style={{display: 'flex', width: '100%'}}>
           <div style={{width: '40%'}}>
-            <h3>{t('Category', {ns: 'dataquery', count: 1})}</h3>
             <FilterableSelectGroup
               groups={props.categories.categories}
               mapGroupName={(key) => props.categories.modules[key]}
@@ -304,8 +308,7 @@ function AddFilterModal(props: {
               }}
             />
           </div>
-          <div style={{width: '100%'}}>
-            <h3>{t('Field', {ns: 'dataquery', count: 1})}</h3>
+          <div style={{width: '60%'}}>
             {fieldSelect}
           </div>
         </div>
@@ -356,9 +359,9 @@ function getOperatorOptions(dict: FieldDictionary, t: any) {
     options = {
       'eq': '=',
       'neq': '≠',
-      'startsWith': t('starts with', {ns: 'dataquery'}),
-      'contains': t('contains', {ns: 'dataquery'}),
-      'endsWith': t('ends with', {ns: 'dataquery'}),
+      'startsWith': t('Starts With', {ns: 'dataquery'}),
+      'contains': t('Contains', {ns: 'dataquery'}),
+      'endsWith': t('Ends With', {ns: 'dataquery'}),
     };
   } else {
     // fall back to == and !=, valid for any type.

From 08502902cdf909868fa8ddaded939d49349c5a79 Mon Sep 17 00:00:00 2001
From: arnav-makkar <arnavmakkar080505@gmail.com>
Date: Tue, 3 Feb 2026 13:38:51 +0530
Subject: [PATCH 3/4] linter

---
 modules/dataquery/jsx/definefilters.addfiltermodal.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index bb312ad565..a9e2624371 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -166,7 +166,7 @@ function AddFilterModal(props: {
     if (fieldDictionary.scope == 'session' && fieldDictionary.visits) {
       visitSelect = <div onClick={(e) => e.stopPropagation()}>
         <h4 style={{color: '#003d68', fontWeight: 'normal'}}>
-            {t('Visits', {ns: 'dataquery'})}
+          {t('Visits', {ns: 'dataquery'})}
         </h4>
         <VisitList
           t={t}
@@ -288,10 +288,10 @@ function AddFilterModal(props: {
     <Modal title={<span style={{color: '#003d68'}}>
       {t('Add Condition', {ns: 'dataquery'})}
     </span>}
-      show={true}
-      throwWarning={true}
-      onClose={props.closeModal}
-      onSubmit={submitPromise}>
+    show={true}
+    throwWarning={true}
+    onClose={props.closeModal}
+    onSubmit={submitPromise}>
       <div style={{width: '100%', padding: '1em'}}>
         <div style={{display: 'flex', width: '100%'}}>
           <div style={{width: '40%'}}>

From 9a35664b31e5762f18a93576616fd783edca8e5c Mon Sep 17 00:00:00 2001
From: arnav-makkar <arnavmakkar080505@gmail.com>
Date: Thu, 2 Apr 2026 23:49:40 +0530
Subject: [PATCH 4/4] fix comments

---
 .../dataquery/jsx/definefilters.addfiltermodal.tsx    | 11 +++++------
 modules/dataquery/locale/dataquery.pot                |  3 ---
 modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po  |  3 ---
 modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po  |  3 ---
 modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po  |  3 ---
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
index a9e2624371..34d9e4b09e 100644
--- a/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
+++ b/modules/dataquery/jsx/definefilters.addfiltermodal.tsx
@@ -165,9 +165,8 @@ function AddFilterModal(props: {
 
     if (fieldDictionary.scope == 'session' && fieldDictionary.visits) {
       visitSelect = <div onClick={(e) => e.stopPropagation()}>
-        <h4 style={{color: '#003d68', fontWeight: 'normal'}}>
-          {t('Visits', {ns: 'dataquery'})}
-        </h4>
+        <h3>{t('for at least one of the following visits',
+          {ns: 'dataquery'})}</h3>
         <VisitList
           t={t}
           options={fieldDictionary.visits}
@@ -359,9 +358,9 @@ function getOperatorOptions(dict: FieldDictionary, t: any) {
     options = {
       'eq': '=',
       'neq': '≠',
-      'startsWith': t('Starts With', {ns: 'dataquery'}),
-      'contains': t('Contains', {ns: 'dataquery'}),
-      'endsWith': t('Ends With', {ns: 'dataquery'}),
+      'startsWith': t('starts with', {ns: 'dataquery'}),
+      'contains': t('contains', {ns: 'dataquery'}),
+      'endsWith': t('ends with', {ns: 'dataquery'}),
     };
   } else {
     // fall back to == and !=, valid for any type.
diff --git a/modules/dataquery/locale/dataquery.pot b/modules/dataquery/locale/dataquery.pot
index 165db07949..eb2f8e18d2 100644
--- a/modules/dataquery/locale/dataquery.pot
+++ b/modules/dataquery/locale/dataquery.pot
@@ -250,9 +250,6 @@ msgstr ""
 msgid "No visits selected for criteria."
 msgstr ""
 
-msgid "Add criteria"
-msgstr ""
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] ""
diff --git a/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
index d35352d9f9..526a289281 100644
--- a/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
@@ -373,9 +373,6 @@ msgstr "Visites non valides"
 msgid "No visits selected for criteria."
 msgstr "Aucune visite sélectionnée pour ces critères."
 
-msgid "Add criteria"
-msgstr "Ajouter critère"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "Champ"
diff --git a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
index 11b88ab4ad..d4fc90fe0d 100644
--- a/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
@@ -256,9 +256,6 @@ msgstr "अमान्य विज़िट"
 msgid "No visits selected for criteria."
 msgstr "मानदंड के लिए कोई विज़िट चयनित नहीं है।"
 
-msgid "Add criteria"
-msgstr "मानदंड जोड़ें"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "फ़ील्ड"
diff --git a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
index d1374b635a..cbf973efa0 100644
--- a/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
+++ b/modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
@@ -259,9 +259,6 @@ msgstr "無効な訪問"
 msgid "No visits selected for criteria."
 msgstr "基準に該当する訪問が選択されていません。"
 
-msgid "Add criteria"
-msgstr "条件を追加する"
-
 msgid "Field"
 msgid_plural "Fields"
 msgstr[0] "分野"