Merge branch '2.4-develop' into L3_PR_21-10-10

Author: veloraven

app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml

@@ -32,12 +32,10 @@
 
 require([
     'jquery',
-    'mage/backend/form',
-    'mage/backend/validation'
+    'mage/mage'
 ], function($){
 
-    $('#edit_form').form()
-        .validation({
+    $('#edit_form').mage('form').mage('validation', {
             validationUrl: '{$block->escapeJs($block->getValidationUrl())}',
             highlight: function(element) {
                 var detailsElement = $(element).closest('details');
@@ -49,8 +47,7 @@ require([
                 }
                 $(element).trigger('highlight.validate');
             }
-        });
-
+    });
 });
 
 script;

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryFilterSection">
-        <element name="CategoryFilter" type="button" selector="//main//div[@class='filter-options']//div[contains(text(), 'Category')]"/>
+        <element name="CategoryFilter" type="button" selector="//main//div[contains(@class,'filter-options')]//div[contains(text(), 'Category')]"/>
         <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml

@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderCommentsTabSection">
-        <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
-        <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
-        <element name="orderComment" type="text" selector="#Order_History .comments-block-item-comment"/>
+        <element name="orderNotesList" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .edit-order-comments .note-list"/>
+        <element name="orderComments" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .edit-order-comments-block"/>
+        <element name="orderComment" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .comments-block-item-comment"/>
     </section>
 </sections>

lib/web/mage/backend/tabs.js

@@ -239,11 +239,22 @@ define([
     // Extension for mage.tabs - Ajax functionality for tabs
     $.widget('mage.tabs', $.mage.tabs, {
         options: {
-            ajaxOptions: {
-                data: {
-                    isAjax: true,
-                    'form_key': typeof FORM_KEY !== 'undefined' ? FORM_KEY : null
-                }
+            /**
+             * Add form key to ajax call
+             * @param {Object} event - event object
+             * @param {Object} ui
+             */
+            beforeLoad: function (event, ui) {
+                ui.ajaxSettings.type = 'POST';
+                ui.ajaxSettings.hasContent = true;
+                ui.jqXHR.setRequestHeader('Content-Type', ui.ajaxSettings.contentType);
+                ui.ajaxSettings.data = jQuery.param(
+                    {
+                        isAjax: true,
+                        'form_key': typeof FORM_KEY !== 'undefined' ? FORM_KEY : null
+                    },
+                    ui.ajaxSettings.traditional
+                );
             },
 
             /**