[ENG-11866][ENG-11524][ENG-11871] Refactor notification campaign filters to use a dynamic query builder + Bug fixes

admin/notifications/views.py

@@ -19,8 +19,9 @@
 from mako.parsetree import ControlLine
 from string import Formatter
 from osf.email import _render_email_html
-from osf.email.notification_campaign import FILTER_PRESETS, counter_subquery
+from osf.email.notification_campaign import FILTER_PRESETS, counter_subquery, build_query
 from website import settings
+from urllib.parse import urlencode
 
 
 def delete_selected_notifications(selected_ids):
@@ -556,6 +557,14 @@ class NotificationCampaignCreateView(CreateView):
     def form_valid(self, form):
         form.instance.created_by = self.request.user
 
+        if 'manual' in form.cleaned_data['filters']:
+            if not form.cleaned_data['filters']['manual']['children']:
+                form.add_error(
+                    'filters',
+                    'Manual filters cannot be empty.'
+                )
+                return self.form_invalid(form)
+
         form.instance.metadata = {
             'filters': form.cleaned_data['filters'],
             'context': form.cleaned_data['context'],
@@ -620,20 +629,16 @@ class NotificationCampaignsRecipientsPreview(PermissionRequiredMixin, ListView):
     paginate_by = 25
 
     def get_queryset(self):
-        filters = {}
+        query = Q()
         raw_filters = self.request.GET.get('filters', None)
         if raw_filters:
             json_filters = json.loads(raw_filters)
             if predefined := json_filters.get('predefined'):
-                filters = FILTER_PRESETS.get(predefined, {})
+                query = Q(**FILTER_PRESETS.get(predefined, {}))
             else:
-                for item in json_filters.get('manual', []):
-                    if item['lookup'] != 'in':
-                        filters[f'{item["field"]}__{item["lookup"]}'] = item['value']
-                    else:
-                        filters[f'{item["field"]}__{item["lookup"]}'] = [value.strip() for value in item['value'].split(',')]
+                query = build_query(json_filters.get('manual'))
 
-        qs = OSFUser.objects.filter(**filters)
+        qs = OSFUser.objects.filter(query)
         qs = qs.annotate(
             guid=F('guids___id'),
             activity_score=Coalesce(Subquery(counter_subquery), 0)
@@ -649,8 +654,10 @@ def get_context_data(self, **kwargs):
             users,
             page_size,
         )
+
+        filters = self.request.GET.get('filters')
         # append search param to pagination links
-        kwargs.update({'extra_query_params': f'&filters={self.request.GET.get("filters")}'})
+        kwargs.update({'extra_query_params': f'&{urlencode({'filters': filters})}'})
         return super().get_context_data(
             **kwargs,
             page=page,

admin/templates/notifications/campaign_filter_group.html

@@ -0,0 +1,22 @@
+<div class="filter-group{% if not is_root %} ms-4{% endif %}">
+    <div class="d-flex align-items-center gap-2 mb-2">
+        <strong>Match</strong>
+        <span class="badge bg-secondary">{{ group.operator }}</span>
+    </div>
+
+    <div class="filter-children border-start ps-3">
+        {% for child in group.children %}
+            {% if child.children %}
+                {% include "notifications/campaign_filter_group.html" with group=child is_root=False %}
+            {% else %}
+                <div class="mb-2">
+                    <strong>{{ child.field }}</strong>
+                    {{ child.lookup }}
+                    <code>{{ child.value }}</code>
+                </div>
+            {% endif %}
+        {% empty %}
+            <div class="text-muted">No filters configured.</div>
+        {% endfor %}
+    </div>
+</div>

admin/templates/notifications/notification_campaigns_detail.html

@@ -7,6 +7,14 @@
 {% endblock title %}
 
 {% block content %}
+<style>
+.filter-group {
+    padding-left: 24px;
+    border-left: 2px solid #000000;
+    margin-left: 8px;
+}
+</style>
+
 <div>
     {% if messages %}
         <ul>
@@ -261,30 +269,13 @@ <h4>Recipient Filters</h4>
 
             {% if not "predefined" in metadata.filters  %}
 
-                <table class="table table-bordered table-striped">
-                    <thead>
-                        <tr>
-                            <th style="width:35%;">Field</th>
-                            <th style="width:25%;">Lookup</th>
-                            <th>Value</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for filter in metadata.filters.manual %}
-                        <tr>
-                            <td>{{ filter.field }}</td>
-                            <td>{{ filter.lookup }}</td>
-                            <td><code>{{ filter.value }}</code></td>
-                        </tr>
-                        {% empty %}
-                        <tr>
-                            <td colspan="3" class="text-center">
-                                No filters configured.
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
+                {% if not "predefined" in metadata.filters %}
+                    {% if metadata.filters.manual %}
+                        {% include "notifications/campaign_filter_group.html" with group=metadata.filters.manual is_root=True %}
+                    {% else %}
+                        <p class="text-muted">No filters configured.</p>
+                    {% endif %}
+                {% endif %}
 
             {% elif "predefined" in metadata.filters %}