Add limit operator to smart search dialog.

zetkin · Sep 26, 2023 · 03430ba · 03430ba
1 parent c6aa98a
commit 03430ba
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 0 deletions.
diff --git a/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx b/src/features/smartSearch/components/SmartSearchDialog/QueryOverview/getFilterComponents.tsx
@@ -6,6 +6,7 @@ import {
   Call,
   CheckBoxOutlined,
   Event,
+  FilterAlt,
   LocalOfferOutlined,
   PersonAddAlt,
   PersonOutlined,
@@ -64,6 +65,8 @@ export default function getFilterComponents(
     filterOperatorIcon = undefined;
   } else if (filter.op === OPERATION.SUB) {
     filterOperatorIcon = <Remove color="secondary" fontSize="small" />;
+  } else if (filter.op === OPERATION.LIMIT) {
+    filterOperatorIcon = <FilterAlt color="secondary" fontSize="small" />;
   }
 
   //Uses CALL_BLOCKED as default

diff --git a/src/features/smartSearch/components/filters/CampaignParticipation/index.tsx b/src/features/smartSearch/components/filters/CampaignParticipation/index.tsx
@@ -184,6 +184,9 @@ const CampaignParticipation = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={messageIds.operators.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={messageIds.operators.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             bookedSelect: (

diff --git a/src/features/smartSearch/components/filters/MostActive/index.tsx b/src/features/smartSearch/components/filters/MostActive/index.tsx
@@ -81,6 +81,9 @@ const MostActive = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={messageIds.operators.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={messageIds.operators.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             numPeople: filter.config?.size,

diff --git a/src/features/smartSearch/components/filters/PersonData/index.tsx b/src/features/smartSearch/components/filters/PersonData/index.tsx
@@ -120,6 +120,9 @@ const PersonData = ({
       <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
         <Msg id={messageIds.operators.sub} />
       </MenuItem>
+      <MenuItem key={OPERATION.SUB} value={OPERATION.LIMIT}>
+        <Msg id={messageIds.operators.limit} />
+      </MenuItem>
     </StyledSelect>
   );
 

diff --git a/src/features/smartSearch/components/filters/PersonView/index.tsx b/src/features/smartSearch/components/filters/PersonView/index.tsx
@@ -102,6 +102,9 @@ const PersonView = ({
                   <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                     <Msg id={messageIds.operators.sub} />
                   </MenuItem>
+                  <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                    <Msg id={messageIds.operators.limit} />
+                  </MenuItem>
                 </StyledSelect>
               ),
               inSelect: (

diff --git a/src/features/smartSearch/components/filters/Random/index.tsx b/src/features/smartSearch/components/filters/Random/index.tsx
@@ -105,6 +105,9 @@ const Random = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={localMessageIds.addLimitRemoveSelect.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={localMessageIds.addLimitRemoveSelect.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             quantity: (

diff --git a/src/features/smartSearch/components/filters/SurveyResponse/index.tsx b/src/features/smartSearch/components/filters/SurveyResponse/index.tsx
@@ -190,6 +190,9 @@ const SurveyResponse = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={messageIds.operators.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={messageIds.operators.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             freeTextInput: (

diff --git a/src/features/smartSearch/components/filters/SurveySubmission/index.tsx b/src/features/smartSearch/components/filters/SurveySubmission/index.tsx
@@ -115,6 +115,9 @@ const SurveySubmission = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={messageIds.operators.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={messageIds.operators.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             surveySelect: (

diff --git a/src/features/smartSearch/components/filters/User/index.tsx b/src/features/smartSearch/components/filters/User/index.tsx
@@ -66,6 +66,9 @@ const User = ({
                 <MenuItem key={OPERATION.SUB} value={OPERATION.SUB}>
                   <Msg id={messageIds.operators.sub} />
                 </MenuItem>
+                <MenuItem key={OPERATION.LIMIT} value={OPERATION.LIMIT}>
+                  <Msg id={messageIds.operators.limit} />
+                </MenuItem>
               </StyledSelect>
             ),
             connectedSelect: (

diff --git a/src/features/smartSearch/components/types.ts b/src/features/smartSearch/components/types.ts
@@ -46,6 +46,7 @@ export enum CALL_OPERATOR {
 export enum OPERATION {
   ADD = 'add',
   SUB = 'sub',
+  LIMIT = 'limit',
 }
 
 export enum QUANTITY {

diff --git a/src/features/smartSearch/l10n/messageIds.ts b/src/features/smartSearch/l10n/messageIds.ts
@@ -283,6 +283,7 @@ export default makeMessages('feat.smartSearch', {
     random: {
       addLimitRemoveSelect: {
         add: m('add'),
+        limit: m('limit to'),
         sub: m('remove'),
       },
       examples: {
@@ -568,6 +569,7 @@ export default makeMessages('feat.smartSearch', {
   },
   operators: {
     add: m('Add'),
+    limit: m('Limit to'),
     sub: m('Remove'),
   },
   quantity: {