chore: show deleted organisations in sales dashboard (#5390)

Author: matthewelwell

api/sales_dashboard/templates/sales_dashboard/home.html

@@ -29,6 +29,8 @@ <h1 class="h2">Organisations</h1>
 
       <div class="sort-form">
         <form action="{% url 'sales_dashboard:index' %}" method="get" class="form-inline float-right">
+        <label for="include-deleted" class="mr-1">Include deleted:</label>
+        <input type="checkbox" name="include_deleted" id="include-deleted" class="mr-1" {% if include_deleted %}checked{% endif %}>
         <label for="filter-plan">Filter: </label>
           <select name="filter_plan" id="filter-plan" class="custom-select m-1">
             <option value="" {% if not filter_plan %}selected{% endif %}>Filter Plan</option>
@@ -82,7 +84,7 @@ <h1 class="h2">Organisations</h1>
               {% endif %}"
               >
               <td>{{org.id}}</td>
-              <td><a href="/sales-dashboard/organisations/{{org.id}}">{{org.name}}</a></td>
+              <td><a href="/sales-dashboard/organisations/{{org.id}}">{{org.name}} {% if org.deleted_at %}<span class="badge badge-danger">Deleted</span>{% endif %}</a></td>
               <td>{{ org.subscription.plan|default:"Free" }}{% if org.subscription.payment_method %} - {{ org.subscription.payment_method|capfirst }}{% endif %}</td>
               <td><span class="{% if org.num_users > org.subscription_information_cache.allowed_seats %}badge badge-danger{% endif %}">{{org.num_users}}</span></td>
               <td>{{org.subscription_information_cache.allowed_seats|default:1}}</td>

api/sales_dashboard/templates/sales_dashboard/organisation.html

@@ -16,7 +16,8 @@
                 <h1 class="h2 float-left">
                     Organisation: <strong>{{organisation.name}}</strong>
                     - Plan: <strong>{{ organisation.subscription.plan|default:"Free"}}</strong>
-                    {% if organisation.has_paid_subscription and not organisation.is_paid %}<span class="badge badge-danger">Subscription Cancelled</button>{% endif %}
+                    {% if organisation.deleted_at %}<span class="badge badge-danger">Deleted</span>{% endif %}
+                    {% if organisation.has_paid_subscription and not organisation.is_paid %}<span class="badge badge-danger">Subscription Cancelled</span>{% endif %}
                 </h1>
                 <div class="float-right"><a href="/admin/organisations/organisation/{{organisation.id}}/change">Django Admin</a></div>
                 <div class="float-right">

api/sales_dashboard/views.py

@@ -67,7 +67,14 @@ class OrganisationList(ListView):  # type: ignore[type-arg]
     template_name = "sales_dashboard/home.html"
 
     def get_queryset(self):  # type: ignore[no-untyped-def]
-        queryset = Organisation.objects.annotate(
+        if self.request.GET.get("include_deleted") == "on" or self.request.GET.get(
+            "search"
+        ):
+            queryset = Organisation.objects.all_with_deleted()
+        else:
+            queryset = Organisation.objects.all()
+
+        queryset = queryset.annotate(
             num_projects=Count("projects", distinct=True),
             num_users=Count("users", distinct=True),
             num_features=Count("projects__features", distinct=True),
@@ -105,6 +112,7 @@ def get_context_data(self, **kwargs):  # type: ignore[no-untyped-def]
         data["filter_plan"] = self.request.GET.get("filter_plan")
         data["sort_field"] = self.request.GET.get("sort_field")
         data["sort_direction"] = self.request.GET.get("sort_direction")
+        data["include_deleted"] = self.request.GET.get("include_deleted", "off") == "on"
 
         # Use the most recent "influx_updated_at" in
         # OrganisationSubscriptionInformationCache object to determine
@@ -155,7 +163,8 @@ def _build_search_query(self, search_term: str) -> Q:
 @staff_member_required
 def organisation_info(request: HttpRequest, organisation_id: int) -> HttpResponse:
     organisation = get_object_or_404(
-        Organisation.objects.select_related("subscription"), pk=organisation_id
+        Organisation.objects.all_with_deleted().select_related("subscription"),
+        pk=organisation_id,
     )
     template = loader.get_template("sales_dashboard/organisation.html")
     subscription_metadata = organisation.subscription.get_subscription_metadata()