resolve merge conflicts

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

Author: aayushkdev

scanpipe/templates/scanpipe/panels/resource_table_panel.html

@@ -1,5 +1,4 @@
 {% load humanize %}
-
 <div class="mb-4">
   <div class="has-text-weight-semibold is-flex is-align-items-center is-family-monospace">
     {% if path_segments %}
@@ -18,11 +17,6 @@
       <button class="copy-to-clipboard ml-2 is-size-6 is-shadowless is-white" aria-label="Copy path" data-copy="{{ path }}" data-copy-feedback="Path copied!">
         <i class="fa-regular fa-copy"></i>
       </button>
-    {% else %}
-      <span id="resource-path" class="has-text-weight-medium">/</span>
-      <button class="copy-to-clipboard ml-2 is-size-6 is-shadowless is-white" aria-label="Copy path" data-copy="/" data-copy-feedback="Path copied!">
-        <i class="fa-regular fa-copy"></i>
-      </button>
     {% endif %}
   </div>
 </div>

scanpipe/templates/scanpipe/resource_tree.html

@@ -115,7 +115,7 @@
 
 {% block scripts %}
   <script>
-    document.body.addEventListener('htmx:afterSwap', function(evt) {
+    document.body.addEventListener('htmx:afterSettle', function(evt) {
       if (evt.target && evt.target.id === 'right-pane') {
         if (typeof enableCopyToClipboard === 'function') {
           enableCopyToClipboard('.copy-to-clipboard');
@@ -163,10 +163,6 @@
         finalNode.classList.add('is-current');
         finalNode.scrollIntoView({ behavior: "smooth", block: "center" });
       }
-
-      const rightPane = document.getElementById('right-pane');
-      rightPane.setAttribute('hx-get', `/project/{{ project.slug }}/resource_table/?path=${encodeURIComponent(path)}`);
-      htmx.trigger(rightPane, 'htmx:trigger');
     }
 
     document.addEventListener("click", async e => {
@@ -182,7 +178,10 @@
     });
 
     document.addEventListener("DOMContentLoaded", function() {
-      expandToPath("{{ path }}");
+      const currentPath = "{{ path }}";
+      if (currentPath) {
+        expandToPath(currentPath);
+      }
 
       const resizer = document.getElementById('resizer');
       const leftPane = document.getElementById('left-pane');