Display the resolved_to_package as link in the dependencies tab (#1314)

Signed-off-by: tdruez <tdruez@nexb.com>

Author: tdruez

CHANGELOG.rst

@@ -11,6 +11,9 @@ v34.7.1 (unreleased)
   This is an advanced feature and should we used with caution.
   https://github.com/nexB/scancode.io/issues/1303
 
+- Display the resolved_to_package as link in the dependencies tab.
+  https://github.com/nexB/scancode.io/pull/1314
+
 v34.7.0 (2024-07-02)
 --------------------
 

scanpipe/models.py

@@ -2908,6 +2908,13 @@ def with_resources_count(self):
         )
         return self.annotate(resources_count=count_subquery)
 
+    def only_purl_fields(self):
+        """
+        Only select and return the UUID and PURL fields.
+        Minimum requirements to render a Package link in the UI.
+        """
+        return self.only("uuid", *PURL_FIELDS)
+
 
 class AbstractPackage(models.Model):
     """These fields should be kept in line with `packagedcode.models.PackageData`."""

scanpipe/templates/scanpipe/tabset/tab_dependencies.html

@@ -3,6 +3,7 @@
     <thead>
       <tr>
         <th>Package URL</th>
+        <th>Resolved to package</th>
         <th>Type</th>
         <th>Scope</th>
         <th>Datasource ID</th>
@@ -12,7 +13,14 @@
       {% for dependency in tab_data.fields.declared_dependencies.value %}
         <tr>
           <td title="{{ dependency.dependency_uid }}">
-            <a href="{{ dependency.get_absolute_url }}">{{ dependency.purl }}</a>
+            {# CAUTION: Avoid relying on get_absolute_url to prevent unnecessary query triggers #}
+            <a href="{% url 'dependency_detail' project.slug dependency.dependency_uid %}">{{ dependency.purl }}</a>
+          </td>
+          <td>
+            {% if dependency.resolved_to_package %}
+               {# CAUTION: Avoid relying on get_absolute_url to prevent unnecessary query triggers #}
+                <a href="{% url 'package_detail' project.slug dependency.resolved_to_package.uuid %}">{{ dependency.resolved_to_package.purl }}</a>
+            {% endif %}
           </td>
           <td>{{ dependency.type }}</td>
           <td class="break-normal">{{ dependency.scope }}</td>

scanpipe/views.py

@@ -1370,7 +1370,7 @@ class CodebaseResourceListView(
     prefetch_related = [
         Prefetch(
             "discovered_packages",
-            queryset=DiscoveredPackage.objects.only("uuid", *PURL_FIELDS),
+            queryset=DiscoveredPackage.objects.only_purl_fields(),
         )
     ]
     table_columns = [
@@ -1509,12 +1509,10 @@ class DiscoveredDependencyListView(
     template_name = "scanpipe/dependency_list.html"
     paginate_by = settings.SCANCODEIO_PAGINATE_BY.get("dependency", 100)
     prefetch_related = [
-        Prefetch(
-            "for_package", queryset=DiscoveredPackage.objects.only("uuid", *PURL_FIELDS)
-        ),
+        Prefetch("for_package", queryset=DiscoveredPackage.objects.only_purl_fields()),
         Prefetch(
             "resolved_to_package",
-            queryset=DiscoveredPackage.objects.only("uuid", *PURL_FIELDS),
+            queryset=DiscoveredPackage.objects.only_purl_fields(),
         ),
         Prefetch(
             "datafile_resource", queryset=CodebaseResource.objects.only("path", "name")
@@ -1853,7 +1851,10 @@ class DiscoveredPackageDetailsView(
                 "project_id",
             ),
         ),
-        "declared_dependencies__project",
+        Prefetch(
+            "declared_dependencies__resolved_to_package",
+            queryset=DiscoveredPackage.objects.only_purl_fields(),
+        ),
     ]
     tabset = {
         "essentials": {