implement suggested changes

Signed-off-by: Aayush Kumar <aayush214.kumar@gmail.com>

Author: aayushkdev

scanpipe/models.py

@@ -46,6 +46,7 @@
 from django.db import transaction
 from django.db.models import Case
 from django.db.models import Count
+from django.db.models import Exists
 from django.db.models import IntegerField
 from django.db.models import OuterRef
 from django.db.models import Prefetch
@@ -2383,6 +2384,18 @@ def macho_binaries(self):
     def executable_binaries(self):
         return self.union(self.win_exes(), self.macho_binaries(), self.elfs())
 
+    def with_children(self, project):
+        """
+        Annotate the QuerySet with has_children field based on whether
+        each resource has any children (subdirectories/files).
+        """
+        subdirs = CodebaseResource.objects.filter(
+            project=project,
+            parent_path=OuterRef("path"),
+        )
+
+        return self.annotate(has_children=Exists(subdirs))
+
 
 class ScanFieldsModelMixin(models.Model):
     """Fields returned by the ScanCode-toolkit scans."""

scanpipe/templates/scanpipe/panels/file_tree_panel.html renamed to scanpipe/templates/scanpipe/panels/codebase_tree_panel.html

@@ -2,8 +2,8 @@
   {% for node in children %}
     <li class="mb-1">
       {% if node.is_dir %}
-        <div class="tree-node is-flex is-align-items-center has-text-weight-semibold is-clickable px-1" data-folder{% if node.has_children %} data-target="{{ node.path|slugify }}" data-url="{% url 'file_tree' slug=project.slug %}?path={{ node.path }}"{% endif %}>
-          <span class="icon is-small chevron mr-1" data-chevron{% if not node.has_children %} style="visibility: hidden;"{% endif %}>
+        <div class="tree-node is-flex is-align-items-center has-text-weight-semibold is-clickable px-1" data-folder{% if node.has_children %} data-target="{{ node.path|slugify }}" data-url="{% url 'codebase_resource_tree' slug=project.slug %}?path={{ node.path }}"{% endif %}>
+          <span class="icon is-small chevron mr-1{% if not node.has_children %} is-invisible{% endif %}" data-chevron>
             <i class="fas fa-chevron-right"></i>
           </span>
           <span class="is-flex is-align-items-center folder-meta">
@@ -14,12 +14,12 @@
           </span>
         </div>
         {% if node.has_children %}
-          <div id="dir-{{ node.path|slugify }}" class="ml-4 hidden" data-loaded="false"></div>
+          <div id="dir-{{ node.path|slugify }}" class="ml-4 is-hidden" data-loaded="false"></div>
         {% endif %}
       {% else %}
         <div class="is-flex is-align-items-center ml-5 is-clickable">
           <span class="icon is-small mr-1">
-            <i class="fas fa-file"></i>
+            <i class="far fa-file"></i>
           </span>
           <span>{{ node.name }}</span>
         </div>

scanpipe/templates/scanpipe/resource_tree.html

@@ -4,9 +4,6 @@
 
 {% block extrahead %}
   <style>
-    .hidden {
-      display: none;
-    }
     .chevron {
       transition: transform 0.2s ease;
       display: inline-block;
@@ -29,8 +26,8 @@
 
 <div class="columns is-gapless is-mobile" style="height: 80vh; margin: 0;">
   <div class="column is-one-third p-4" style="border-right: 1px solid #ccc; overflow-y: auto;">
-    <div id="file-tree">
-      {% include "scanpipe/panels/file_tree_panel.html" with children=children path=path %}
+    <div id="resource-tree">
+      {% include "scanpipe/panels/codebase_tree_panel.html" with children=children path=path %}
     </div>
   </div>
   <div class="column p-4" style="overflow-y: auto;">
@@ -52,9 +49,9 @@
         const target = document.getElementById("dir-" + targetId);
 
         if (target.dataset.loaded === "true") {
-          target.classList.toggle("hidden");
+          target.classList.toggle("is-hidden");
         } else {
-          target.classList.remove("hidden");
+          target.classList.remove("is-hidden");
           const response = await fetch(url + "&tree=true");
           target.innerHTML = await response.text();
           target.dataset.loaded = "true";

scanpipe/urls.py

@@ -121,6 +121,11 @@
         views.ProjectCodebaseView.as_view(),
         name="project_codebase",
     ),
+    path(
+        "project/<slug:slug>/codebase_tree/",
+        views.CodebaseResourceTreeView.as_view(),
+        name="codebase_resource_tree",
+    ),
     path(
         "run/<uuid:uuid>/",
         views.run_detail_view,
@@ -241,10 +246,5 @@
         views.LicenseListView.as_view(),
         name="license_list",
     ),
-    path(
-        "project/<slug:slug>/codebase_tree/",
-        views.CodebaseResourceTreeView.as_view(),
-        name="file_tree",
-    ),
     path("monitor/", include("django_rq.urls")),
 ]

scanpipe/views.py

@@ -37,8 +37,6 @@
 from django.core.exceptions import ValidationError
 from django.core.files.storage.filesystem import FileSystemStorage
 from django.core.serializers.json import DjangoJSONEncoder
-from django.db.models import Exists
-from django.db.models import OuterRef
 from django.db.models import Prefetch
 from django.db.models.manager import Manager
 from django.http import FileResponse
@@ -2585,12 +2583,7 @@ def get(self, request, *args, **kwargs):
             .order_by("path")
         )
 
-        subdirs = CodebaseResource.objects.filter(
-            project=project,
-            parent_path=OuterRef("path"),
-        )
-
-        children = base_qs.annotate(has_children=Exists(subdirs))
+        children = base_qs.with_children(project)
 
         context = {
             "project": project,
@@ -2599,5 +2592,5 @@ def get(self, request, *args, **kwargs):
         }
 
         if request.GET.get("tree") == "true":
-            return render(request, "scanpipe/panels/file_tree_panel.html", context)
+            return render(request, "scanpipe/panels/codebase_tree_panel.html", context)
         return render(request, self.template_name, context)