diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f459d6d7e3..35bc59914e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -33,6 +33,8 @@ v34.12.0 (unreleased) - Add "(No value detected)" for Copyright and Holder charts. https://github.com/aboutcode-org/scancode.io/issues/1697 +- Add "Package Compliance Alert" chart in the Policies section. + v34.11.0 (2025-05-02) --------------------- diff --git a/scanpipe/templates/scanpipe/project_charts.html b/scanpipe/templates/scanpipe/project_charts.html index 6b64194019..22dcaebabe 100644 --- a/scanpipe/templates/scanpipe/project_charts.html +++ b/scanpipe/templates/scanpipe/project_charts.html @@ -58,16 +58,26 @@

{% include "scanpipe/includes/resource_chart_column.html" with field_name="detected_license_expression" url=resources_url %}
- {% if file_compliance_alert %} -
-

- Policies -

-
+{% endif %} + +{% if file_compliance_alert or package_compliance_alert %} +
+

+ Policies +

+
+ {% if file_compliance_alert %} {% include "scanpipe/includes/resource_chart_column.html" with field_name="compliance_alert" url=resources_url %} + {% endif %} + {% if package_compliance_alert %} +
+
+
+ {% endif %} + {% if not file_compliance_alert or not package_compliance_alert %}
-
- {% endif %} + {% endif %} +
{% endif %} {% block scripts %} @@ -79,6 +89,7 @@

{{ file_compliance_alert|json_script:"file_compliance_alert" }} {{ package_declared_license_expression|json_script:"package_declared_license_expression" }} {{ package_type|json_script:"package_type" }} + {{ package_compliance_alert|json_script:"package_compliance_alert" }} {{ dependency_type|json_script:"dependency_type" }} {{ dependency_is_runtime|json_script:"dependency_is_runtime" }} {{ dependency_is_optional|json_script:"dependency_is_optional" }} @@ -154,6 +165,7 @@

{% if project.package_count %} makeChart("package_type", "#package_type_chart", "Package\nType"); makeChart("package_declared_license_expression", "#package_license_chart", "Package\nLicense\nExpression"); + makeChart("package_compliance_alert", "#package_compliance_alert_chart", "Package\nCompliance\nAlert"); {% endif %} {% if project.dependency_count %} makeChart("dependency_type", "#dependency_type_chart", "Package\nType"); @@ -167,7 +179,7 @@

makeChart("file_holders", "#holders_chart", "Holder"); makeChart("file_copyrights", "#copyrights_chart", "Copyright"); makeChart("file_detected_license_expression", "#detected_license_expression_chart", "Detected\nLicense\nExpression"); - makeChart("file_compliance_alert", "#compliance_alert_chart", "Compliance\nAlert"); + makeChart("file_compliance_alert", "#compliance_alert_chart", "Resource\nCompliance\nAlert"); {% endif %} {% endblock %} \ No newline at end of file diff --git a/scanpipe/views.py b/scanpipe/views.py index 47c45d9fe2..707d4920bc 100644 --- a/scanpipe/views.py +++ b/scanpipe/views.py @@ -1013,7 +1013,7 @@ def get_context_data(self, **kwargs): }, "package": { "queryset": project.discoveredpackages, - "fields": ["type", "declared_license_expression"], + "fields": ["type", "declared_license_expression", "compliance_alert"], }, "dependency": { "queryset": project.discovereddependencies,