Merge branch '6.0/htmx-admin-lifecycle' into 6.0-trunk

Author: cbrandtbuffalo

lib/RT/Interface/Web.pm

@@ -1228,6 +1228,8 @@ sub Redirect {
                 $HTML::Mason::Commands::r->{query}->env->{REQUEST_METHOD} = 'GET';
                 $HTML::Mason::Commands::r->headers_out->{'HX-Push-Url'} = "$uri";
                 my $args = $uri->query_form_hash;
+
+                RT->System->MaybeRebuildLifecycleCache();
                 ExpandShortenerCode($args);
                 local $HTML::Mason::Commands::DECODED_ARGS = $args;
                 $HTML::Mason::Commands::m->comp( $path,              %$args );

share/static/js/util.js

@@ -1612,7 +1612,7 @@ htmx.onLoad(function(elt) {
 
     if (elt.querySelectorAll('.lifecycle-ui').length) {
         const checkLifecycleEditor = setInterval(function () {
-            if (d3 && RT.NewLifecycleEditor) {
+            if (window.d3 && RT.NewLifecycleEditor) {
                 clearInterval(checkLifecycleEditor);
                 elt.querySelectorAll('.lifecycle-ui').forEach(elt => {
                     new RT.NewLifecycleEditor(elt, JSON.parse(elt.getAttribute('data-config')), JSON.parse(elt.getAttribute('data-maps')), elt.getAttribute('data-layout') ? JSON.parse(elt.getAttribute('data-layout')) : null);

t/selenium/global_admin_pages.t

@@ -161,6 +161,25 @@ $s->login();
     is( $final_name_field, $copied_action_name, 'Found new action name in Name field' );
 }
 
+# Test lifecycle admin functionality
+{
+    $s->get_ok( $url . '/Admin/Lifecycles/Rights.html?Type=ticket;Name=default', 'Go to lifecycle rights page' );
+    $s->submit_form_ok(
+        {   form_name => 'ModifyLifecycleRights',
+            fields    => {
+                'Right-From-3' => 'new',
+                'Right-To-3'   => 'open',
+                'Right-Name-3' => 'OpenTicket',
+            },
+            button => 'Update',
+        },
+        'Update lifecycle rights'
+    );
+    $s->text_contains( 'Lifecycle updated', 'Lifecycle updated message' );
+    is( $s->find_element( selector_to_xpath(q{input[name='Right-Name-3']}) )->get_value(),
+        'OpenTicket', 'Form is updated' );
+}
+
 $s->logout;
 
 done_testing;