Update ProductPackage license unknown during Scan all Packages

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

Author: tdruez

component_catalog/models.py

@@ -2630,7 +2630,7 @@ def update_from_purldb(self, user):
         )
         return updated_fields
 
-    def update_from_scan(self, user):
+    def update_from_scan(self, user, update_product_relations=False):
         scancodeio = ScanCodeIO(self.dataspace)
         can_update_from_scan = all(
             [
@@ -2640,9 +2640,16 @@ def update_from_scan(self, user):
             ]
         )
 
-        if can_update_from_scan:
-            updated_fields = scancodeio.update_from_scan(package=self, user=user)
-            return updated_fields
+        if not can_update_from_scan:
+            return
+
+        updated_fields = scancodeio.update_from_scan(package=self, user=user)
+
+        if update_product_relations and "declared_license_expression" in updated_fields:
+            for product_package in self.productpackages.license_unknown():
+                product_package.update_license_unknown()
+
+        return updated_fields
 
     def get_related_packages_qs(self):
         """

component_catalog/views.py

@@ -1761,7 +1761,7 @@ def send_scan_notification(request, key):
     run = json_data.get("run")
     scan_status = run.get("status")
     if scan_status.lower() == "success":
-        updated_fields = package.update_from_scan(user)
+        updated_fields = package.update_from_scan(user, update_product_relations=True)
 
     if updated_fields:
         description = (

product_portfolio/models.py

@@ -579,13 +579,11 @@ def improve_packages_from_purldb(self, user):
         # Update the Product Package relationship `license_expression` if the
         # Package.declared_license_expression was updated from "unknwon" value using
         # PurlDB data.
-        productpackages_unknown_licenses = self.productpackages.filter(
-            package__in=updated_packages, license_expression="unknown"
-        )
-        for product_package in productpackages_unknown_licenses:
-            package_license_expression = product_package.package.declared_license_expression
-            if package_license_expression and package_license_expression != "unknown":
-                product_package.update(license_expression=package_license_expression)
+        productpackages_qs = self.productpackages.filter(
+            package__in=updated_packages
+        ).license_unknown()
+        for product_package in productpackages_qs:
+            product_package.update_license_unknown()
 
         return updated_packages
 
@@ -707,6 +705,9 @@ class ProductPackageQuerySet(ProductSecuredQuerySet):
     def vulnerable(self):
         return self.filter(weighted_risk_score__isnull=False)
 
+    def license_unknown(self):
+        return self.filter(license_expression="unknown")
+
     def annotate_weighted_risk_score(self):
         """Annotate the Queeryset with the weighted_risk_score computed value."""
         purpose = ProductItemPurpose.objects.filter(productpackage=OuterRef("pk"))
@@ -1100,6 +1101,20 @@ def __str__(self):
     def permission_protected_fields(self):
         return {"review_status": "change_review_status_on_productpackage"}
 
+    def update_license_unknown(self):
+        """
+        Update this Product Package relationship `license_expression` from "unknown"
+        if the related Package `declared_license_expression` has known value.
+        """
+        package_license_expression = self.package.declared_license_expression
+        conditions = [
+            self.license_expression == "unknown",
+            package_license_expression,
+            package_license_expression != "unknown",
+        ]
+        if all(conditions):
+            self.update(license_expression=package_license_expression)
+
 
 class ProductAssignedLicense(DataspacedModel):
     product = models.ForeignKey(

product_portfolio/templates/product_portfolio/tables/scan_action_cell.html

@@ -1,6 +1,6 @@
 <span{% if package.download_url %} data-bs-toggle="modal" data-bs-target="#scan-package-modal" data-package-scan-url="{% url 'component_catalog:package_scan' user.dataspace package.uuid %}"{% endif %}>
   <span data-bs-toggle="tooltip" title="{% if package.download_url %}Submit Scan Request{% else %}Download URL not available{% endif %}">
-    <button type="button" class="btn btn-outline-dark btn-sm{% if not package.download_url %} disabled{% endif %}">
+    <button type="button" style="width:max-content;" class="btn btn-outline-dark btn-sm{% if not package.download_url %} disabled{% endif %}">
       <i class="fas fa-barcode"></i> Scan
     </button>
   </span>

product_portfolio/templates/product_portfolio/tabs/tab_imports.html

@@ -18,7 +18,7 @@
     <thead>
       <tr>
         <th>{% trans 'Import type' %}</th>
-        <th style="width:115px;">{% trans 'Status' %}</th>
+        <th style="width:140px;">{% trans 'Status' %}</th>
         <th>{% trans 'Input' %}</th>
         <th colspan="2">{% trans 'Log' %}</th>
       </tr>
@@ -41,17 +41,17 @@
             </div>
           </td>
           <td>
+            {% if scancode_project.project_uuid %}
+              <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
+                <i class="fas fa-info-circle"></i>
+              </a>
+            {% endif %}
             <strong>
               {{ scancode_project.get_status_display|title }}
               {% if scancode_project.has_errors %}
                 <span class="float-start"> with errors</span>
               {% endif %}
             </strong>
-            {% if scancode_project.project_uuid %}
-              <a href="#" role="button" class="ms-1 float-end" data-bs-toggle="modal" data-bs-target="#scancode-project-status-modal" data-fetch-status-url="{% url 'product_portfolio:scancodeio_project_status' scancode_project.uuid %}">
-                <i class="fas fa-info-circle"></i>
-              </a>
-            {% endif %}
             {% include 'component_catalog/includes/scan_status.html' with status=scancode_project.status has_errors=scancode_project.has_errors only %}
           </td>
           <td>