Merge branch '6.0/load-main-content' into 6.0-trunk

Author: sunnavy

lib/RT/Interface/Web.pm

@@ -141,9 +141,10 @@ sub SquishedJS {
 
 sub JSFiles {
     return qw{
-        htmx.min.js
         jquery-3.6.0.min.js
         jquery_noconflict.js
+        init.js
+        htmx.min.js
         tom-select.complete.min.js
         popper.min.js
         bootstrap.min.js

share/html/Asset/Create.html

@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Header, Title => loc("Create a new asset in catalog [_1]", $catalog->Name), &>
+<& /Elements/Header, Title => loc("Create a new asset in catalog [_1]", $catalog->Name), LoadMainContent => 1, &>
 <& /Elements/Tabs &>
 
 <& /Elements/ListActions, actions => \@results &>

share/html/Asset/Display.html

@@ -49,6 +49,7 @@
     Title => loc("Asset #[_1]: [_2]", $asset->id, $asset->Name),
     TitleTrigger => 'assetNameChanged from:body',
     TitleSource => RT->Config->Get('WebPath') . '/Views/Asset/Title?id=' . $asset->Id,
+    LoadMainContent => 1,
 &>
 <& /Elements/Tabs &>
 

share/html/Elements/Header

@@ -106,7 +106,7 @@
     <div id="main-navigation" tabindex="-1"><& /Elements/Menu, menu => Menu(), id => 'app-nav' &></div>
 % }
 
-% if ( $ShowMenu
+% if ( !$LoadMainContent && $ShowMenu
 %    && RT::Interface::Web->ModernClient()
 %    && ( $DECODED_ARGS->{ModernClient} // 1 )
 %    && !RT::Interface::Web::RequestENV('HTTP_HX_REQUEST')
@@ -247,4 +247,5 @@ $BodyClass => undef
 $MainContainerClass => undef
 $TitleTrigger => ''
 $TitleSource => ''
+$LoadMainContent => undef
 </%ARGS>

share/html/Ticket/Create.html

@@ -47,6 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Header,
     Title => $title,
+    LoadMainContent => 1,
 &>
 <& /Elements/Tabs &>
 

share/html/Ticket/Display.html

@@ -49,6 +49,7 @@
     Title => $title,
     TitleTrigger => 'ticketSubjectChanged from:body',
     TitleSource => RT->Config->Get('WebPath') . '/Views/Ticket/Title?id=' . $TicketObj->Id,
+    LoadMainContent => 1,
     LinkRel => \%link_rel &>
 <& /Elements/Tabs &>
 

share/html/Ticket/Update.html

@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<& /Elements/Header, Title  => $title &>
+<& /Elements/Header, Title  => $title, LoadMainContent => 1, &>
 <& /Elements/Tabs &>
 
 % $m->callback(CallbackName => 'BeforeActionList', ARGSRef => \%ARGS, Ticket => $TicketObj, results => \@results);

share/static/js/assets.js

@@ -12,31 +12,4 @@ htmx.onLoad(function(elt) {
             }
         });
     });
-    jQuery(elt).find(".asset-create-linked-ticket").click(function(ev){
-        ev.preventDefault();
-        var url = this.href.replace(/\/Asset\/CreateLinkedTicket\.html\?/g,
-                                    '/Asset/Helpers/CreateLinkedTicket?');
-
-        htmx.ajax('GET', url, '#dynamic-modal').then(() => {
-            bootstrap.Modal.getOrCreateInstance('#dynamic-modal').show();
-        });
-    });
-    jQuery(elt).find("#bulk-update-create-linked-ticket").click(function(ev){
-        ev.preventDefault();
-        var chkArray = [];
-
-        jQuery("input[name='UpdateAsset']:checked").each(function() {
-            chkArray.push(jQuery(this).val());
-        });
-
-        var selected = '';
-        for (var i = 0; i < chkArray.length; i++) {
-            selected += 'Asset=' + chkArray[i] + '&';
-        }
-        /* selected = chkArray.join(','); */
-        var url = RT.Config.WebHomePath + '/Asset/Helpers/CreateLinkedTicket?' + selected;
-        htmx.ajax('GET', url, '#dynamic-modal').then(() => {
-            bootstrap.Modal.getOrCreateInstance('#dynamic-modal').show();
-        });
-    });
 });

share/static/js/event-registration.js

@@ -1,20 +1,3 @@
-// Disable chosing individual objects when a scrip is applied globally
-htmx.onLoad(function(elt) {
-    var global_checkboxes = [
-        "form[name=AddRemoveScrip] input[type=checkbox][name^=AddScrip-][value=0]",
-        "form input[type=checkbox][name^=AddCustomField-][value=0]"
-    ];
-    jQuery(elt).find(global_checkboxes.join(", "))
-        .change(function(){
-            var self    = jQuery(this);
-            var checked = self.prop("checked");
-
-            self.closest("form")
-                .find("table.collection input[type=checkbox]")
-                .prop("disabled", checked);
-        });
-});
-
 // Replace user references in history with the HTML versions
 function ReplaceUserReferences(elt) {
     var users = jQuery(elt).find(".user[data-replace=user]");
@@ -118,71 +101,3 @@ htmx.onLoad(function(elt) {
         }
     });
 });
-
-htmx.onLoad( function(elt) {
-    jQuery(elt).find("input[type=file]").change( function() {
-        var input = jQuery(this);
-        var warning = input.next(".invalid");
-
-        if ( !input.val().match(/"/) ) {
-            warning.hide();
-        } else {
-            if (warning.length) {
-                warning.show();
-            } else {
-                input.val("");
-                jQuery("<span class='invalid'>")
-                    .text(loc_key("quote_in_filename"))
-                    .insertAfter(input);
-            }
-        }
-    });
-});
-
-htmx.onLoad(function(elt) {
-    jQuery(elt).find("#UpdateType").change(function(ev) {
-        jQuery(".messagebox-container")
-            .removeClass("action-response action-private")
-            .addClass("action-"+ev.target.value);
-    });
-});
-
-htmx.onLoad(function(elt) {
-    jQuery(elt).find('.toggle-txn-details:not(.toggle-txn-details-registered)').click(function () {
-        return toggleTransactionDetails.apply(this);
-    }).addClass('toggle-txn-details-registered');
-});
-
-const article_link_focus_handler = function() {
-  // if input focus in last row add another row of inputs
-  const link_div  = jQuery(this).parent().parent();
-  const links_div = link_div.parent();
-  if ( link_div.attr('data-link-number') == links_div.attr('data-link-count') ) {
-    const link_count = parseInt( links_div.attr('data-link-count') ) + 1;
-    links_div.attr( 'data-link-count', link_count );
-    let new_link_div = link_div.clone();
-    new_link_div.attr( 'data-link-number', link_count );
-    new_link_div.find('[name^="article-link-"]').each(function(){
-      var oldName = jQuery(this).attr('name');
-      var newName = oldName.replace( /-\d+$/, '-' + link_count );
-      jQuery(this).attr( 'name', newName );
-    });
-    new_link_div.find('[name^="article-link-"]').on( "focus", article_link_focus_handler );
-    links_div.append(new_link_div);
-  }
-};
-htmx.onLoad(function(elt) {
-    jQuery('[name^="article-link-"]').on( "focus", article_link_focus_handler );
-});
-htmx.onLoad(function(elt) {
-    jQuery(elt).find('.article-basics [name="Type"]').change(function(ev) {
-        if ( jQuery(this).val() == 'Content' ) {
-            jQuery('#article-type-links').addClass('hidden');
-            jQuery('#article-type-content').removeClass('hidden');
-        }
-        else {
-            jQuery('#article-type-content').addClass('hidden');
-            jQuery('#article-type-links').removeClass('hidden');
-        }
-    });
-});