Add the ability to delete a Scan from Product inventory #230

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

Author: tdruez

component_catalog/templates/component_catalog/includes/scan_delete_modal.html

@@ -10,7 +10,7 @@ <h5 class="modal-title">Delete {% trans 'Scan' %}</h5>
         <p><strong>Are you sure you want to delete this Scan?</strong></p>
         <p>
           All data and results related to the Scan will be deleted.<br>
-          If the Scan is in progress, it will be cancel.
+          If the Scan is in progress, it will be canceled.
         </p>
       </div>
       <div class="modal-footer">

component_catalog/templates/component_catalog/includes/scan_progress.html

@@ -2,14 +2,29 @@
 {% include 'component_catalog/includes/scan_status.html' with status=scan.runs.0.status only %}
 
 {% if compact_mode %}
-  <div class="mt-1">
+  <ul class="list-inline mt-1 mb-0">
     {% if view_url %}
-      <a class="text-dark" href="{{ view_url }}#scan" target="_blank" data-bs-toggle="tooltip" data-bs-title="View Scan results"><i class="far fa-file-alt"></i></a>&nbsp;
+      <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-title="View Scan results">
+        <a class="text-dark" href="{{ view_url }}#scan" target="_blank">
+          <i class="far fa-file-alt"></i>
+        </a>
+      </li>
     {% endif %}
     {% if scan.download_result_url %}
-      <a class="text-dark" href="{{ scan.download_result_url }}" target="_blank" data-bs-toggle="tooltip" data-bs-title="Download Scan results"><i class="fas fa-download"></i></a>
+      <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-title="Download Scan results">
+        <a class="text-dark" href="{{ scan.download_result_url }}" target="_blank">
+          <i class="fas fa-download"></i>
+        </a>
+      </li>
     {% endif %}
-  </div>
+    {% if scan.delete_url %}
+      <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-title="Delete Scan">
+        <a class="text-dark scan_delete_link" href="#scan-delete-modal" role="button" data-delete-url="{{ scan.delete_url }}" data-bs-toggle="modal">
+          <i class="far fa-trash-alt"></i>
+        </a>
+      </li>
+    {% endif %}
+  </ul>
 {% else %}
   <div class="text-center">
     {% if scan.download_result_url %}

component_catalog/templates/component_catalog/scan_list.html

@@ -36,9 +36,11 @@
   {{ block.super }}
   <script>
     document.addEventListener('DOMContentLoaded', function () {
-      $('.scan_delete_link').on('click', function() {
-        let delete_url = $(this).data('delete-url');
-        $('#scan-delete-modal a.delete-confirm').attr('href', delete_url);
+      document.querySelectorAll('.scan_delete_link').forEach(link => {
+        link.addEventListener('click', function() {
+          let deleteUrl = this.getAttribute('data-delete-url');
+          document.querySelector('#scan-delete-modal a.delete-confirm').setAttribute('href', deleteUrl);
+        });
       });
     });
   </script>

product_portfolio/templates/product_portfolio/product_details.html

@@ -113,6 +113,7 @@
   {% endif %}
   {% if display_scan_features %}
     {% include 'component_catalog/includes/scan_package_modal.html' %}
+    {% include 'component_catalog/includes/scan_delete_modal.html' %}
   {% endif %}
   {% if pull_project_data_form %}
     {% include 'product_portfolio/includes/pull_project_data_modal.html' %}

product_portfolio/templates/product_portfolio/tabs/tab_inventory.html

@@ -142,7 +142,7 @@
         {% if relation.package and display_scan_features %}
           <tr class="{{ rowcolors }} extra-details">
             <td colspan="100" class="ps-4">
-              <div class="col-4 p-0">
+              <div class="col-2 p-0">
                 {% if relation.scan %}
                   <strong>{% trans 'Scan' %}:</strong> {% include 'component_catalog/includes/scan_progress.html' with scan=relation.scan view_url=relation.package.get_absolute_url compact_mode=True only %}
                 {% else %}
@@ -311,4 +311,13 @@
       new bootstrap.Tooltip(iconElement, {container: 'body'});
     }
   {% endif %}
+
+  {% if display_scan_features %}
+    document.querySelectorAll('.scan_delete_link').forEach(link => {
+      link.addEventListener('click', function() {
+        let deleteUrl = this.getAttribute('data-delete-url');
+        document.querySelector('#scan-delete-modal a.delete-confirm').setAttribute('href', deleteUrl);
+      });
+    });
+  {% endif %}
 </script>

product_portfolio/views.py

@@ -950,6 +950,9 @@ def inject_scan_data(scancodeio, feature_grouped, dataspace_uuid):
                 scan = scans_by_uri.get(productpackage.package.download_url)
                 if scan:
                     scan["download_result_url"] = get_scan_results_as_file_url(scan)
+                    scan["delete_url"] = reverse(
+                        "component_catalog:scan_delete", args=[scan.get("uuid")]
+                    )
                     productpackage.scan = scan
                 injected_productpackages.append(productpackage)