From 7231576a6e8b16d1914a90914bf37f2d0fe8f6bb Mon Sep 17 00:00:00 2001
From: tdruez <tdruez@nexb.com>
Date: Tue, 27 Aug 2024 18:24:45 +0400
Subject: [PATCH] Add sorting dropdown in the list #95

Signed-off-by: tdruez <tdruez@nexb.com>
---
 component_catalog/filters.py                               | 1 -
 .../templates/component_catalog/vulnerability_list.html    | 7 +++++++
 component_catalog/views.py                                 | 3 ++-
 .../includes => dje/templates/modals}/filterset_modal.html | 6 +++---
 purldb/templates/purldb/purldb_list.html                   | 4 ++--
 purldb/tests/test_views.py                                 | 4 ++--
 purldb/views.py                                            | 4 ++--
 7 files changed, 18 insertions(+), 11 deletions(-)
 rename {purldb/templates/purldb/includes => dje/templates/modals}/filterset_modal.html (72%)

diff --git a/component_catalog/filters.py b/component_catalog/filters.py
index 360c2146..a3a727dd 100644
--- a/component_catalog/filters.py
+++ b/component_catalog/filters.py
@@ -307,7 +307,6 @@ class VulnerabilityFilterSet(DataspacedFilterSet):
         fields=[
             "max_score",
             "min_score",
-            "vulnerability_id",
             "affected_products_count",
             "affected_packages_count",
             "fixed_packages_length",
diff --git a/component_catalog/templates/component_catalog/vulnerability_list.html b/component_catalog/templates/component_catalog/vulnerability_list.html
index 5ebdddc4..ec99b8a0 100644
--- a/component_catalog/templates/component_catalog/vulnerability_list.html
+++ b/component_catalog/templates/component_catalog/vulnerability_list.html
@@ -13,4 +13,11 @@
       </div>
     </form>
   </li>
+{% endblock %}
+
+{% block top-right-buttons %}
+  {{ block.super }}
+  <div class="btn-group">
+    {{ filter.form.sort }}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/component_catalog/views.py b/component_catalog/views.py
index ceec2de3..64e95e51 100644
--- a/component_catalog/views.py
+++ b/component_catalog/views.py
@@ -2491,7 +2491,8 @@ class VulnerabilityListView(
     table_headers = (
         Header("vulnerability_id", _("Vulnerability")),
         Header("aliases", _("Aliases")),
-        Header("score_range", _("Score"), help_text="Severity score range", filter="max_score"),
+        # Keep `max_score` to enable column sorting
+        Header("max_score", _("Score"), help_text="Severity score range", filter="max_score"),
         Header("summary", _("Summary")),
         Header("affected_products_count", _("Affected products"), help_text="Affected products"),
         Header("affected_packages_count", _("Affected packages"), help_text="Affected packages"),
diff --git a/purldb/templates/purldb/includes/filterset_modal.html b/dje/templates/modals/filterset_modal.html
similarity index 72%
rename from purldb/templates/purldb/includes/filterset_modal.html
rename to dje/templates/modals/filterset_modal.html
index 6aabba38..86f86e29 100644
--- a/purldb/templates/purldb/includes/filterset_modal.html
+++ b/dje/templates/modals/filterset_modal.html
@@ -1,14 +1,14 @@
 {% load crispy_forms_tags %}
-<div id="purldb-filterset-modal" class="modal" tabindex="-1" role="dialog">
+<div id="filterset-modal" class="modal" tabindex="-1" role="dialog">
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title">Filters</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
-      <form autocomplete="off" method="{{ form_helper.form_method }}" class="{{ form_helper.form_class }}">
+      <form autocomplete="off" method="{{ filter_form_helper.form_method }}" class="{{ filter_form_helper.form_class }}">
         <div class="modal-body bg-body-tertiary">
-          {% crispy filter.form form_helper %}
+          {% crispy filter.form filter_form_helper %}
         </div>
         <div class="modal-footer">
           <input type="button" name="close" value="Close" class="btn btn-secondary" data-bs-dismiss="modal">
diff --git a/purldb/templates/purldb/purldb_list.html b/purldb/templates/purldb/purldb_list.html
index 4398a286..49947af6 100644
--- a/purldb/templates/purldb/purldb_list.html
+++ b/purldb/templates/purldb/purldb_list.html
@@ -18,11 +18,11 @@
 {% block top-right-buttons %}
   {{ block.super }}
    <div class="btn-group">
-    <button type="button" class="btn btn-outline-dark {% if filter.form.changed_data %}active{% endif %}" data-bs-toggle="modal" data-bs-target="#purldb-filterset-modal"><i class="fas fa-filter"></i> Filters</button>
+    <button type="button" class="btn btn-outline-dark {% if filter.form.changed_data %}active{% endif %}" data-bs-toggle="modal" data-bs-target="#filterset-modal"><i class="fas fa-filter"></i> Filters</button>
   </div>
 {% endblock %}
 
 {% block content %}
   {{ block.super }}
-  {% include 'purldb/includes/filterset_modal.html' %}
+  {% include 'modals/filterset_modal.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/purldb/tests/test_views.py b/purldb/tests/test_views.py
index 5737c4eb..23e0d3fd 100644
--- a/purldb/tests/test_views.py
+++ b/purldb/tests/test_views.py
@@ -199,8 +199,8 @@ def test_purldb_list_view_filters(self):
         self.client.login(username=self.nexb_user.username, password="secret")
 
         response = self.client.get(list_url + "?sort=-name&type=pypi")
-        self.assertContains(response, 'data-bs-target="#purldb-filterset-modal"')
-        self.assertContains(response, 'id="purldb-filterset-modal"')
+        self.assertContains(response, 'data-bs-target="#filterset-modal"')
+        self.assertContains(response, 'id="filterset-modal"')
         self.assertContains(
             response, '<option value="-name" selected>Name (descending)</option>', html=True
         )
diff --git a/purldb/views.py b/purldb/views.py
index d568310b..1c4233d8 100644
--- a/purldb/views.py
+++ b/purldb/views.py
@@ -178,7 +178,7 @@ def get_queryset(self):
         return self.list_data.get("results", [])
 
     @staticmethod
-    def get_form_helper():
+    def get_filter_form_helper():
         helper = FormHelper()
         helper.form_method = "get"
         helper.form_tag = False
@@ -200,7 +200,7 @@ def get_context_data(self, **kwargs):
         )
 
         context["filter"] = self.filterset
-        context["form_helper"] = self.get_form_helper()
+        context["filter_form_helper"] = self.get_filter_form_helper()
 
         return context