Refine the display of exploitability #98

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Nov 15, 2024 · 666ef3d · 666ef3d
1 parent 1bd041a
commit 666ef3d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/component_catalog/templates/component_catalog/tabs/tab_vulnerabilities.html b/component_catalog/templates/component_catalog/tabs/tab_vulnerabilities.html
@@ -75,13 +75,13 @@
           {% endif %}
         </td>
         <td>
-          {{ vulnerability.get_exploitability_display }}
+          {% include 'vulnerabilities/includes/exploitability.html' with instance=vulnerability only %}
         </td>
         <td>
           {{ vulnerability.weighted_severity|default_if_none:"" }}
         </td>
         <td class="fs-110pct">
-          {% include 'component_catalog/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
+          {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
         </td>
         <td>
           {% if vulnerability.fixed_packages_html %}

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html b/product_portfolio/templates/product_portfolio/tabs/tab_inventory.html
@@ -134,7 +134,7 @@
           {% if product.dataspace.enable_vulnerablecodedb_access %}
             <td class="fs-110pct">
               {% if relation.related_component_or_package.vulnerability_count %}
-                {% include 'component_catalog/includes/risk_score_badge.html' with risk_score=relation.related_component_or_package.risk_score only %}
+                {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=relation.related_component_or_package.risk_score only %}
               {% endif %}
             </td>
           {% endif %}

diff --git a/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html b/product_portfolio/templates/product_portfolio/tabs/tab_vulnerabilities.html
@@ -25,19 +25,19 @@
             {% for package in vulnerability.affected_packages.all %}
               <li>
                 <a href="{{ package.get_absolute_url }}#vulnerabilities" target="_blank">{{ package }}</a>
-                {% include 'component_catalog/includes/risk_score_badge.html' with risk_score=package.risk_score label='risk' only %}
+                {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=package.risk_score label='risk' only %}
               </li>
             {% endfor %}
           </ul>
         </td>
         <td>
-          {{ vulnerability.get_exploitability_display }}
+          {% include 'vulnerabilities/includes/exploitability.html' with instance=vulnerability only %}
         </td>
         <td>
           {{ vulnerability.weighted_severity|default_if_none:"" }}
         </td>
         <td class="fs-110pct">
-          {% include 'component_catalog/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
+          {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
         </td>
         <td>
           {% if vulnerability.summary %}

diff --git a/vulnerabilities/templates/vulnerabilities/includes/exploitability.html b/vulnerabilities/templates/vulnerabilities/includes/exploitability.html
@@ -0,0 +1,10 @@
+{% if instance.exploitability %}
+  <span class="
+    {% if instance.exploitability == 0.5 %}text-success
+    {% elif instance.exploitability == 1.0 %}text-warning
+    {% elif instance.exploitability == 2.0 %}text-danger
+    {% endif %}
+  ">
+    {{ instance.get_exploitability_display }}
+  </span>
+{% endif %}
diff --git a/...nt_catalog/includes/risk_score_badge.html → ...rabilities/includes/risk_score_badge.html b/...nt_catalog/includes/risk_score_badge.html → ...rabilities/includes/risk_score_badge.html
diff --git a/vulnerabilities/templates/vulnerabilities/tables/vulnerability_list_table.html b/vulnerabilities/templates/vulnerabilities/tables/vulnerability_list_table.html
@@ -36,13 +36,13 @@
         {% endif %}
       </td>
       <td>
-        {{ vulnerability.get_exploitability_display }}
+        {% include 'vulnerabilities/includes/exploitability.html' with instance=vulnerability only %}
       </td>
       <td>
         {{ vulnerability.weighted_severity|default_if_none:"" }}
       </td>
       <td class="fs-110pct">
-        {% include 'component_catalog/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
+        {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score only %}
       </td>
       <td>
         {% if vulnerability.affected_products_count %}