Merge branch '6.0/queries-page-in-htmx' into 6.0-trunk

Author: cbrandtbuffalo

lib/RT/Interface/Web/MenuBuilder.pm

@@ -1559,9 +1559,6 @@ sub _BuildAdminTopMenu {
            title       => loc('SQL Queries'),
            description => loc('Browse the SQL queries made in this process'),
            path        => '/Admin/Tools/Queries.html',
-           attributes  => {
-               'hx-boost' => 'false',
-           },
        );
     }
     $admin_tools->child( rights_inspector =>

share/html/Admin/Tools/Queries.html

@@ -66,10 +66,6 @@
 % } elsif (!$history) {
     <p><&|/l&>This server process has recorded no SQL queries.</&></p>
 % } else {
-    <script type="text/javascript">
-        jQuery(function () { jQuery(".tablesorter").tablesorter(); });
-    </script>
-
     <ol>
 %     my $r = 0;
 %     for my $request (@$history) {

share/static/js/init.js

@@ -817,6 +817,20 @@ document.addEventListener('htmx:load', function(evt) {
         }
     }
 
+    if ( elt.querySelector(".tablesorter") ) {
+        let checkTableSorterAttempts = 0;
+        const checkTableSorter = setInterval(function() {
+            if ( !document.contains(elt) || ++checkTableSorterAttempts >= 100 ) {
+                clearInterval(checkTableSorter);
+                return;
+            }
+            if ( jQuery.tablesorter ) {
+                jQuery(elt).find(".tablesorter").tablesorter();
+                clearInterval(checkTableSorter);
+            }
+        }, 50);
+    }
+
     // Clear orphaned tooltips
     document.querySelectorAll('body > div.tooltip[id^=tooltip]').forEach(elt => {
         if ( !document.querySelector(`[aria-describedby="${elt.id}"]`) ) {