Display the risk_threshold value when enabled #97

Including a link to see all vulnerabilities Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Dec 13, 2024 · 832c5b2 · 832c5b2
1 parent 61a47e3
commit 832c5b2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/dje/templates/object_details_base.html b/dje/templates/object_details_base.html
@@ -91,7 +91,7 @@ <h1 class="header-title text-break">
   </nav>
 
   <div class="background-white">
-    <div class="tab-content pt-4 px-0 container" style="height: 100%; min-height: 28.5em;">
+    <div class="tab-content pt-3 px-0 container" style="height: 100%; min-height: 28.5em;">
       {% for tab_name, tab_context in tabsets.items %}
         {# IDs are prefixed with "tab_" to avoid autoscroll issue #}
         <div class="tab-pane{% if forloop.first %} show active{% endif %}" id="tab_{{ tab_name|slugify }}" role="tabpanel" aria-labelledby="tab_{{ tab_name|slugify }}-tab" tabindex="0">

diff --git a/dje/templates/tabs/pagination.html b/dje/templates/tabs/pagination.html
@@ -1,6 +1,6 @@
 {% load humanize %}
 <div class="row align-items-end">
-  <div class="col mb-3">
+  <div class="col mb-2">
     <ul class="nav nav-pills">
       <li class="nav-item">
         <form id="tab-{{ tab_id }}-search-form" class="mt-md-0 me-sm-2">

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html b/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html
@@ -2,6 +2,14 @@
 {% load as_icon from dje_tags %}
 
 {% include 'tabs/pagination.html' %}
+
+{% if risk_threshold %}
+  <small class="d-inline-flex mb-3 px-2 py-1 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-2">
+    A risk threshold filter at "{{ risk_threshold }}" is currently applied.
+    <a class="ms-1" href="?vulnerabilities-bypass_risk_threshold=Yes#vulnerabilities">Click here to see all vulnerabilities.</a>
+  </small>
+{% endif %}
+
 <table class="table table-bordered table-md text-break">
   {% include 'includes/object_list_table_header.html' with filter=filterset include_actions=True %}
   <tbody>

diff --git a/product_portfolio/views.py b/product_portfolio/views.py
@@ -541,7 +541,11 @@ def tab_vulnerabilities(self):
         if not all(display_tab_contions):
             return
 
-        risk_threshold = product.get_vulnerabilities_risk_threshold()
+        if self.request.GET.get("vulnerabilities-bypass_risk_threshold"):
+            risk_threshold = None
+        else:
+            risk_threshold = product.get_vulnerabilities_risk_threshold()
+
         vulnerability_count = product.get_vulnerability_qs(risk_threshold=risk_threshold).count()
         if not vulnerability_count:
             label = 'Vulnerabilities <span class="badge bg-secondary">0</span>'
@@ -1153,7 +1157,11 @@ class ProductTabVulnerabilitiesView(
 
     def get_context_data(self, **kwargs):
         product = self.object
-        risk_threshold = product.get_vulnerabilities_risk_threshold()
+
+        if self.request.GET.get("vulnerabilities-bypass_risk_threshold"):
+            risk_threshold = None
+        else:
+            risk_threshold = product.get_vulnerabilities_risk_threshold()
 
         total_count = product.get_vulnerability_qs(risk_threshold=risk_threshold).count()
         vulnerability_qs = (