Tweak the behavior of "Jump to Unread" links for clicked history

Instead of adding "ForceShowHistory=1" to the URL (which would reload the
entire page), this commit tweaked the behavior to implicitly trigger the
"Show ticket history" link, which only updates the history widget.

Since we now find and scroll to the anchor after every htmx load, the
"anchor scroll" code in ClickToShowHistory is no longer needed.

Author: sunnavy

share/html/Elements/RT__Ticket/ColumnMap

@@ -420,7 +420,6 @@ $COLUMN_MAP = {
             my $link = RT->Config->Get('WebPath');
             $link .= $session{'CurrentUser'}->Privileged ? '/Ticket/Display.html?id=' : '/SelfService/Display.html?id=';
             $link .= $self->id . '&MarkAsSeen=1&Anchor=txn-' . $first_unread->id;
-            $link .= '&ForceShowHistory=1' if RT->Config->Get( 'ShowHistory', $session{'CurrentUser'} ) eq 'click';
 
             my $title = loc("Jump to Unread & Mark as Seen");
             return \( '<a data-bs-toggle="tooltip" data-bs-title="' . $title . '" href="' . $link . '"><b>' ),

share/html/Ticket/Elements/ClickToShowHistory

@@ -55,14 +55,7 @@
 jQuery(function(){
     jQuery('#deferred_ticket_history a.show-ticket-history').click(function() {
         jQuery('#deferred_ticket_history').text(<% loc('Loading...') |n,j%>);
-        htmx.ajax('GET', <% $url |n,j %>, { source: '#deferred_ticket_history', target: '#deferred_ticket_history' }).then(() => {
-            if ( window.location.hash.match(/#txn-\d+/) ) {
-                var hash = window.location.hash;
-                // Refresh anchor so browser can jump to it accordingly
-                window.location.hash = '';
-                window.location.hash = hash;
-            }
-        });
+        htmx.ajax('GET', <% $url |n,j %>, { source: '#deferred_ticket_history', target: '#deferred_ticket_history' });
         return false;
     });
 

share/html/Ticket/Elements/ShowUpdateStatus

@@ -56,9 +56,6 @@
       <span class="new-messages-buttons">
 % my $ShowHistory = RT->Config->Get( 'ShowHistory', $session{'CurrentUser'} );
 % my $url = RT->Config->Get('WebPath') . "/$DisplayPath/Display.html?id=" . $Ticket->id;
-% if ( $ShowHistory eq 'click' ) {
-%   $url .= '&ForceShowHistory=1';
-% }
         <a
 %       if ( RT::Interface::Web::RequestENV('REQUEST_URI') eq $url ) { # URL doesn't change, no need to reload
           hx-boost="false"

share/static/js/init.js

@@ -707,7 +707,12 @@ document.addEventListener('htmx:load', function(evt) {
     if (window.location.hash) {
         const hash = window.location.hash;
         if (hash.match(/#txn-\d+$/)) {
-            revealHistoryWidget();
+            if ( document.querySelector('#deferred_ticket_history a.show-ticket-history') ) {
+                htmx.trigger(document.querySelector('a.show-ticket-history'), 'click');
+            }
+            else {
+                revealHistoryWidget();
+            }
         }
 
         // Automatically scroll to the specified element
@@ -960,6 +965,10 @@ jQuery(document).on('click', 'a.jump-to-unread', function (evt) {
                 }
             }
         }
+        else if ( widget.querySelector('#deferred_ticket_history a.show-ticket-history') ) {
+            location.href = evt.target.getAttribute('href');
+            htmx.trigger(widget.querySelector('a.show-ticket-history'), 'click');
+        }
         else {
             revealHistoryWidget();
         }