Proper rendering of resource detail in the right panel

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

Author: tdruez

scanpipe/templates/scanpipe/resource_detail.html

@@ -16,7 +16,7 @@
     <div class="mx-5">
       {% block partial-content %}
         {% if request.htmx %}
-          {% include 'scanpipe/tree/resource_path_breadcrumb.html' %}
+          {% include 'scanpipe/tree/resource_path_breadcrumb.html' with path=object.path %}
         {% endif %}
         {% include 'scanpipe/tabset/tabset.html' %}
       {% endblock %}

scanpipe/templates/scanpipe/resource_tree.html

@@ -29,7 +29,11 @@
       <div id="right-pane" class="right-pane px-3">
         {% if path %}
           <div
-            hx-get="{% url 'project_resource_tree_table' project.slug %}?path={{ path }}"
+            {% if resource.is_file %}
+              hx-get="{% url 'resource_detail' project.slug resource.path %}"
+            {% else %}
+              hx-get="{% url 'project_resource_tree_table' project.slug %}?path={{ path }}"
+            {% endif %}
             hx-trigger="load"
             hx-target="this">
           </div>

scanpipe/templates/scanpipe/tree/resource_path_breadcrumb.html

@@ -1,5 +1,5 @@
 {% if path_segments %}
-<nav class="breadcrumb is-flex is-align-items-center" aria-label="breadcrumbs">
+<nav class="breadcrumb is-flex is-align-items-center mb-2" aria-label="breadcrumbs">
   <button
     id="expand-left-pane"
     class="button is-light px-2 mr-2 has-tooltip is-hidden"

scanpipe/views.py

@@ -31,6 +31,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import SuspiciousFileOperation
 from django.core.exceptions import ValidationError
 from django.core.files.storage.filesystem import FileSystemStorage
@@ -2749,16 +2750,23 @@ def get(self, request, *args, **kwargs):
             .order_by("type", "path")
         )
 
+        try:
+            resource = project.codebaseresources.get(path=path)
+        except ObjectDoesNotExist:
+            resource = None
+
         context = {
             "project": project,
             "path": path,
             "children": children,
+            "resource": resource,
         }
 
         if request.GET.get("tree_panel") == "true":
             return render(
                 request, "scanpipe/tree/resource_left_pane_tree.html", context
             )
+
         return render(request, self.template_name, context)