Refresh main content on big inline edit changes like queue

Previously we refreshed the whole HTML including menu, which was not necessary.
bestpractical · Sep 6, 2024 · c7b84df · c7b84df
1 parent f573687
commit c7b84df
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 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/Helpers/AssetUpdate b/share/html/Helpers/AssetUpdate
@@ -99,7 +99,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
@@ -105,15 +105,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
@@ -833,12 +833,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);