feat: Support multiple OR'd search terms in sales-dashboard (#3715)

Flagsmith · Apr 3, 2024 · d5f76ff · d5f76ff
1 parent af0cc9c
commit d5f76ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/api/sales_dashboard/templates/sales_dashboard/base.html b/api/sales_dashboard/templates/sales_dashboard/base.html
@@ -16,10 +16,10 @@
   </head>
   <body>
     <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-    <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/sales-dashboard/">Flagsmith</a>
+      <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/sales-dashboard/">Flagsmith</a>
       <form method="get" action="{% url 'sales_dashboard:index' %}" class="form-inline w-100">
         {% csrf_token %}
-        <input class="form-control mr-sm-2 w-100=" type="search" placeholder="Search" aria-label="Search" name="search" value="{{ search }}">
+        <input class="form-control mr-sm-2 w-75" type="search" placeholder="Search by org name, email addresses or subscription ID. Separate multiple search terms with commas" aria-label="Search" name="search" value="{{ search }}">
         <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
       </form>
       <ul class="navbar-nav px-3">

diff --git a/api/sales_dashboard/views.py b/api/sales_dashboard/views.py
@@ -61,11 +61,16 @@ def get_queryset(self):
 
         if self.request.GET.get("search"):
             search_term = self.request.GET["search"]
-            queryset = queryset.filter(
-                Q(name__icontains=search_term)
-                | Q(users__email__icontains=search_term)
-                | Q(subscription__subscription_id=search_term)
-            )
+            criteria = Q()
+            terms = search_term.split(",")
+            for t in terms:
+                term = t.strip()
+                criteria |= (
+                    Q(name__icontains=term)
+                    | Q(users__email__icontains=term)
+                    | Q(subscription__subscription_id=term)
+                )
+            queryset = queryset.filter(criteria)
 
         if self.request.GET.get("filter_plan"):
             filter_plan = self.request.GET["filter_plan"]