Merge branch '6.0/refresh-main-content-on-big-inline-edit-changes'

bestpractical · Sep 13, 2024 · 6ff4df4 · 6ff4df4
2 parents 1fa65ba + 092cdd3
commit 6ff4df4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
@@ -121,6 +121,15 @@
 % $m->abort;
 % } else {
     <div class="main-container">
+
+%# To refresh main container, here we create a separated div so its hx-* attributes are not inherited.
+      <div
+        hx-get="<% RT::Interface::Web::RequestENV('REQUEST_URI') %>"
+        hx-trigger="mainContainerChanged from:body"
+        hx-target="closest .main-container"
+        hx-select=".main-container"
+        hx-swap="outerHTML"
+      ></div>
 % }
 
 % if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) {

diff --git a/share/html/Elements/ShowHistoryHeader b/share/html/Elements/ShowHistoryHeader
@@ -68,6 +68,8 @@ else {
     # Oldest Txns first is ASC, so reverse it for this option default
     $reverse_txns = RT->Config->Get("OldestTransactionsFirst", $session{'CurrentUser'}) ? 'DESC' : 'ASC';
 }
+
+my $container_id = 'history-container-' . Digest::MD5::md5_hex(time . {} . $$ . rand(1024));
 </%INIT>
 <div class="history <% lc $record_type %>" id="<% $histid %>">
 <%perl>
@@ -158,7 +160,7 @@ else {
 
 <script type="text/javascript">
 jQuery(function(){
-    var container = document.querySelector('div.history-container');
+    var container = document.getElementById(<% $container_id | j%>);
     container.setAttribute('data-oldest-transactions-first', '<% $oldestTransactionsFirst %>');
 % if ( !$ScrollShowHistory ) {
     container.setAttribute('data-disable-scroll-loading', '');
@@ -198,7 +200,8 @@ jQuery(function(){
     };
 
     var loadHistoryPage = function() {
-        if (isLoading || container.hasAttribute('data-disable-scroll-loading')) return;
+        container = document.getElementById(<% $container_id |j %>);
+        if (isLoading || !container || container.hasAttribute('data-disable-scroll-loading')) return;
 
         isLoading = true;
         showLoadingMessage();
@@ -315,4 +318,4 @@ jQuery(function(){
 </script>
 % }
 
-<div class="history-container" data-url="<% $url %>">
+<div class="history-container" data-url="<% $url %>" id="<% $container_id %>">
diff --git a/share/html/Helpers/AssetUpdate b/share/html/Helpers/AssetUpdate
@@ -101,7 +101,7 @@ for my $txn ( @{ $asset->{_TransactionBatch} || [] } ) {
     if ( $txn->Type eq 'Set' ) {
         push @events, 'asset' . $txn->Field . 'Changed';
         if ( $txn->Field eq 'Catalog' ) {
-            push @events, 'reloadRequired';
+            push @events, 'mainContainerChanged';
         }
         elsif ( $txn->Field =~ /^(Name|Status|Description)$/ ) {
             push @events, 'assetBasicsChanged';

diff --git a/share/html/Helpers/TicketUpdate b/share/html/Helpers/TicketUpdate
@@ -107,15 +107,15 @@ for my $txn (@{ $TicketObj->{_TransactionBatch} || [] }) {
     if ( $txn->Type eq 'Set' ) {
         push @events, 'ticket' . $txn->Field . 'Changed';
         if ( $txn->Field eq 'Queue' ) {
-            push @events, 'reloadRequired';
+            push @events, 'mainContainerChanged';
         }
     }
     elsif ( $txn->Type eq 'CustomField' ) {
         push @events, 'customField-' . $txn->Field . 'Changed';
     }
     elsif ( $txn->Type =~ /(?:Add|Delete)Link/ ) {
         if ( $txn->Field eq 'MergedInto' ) {
-            push @events, 'reloadRequired';
+            push @events, 'mainContainerChanged';
         }
         elsif ( ( $txn->OldValue // '' ) =~ m{^asset://} || ( $txn->NewValue // '' ) =~ m{^asset://} ) {
             push @events, 'ticketAssetsChanged';

diff --git a/share/static/js/util.js b/share/static/js/util.js
@@ -812,12 +812,6 @@ jQuery(function() {
         document.title = decodeURIComponent(escape(evt.detail.value));
     });
 
-    document.body.addEventListener('reloadRequired', function(evt) {
-        setTimeout(function () {
-            document.location = document.location;
-        }, 3000); // Give users some time to see growl messages.
-    });
-
     document.body.addEventListener('triggerChanged', function(evt) {
         evt.detail.elt.setAttribute('hx-trigger', evt.detail.value);
         htmx.process(evt.detail.elt);