Merge branch '6.0/htmx-user-warnings' into 6.0-trunk

Author: cbrandtbuffalo

lib/RT/Interface/Web.pm

@@ -481,6 +481,15 @@ sub HandleRequest {
     if ( $HTML::Mason::Commands::m->request_path !~ /^(?:\/SelfService)?\/Views/ ) {
         $HTML::Mason::Commands::m->comp( '/Elements/Footer', %$ARGS );
     }
+
+    if ( RT::Interface::Web::RequestENV('HTTP_HX_REQUEST') && $HTML::Mason::Commands::m->notes('HXUserWarnings') ) {
+        my $data;
+        if ( my $old_trigger = $HTML::Mason::Commands::r->headers_out->{'HX-Trigger'} ) {
+            $data = JSON::decode_json($old_trigger);
+        }
+        push @{ $data->{userWarnings} ||= [] }, @{ $HTML::Mason::Commands::m->notes('HXUserWarnings') };
+        $HTML::Mason::Commands::r->headers_out->{'HX-Trigger'} = EncodeJSON( $data, ascii => 1 );
+    }
 }
 
 sub _ForceLogout {

share/html/Elements/ShowCustomFieldCustomGroupings

@@ -141,5 +141,19 @@ if ( my $config = RT->Config->Get('InlineEditPanelBehavior') ) {
 my $edit_label   = $m->interp->apply_escapes( loc("Edit"), 'h' );
 my $cancel_label = $m->interp->apply_escapes( loc("Cancel"), 'h' );
 
-@Groupings = (RT::CustomField->CustomGroupings( $Object ), '') unless @Groupings;
+if ( @Groupings ) {
+    my %valid = map { $_ => 1 } RT::CustomField->Groupings( $Object ), '';
+    if ( my @invalid_groups = grep { !$valid{$_} } @Groupings ) {
+        RT->Logger->warning(
+            "Invalid custom field groupings for " . ref($Object) . '#' . $Object->Id . ': ' . join ', ',
+            @invalid_groups );
+        push @{ $m->notes->{'HXUserWarnings'} ||= [] },
+            loc( "Some custom field groupings were not found: [_1]" , join ', ', @invalid_groups )
+                . ". " . loc("Contact your RT administrator.");
+    }
+    @Groupings = grep { $valid{$_} } @Groupings;
+}
+else {
+    @Groupings = ( RT::CustomField->CustomGroupings( $Object ), '' );
+}
 </%INIT>

share/static/js/util.js

@@ -1022,6 +1022,14 @@ jQuery(function() {
         }
     });
 
+    document.body.addEventListener('userWarnings', function(evt) {
+        if ( evt.detail.value ) {
+            for ( const item of evt.detail.value ) {
+                alertWarning(escapeHTML(item));
+            }
+        }
+    });
+
     document.body.addEventListener('actionsChanged', function(evt) {
         jQuery.jGrowl('close');
         evt.detail.messages ||= evt.detail.value; // .value contains messages if it's passed as "actionsChanged => [$msg]"