Update Dependency field labels #447

    * Remove related dependencies when resetting a project

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

Author: JonoYang

scanpipe/models.py

@@ -480,6 +480,7 @@ def reset(self, keep_input=True):
             self.projecterrors,
             self.runs,
             self.discoveredpackages,
+            self.discovereddependencys,
             self.codebaseresources,
         ]
 

scanpipe/templates/scanpipe/dependency_list.html

@@ -18,16 +18,16 @@
       <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>purl</th>
-            <th>extracted_requirement</th>
+            <th>Package URL</th>
+            <th>Extracted requirement</th>
             <th>scope</th>
-            <th>is_runtime</th>
-            <th>is_optional</th>
-            <th>is_resolved</th>
-            <th>dependency_uid</th>
-            <th>for_package_uid</th>
-            <th>datafile_path</th>
-            <th>datasource_id</th>
+            <th>Is runtime</th>
+            <th>Is optional</th>
+            <th>Is resolved</th>
+            <th>Dependency UID</th>
+            <th>For package UID</th>
+            <th>Datafile path</th>
+            <th>Datasource ID</th>
           </tr>
         </thead>
         <tbody>
@@ -51,13 +51,13 @@
               <td>
                 {{ dependency.is_resolved }}
               </td>
-              <td style="min-width: 500px;" title="{{ dependency.dependency_uid }}">
+              <td style="min-width: 400px;" title="{{ dependency.dependency_uid }}">
                 {{ dependency.dependency_uid }}
               </td>
-              <td style="min-width: 500px;" title="{{ dependency.for_package_uid }}">
+              <td style="min-width: 400px;" title="{{ dependency.for_package_uid }}">
                 {{ dependency.for_package_uid }}
               </td>
-              <td style="min-width: 500px;" title="{{ dependency.datafile_path }}">
+              <td style="min-width: 400px;" title="{{ dependency.datafile_path }}">
                 {{ dependency.datafile_path }}
               </td>
               <td>

scanpipe/templates/scanpipe/includes/project_list_table.html

@@ -4,6 +4,7 @@
     <tr>
       <th>Name</th>
       <th>Packages</th>
+      <th>Dependencies</th>
       <th>Resources</th>
       <th>Errors</th>
       <th>Pipelines</th>
@@ -28,6 +29,17 @@
           </span>
         {% endif %}
       </td>
+      <td>
+        {% if project.dependency_count %}
+          <a href="{% url 'project_dependencies' project.uuid %}">
+            {{ project.dependency_count|intcomma }}
+          </a>
+        {% else %}
+          <span>
+            {{ project.dependency_count|intcomma }}
+          </span>
+        {% endif %}
+      </td>
       <td>
         {% if project.resource_count %}
           <a href="{% url 'project_resources' project.uuid %}">

scanpipe/templates/scanpipe/includes/project_summary_level.html

@@ -16,6 +16,22 @@
       </p>
     </div>
   </div>
+  <div class="level-item has-text-centered">
+    <div>
+      <p class="heading">Dependencies</p>
+      <p class="{{ title_class }}">
+        {% if project.dependency_count %}
+          <a href="{% url 'project_dependencies' project.uuid %}">
+            {{ project.dependency_count|intcomma }}
+          </a>
+        {% else %}
+          <span>
+            {{ project.dependency_count|intcomma }}
+          </span>
+        {% endif %}
+      </p>
+    </div>
+  </div>
   <div class="level-item has-text-centered">
     <div>
       <p class="heading">Resources</p>