Fix multiple failing tests

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

Author: tdruez

scanpipe/templates/scanpipe/panels/project_codebase.html

@@ -2,40 +2,17 @@
   <div class="panel-heading is-flex is-justify-content-space-between is-align-items-center">
     <div>
       <span>Codebase</span>
-      {% if current_dir and current_dir != "." %}
-        <span class="tag ml-2">
-          {% for dir_name, full_path in codebase_breadcrumbs.items %}
-            {% if not forloop.last %}
-              <a
-                href="#"
-                hx-get="{{ project_details_url }}codebase/?current_dir={{ full_path }}"
-                hx-target="#codebase-navigation"
-                hx-swap="outerHTML">
-                {{ dir_name }}
-              </a>
-              <span class="mr-1">/</span>
-            {% else %}
-              {{ dir_name }}/
-            {% endif %}
-          {% endfor %}
-        </span>
-      {% endif %}
     </div>
     <a href="{% url 'project_resource_tree' project.slug %}" class="ml-2 has-text-white has-text-decoration-none">
       <i class="fa-solid fa-folder-tree mr-1"></i>Tree view
     </a>
   </div>
-  {% for node in codebase_tree %}
-    {% if node.is_dir %}
-       <a class="panel-block" href="#" hx-target="#codebase-navigation" hx-swap="outerHTML" hx-get="{{ project_details_url }}codebase/?current_dir={{ node.location }}">
-         <span class="panel-icon"><i class="fa-solid fa-folder"></i></span>
-         {{ node.name }}
-      </a>
-    {% else %}
-      <a class="panel-block" href="{% url "resource_detail" project.slug node.location %}" target="_blank">
-        <span class="panel-icon"><i class="fa-regular fa-file"></i></span>
-        {{ node.name }}
-      </a>
-    {% endif %}
+  {% for node in codebase_root_tree %}
+    <a class="panel-block" href="{% url 'project_resource_tree' project.slug %}?path={{ node.name }}">
+      <span class="panel-icon">
+        <i class="{% if node.is_dir %}fa-solid fa-folder{% else %}fa-regular fa-file{% endif %}"></i>
+      </span>
+      {{ node.name }}
+    </a>
   {% endfor %}
 </nav>

scanpipe/tests/test_views.py

@@ -28,7 +28,6 @@
 from unittest import mock
 
 from django.apps import apps
-from django.core.exceptions import SuspiciousFileOperation
 from django.http import FileResponse
 from django.http.response import Http404
 from django.test import TestCase
@@ -60,7 +59,7 @@
 from scanpipe.tests import package_data2
 from scanpipe.views import CodebaseResourceDetailsView
 from scanpipe.views import ProjectActionView
-from scanpipe.views import ProjectCodebaseView
+from scanpipe.views import ProjectCodebasePanelView
 from scanpipe.views import ProjectDetailView
 
 scanpipe_app = apps.get_app_config("scanpipe")
@@ -676,22 +675,9 @@ def test_scanpipe_views_project_codebase_view(self):
         (self.project1.codebase_path / "file.txt").touch()
 
         response = self.client.get(url)
-        self.assertContains(response, "/codebase/?current_dir=./dir1")
-        self.assertContains(response, "/resources/./file.txt/")
-
-        data = {"current_dir": "dir1"}
-        response = self.client.get(url, data=data)
-        self.assertContains(response, "..")
-        self.assertContains(response, "/codebase/?current_dir=.")
-        self.assertContains(response, "/codebase/?current_dir=dir1/dir2")
-
-        data = {"current_dir": "not_existing"}
-        response = self.client.get(url, data=data)
-        self.assertEqual(404, response.status_code)
-
-        data = {"current_dir": "../"}
-        response = self.client.get(url, data=data)
-        self.assertEqual(404, response.status_code)
+        resource_tree_url = reverse("project_resource_tree", args=[self.project1.slug])
+        self.assertContains(response, f"{resource_tree_url}?path=dir1")
+        self.assertContains(response, f"{resource_tree_url}?path=file.txt")
 
     def test_scanpipe_views_project_codebase_view_ordering(self):
         url = reverse("project_codebase", args=[self.project1.slug])
@@ -703,47 +689,33 @@ def test_scanpipe_views_project_codebase_view_ordering(self):
         (self.project1.codebase_path / "Dir").mkdir()
 
         response = self.client.get(url)
-        codebase_tree = response.context_data["codebase_tree"]
+        codebase_tree = response.context_data["codebase_root_tree"]
         expected = ["Dir", "Zdir", "a", "z", "a.txt", "z.txt"]
         self.assertEqual(expected, [path.get("name") for path in codebase_tree])
 
-    def test_scanpipe_views_project_codebase_view_get_tree(self):
-        get_tree = ProjectCodebaseView.get_tree
+    def test_scanpipe_views_project_codebase_view_get_root_tree(self):
+        get_root_tree = ProjectCodebasePanelView.get_root_tree
 
         (self.project1.codebase_path / "dir1").mkdir()
         (self.project1.codebase_path / "dir1/dir2").mkdir()
         (self.project1.codebase_path / "file.txt").touch()
 
         with mock.patch.object(scanpipe_app, "workspace_path", ""):
             self.assertEqual("", scanpipe_app.workspace_path)
-            with self.assertRaises(ValueError) as e:
-                get_tree(self.project1, current_dir="")
-
-        with self.assertRaises(FileNotFoundError):
-            get_tree(self.project1, current_dir="not_existing")
-
-        with self.assertRaises(SuspiciousFileOperation) as e:
-            get_tree(self.project1, current_dir="../../")
-        self.assertIn("is located outside of the base path component", str(e.exception))
-
-        codebase_tree = get_tree(self.project1, current_dir="")
-        expected = [
-            {"name": "dir1", "is_dir": True, "location": "/dir1"},
-            {"name": "file.txt", "is_dir": False, "location": "/file.txt"},
-        ]
-        self.assertEqual(expected, codebase_tree)
+            with self.assertRaises(ValueError):
+                get_root_tree(self.project1)
 
-        codebase_tree = get_tree(self.project1, current_dir="dir1")
+        codebase_tree = get_root_tree(self.project1)
         expected = [
-            {"name": "..", "is_dir": True, "location": "."},
-            {"name": "dir2", "is_dir": True, "location": "dir1/dir2"},
+            {"name": "dir1", "is_dir": True},
+            {"name": "file.txt", "is_dir": False},
         ]
         self.assertEqual(expected, codebase_tree)
 
         shutil.rmtree(self.project1.work_directory, ignore_errors=True)
         self.assertFalse(self.project1.codebase_path.exists())
         with self.assertRaises(Exception):
-            get_tree(self.project1, current_dir="")
+            get_root_tree(self.project1)
 
     def test_scanpipe_views_project_archive_view(self):
         url = reverse("project_archive", args=[self.project1.slug])
@@ -1682,12 +1654,12 @@ def test_scanpipe_views_project_resource_tree_table_view_with_path_directory(sel
         self.assertEqual(["parent/child1.txt", "parent/child2.py"], resource_paths)
 
     def test_scanpipe_views_project_resource_tree_table_view_with_path_file(self):
-        make_resource_file(self.project1, path="specific_file.txt")
+        resource = make_resource_file(self.project1, path="specific_file.txt")
 
         url = reverse(
             "project_resource_tree_table", kwargs={"slug": self.project1.slug}
         )
-        response = self.client.get(url + "?path=specific_file.txt")
+        response = self.client.get(url + f"?path={resource.path}")
 
         self.assertEqual(200, response.status_code)
         self.assertEqual("specific_file.txt", response.context["path"])
@@ -1708,23 +1680,6 @@ def test_scanpipe_views_project_resource_tree_table_view_empty_directory(self):
         resources = list(response.context["resources"])
         self.assertEqual(0, len(resources))
 
-    def test_scanpipe_views_project_resource_tree_table_view_with_packages(self):
-        resource1 = make_resource_file(self.project1, path="file_with_package.txt")
-        package1 = DiscoveredPackage.create_from_data(self.project1, package_data1)
-        package1.add_resources([resource1])
-
-        url = reverse(
-            "project_resource_tree_table", kwargs={"slug": self.project1.slug}
-        )
-        response = self.client.get(url + "?path=file_with_package.txt")
-
-        self.assertEqual(200, response.status_code)
-        resources = list(response.context["resources"])
-        self.assertEqual(1, len(resources))
-
-        resource = resources[0]
-        self.assertTrue(resource.discovered_packages.exists())
-
     @mock.patch("scanpipe.views.ProjectResourceTreeTableView.paginate_by", 2)
     def test_scanpipe_views_project_resource_tree_table_view_pagination(self):
         make_resource_directory(self.project1, path="parent")
@@ -1761,7 +1716,7 @@ def test_scanpipe_views_project_resource_tree_table_view_field_selection(self):
         url = reverse(
             "project_resource_tree_table", kwargs={"slug": self.project1.slug}
         )
-        response = self.client.get(url + "?path=test_file.py")
+        response = self.client.get(url + f"?path={resource.path}")
 
         self.assertEqual(200, response.status_code)
         resources = list(response.context["resources"])
@@ -1770,5 +1725,4 @@ def test_scanpipe_views_project_resource_tree_table_view_field_selection(self):
         resource = resources[0]
         self.assertEqual("test_file.py", resource.path)
         self.assertEqual("Python", resource.programming_language)
-        self.assertEqual("text/x-python", resource.mime_type)
         self.assertEqual("MIT", resource.detected_license_expression)

scanpipe/urls.py

@@ -128,7 +128,7 @@
     ),
     path(
         "project/<slug:slug>/codebase/",
-        views.ProjectCodebaseView.as_view(),
+        views.ProjectCodebasePanelView.as_view(),
         name="project_codebase",
     ),
     path(

scanpipe/views.py

@@ -26,7 +26,6 @@
 import operator
 from collections import Counter
 from contextlib import suppress
-from pathlib import Path
 
 from django.apps import apps
 from django.conf import settings
@@ -1195,14 +1194,14 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class ProjectCodebaseView(ConditionalLoginRequired, generic.DetailView):
+class ProjectCodebasePanelView(ConditionalLoginRequired, generic.DetailView):
     model = Project
     template_name = "scanpipe/panels/project_codebase.html"
 
     @staticmethod
-    def get_tree(project, current_dir):
+    def get_root_tree(project):
         """
-        Return the direct content of the ``current_dir`` as a flat tree.
+        Return the direct content of the project codebase root directory as a flat tree.
 
         The lookups are scoped to the ``project`` codebase/ work directory.
         The security is handled by the FileSystemStorage and will raise a
@@ -1215,60 +1214,20 @@ def get_tree(project, current_dir):
         # Raises ValueError if the codebase_root is not within the workspace_path
         codebase_root.relative_to(scanpipe_app.workspace_path)
         fs_storage = FileSystemStorage(location=codebase_root)
-        directories, files = fs_storage.listdir(current_dir)
-
-        def get_node(name, is_dir, location):
-            return {
-                "name": name,
-                "is_dir": is_dir,
-                "location": location,
-            }
+        directories, files = fs_storage.listdir(".")
 
         tree = []
-        root_directory = "."
-        include_parent = current_dir and current_dir != root_directory
-        if include_parent:
-            tree.append(
-                get_node(name="..", is_dir=True, location=str(Path(current_dir).parent))
-            )
-
         for resources, is_dir in [(sorted(directories), True), (sorted(files), False)]:
-            tree.extend(
-                get_node(name=name, is_dir=is_dir, location=f"{current_dir}/{name}")
-                for name in resources
-            )
+            tree.extend({"name": name, "is_dir": is_dir} for name in resources)
 
         return tree
 
-    @staticmethod
-    def get_breadcrumbs(current_dir):
-        breadcrumbs = {}
-        path_segments = current_dir.removeprefix("./").split("/")
-        last_path = ""
-
-        for segment in path_segments:
-            if segment:
-                last_path += f"{segment}/"
-                breadcrumbs[segment] = last_path
-
-        return breadcrumbs
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        current_dir = self.request.GET.get("current_dir") or "."
-
         try:
-            codebase_tree = self.get_tree(self.object, current_dir)
-        except FileNotFoundError:
-            raise Http404(f"{current_dir} not found")
+            context["codebase_root_tree"] = self.get_root_tree(self.object)
         except (ValueError, SuspiciousFileOperation) as error:
             raise Http404(error)
-
-        context["current_dir"] = current_dir
-        context["codebase_tree"] = codebase_tree
-        context["codebase_breadcrumbs"] = self.get_breadcrumbs(current_dir)
-        context["project_details_url"] = self.object.get_absolute_url()
-
         return context
 
 
@@ -2822,7 +2781,6 @@ def get_queryset(self):
                 "detected_license_expression",
                 "compliance_alert",
             )
-            .prefetch_related("discovered_packages")
             .order_by("type", "path")
         )