adjust active filter rendering

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

Author: tdruez

product_portfolio/filters.py

@@ -264,6 +264,19 @@ class BaseProductRelationFilterSet(DataspacedFilterSet):
         field_name="licenses__usage_policy__compliance_alert",
         distinct=True,
     )
+    policy_rule = django_filters.CharFilter(
+        label=_("Policy rule"),
+        method="filter_by_policy_rule",
+    )
+
+    def filter_by_policy_rule(self, queryset, name, value):
+        """Filter packages that triggered the given policy rule type."""
+        if queryset.model is not ProductPackage:
+            return queryset.none()
+        handler = RULE_REGISTRY.get(value)
+        if not handler:
+            return queryset
+        return handler.filter_queryset(queryset).distinct()
 
     @staticmethod
     def filter_object_type(queryset, name, value):
@@ -408,7 +421,6 @@ class ProductPackageFilterSet(BaseProductRelationFilterSet):
         field_name="package__usage_policy__compliance_alert",
         distinct=True,
     )
-    policy_rule = django_filters.CharFilter(method="filter_by_policy_rule")
 
     class Meta:
         model = ProductPackage
@@ -424,13 +436,6 @@ class Meta:
             "exploitability",
         ]
 
-    def filter_by_policy_rule(self, queryset, name, value):
-        """Filter packages that triggered the given policy rule type."""
-        handler = RULE_REGISTRY.get(value)
-        if not handler:
-            return queryset
-        return handler.filter_queryset(queryset).distinct()
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.filters["vulnerability_analyses__state"].extra["null_label"] = "(No values)"

product_portfolio/templates/product_portfolio/compliance/compliance_panels.html

@@ -95,7 +95,7 @@ <h5 class="modal-title fs-6 fw-medium" id="policy-rules-modal-label">{% trans "P
               </td>
               <td class="text-body-secondary small">{{ violation.rule_description }}</td>
               <td class="text-end">
-                <a href="{{ product_url }}?inventory-object_type=package&amp;inventory-policy_rule={{ violation.rule_type }}#inventory"
+                <a href="{{ product_url }}?inventory-policy_rule={{ violation.rule_type }}#inventory"
                    class="text-decoration-none">
                   {{ violation.violation_count }}
                 </a>