Merge pull request #568 from weni-ai/feature/filters-to-flow-start-logs

Add filters to flow start logs

Author: lucaslinhares

temba/flows/tests.py

@@ -5936,6 +5936,7 @@ def test_list(self):
         other_org_flow = self.create_flow(org=self.org2)
         FlowStart.create(other_org_flow, self.admin2)
 
+        # no filtering
         response = self.assertListFetch(
             list_url, allow_viewers=True, allow_editors=True, context_objects=[start3, start2, start1]
         )
@@ -5947,12 +5948,42 @@ def test_list(self):
         self.assertContains(response, "contacts who haven't already been through this flow")
         self.assertContains(response, "<b>1,234</b> runs")
 
+        # filter by manual type
         response = self.assertListFetch(
             list_url + "?type=manual", allow_viewers=True, allow_editors=True, context_objects=[start1]
         )
         self.assertTrue(response.context["filtered"])
         self.assertEqual(response.context["url_params"], "?type=manual&")
 
+        # filter by flow
+        response = self.client.get(list_url + f"?flow={flow.uuid}")
+        self.assertEqual(list(response.context["object_list"]), [start3, start2, start1])
+
+        # filter by group
+        response = self.client.get(list_url + f"?group={group.uuid}")
+        self.assertEqual(list(response.context["object_list"]), [start3])
+
+        # filter by time (last hour)
+        now = timezone.now()
+        start2.created_on = now - timedelta(minutes=30)
+        start2.save(update_fields=["created_on"])
+        start3.created_on = now - timedelta(hours=2)
+        start3.save(update_fields=["created_on"])
+
+        # test with valid time parameter
+        response = self.client.get(list_url + "?time=60")
+        self.assertEqual(list(response.context["object_list"]), [start1, start2])  # ordered by -created_on
+
+        # test with invalid time parameter
+        response = self.client.get(list_url + "?time=invalid")
+        self.assertEqual(list(response.context["object_list"]), [start1, start2, start3])  # no time filtering applied
+
+        # check that we show flows and groups in context
+        self.login(self.admin)
+        response = self.client.get(list_url)
+        self.assertEqual(list(response.context["flows"]), [flow])
+        self.assertEqual(list(response.context["contact_groups"]), [group])
+
 
 class AssetServerTest(TembaTest):
     def test_environment(self):

temba/flows/views.py

@@ -26,6 +26,7 @@
 from django.db.models.functions import Lower
 from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
@@ -2257,16 +2258,45 @@ def get_gear_links(self):
         def derive_queryset(self, *args, **kwargs):
             qs = super().derive_queryset(*args, **kwargs)
 
+            # Filter by start type
             if self.request.GET.get("type") == "manual":
                 qs = qs.filter(start_type=FlowStart.TYPE_MANUAL)
             else:
                 qs = qs.filter(start_type__in=(FlowStart.TYPE_MANUAL, FlowStart.TYPE_API, FlowStart.TYPE_API_ZAPIER))
 
+            # Filter by flow
+            flow_uuid = self.request.GET.get("flow")
+            if flow_uuid:
+                qs = qs.filter(flow__uuid=flow_uuid)
+
+            # Filter by group
+            group_uuid = self.request.GET.get("group")
+            if group_uuid:
+                qs = qs.filter(groups__uuid=group_uuid)
+
+            # Filter by time
+            minutes = self.request.GET.get("time")
+            if minutes:
+                try:
+                    minutes = int(minutes)
+                    since = timezone.now() - timedelta(minutes=minutes)
+                    qs = qs.filter(created_on__gte=since)
+                except ValueError:
+                    pass
+
             return qs.prefetch_related("contacts", "groups")
 
         def get_context_data(self, *args, **kwargs):
             context = super().get_context_data(*args, **kwargs)
+            org = self.request.user.get_org()
+
+            # Add flows for filter dropdown
+            context["flows"] = Flow.objects.filter(org=org, is_active=True).order_by("name")
+
+            # Add contact groups for filter dropdown
+            context["contact_groups"] = ContactGroup.user_groups.filter(org=org, is_active=True).order_by("name")
 
+            # Handle manual filter flag
             filtered = False
             if self.request.GET.get("type") == "manual":
                 context["url_params"] = "?type=manual&"

templates/flows/flowstart_list.haml

@@ -11,6 +11,34 @@
 
 
 -block content
+  %div.flex.gap-4.mb-6
+    %temba-select#flows.flex-grow(name="flow" label='{{_("Flow")|escapejs}}' searchable="true" onchange="handleSelectChange(this, `flow`)" value="{{ request.GET.flow }}" style="flex-grow: 4;")
+      %temba-option(name='{{_("All Flows")}}' value="")
+      -for flow in flows
+        %temba-option(name="{{flow.name}}" value="{{flow.uuid}}")
+
+    %temba-select#groups.flex-grow(name="group" label='{{_("Contact Group")|escapejs}}' searchable="true" onchange="handleSelectChange(this, `group`)" value="{{ request.GET.group }}")
+      %temba-option(name='{{_("All Groups")}}' value="")
+      -for group in contact_groups
+        %temba-option(name="{{group.name}}" value="{{group.uuid}}")
+
+    %temba-select#time.flex-grow(name="time" label='{{_("Time")|escapejs}}' searchable="true" onchange="handleSelectChange(this, `time`)" value="{{ request.GET.time }}")
+      %temba-option(name='{{_("All Time")}}' value="")
+      %temba-option(name='{{_("Last minute")}}' value="1")
+      %temba-option(name='2 {{_("minutes")}}' value="2")
+      %temba-option(name='5 {{_("minutes")}}' value="5")
+      %temba-option(name='15 {{_("minutes")}}' value="15")
+      %temba-option(name='30 {{_("minutes")}}' value="30")
+      %temba-option(name='1 {{_("hour")}}' value="60")
+      %temba-option(name='3 {{_("hours")}}' value="180")
+      %temba-option(name='12 {{_("hours")}}' value="720")
+      %temba-option(name='1 {{_("day")}}' value="1440")
+      %temba-option(name='2 {{_("days")}}' value="2880")
+      %temba-option(name='3 {{_("days")}}' value="4320")
+      %temba-option(name='1 {{_("week")}}' value="10080")
+      %temba-option(name='2 {{_("weeks")}}' value="20160")
+      %temba-option(name='1 {{_("month")}}' value="43200")
+
   %table.list.lined
     %thead
       %tr
@@ -73,3 +101,24 @@
 
   -block paginator
     -include "includes/pagination.haml"
+
+-block extra-script
+  {{ block.super }}
+
+  :javascript
+    function handleSelectChange(event, name) {
+      if (event.values.length) {
+        const value = event.values[0].value;
+        if (value) {
+          const params = new URLSearchParams(window.location.search);
+          params.set(name, value);
+          window.location.search = params.toString();
+        } else {
+          const params = new URLSearchParams(window.location.search);
+          if(params.has(name)) {
+            params.delete(name);
+            window.location.search = params.toString();
+          }
+        }
+      }
+    }