add sort and filtering

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

product_portfolio/filters.py

@@ -43,6 +43,8 @@
 from vulnerabilities.models import RISK_SCORE_RANGES
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.models import VulnerabilityAnalysisMixin
+from vulnerabilities.triage.models import TriageAction
+from vulnerabilities.triage.models import TriageRecord
 
 
 class HasComplianceIssueFilter(django_filters.BooleanFilter):
@@ -584,3 +586,32 @@ class Meta:
             "is_pinned",
             "is_direct",
         ]
+
+
+class TriageRecordFilterSet(DataspacedFilterSet):
+    dropdown_fields = ["action"]
+
+    q = SearchFilter(
+        label=_("Search"),
+        search_fields=[
+            "product_package__package__name",
+            "product_package__package__namespace",
+            "product_package__package__version",
+        ],
+    )
+    action = django_filters.ChoiceFilter(
+        label=_("Action"),
+        choices=TriageAction.choices,
+        empty_label=_("All actions"),
+    )
+    sort = DefaultOrderingFilter(
+        label=_("Sort"),
+        fields=[
+            ("product_package__package__name", "package"),
+            ("detected_date", "detected_date"),
+        ],
+    )
+
+    class Meta:
+        model = TriageRecord
+        fields = ["action"]

product_portfolio/templates/product_portfolio/tabs/tab_triage.html

@@ -1,23 +1,9 @@
 {% load i18n %}
 
-<div class="d-flex justify-content-between align-items-center mb-3">
-  <div class="text-body-secondary small">
-    {{ total_count }} package{{ total_count|pluralize }} with pending triage action{{ total_count|pluralize }}
-  </div>
-  {% if page_obj.paginator.num_pages > 1 %}
-    {% include 'pagination/object_list_pagination.html' with hx_target=tab_id_html %}
-  {% endif %}
-</div>
+{% include 'tabs/pagination.html' with search_verbose_name="packages" %}
 
 <table class="table table-bordered table-md text-break">
-    <thead>
-      <tr>
-        <th style="width: 38%">{% trans "Package" %}</th>
-        <th style="width: 22%">{% trans "Recommended action" %}</th>
-        <th>{% trans "Vulnerability exposure" %}</th>
-        <th style="width: 10%" class="text-nowrap">{% trans "Detected" %}</th>
-      </tr>
-    </thead>
+    {% include 'includes/object_list_table_header.html' %}
     <tbody>
       {% for record in page_obj.object_list %}
         <tr>
@@ -87,6 +73,3 @@
       {% endfor %}
     </tbody>
   </table>
-{% if page_obj.paginator.num_pages > 1 %}
-  {% include 'pagination/object_list_pagination.html' with hx_target=tab_id_html %}
-{% endif %}

product_portfolio/views.py

@@ -119,6 +119,7 @@
 from product_portfolio.filters import ProductComponentFilterSet
 from product_portfolio.filters import ProductFilterSet
 from product_portfolio.filters import ProductPackageFilterSet
+from product_portfolio.filters import TriageRecordFilterSet
 from product_portfolio.forms import AttributionConfigurationForm
 from product_portfolio.forms import BaseProductRelationshipInlineFormSet
 from product_portfolio.forms import ComparisonExcludeFieldsForm
@@ -1369,12 +1370,25 @@ class ProductTabTriageView(
     LoginRequiredMixin,
     BaseProductViewMixin,
     PaginationMixin,
+    TableHeaderMixin,
     TabContentView,
 ):
     template_name = "product_portfolio/tabs/tab_triage.html"
     paginate_by = 50
     query_dict_page_param = "triage-page"
     tab_id = "triage"
+    table_model = TriageRecord
+    filterset_class = TriageRecordFilterSet
+    table_headers = (
+        Header("package", _("Package"), help_text=_("Package with a pending triage action")),
+        Header("action", _("Recommended action"), filter="action"),
+        Header(
+            "vulnerability_exposure",
+            _("Vulnerability exposure"),
+            help_text=_("Known vulnerabilities affecting this package"),
+        ),
+        Header("detected_date", _("Detected")),
+    )
 
     def get_context_data(self, **kwargs):
         product = self.object
@@ -1424,7 +1438,17 @@ def get_context_data(self, **kwargs):
         )
         total_count = triage_qs.count()
 
-        paginator = Paginator(triage_qs, self.paginate_by)
+        self.filterset = self.filterset_class(
+            self.request.GET,
+            queryset=triage_qs,
+            dataspace=product.dataspace,
+            prefix=self.tab_id,
+            anchor=f"#{self.tab_id}",
+        )
+
+        context_data = super().get_context_data(**kwargs)
+
+        paginator = Paginator(self.filterset.qs, self.paginate_by)
         page_number = self.request.GET.get(self.query_dict_page_param)
         page_obj = paginator.get_page(page_number)
 
@@ -1434,11 +1458,12 @@ def get_context_data(self, **kwargs):
             record.action_badge_class = badge_class
             record.action_icon = icon
 
-        context_data = super().get_context_data(**kwargs)
         context_data.update(
             {
+                "filterset": self.filterset,
                 "page_obj": page_obj,
                 "total_count": total_count,
+                "search_query": self.request.GET.get(f"{self.tab_id}-q", ""),
             }
         )