have compliance alerts in the single panel

Signed-off-by: NucleonGodX <[email protected]>

Author: NucleonGodX

scanpipe/templates/scanpipe/panels/clarity_compliance.html

@@ -1,11 +1,11 @@
 {% load humanize %}
-{% if compliance_alerts %}
+{% if compliance_alerts or clarity_compliance_alert %}
   <div class="column is-half">
     <nav id="compliance-panel" class="panel is-dark">
       <p class="panel-heading">
         Compliance alerts
       </p>
-      {% for model_name, model_alerts in compliance_alerts.items  %}
+      {% for model_name, model_alerts in compliance_alerts.items %}
         <div class="panel-block">
           <span class="pr-1">
             {{ model_name|title }}
@@ -19,6 +19,20 @@
           {% endfor %}
         </div>
       {% endfor %}
+      {% if clarity_compliance_alert %}
+        <div class="panel-block">
+          <span class="pr-1">
+            License clarity
+          </span>
+          <span class="tag is-rounded ml-1
+            {% if clarity_compliance_alert == 'error' %}is-danger
+            {% elif clarity_compliance_alert == 'warning' %}is-warning
+            {% elif clarity_compliance_alert == 'ok' %}is-success
+            {% else %}is-light{% endif %}">
+            {{ clarity_compliance_alert|title }}
+          </span>
+        </div>
+      {% endif %}
     </nav>
   </div>
-{% endif %}
+{% endif %}

scanpipe/templates/scanpipe/panels/project_compliance.html

@@ -120,7 +120,6 @@
       {% if policies_enabled %}
         <div class="columns">
           <div hx-get="{% url 'project_compliance_panel' project.slug %}" hx-trigger="load" hx-swap="outerHTML"></div>
-          <div hx-get="{% url 'clarity_compliance_panel' project.slug %}" hx-trigger="load" hx-swap="outerHTML"></div>
         </div>
       {% endif %}
 

scanpipe/templates/scanpipe/project_detail.html

@@ -997,6 +997,9 @@ def test_scanpipe_views_project_compliance_panel_view(self, mock_policies_enable
             compliance_alert=DiscoveredPackage.Compliance.ERROR,
         )
 
+        self.project1.extra_data = {"clarity_compliance_alert": "warning"}
+        self.project1.save(update_fields=["extra_data"])
+
         mock_policies_enabled.return_value = False
         response = self.client.get(url)
         self.assertEqual(404, response.status_code)
@@ -1005,27 +1008,11 @@ def test_scanpipe_views_project_compliance_panel_view(self, mock_policies_enable
         response = self.client.get(url)
         self.assertContains(response, "Compliance alerts")
         self.assertContains(response, "1 Error")
+        self.assertContains(response, "License clarity")
+        self.assertContains(response, "Warning")
         expected = f"/project/{self.project1.slug}/packages/?compliance_alert=error"
         self.assertContains(response, expected)
 
-    @mock.patch.object(Project, "policies_enabled", new_callable=mock.PropertyMock)
-    def test_scanpipe_views_project_clarity_compliance_panel_view(
-        self, mock_policies_enabled
-    ):
-        url = reverse("clarity_compliance_panel", args=[self.project1.slug])
-        self.project1.extra_data = {"clarity_compliance_alert": "error"}
-        self.project1.save(update_fields=["extra_data"])
-
-        mock_policies_enabled.return_value = False
-        response = self.client.get(url)
-        self.assertEqual(404, response.status_code)
-
-        mock_policies_enabled.return_value = True
-        response = self.client.get(url)
-        self.assertContains(response, "Clarity Compliance")
-        self.assertContains(response, "Error")
-        self.assertContains(response, "License clarity is insufficient")
-
     def test_scanpipe_views_pipeline_help_view(self):
         url = reverse("pipeline_help", args=["not_existing_pipeline"])
         response = self.client.get(url)

scanpipe/tests/test_views.py

@@ -221,11 +221,6 @@
         views.ProjectCompliancePanelView.as_view(),
         name="project_compliance_panel",
     ),
-    path(
-        "projects/<slug:slug>/clarity_compliance_panel/",
-        views.ClarityCompliancePanelView.as_view(),
-        name="clarity_compliance_panel",
-    ),
     path(
         "project/<slug:slug>/",
         views.ProjectDetailView.as_view(),

scanpipe/urls.py

@@ -1209,19 +1209,6 @@ def get_context_data(self, **kwargs):
             fail_level="missing",
         )
         context["compliance_alerts"] = compliance_alerts
-        return context
-
-
-class ClarityCompliancePanelView(ConditionalLoginRequired, generic.DetailView):
-    model = Project
-    template_name = "scanpipe/panels/clarity_compliance.html"
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        project = self.object
-
-        if not project.policies_enabled:
-            raise Http404
 
         extra_data = project.extra_data or {}
         context["clarity_compliance_alert"] = extra_data.get("clarity_compliance_alert")