Add the filting via forms

Signed-off-by: RISHI GARG <134256793+Rishi-source@users.noreply.github.com>

Author: Rishi-source

vulnerabilities/api_v2.py

@@ -293,8 +293,6 @@ def get_queryset(self):
             queryset = queryset.with_is_vulnerable()
             is_vulnerable = is_vulnerable.lower() == "true"
             queryset = queryset.filter(is_vulnerable=is_vulnerable)
-
-        queryset = queryset.exclude(version="")
         return queryset.with_is_vulnerable()
 
     def list(self, request, *args, **kwargs):

vulnerabilities/forms.py

@@ -23,6 +23,14 @@ class PackageSearchForm(forms.Form):
             attrs={"placeholder": "Package name, purl or purl fragment"},
         ),
     )
+    vulnerable_only = forms.ChoiceField(
+        required=False,
+        choices=[
+            ("", "All Packages"),
+            ("true", "Vulnerable Only"),
+            ("false", "Non-Vulnerable Only"),
+        ],
+    )
 
 
 class VulnerabilitySearchForm(forms.Form):

vulnerabilities/templates/packages.html

@@ -18,14 +18,37 @@
                 <div>
                     {{ page_obj.paginator.count|intcomma }} results
                 </div>
-                <form method="get" style="display: inline;">
-                    {% if search %}<input type="hidden" name="search" value="{{ search }}">{% endif %}
-                    <select name="vulnerable_only" class="select" id="vulnerable-select" onchange="this.form.submit()">
-                        <option value="">All Packages</option>
-                        <option value="true" {% if request.GET.vulnerable_only == 'true' %}selected{% endif %}>Vulnerable Only</option>
-                        <option value="false" {% if request.GET.vulnerable_only == 'false' %}selected{% endif %}>Non-Vulnerable Only</option>
-                    </select>
-                </form>
+                <div class="dropdown is-hoverable">
+                    <div class="dropdown-trigger">
+                        <button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
+                            <span>
+                                {% if request.GET.vulnerable_only == 'true' %}
+                                    Vulnerable Only
+                                {% elif request.GET.vulnerable_only == 'false' %}
+                                    Non-Vulnerable Only
+                                {% else %}
+                                    All Packages
+                                {% endif %}
+                            </span>
+                            <span class="icon is-small">
+                                <i class="fa fa-filter" aria-hidden="true"></i>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="dropdown-menu" id="dropdown-menu" role="menu">
+                        <div class="dropdown-content">
+                            <a href="?search={{ search }}" class="dropdown-item {% if not request.GET.vulnerable_only %}is-active{% endif %}">
+                                All Packages
+                            </a>
+                            <a href="?search={{ search }}&vulnerable_only=true" class="dropdown-item {% if request.GET.vulnerable_only == 'true' %}is-active{% endif %}">
+                                Vulnerable Only
+                            </a>
+                            <a href="?search={{ search }}&vulnerable_only=false" class="dropdown-item {% if request.GET.vulnerable_only == 'false' %}is-active{% endif %}">
+                                Non-Vulnerable Only
+                            </a>
+                        </div>
+                    </div>
+                </div>
                 {% if is_paginated %}
                     {% include 'includes/pagination.html' with page_obj=page_obj %}
                 {% endif %}
@@ -89,4 +112,4 @@
 
     </section>
 {% endif %}
-{% endblock %}
+{% endblock %}

vulnerabilities/views.py

@@ -49,6 +49,7 @@ def get_context_data(self, **kwargs):
         request_query = self.request.GET
         context["package_search_form"] = PackageSearchForm(request_query)
         context["search"] = request_query.get("search")
+        context["vulnerable_only"] = request_query.get("vulnerable_only", "")
         return context
 
     def get_queryset(self, query=None):
@@ -57,18 +58,22 @@ def get_queryset(self, query=None):
         Make a best effort approach to find matching packages either based
         on exact purl, partial purl or just name and namespace.
         """
+        form = PackageSearchForm(self.request.GET)
         query = query or self.request.GET.get("search") or ""
+
         queryset = (
             self.model.objects.search(query)
             .with_vulnerability_counts()
             .prefetch_related()
             .order_by("package_url")
         )
-        if hasattr(self, "request"):
-            vulnerable_only = self.request.GET.get("vulnerable_only", "").lower()
+
+        if form.is_valid():
+            vulnerable_only = form.cleaned_data.get("vulnerable_only", "")
             if vulnerable_only in ["true", "false"]:
                 queryset = queryset.with_is_vulnerable()
                 queryset = queryset.filter(is_vulnerable=vulnerable_only == "true")
+
         return queryset