move triage content into the vulnerabilites tab

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

Author: tdruez

dejacode/static/css/dejacode_bootstrap.css

@@ -433,13 +433,13 @@ table.vulnerabilities-table .column-summary {
   width: 300px;
 }
 #tab_vulnerabilities .column-vulnerability_analyses__state {
-  min-width: 125px;
+  min-width: 100px;
 }
 #tab_vulnerabilities .column-vulnerability_analyses__justification {
   min-width: 130px;
 }
 #tab_vulnerabilities .column-vulnerability_analyses__responses {
-  width: 185px;
+  min-width: 120px;
 }
 #tab_vulnerabilities .column-vulnerability_analyses__is_reachable {
   width: 80px;

product_portfolio/filters.py

@@ -44,7 +44,6 @@
 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):
@@ -368,6 +367,7 @@ class ProductPackageFilterSet(BaseProductRelationFilterSet):
     dropdown_fields = [
         "is_modified",
         "weighted_risk_score",
+        "triage_action",
         "vulnerability_analyses__state",
         "vulnerability_analyses__justification",
         "responses",
@@ -421,6 +421,12 @@ class ProductPackageFilterSet(BaseProductRelationFilterSet):
             ("unknown", _("Reachability not known")),
         ),
     )
+    triage_action = django_filters.ChoiceFilter(
+        label=_("Triage action"),
+        choices=TriageAction.choices,
+        empty_label=_("All actions"),
+        method="filter_triage_action",
+    )
     compliance_issues = HasComplianceIssueFilter(
         field_name="package__usage_policy__compliance_alert",
         distinct=True,
@@ -440,6 +446,15 @@ class Meta:
             "exploitability",
         ]
 
+    @staticmethod
+    def filter_triage_action(queryset, name, value):
+        if not value:
+            return queryset
+        return queryset.filter(
+            triage_records__action=value,
+            triage_records__ruleset__enabled=True,
+        ).distinct()
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.filters["vulnerability_analyses__state"].extra["null_label"] = "(No values)"
@@ -586,32 +601,3 @@ 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_packages_vulnerabilities.html

@@ -19,24 +19,36 @@
           <strong>
             <a href="{{ product_package.package.get_absolute_url }}#vulnerabilities" target="_blank">{{ product_package.package }}</a>
           </strong>
-          {% if product_package.purpose %}
-            <div class="text-nowrap mt-1">
-              {{ product_package.purpose.label_with_icon }}
-              {% if product_package.purpose.exposure_factor %}
-                <div>
-                  <i class="fas fa-arrow-alt-circle-right"></i>
-                  Exposure factor: {{ product_package.purpose.exposure_factor }}
-                </div>
+          <div class="d-flex flex-wrap gap-2 mt-1">
+            {% with score=product_package.weighted_risk_score %}
+              {% if score %}
+                <span class="badge {% if score >= 8.0 %}bg-danger-subtle text-danger-emphasis{% elif score >= 6.0 %}bg-warning-subtle text-warning-emphasis{% elif score >= 3.0 %}bg-info-subtle text-info-emphasis{% else %}bg-secondary-subtle text-secondary-emphasis{% endif %}">
+                  {% trans "Risk" %} {{ score }}
+                </span>
               {% endif %}
-              <div>
-                {{ product_package.is_deployed|as_icon }}
-                {% if product_package.is_deployed %}Deployed{% else %}Not deployed{% endif %}
-              </div>
-            </div>
-          {% endif %}
+            {% endwith %}
+            {% if product_package.is_deployed %}
+              <span class="badge text-bg-light border">{% trans "Deployed" %}</span>
+            {% endif %}
+            {% if product_package.purpose %}
+              <span class="badge text-bg-light border">{{ product_package.purpose.label }}</span>
+            {% endif %}
+          </div>
         </td>
         <td rowspan="{{ product_package.package.vulnerability_count }}">
-          {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=product_package.weighted_risk_score only %}
+          {% if product_package.triage_record %}
+            {% with record=product_package.triage_record %}
+              <span class="badge {{ record.action_badge_class }} d-block text-start">
+                <i class="fas {{ record.action_icon }} me-1"></i>{{ record.action_label }}
+              </span>
+              <div class="small text-body-secondary mt-1 ps-1">
+                <i class="fas fa-layer-group fa-xs me-1"></i>{{ record.ruleset.name }}
+              </div>
+              <div class="small text-body-tertiary mt-1 ps-1">
+                {% trans "Since:" %} {{ record.detected_date|date:"M j, Y" }}
+              </div>
+            {% endwith %}
+          {% endif %}
         </td>
         {% for vulnerability in product_package.package.affected_by_vulnerabilities.all %}
           {% if not forloop.first %}<tr>{% endif %}
@@ -56,9 +68,19 @@
                   </span>
                 {% endif %}
               </strong>
-              <div>
-                {% include 'vulnerabilities/includes/risk_score_badge.html' with risk_score=vulnerability.risk_score label="Risk:" only %}
-                {% include 'vulnerabilities/includes/exploitability.html' with instance=vulnerability only %}
+              <div class="d-flex flex-wrap gap-1 mt-1">
+                {% with score=vulnerability.risk_score %}
+                  {% if score %}
+                    <span class="badge {% if score >= 8.0 %}bg-danger-subtle text-danger-emphasis{% elif score >= 6.0 %}bg-warning-subtle text-warning-emphasis{% elif score >= 3.0 %}bg-info-subtle text-info-emphasis{% else %}bg-secondary-subtle text-secondary-emphasis{% endif %}">
+                      {% trans "Risk:" %} {{ score }}
+                    </span>
+                  {% endif %}
+                {% endwith %}
+                {% if vulnerability.exploitability %}
+                  <span class="badge {% if vulnerability.exploitability == 2.0 %}bg-danger-subtle text-danger-emphasis{% elif vulnerability.exploitability == 1.0 %}bg-warning-subtle text-warning-emphasis{% else %}bg-secondary-subtle text-secondary-emphasis{% endif %}">
+                    {{ vulnerability.get_exploitability_display }}
+                  </span>
+                {% endif %}
               </div>
               {% if vulnerability.aliases %}
                 <div class="mt-2">

product_portfolio/templates/product_portfolio/tabs/tab_triage.html

@@ -34,7 +34,6 @@
 from product_portfolio.views import ProductTabDependenciesView
 from product_portfolio.views import ProductTabInventoryView
 from product_portfolio.views import ProductTabLicensesView
-from product_portfolio.views import ProductTabTriageView
 from product_portfolio.views import ProductTabVulnerabilitiesView
 from product_portfolio.views import ProductTreeComparisonView
 from product_portfolio.views import ProductUpdateView
@@ -153,7 +152,6 @@ def product_path(path_segment, view):
     *product_path("tab_dependencies", ProductTabDependenciesView.as_view()),
     *product_path("tab_licenses", ProductTabLicensesView.as_view()),
     *product_path("tab_vulnerabilities", ProductTabVulnerabilitiesView.as_view()),
-    *product_path("tab_triage", ProductTabTriageView.as_view()),
     *product_path("tab_activity", ProductTabActivityView.as_view()),
     *product_path("tab_inventory", ProductTabInventoryView.as_view()),
     *product_path("tab_compliance", ProductTabComplianceView.as_view()),