Create donut chart for package type #447

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

scanpipe/templates/scanpipe/project_detail.html

@@ -128,17 +128,19 @@ <h3 class="title is-4 has-text-centered">
       </h3>
       <div class="columns is-gapless">
         <div class="column">
-          <div id="dependency_is_runtime_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="is_runtime"></div>
+          <div id="dependency_package_type_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="package_type"></div>
         </div>
         <div class="column">
-          <div id="dependency_is_optional_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="is_optional"></div>
+          <div id="dependency_is_runtime_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="is_runtime"></div>
         </div>
       </div>
       <div class="columns is-gapless">
+        <div class="column">
+          <div id="dependency_is_optional_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="is_optional"></div>
+        </div>
         <div class="column">
           <div id="dependency_is_resolved_chart" data-url="{% url 'project_dependencies' project.uuid %}" data-lookup_field="is_resolved"></div>
         </div>
-        <div class="column"></div>
       </div>
     {% endif %}
 
@@ -197,6 +199,7 @@ <h3 class="title is-4 has-text-centered mb-3">
     {{ package_types|json_script:"package_types" }}
   {% endif %}
   {% if project.dependency_count %}
+    {{ dependency_package_type|json_script:"dependency_package_type" }}
     {{ dependency_is_runtime|json_script:"dependency_is_runtime" }}
     {{ dependency_is_optional|json_script:"dependency_is_optional" }}
     {{ dependency_is_resolved|json_script:"dependency_is_resolved" }}
@@ -273,6 +276,7 @@ <h3 class="title is-4 has-text-centered mb-3">
     makeChart("package_types", "#package_type_chart", "Package\nType");
     makeChart("package_licenses", "#package_license_chart", "Package\nLicense\nExpression");
     // Dependencies
+    makeChart("dependency_package_type", "#dependency_package_type_chart", "Package\nType");
     makeChart("dependency_is_runtime", "#dependency_is_runtime_chart", "Runtime\nDependencies");
     makeChart("dependency_is_optional", "#dependency_is_optional_chart", "Optional\nDependencies");
     makeChart("dependency_is_resolved", "#dependency_is_resolved_chart", "Resolved\nDependencies");

scanpipe/views.py

@@ -585,6 +585,7 @@ def get_context_data(self, **kwargs):
         package_licenses = packages.values_list("license_expression", flat=True)
         package_types = packages.values_list("type", flat=True)
 
+        dependency_package_type = dependencies.values_list("type", flat=True)
         dependency_is_runtime = dependencies.values_list("is_runtime", flat=True)
         dependency_is_optional = dependencies.values_list("is_optional", flat=True)
         dependency_is_resolved = dependencies.values_list("is_resolved", flat=True)
@@ -624,6 +625,7 @@ def get_context_data(self, **kwargs):
                 "file_compliance_alert": self.get_summary(file_compliance_alert),
                 "package_licenses": self.get_summary(package_licenses),
                 "package_types": self.get_summary(package_types),
+                "dependency_package_type": self.get_summary(dependency_package_type),
                 "dependency_is_runtime": self.get_summary(dependency_is_runtime),
                 "dependency_is_optional": self.get_summary(dependency_is_optional),
                 "dependency_is_resolved": self.get_summary(dependency_is_resolved),