Get correct ShowHistory mode for jump to page

Author: cbrandtbuffalo

lib/RT/Interface/Web.pm

@@ -6578,6 +6578,51 @@ sub GetPageLayout {
     return;
 }
 
+=head2 GetPageLayoutShowHistory Object => $Object, Page => $Page
+
+Returns the C<ShowHistory> value configured on the History widget in the page
+layout for the given C<$Object> and C<$Page>, or C<undef> if the layout does
+not override it.
+
+=cut
+
+sub GetPageLayoutShowHistory {
+    my %args = (
+        Object => '',
+        Page   => 'Display',
+        @_,
+    );
+
+    my $config = GetPageLayout(%args);
+    return unless $config;
+
+    my $content = ref $config eq 'HASH' ? $config->{Content} : $config;
+    return unless $content && ref $content eq 'ARRAY';
+
+    for my $item ( @$content ) {
+        next unless ref $item eq 'HASH';
+
+        if ( $item->{Elements} ) {
+            for my $col ( @{ $item->{Elements} } ) {
+                my @widgets = ref $col eq 'ARRAY' ? @$col : ($col);
+                for my $widget (@widgets) {
+                    if ( ref $widget eq 'HASH'
+                        && ( $widget->{Name} // '' ) eq 'History'
+                        && defined $widget->{ShowHistory} )
+                    {
+                        return $widget->{ShowHistory};
+                    }
+                }
+            }
+        }
+        elsif ( ( $item->{Name} // '' ) eq 'History' && defined $item->{ShowHistory} ) {
+            return $item->{ShowHistory};
+        }
+    }
+
+    return;
+}
+
 =head2 GetAvailableWidgets Class => $Class, Page => $Page
 
 Returns a list of available widgets for the given C<$Class> and C<$Page>.

share/html/Ticket/Elements/ShowUpdateStatus

@@ -54,10 +54,14 @@
       </span>
       <div class="d-md-none"></div>
       <span class="new-messages-buttons">
-% my $ShowHistory = RT->Config->Get( 'ShowHistory', $session{'CurrentUser'} );
+% my $ShowHistory = GetPageLayoutShowHistory(
+%     Object => $Ticket, Page => $DisplayPath eq 'SelfService' ? 'SelfService Display' : 'Display'
+% ) // RT->Config->Get( 'ShowHistory', $session{'CurrentUser'} );
 % my $url = RT->Config->Get('WebPath') . "/$DisplayPath/Display.html?id=" . $Ticket->id;
 % if ( $ShowHistory eq 'click' ) {
 %   $url .= '&ShowHistory=1';
+% } elsif ( $ShowHistory eq 'page' ) {
+%   $url .= '&ShowHistory=page';
 % }
         <a
 %       if ( RT::Interface::Web::RequestENV('REQUEST_URI') eq $url ) { # URL doesn't change, no need to reload

share/static/js/util.js

@@ -1787,12 +1787,15 @@ htmx.onLoad(function(elt) {
     elt.querySelector('a.jump-to-unread')?.addEventListener('click', (evt) => {
         const widget = document.querySelector('.htmx-load-widget[hx-get$="/Widgets/Display/History"]');
         if (widget) {
+            const linkHref = evt.target.closest('a').getAttribute('href');
+            const linkUrl = new URL(linkHref, location.origin);
+            const showHistory = linkUrl.searchParams.get('ShowHistory');
             // For paginated history, we need to reload widget if the specified txn is not on current page
-            if ( RT.Config.ShowHistory === 'page' && widget.getAttribute('data-hx-revealed') === 'true' ) {
-                const matched = evt.target.getAttribute('href').match(/#(txn-\d+)$/);
+            if ( showHistory === 'page' && widget.getAttribute('data-hx-revealed') === 'true' ) {
+                const matched = linkHref.match(/#(txn-\d+)$/);
                 if ( matched && !document.querySelector('[name="' + matched[1] + '"]') ) {
                     // Update location first so widget can retrieve the txn id from hash in URL
-                    location.href = evt.target.getAttribute('href');
+                    location.href = linkHref;
                     reloadElement(widget, { "hx-vals": JSON.stringify({ id: (new URLSearchParams(location.search)).get('id') }) });
                 }
             }