Skip to content

[DQT] Fix terminology and labels in Add Condition modal #10504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HachemJ wants to merge 4 commits into
base: 28.0-release
Choose a base branch
from
Open

[DQT] Fix terminology and labels in Add Condition modal #10504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55edc6c
fixed add criteria box
arnav-makkar Jan 25, 2026
84db646
removed redundancy, ui improvements
arnav-makkar Feb 3, 2026
0850290
linter
arnav-makkar Feb 3, 2026
9a35664
fix comments
arnav-makkar Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions modules/dataquery/jsx/definefilters.addfiltermodal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
}
Expand All @@ -157,7 +159,7 @@ 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>;

Expand Down Expand Up @@ -282,13 +284,14 @@ function AddFilterModal(props: {
}
);
return (
<Modal title={t('Add criteria', {ns: 'dataquery'})}
show={true}
throwWarning={true}
onClose={props.closeModal}
onSubmit={submitPromise}>
<Modal title={<span style={{color: '#003d68'}}>
{t('Add Condition', {ns: 'dataquery'})}
</span>}
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%'}}>
<FilterableSelectGroup
Expand All @@ -304,7 +307,7 @@ function AddFilterModal(props: {
}}
/>
</div>
<div style={{width: '100%'}}>
<div style={{width: '60%'}}>
{fieldSelect}
</div>
</div>
Expand Down
3 changes: 0 additions & 3 deletions modules/dataquery/locale/dataquery.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,6 @@ msgstr ""
msgid "No visits selected for criteria."
msgstr ""

msgid "Add criteria"
msgstr ""

msgid "Field"
msgid_plural "Fields"
msgstr[0] ""
Expand Down
3 changes: 0 additions & 3 deletions modules/dataquery/locale/fr/LC_MESSAGES/dataquery.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions modules/dataquery/locale/hi/LC_MESSAGES/dataquery.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ msgstr "अमान्य विज़िट"
msgid "No visits selected for criteria."
msgstr "मानदंड के लिए कोई विज़िट चयनित नहीं है।"

msgid "Add criteria"
msgstr "मानदंड जोड़ें"

msgid "Field"
msgid_plural "Fields"
msgstr[0] "फ़ील्ड"
Expand Down
3 changes: 0 additions & 3 deletions modules/dataquery/locale/ja/LC_MESSAGES/dataquery.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ msgstr "無効な訪問"
msgid "No visits selected for criteria."
msgstr "基準に該当する訪問が選択されていません。"

msgid "Add criteria"
msgstr "条件を追加する"

msgid "Field"
msgid_plural "Fields"
msgstr[0] "分野"
Expand Down
Loading