Missed some bits

Author: alexiri

astra_app/core/static/core/js/membership_requests_datatables.js

@@ -449,6 +449,10 @@
     return document.getElementById(section === 'pending' ? 'membership-requests-pending-pager' : 'membership-requests-on-hold-pager');
   }
 
+  function sectionCountElement(section) {
+    return document.getElementById(section === 'pending' ? 'membership-requests-pending-count' : 'membership-requests-on-hold-count');
+  }
+
   function tableBodyElement(tableSelector) {
     return document.querySelector(tableSelector + ' tbody');
   }
@@ -468,6 +472,31 @@
     }
   }
 
+  function updateSectionCount(section, count) {
+    var countElement = sectionCountElement(section);
+    if (!countElement) {
+      return;
+    }
+    countElement.innerHTML = (section === 'pending' ? 'Pending: ' : 'On hold: ') + String(count);
+  }
+
+  function updatePendingFilterOptions(filterMetadata) {
+    var filterSelect = document.getElementById('requests-filter');
+    if (!filterSelect || !filterMetadata || !Array.isArray(filterMetadata.options)) {
+      return;
+    }
+
+    filterSelect.innerHTML = filterMetadata.options.map(function (option) {
+      var selected = option && option.value === filterMetadata.selected ? ' selected' : '';
+      return '<option value="' + escapeHtml(option.value || '') + '"' + selected + '>' +
+        escapeHtml(option.label || '') + ' (' + escapeHtml(option.count || 0) + ')</option>';
+    }).join('');
+
+    if (filterMetadata.selected) {
+      filterSelect.value = String(filterMetadata.selected);
+    }
+  }
+
   function paginationWindow(totalPages, currentPage) {
     if (totalPages <= 10) {
       return {
@@ -898,6 +927,10 @@
                 throw new Error((result.payload && result.payload.error) || 'Failed to load membership requests.');
               }
               callback(result.payload);
+              updateSectionCount(section, Number(result.payload.recordsFiltered || 0));
+              if (section === 'pending') {
+                updatePendingFilterOptions(result.payload.pending_filter);
+              }
               var tbody = tableBodyElement(tableSelector);
               if (!tbody) return;
               var rows = result.payload.data || [];

astra_app/core/templates/core/membership_requests.html

@@ -77,14 +77,14 @@ <h1 class="m-0">Membership Requests</h1>
             >
               {% for option in filter_options %}
                 <option value="{{ option.value }}"{% if option.value == selected_filter %} selected{% endif %}>
-                  {{ option.label }} ({{ option.count }})
+                  {{ option.label }}{% if option.count != '' %} ({{ option.count }}){% endif %}
                 </option>
               {% endfor %}
             </select>
           </form>
         </div>
 
-        <div class="text-muted">Pending: {{ pending_count }}</div>
+        <div class="text-muted" id="membership-requests-pending-count">Pending: {{ pending_count }}</div>
       </div>
     </div>
 
@@ -150,7 +150,7 @@ <h3 class="mt-4 mb-2">Waiting for requester response</h3>
             </div>
           </form>
 
-          <div class="text-muted">On hold: {{ on_hold_count }}</div>
+          <div class="text-muted" id="membership-requests-on-hold-count">On hold: {{ on_hold_count }}</div>
         </div>
       </div>
 

astra_app/core/templatetags/core_membership_notes.py

@@ -671,7 +671,7 @@ def _render_membership_notes_aggregate(
     membership_can_change = bool(context.get("membership_can_change", False))
     membership_can_delete = bool(context.get("membership_can_delete", False))
     can_write = membership_can_add or membership_can_change or membership_can_delete
-    resolved_notes = list(notes or [])
+    resolved_notes = None if notes is None else list(notes)
 
     dummy_request = SimpleNamespace(pk=_timeline_dom_id(dom_key))
 
@@ -713,32 +713,34 @@ def _render_membership_notes_aggregate(
     note_summary_url = reverse("api-membership-notes-aggregate-summary") + "?" + aggregate_note_query
     note_detail_url = reverse("api-membership-notes-aggregate") + "?" + aggregate_note_query
 
-    votes_by_user = last_votes(resolved_notes)
-    approvals = sum(1 for vote in votes_by_user.values() if vote == "approve")
-    disapprovals = sum(1 for vote in votes_by_user.values() if vote == "disapprove")
-    current_responses_by_request_id = _membership_request_responses_by_id(resolved_notes)
-    request_resubmitted_new_snapshots_by_note_id = _request_resubmitted_new_snapshots_by_note_id(
-        resolved_notes,
-        current_responses_by_request_id=current_responses_by_request_id,
-    )
-    preloaded_users_by_username = _preloaded_aggregate_avatar_users_by_username(
-        context=context,
-        notes=resolved_notes,
-        http_request=http_request,
-        aggregate_target_user=aggregate_target_user,
-    )
-    groups = _group_timeline_entries(
-        _timeline_entries_for_notes(
+    has_fallback_content = resolved_notes is not None
+    if resolved_notes is not None:
+        votes_by_user = last_votes(resolved_notes)
+        approvals = sum(1 for vote in votes_by_user.values() if vote == "approve")
+        disapprovals = sum(1 for vote in votes_by_user.values() if vote == "disapprove")
+        current_responses_by_request_id = _membership_request_responses_by_id(resolved_notes)
+        request_resubmitted_new_snapshots_by_note_id = _request_resubmitted_new_snapshots_by_note_id(
             resolved_notes,
-            current_username=_current_username_from_request(http_request),
-            request_resubmitted_new_snapshots_by_note_id=request_resubmitted_new_snapshots_by_note_id,
-            avatar_users_by_username=_aggregate_avatar_users_by_username(
+            current_responses_by_request_id=current_responses_by_request_id,
+        )
+        preloaded_users_by_username = _preloaded_aggregate_avatar_users_by_username(
+            context=context,
+            notes=resolved_notes,
+            http_request=http_request,
+            aggregate_target_user=aggregate_target_user,
+        )
+        groups = _group_timeline_entries(
+            _timeline_entries_for_notes(
                 resolved_notes,
-                preloaded_users_by_username=preloaded_users_by_username,
-            ),
+                current_username=_current_username_from_request(http_request),
+                request_resubmitted_new_snapshots_by_note_id=request_resubmitted_new_snapshots_by_note_id,
+                avatar_users_by_username=_aggregate_avatar_users_by_username(
+                    resolved_notes,
+                    preloaded_users_by_username=preloaded_users_by_username,
+                ),
+            )
         )
-    )
-    note_count = len(resolved_notes)
+        note_count = len(resolved_notes)
 
     html = render_to_string(
         "core/_membership_notes.html",
@@ -752,7 +754,7 @@ def _render_membership_notes_aggregate(
             "current_user_vote": None,
             "can_vote": False,
             "can_write": can_write,
-            "has_fallback_content": True,
+            "has_fallback_content": has_fallback_content,
             "details_loaded": False,
             "post_url": post_url,
             "aggregate_target_type": aggregate_target_type,
@@ -781,10 +783,9 @@ def _membership_notes_aggregate_for_target(
     if not membership_can_view:
         return ""
 
-    notes = list(Note.objects.filter(**notes_filter).order_by("timestamp", "pk"))
     return _render_membership_notes_aggregate(
         context=context,
-        notes=notes,
+        notes=None,
         dom_key=dom_key,
         compact=compact,
         next_url=next_url,