Updated ordering of invites, limit no of coapplicants

Author: sandeepsajan0

hypha/apply/funds/templates/funds/includes/co-applicant-block.html

@@ -7,7 +7,7 @@
             class="flex items-center py-1 px-2 font-bold rounded-sm transition-colors hover:bg-gray-100 text-dark-blue -me-2"
             hx-get="{% url 'apply:submissions:invite_co_applicant' pk=object.id %}"
             hx-target="#htmx-modal"
-            {% if object.co_applicant_invites.count >= 100 %}disabled{% endif %}
+            {% if object.co_applicant_invites.count >= 20 %}disabled{% endif %}
             role="button"
             aria-label="{% trans "Invite CoApplicant" %}"
         >
@@ -16,7 +16,7 @@
         </button>
     </div>
     <div class="flex flex-col gap-2 justify-between">
-        {% for invite in object.co_applicant_invites.all %}
+        {% for invite in co_applicants %}
 
             <div>
                 <a

hypha/apply/funds/views/co_applicants.py

@@ -6,6 +6,7 @@
 from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
+from django.db.models import Case, IntegerField, Value, When
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse_lazy
@@ -304,7 +305,19 @@ def list_coapplicant_invites(request, pk):
     has_permission(
         "co_applicants_view", user=request.user, object=submission, raise_exception=True
     )
-    co_applicant_invites = CoApplicantInvite.objects.filter(submission=submission)
+    status_order = Case(
+        When(status="accepted", then=Value(0)),
+        When(status="pending", then=Value(1)),
+        When(status="rejected", then=Value(2)),
+        When(status="expired", then=Value(3)),
+        default=Value(4),
+        output_field=IntegerField(),
+    )
+    co_applicant_invites = (
+        CoApplicantInvite.objects.filter(submission=submission)
+        .annotate(status_priority=status_order)
+        .order_by("status_priority", "-responded_on", "-created_at")
+    )
     return render(
         request,
         "funds/includes/co-applicant-block.html",