Merge branch '6.0/lifecycle-editor-in-htmx'

bestpractical · Dec 31, 2024 · c461b3e · c461b3e
2 parents 4dc46a5 + 91a4537
commit c461b3e
Show file tree

Hide file tree

Showing 8 changed files with 848 additions and 864 deletions.
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
@@ -2223,11 +2223,6 @@ sub RequestENV {
     return $value;
 }
 
-sub ClientIsIE {
-    # IE 11.0 dropped "MSIE", so we can't use that alone
-    return RequestENV('HTTP_USER_AGENT') =~ m{MSIE|Trident/} ? 1 : 0;
-}
-
 =head2 ExpandShortenerCode $ARGS
 
 Expand shortener code and put expanded ones into C<$ARGS>.

diff --git a/lib/RT/Interface/Web/MenuBuilder.pm b/lib/RT/Interface/Web/MenuBuilder.pm
@@ -1815,15 +1815,10 @@ sub _BuildAdminPageMenu {
                 RT::Interface::Web::EscapeURI(\$Name_uri);
                 RT::Interface::Web::EscapeURI(\$Type_uri);
 
-                unless ( RT::Interface::Web->ClientIsIE ) {
-                    $page->child(
-                        basics     => title => loc('Modify'),
-                        path       => "/Admin/Lifecycles/Modify.html?Type=" . $Type_uri . ";Name=" . $Name_uri,
-                        attributes => {
-                            'hx-boost' => 'false',
-                        },
-                    );
-                }
+                $page->child(
+                    basics     => title => loc('Modify'),
+                    path       => "/Admin/Lifecycles/Modify.html?Type=" . $Type_uri . ";Name=" . $Name_uri,
+                );
                 $page->child( actions => title => loc('Actions'), path => "/Admin/Lifecycles/Actions.html?Type=" . $Type_uri . ";Name=" . $Name_uri );
                 $page->child( rights => title => loc('Rights'), path => "/Admin/Lifecycles/Rights.html?Type=" . $Type_uri . ";Name=" . $Name_uri );
                 $page->child( mappings => title => loc('Mappings'),  path => "/Admin/Lifecycles/Mappings.html?Type=" . $Type_uri . ";Name=" . $Name_uri );

diff --git a/share/html/Admin/Lifecycles/Advanced.html b/share/html/Admin/Lifecycles/Advanced.html
@@ -125,10 +125,6 @@
 
 $Config ||= JSON::to_json(RT->Config->Get('Lifecycles')->{$LifecycleObj->Name}, { canonical => 1, pretty => 1 });
 
-if ( $ARGS{RedirectedFromModify} && RT::Interface::Web->ClientIsIE() ) {
-    push @results, loc("The graphical lifecycle builder is not currently supported on IE 11. You can update the lifecycle configuration using the Advanced tab or access the lifecycle editor in a supported browser.");
-}
-
 if ( !defined $Maps && ( my $all_maps = RT->Config->Get('Lifecycles')->{__maps__} ) ) {
     for my $item ( grep {/^\Q$Name\E -> | -> \Q$Name\E$/} keys %$all_maps ) {
         $Maps->{$item} = $all_maps->{$item};

diff --git a/share/html/Admin/Lifecycles/Modify.html b/share/html/Admin/Lifecycles/Modify.html
@@ -55,7 +55,6 @@
 </div>
 
 <script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/d3.min.js"></script>
-<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/lifecycleui-model.js"></script>
 <script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/lifecycleui-editor.js"></script>
 
 <form action="<%RT->Config->Get('WebPath')%>/Admin/Lifecycles/Modify.html" name="ModifyLifecycle" method="post" enctype="multipart/form-data" class="mx-auto max-width-xl">
@@ -71,12 +70,6 @@
 </form>
 <%INIT>
 
-if ( RT::Interface::Web->ClientIsIE() ) {
-    RT::Interface::Web::Redirect( RT->Config->Get('WebURL')
-            . "Admin/Lifecycles/Advanced.html?"
-            . $m->comp( '/Elements/QueryString', %ARGS, RedirectedFromModify => 1 ) );
-}
-
 my ($title, @results);
 my $LifecycleObj = RT::Lifecycle->new();
 $LifecycleObj->Load(Name => $Name, Type => $Type);

diff --git a/share/html/Elements/Lifecycle/Graph b/share/html/Elements/Lifecycle/Graph
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="lifecycle-ui" id="lifecycle-<% $id %>">
+<div class="lifecycle-ui" id="lifecycle-<% $id %>" data-config="<% $Config %>" data-maps="<% $Maps %>" data-layout="<% $Layout || '' %>" >
   <div id="lifeycycle-ui-edit-node" class="lifeycycle-ui-edit-node collapse card card-body">
     <input type="hidden" name="id" />
     <div class="alert alert-warning invalid-name hidden"><&|/l&>Invalid name</&></div>
@@ -74,11 +74,6 @@
     </div>
   </div>
 
-  <script type="text/javascript">
-    jQuery(function () {
-        new RT.NewLifecycleEditor( document.getElementById('lifecycle-<% $id %>'), <% $Config |n %>, <% $Maps |n %> <% $Layout ? ", $Layout" : () |n %> );
-    });
-  </script>
   <div class="row">
     <div class="col-auto">
       <span class="current-value form-control">