Rename ProjectResourceTreeRightPaneView for consistency

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

Author: tdruez

scanpipe/templates/scanpipe/resource_tree.html

@@ -27,19 +27,17 @@
       </div>
       <div id="resizer" class="resizer"></div>
       <div id="right-pane" class="right-pane px-3">
-        {% if path %}
           <div
             {% if resource.is_file %}
               hx-get="{% url 'resource_detail' project.slug resource.path %}"
+            {% elif path %}
+              hx-get="{% url 'project_resource_tree_right_pane' project.slug path %}"
             {% else %}
-              hx-get="{% url 'project_resource_tree_table' project.slug path %}"
+              hx-get="{% url 'project_resource_tree_right_pane' project.slug %}"
             {% endif %}
             hx-trigger="load"
             hx-target="this">
           </div>
-        {% else %}
-          {% include "scanpipe/tree/resource_right_pane.html" %}
-        {% endif %}
       </div>
     </div>
   </div>

scanpipe/templates/scanpipe/tree/resource_left_pane_tree.html

@@ -10,7 +10,7 @@
             class="is-flex is-align-items-center folder-meta is-clickable"
             data-folder-click
             data-path="{{ node.path }}"
-            hx-get="{% url 'project_resource_tree_table' project.slug node.path %}"
+            hx-get="{% url 'project_resource_tree_right_pane' project.slug node.path %}"
             hx-target="#right-pane"
             hx-push-url="{% url 'project_resource_tree' project.slug node.path %}">
             <span class="icon is-small mr-2">

scanpipe/templates/scanpipe/tree/resource_path_breadcrumb.html

@@ -6,7 +6,7 @@
     data-tooltip-position="bottom right">
     <i class="fa-solid fa-square-caret-right"></i>
   </button>
-  {% if path_segments %}
+  {% if path %}
     <ul>
       {% for subpath, segment in path_segments %}
         {% if not forloop.last %}
@@ -15,7 +15,7 @@
               href="{% url 'project_resource_tree' project.slug subpath %}"
               class="expand-in-tree"
               data-path="{{ subpath }}"
-              hx-get="{% url 'project_resource_tree_table' project.slug subpath %}"
+              hx-get="{% url 'project_resource_tree_right_pane' project.slug subpath %}"
               hx-target="#right-pane"
               hx-push-url="{% url 'project_resource_tree' project.slug subpath %}">
               {{ segment }}

scanpipe/templates/scanpipe/tree/resource_table.html

@@ -14,7 +14,7 @@
           <tr
             class="expand-in-tree is-clickable"
             data-path="{{ parent_path }}"
-            hx-get="{% url 'project_resource_tree_table' project.slug parent_path %}"
+            hx-get="{% url 'project_resource_tree_right_pane' project.slug parent_path %}"
             hx-target="#right-pane"
             hx-push-url="{% url 'project_resource_tree' project.slug parent_path %}">
             <td colspan="5">
@@ -43,7 +43,7 @@
                     class="expand-in-tree"
                     href="{% url 'project_resource_tree' project.slug resource.path %}"
                     data-path="{{ resource.path }}"
-                    hx-get="{% url 'project_resource_tree_table' project.slug resource.path %}"
+                    hx-get="{% url 'project_resource_tree_right_pane' project.slug resource.path %}"
                     hx-target="#right-pane"
                     hx-push-url="{% url 'project_resource_tree' project.slug resource.path %}">
                     {{ resource.name }}
@@ -84,7 +84,7 @@
       {% if page_obj.has_previous %}
         <a
           class="pagination-previous"
-          hx-get="{% url 'project_resource_tree_table' project.slug path %}?page={{ page_obj.previous_page_number }}"
+          hx-get="{% url 'project_resource_tree_right_pane' project.slug path %}?page={{ page_obj.previous_page_number }}"
           hx-target="#right-pane"
           hx-push-url="{% url 'project_resource_tree' project.slug path %}?page={{ page_obj.previous_page_number }}">
           Previous
@@ -93,7 +93,7 @@
       {% if page_obj.has_next %}
         <a
           class="pagination-next"
-          hx-get="{% url 'project_resource_tree_table' project.slug path%}?page={{ page_obj.next_page_number }}"
+          hx-get="{% url 'project_resource_tree_right_pane' project.slug path%}?page={{ page_obj.next_page_number }}"
           hx-target="#right-pane"
           hx-push-url="{% url 'project_resource_tree' project.slug path %}?page={{ page_obj.next_page_number }}">
           Next page

scanpipe/tests/test_views.py

@@ -1643,13 +1643,15 @@ def test_scanpipe_views_resource_tree_children_path(self):
         self.assertFalse(child1.has_children)
         self.assertTrue(dir1.has_children)
 
-    def test_scanpipe_views_project_resource_tree_table_view_with_path_directory(self):
+    def test_scanpipe_views_project_resource_tree_right_pane_view_with_path_directory(
+        self,
+    ):
         resource1 = make_resource_directory(self.project1, path="parent+special&chars")
         make_resource_file(self.project1, path="parent+special&chars/child1.txt")
         make_resource_file(self.project1, path="parent+special&chars/child2.py")
 
         url = reverse(
-            "project_resource_tree_table",
+            "project_resource_tree_right_pane",
             kwargs={"slug": self.project1.slug, "path": resource1.path},
         )
         response = self.client.get(url)
@@ -1678,11 +1680,11 @@ def test_scanpipe_views_project_resource_tree_view_with_path_file(self):
         self.assertEqual("specific_file.txt", response.context["path"])
         self.assertEqual(resource, response.context["resource"])
 
-    def test_scanpipe_views_project_resource_tree_table_view_empty_directory(self):
+    def test_scanpipe_views_project_resource_tree_right_pane_view_empty_directory(self):
         make_resource_directory(self.project1, path="empty_dir")
 
         url = reverse(
-            "project_resource_tree_table",
+            "project_resource_tree_right_pane",
             kwargs={"slug": self.project1.slug, "path": "empty_dir"},
         )
         response = self.client.get(url)
@@ -1691,15 +1693,15 @@ def test_scanpipe_views_project_resource_tree_table_view_empty_directory(self):
         resources = list(response.context["resources"])
         self.assertEqual(0, len(resources))
 
-    @mock.patch("scanpipe.views.ProjectResourceTreeTableView.paginate_by", 2)
-    def test_scanpipe_views_project_resource_tree_table_view_pagination(self):
+    @mock.patch("scanpipe.views.ProjectResourceTreeRightPaneView.paginate_by", 2)
+    def test_scanpipe_views_project_resource_tree_right_pane_view_pagination(self):
         make_resource_directory(self.project1, path="parent")
         make_resource_file(self.project1, path="parent/file1.txt", parent_path="parent")
         make_resource_file(self.project1, path="parent/file2.txt", parent_path="parent")
         make_resource_file(self.project1, path="parent/file3.txt", parent_path="parent")
 
         url = reverse(
-            "project_resource_tree_table",
+            "project_resource_tree_right_pane",
             kwargs={"slug": self.project1.slug, "path": "parent"},
         )
 

scanpipe/urls.py

@@ -143,13 +143,13 @@
     ),
     path(
         "project/<slug:slug>/resource_tree_table/<path:path>/",
-        views.ProjectResourceTreeTableView.as_view(),
-        name="project_resource_tree_table",
+        views.ProjectResourceTreeRightPaneView.as_view(),
+        name="project_resource_tree_right_pane",
     ),
     path(
         "project/<slug:slug>/resource_tree_table/",
-        views.ProjectResourceTreeTableView.as_view(),
-        name="project_resource_tree_table",
+        views.ProjectResourceTreeRightPaneView.as_view(),
+        name="project_resource_tree_right_pane",
     ),
     path(
         "run/<uuid:uuid>/",

scanpipe/views.py

@@ -2161,7 +2161,7 @@ def get_context_data(self, **kwargs):
         matched_snippet_annotations = self.get_matched_snippet_annotations(resource)
         context["detected_values"]["matched snippets"] = matched_snippet_annotations
 
-        # Compatibility with ProjectResourceTreeTableView
+        # Compatibility with ProjectResourceTreeRightPaneView
         segments = resource.path.strip("/").split("/")
         context["path_segments"] = [
             ("/".join(segments[: i + 1]), segment) for i, segment in enumerate(segments)
@@ -2770,7 +2770,7 @@ def get(self, request, *args, **kwargs):
         return render(request, self.template_name, context)
 
 
-class ProjectResourceTreeTableView(
+class ProjectResourceTreeRightPaneView(
     ConditionalLoginRequired,
     ProjectRelatedViewMixin,
     generic.ListView,