refine the dashboard view

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

Author: tdruez

product_portfolio/filters.py

@@ -36,6 +36,7 @@
 from product_portfolio.models import ProductComponent
 from product_portfolio.models import ProductDependency
 from product_portfolio.models import ProductPackage
+from product_portfolio.models import ProductPolicyViolation
 from product_portfolio.models import ProductStatus
 from vulnerabilities.filters import ScoreRangeFilter
 from vulnerabilities.models import RISK_SCORE_RANGES
@@ -149,6 +150,10 @@ class ProductFilterSet(DataspacedFilterSet):
         label=_("License issues"),
         method="filter_license_compliance_issues",
     )
+    policy_violations = django_filters.BooleanFilter(
+        label=_("Policy violations"),
+        method="filter_policy_violations",
+    )
 
     class Meta:
         model = Product
@@ -189,6 +194,16 @@ def filter_license_compliance_issues(self, queryset, name, value):
         condition = Exists(has_alert)
         return queryset.filter(condition if value else ~condition)
 
+    def filter_policy_violations(self, queryset, name, value):
+        if value is None:
+            return queryset
+        has_violation = ProductPolicyViolation.objects.filter(
+            product_id=OuterRef("pk"),
+            resolved=False,
+        )
+        condition = Exists(has_violation)
+        return queryset.filter(condition if value else ~condition)
+
 
 class BaseProductRelationFilterSet(DataspacedFilterSet):
     field_name_prefix = None

product_portfolio/templates/product_portfolio/compliance/compliance_dashboard.html

@@ -68,7 +68,7 @@ <h1 class="h3 mb-0">
     </div>
     <div class="col-6 col-md-3">
       <div class="bg-body-secondary rounded-3 p-3">
-        <div class="small text-body-secondary mb-1">{% trans "License issues" %}</div>
+        <div class="small text-body-secondary mb-1">{% trans "License compliance" %}</div>
         {% if products_with_license_issues %}
           <a href="?license_compliance_issues=true" class="fs-4 fw-medium lh-sm text-danger">
             {{ products_with_license_issues }}
@@ -80,28 +80,13 @@ <h1 class="h3 mb-0">
         {% endif %}
         <div class="text-body-tertiary fs-xs mt-1">
           {% if products_with_license_issues %}
-            {% trans "products with policy violations" %}
+            {% trans "products with license compliance alerts" %}
           {% else %}
             {% trans "All products within policy" %}
           {% endif %}
         </div>
       </div>
     </div>
-    <div class="col-6 col-md-3">
-      <div class="bg-body-secondary rounded-3 p-3">
-        <div class="small text-body-secondary mb-1">{% trans "Security issues" %}</div>
-        <div class="fs-4 fw-medium lh-sm {% if products_with_critical_or_high %}text-danger{% elif products_with_vulnerabilities %}text-warning-orange{% else %}text-success{% endif %}">
-          {{ products_with_critical_or_high }}
-        </div>
-        <div class="text-body-tertiary fs-xs mt-1">
-          {% if products_with_critical_or_high %}
-            {% trans "products with critical/high vulnerabilities" %}
-          {% else %}
-            {% trans "No critical or high vulnerabilities" %}
-          {% endif %}
-        </div>
-      </div>
-    </div>
     <div class="col-6 col-md-3">
       <div class="bg-body-secondary rounded-3 p-3">
         <div class="small text-body-secondary mb-1">{% trans "Total vulnerabilities" %}</div>
@@ -119,6 +104,27 @@ <h1 class="h3 mb-0">
         </div>
       </div>
     </div>
+    <div class="col-6 col-md-3">
+      <div class="bg-body-secondary rounded-3 p-3">
+        <div class="small text-body-secondary mb-1">{% trans "Policy violations" %}</div>
+        {% if products_with_policy_violations %}
+          <a href="?policy_violations=true" class="fs-4 fw-medium lh-sm text-danger">
+            {{ products_with_policy_violations }}
+          </a>
+        {% else %}
+          <div class="fs-4 fw-medium lh-sm text-success">
+            {{ products_with_policy_violations }}
+          </div>
+        {% endif %}
+        <div class="text-body-tertiary fs-xs mt-1">
+          {% if products_with_policy_violations %}
+            {% trans "products with active rule violations" %}
+          {% else %}
+            {% trans "No active policy violations" %}
+          {% endif %}
+        </div>
+      </div>
+    </div>
   </div>
 
   <div class="border rounded-3 p-3 pt-2 mb-3">

product_portfolio/templates/product_portfolio/compliance/compliance_panels.html

@@ -217,7 +217,7 @@ <h3 class="fs-6 fw-medium mb-0">{% trans "Security compliance" %}</h3>
 </div>
 
 {% if policy_violations %}
-  <div class="row g-4 mb-4">
+  <div id="policy-violations" class="row g-4 mb-4">
     <div class="col-12">
       <div class="border rounded-3 p-3">
         <div class="d-flex justify-content-between align-items-center mb-3">

product_portfolio/views.py

@@ -3075,14 +3075,20 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         products = self.object_list
-        products_with_issues = products.with_compliance_issues().count()
+        products_with_issues = products.filter(
+            Q(license_error_count__gt=0)
+            | Q(license_warning_count__gt=0)
+            | Q(critical_count__gt=0)
+            | Q(high_count__gt=0)
+            | Q(policy_violation_count__gt=0)
+        ).count()
 
         products_with_license_issues = products.filter(
             Q(license_error_count__gt=0) | Q(license_warning_count__gt=0)
         ).count()
 
-        products_with_critical_or_high = products.filter(
-            Q(critical_count__gt=0) | Q(high_count__gt=0)
+        products_with_policy_violations = products.filter(
+            policy_violation_count__gt=0
         ).count()
 
         totals = products.aggregate(
@@ -3098,7 +3104,7 @@ def get_context_data(self, **kwargs):
                 "total_products": context["paginator"].count,
                 "products_with_issues": products_with_issues,
                 "products_with_license_issues": products_with_license_issues,
-                "products_with_critical_or_high": products_with_critical_or_high,
+                "products_with_policy_violations": products_with_policy_violations,
                 "total_vulnerabilities": totals["total_vulnerabilities"] or 0,
                 "total_critical": totals["total_critical"] or 0,
                 "total_high": totals["total_high"] or 0,