add suggested improvements

Signed-off-by: Aayush Kumar <[email protected]>

Author: aayushkdev

scanpipe/models.py

@@ -2384,17 +2384,16 @@ def macho_binaries(self):
     def executable_binaries(self):
         return self.union(self.win_exes(), self.macho_binaries(), self.elfs())
 
-    def with_children(self, project):
+    def with_has_children(self):
         """
         Annotate the QuerySet with has_children field based on whether
         each resource has any children (subdirectories/files).
         """
-        subdirs = CodebaseResource.objects.filter(
-            project=project,
+        children_qs = CodebaseResource.objects.filter(
             parent_path=OuterRef("path"),
         )
 
-        return self.annotate(has_children=Exists(subdirs))
+        return self.annotate(has_children=Exists(children_qs))
 
 
 class ScanFieldsModelMixin(models.Model):

scanpipe/templates/scanpipe/resource_tree.html

@@ -52,7 +52,7 @@
           target.classList.toggle("is-hidden");
         } else {
           target.classList.remove("is-hidden");
-          const response = await fetch(url + "&tree=true");
+          const response = await fetch(url + "&tree_panel=true");
           target.innerHTML = await response.text();
           target.dataset.loaded = "true";
           htmx.process(target);

scanpipe/tests/test_models.py

@@ -3011,6 +3011,31 @@ def test_scanpipe_discovered_package_model_unique_package_uid_in_project(self):
         self.assertTrue(package3.package_uid)
         self.assertNotEqual(package.package_uid, package3.package_uid)
 
+    def test_scanpipe_codebase_resource_queryset_with_has_children(self):
+        project1 = make_project("Analysis")
+
+        CodebaseResource.objects.create(
+            project=project1,
+            type=CodebaseResource.Type.DIRECTORY,
+            path="parent",
+        )
+        CodebaseResource.objects.create(
+            project=project1,
+            type=CodebaseResource.Type.FILE,
+            path="parent/child.txt",
+        )
+        CodebaseResource.objects.create(
+            project=project1,
+            type=CodebaseResource.Type.DIRECTORY,
+            path="empty",
+        )
+
+        qs = CodebaseResource.objects.filter(project=project1).with_has_children()
+        results = {r.path: r.has_children for r in qs}
+        self.assertTrue(results["parent"])
+        self.assertFalse(results["parent/child.txt"])
+        self.assertFalse(results["empty"])
+
     @skipIf(connection.vendor == "sqlite", "No max_length constraints on SQLite.")
     def test_scanpipe_codebase_resource_create_and_add_package_warnings(self):
         project1 = make_project("Analysis")

scanpipe/tests/test_views.py

@@ -1577,27 +1577,26 @@ def test_project_codebase_resources_export_json(self):
         for field in expected_fields:
             self.assertIn(field, json_data[0])
 
-    def test_file_tree_base_url_lists_top_level_nodes(self):
+    def test_scanpipe_views_resource_tree_root_path(self):
         make_resource_file(self.project1, path="child1.txt")
         make_resource_file(self.project1, path="dir1")
 
         url = reverse("codebase_resource_tree", kwargs={"slug": self.project1.slug})
         response = self.client.get(url)
         children = response.context["children"]
-        print(response.context)
         child1 = children[0]
         dir1 = children[1]
 
         self.assertEqual(child1.path, "child1.txt")
         self.assertEqual(dir1.path, "dir1")
 
-    def test_file_tree_nested_url_lists_only_children_of_given_path(self):
+    def test_scanpipe_views_resource_tree_children_path(self):
         make_resource_file(self.project1, path="parent/child1.txt")
         make_resource_file(self.project1, path="parent/dir1")
         make_resource_file(self.project1, path="parent/dir1/child2.txt")
 
         url = reverse("codebase_resource_tree", kwargs={"slug": self.project1.slug})
-        response = self.client.get(url + "?path=parent&tree=true")
+        response = self.client.get(url + "?path=parent&tree_panel=true")
         children = response.context["children"]
 
         child1 = children[0]

scanpipe/views.py

@@ -2577,20 +2577,19 @@ def get(self, request, *args, **kwargs):
         project = get_object_or_404(Project, slug=slug)
         path = request.GET.get("path", "")
 
-        base_qs = (
-            CodebaseResource.objects.filter(project=project, parent_path=path)
+        children = (
+            project.codebaseresources.filter(parent_path=path)
+            .with_has_children()
             .only("path", "name", "type")
             .order_by("path")
         )
 
-        children = base_qs.with_children(project)
-
         context = {
             "project": project,
             "path": path,
             "children": children,
         }
 
-        if request.GET.get("tree") == "true":
+        if request.GET.get("tree_panel") == "true":
             return render(request, "scanpipe/panels/codebase_tree_panel.html", context)
         return render(request, self.template_name, context)