Cleanup global Notifications code (#4431)

- Remove saas code for styling the global notification feed.
- Update/fix the default view to show last 30 days activities.
- Add support for quering the last 3 month activities
- Remove unused 'notifications_dropdown.html' html and python code
- update the admin bar to use the `adminbar` component.

Author: theskumar

hypha/apply/activity/filters.py

@@ -14,6 +14,7 @@ class NotificationFilter(django_filters.FilterSet):
         ("yesterday", _("Yesterday")),
         ("week", _("Past 7 days")),
         ("month", _("This month")),
+        ("three_months", _("Last 3 months")),
     ]
     timestamp_filters = {
         "today": lambda qs, name: qs.filter(
@@ -39,6 +40,12 @@ class NotificationFilter(django_filters.FilterSet):
         "month": lambda qs, name: qs.filter(
             **{"%s__year" % name: now().year, "%s__month" % name: now().month}
         ),
+        "three_months": lambda qs, name: qs.filter(
+            **{
+                "%s__gte" % name: _truncate(now() - timedelta(days=90)),
+                "%s__lt" % name: _truncate(now() + timedelta(days=1)),
+            }
+        ),
     }
 
     date = DateRangeFilter(

hypha/apply/activity/templates/activity/include/notifications_dropdown.html

@@ -3,17 +3,27 @@
 {% block title %}{% trans "Notifications" %}{% endblock %}
 
 {% block content %}
-    <div class="admin-bar">
-        <div class="admin-bar__inner">
-            <div class="admin-bar__inner--with-button">
-                <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Notifications" %}</h1>
-                <form class="form notifications__filters" method="get">
-                    {{ filter.form }}
-                    <button class="button button--primary" type="submit" value="Filter">{% trans "Filter" %}</button>
-                </form>
-            </div>
-        </div>
-    </div>
+
+    {% adminbar %}
+        {% slot header %}{% trans "Notifications" %}{% endslot %}
+        {% slot sub_heading %}
+            {% if PROJECTS_ENABLED %}
+                {% trans "Activity feed across all applications and projects" %}
+            {% else %}
+                {% trans "Activity feed across all the applications" %}
+            {% endif %}
+        {% endslot %}
+
+        <form
+            class="[&>label]:sr-only text-black flex items-center justify-between gap-2"
+            method="get"
+        >
+            {{ filter.form }}
+            <button class="button button--primary" type="submit" value="Filter">
+                {% trans "Filter" %}
+            </button>
+        </form>
+    {% endadminbar %}
 
     <div class="wrapper wrapper--large wrapper--outer-space-medium">
         <div class="border-b-2 border-b-slate-300">
@@ -82,7 +92,9 @@ <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Notificatio
                 </div>
 
                 {% if not object_list %}
-                    {% trans "No comments available" %}
+                    <p class="mb-8 text-xl">
+                        {% trans "No activities found, try updating your filters." %}
+                    </p>
                 {% endif %}
             </section>
         </div>

hypha/apply/activity/templates/activity/notifications.html

@@ -89,7 +89,6 @@ class ActivityContextMixin:
     def get_context_data(self, **kwargs):
         # Do not prefetch on the related_object__author as the models
         # are not homogeneous and this will fail
-        user = self.request.user
         activities = services.get_related_activities_for_user(
             self.object, self.request.user
         )
@@ -100,7 +99,7 @@ def get_context_data(self, **kwargs):
         else:
             application_obj = self.object.submission
 
-        comments_count = services.get_comment_count(application_obj, user)
+        comments_count = services.get_comment_count(application_obj, self.request.user)
 
         extra = {"activities": activities, "comments_count": comments_count}
         return super().get_context_data(**extra, **kwargs)
@@ -167,23 +166,21 @@ class NotificationsView(ListView):
     template_name = "activity/notifications.html"
     filterset_class = NotificationFilter
 
-    def get_template_names(self):
-        if self.request.htmx and self.request.GET.get("type") == "header_dropdown":
-            return ["activity/include/notifications_dropdown.html"]
-        return super().get_template_names()
-
     def get_queryset(self):
-        # List only last 30 days' activities
         queryset = Activity.objects.filter(current=True).latest()
 
-        self.filterset = self.filterset_class(self.request.GET, queryset=queryset)
-        qs = self.filterset.qs.distinct().order_by("-timestamp", "source_object_id")
+        # filter by one month by default
+        date_filter = self.request.GET.get("date", "month")
 
-        if self.request.htmx and self.request.GET.get("type") == "header_dropdown":
-            qs = qs[:5]
-        return qs
+        self.filterset = self.filterset_class(
+            {"date": date_filter}
+            if date_filter not in self.request.GET
+            else self.request.GET,
+            queryset=queryset,
+        )
+        return self.filterset.qs.distinct().order_by("-timestamp", "source_object_id")
 
     def get_context_data(self, *, object_list=None, **kwargs):
-        context = super(NotificationsView, self).get_context_data()
+        context = super().get_context_data()
         context["filter"] = self.filterset
         return context

hypha/apply/activity/views.py

@@ -44,7 +44,6 @@
 @use "components/data-block";
 @use "components/invoice-block";
 @use "components/two-factor";
-@use "components/activity-notifications";
 @use "components/dropdown";
 @use "components/dashboard-table";