merge magento/2.3-develop into magento-engcom/fix-nightly-fails-with-msi

Author: magento-devops-community-builds-svc

app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml

@@ -85,7 +85,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>Help us improve Magento Admin by allowing us to collect usage data.</p>
                         <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin and related products and services.</p>
-                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/m2/ce/user_guide/stores/admin.html" target="_blank">merchant documentation</a>.</p>
+                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/m2/ce/user_guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
 ]]></item>
                     </item>
                 </argument>

app/code/Magento/AdminAnalytics/view/adminhtml/web/js/modal/component.js

@@ -20,16 +20,7 @@ define([
                         enableLogAction: '${ $.provider }:data.enableLogAction',
                         disableLogAction: '${ $.provider }:data.disableLogAction'
                     },
-                    options: {
-                        keyEventHandlers: {
-                            /**
-                             * Prevents escape key from exiting out of modal
-                             */
-                            escapeKey: function () {
-                                return;
-                            }
-                        }
-                    },
+                    options: {},
                     notificationWindow: null
                 },
 
@@ -41,11 +32,32 @@ define([
                     this._super();
                 },
 
+                /**
+                 * Configure ESC and TAB so user can't leave modal
+                 * without selecting an option
+                 *
+                 * @returns {Object} Chainable.
+                 */
+                initModalEvents: function () {
+                    this._super();
+                    //Don't allow ESC key to close modal
+                    this.options.keyEventHandlers.escapeKey = this.handleEscKey.bind(this);
+                    //Restrict tab action to the modal
+                    this.options.keyEventHandlers.tabKey = this.handleTabKey.bind(this);
+
+                    return this;
+                },
+
                 /**
                  * Once the modal is opened it hides the X
                  */
                 onOpened: function () {
-                    $('.modal-header button.action-close').hide();
+                    $('.modal-header button.action-close').attr('disabled', true).hide();
+
+                    this.focusableElements = $(this.rootSelector).find('a[href], button:enabled');
+                    this.firstFocusableElement = this.focusableElements[0];
+                    this.lastFocusableElement = this.focusableElements[this.focusableElements.length - 1];
+                    this.firstFocusableElement.focus();
                 },
 
                 /**
@@ -104,11 +116,70 @@ define([
                  * Allows admin usage popup to be shown first and then new release notification
                  */
                 openReleasePopup: function () {
-                    var notifiModal = registry.get('release_notification.release_notification.notification_modal_1');
+                    var notificationModalSelector = 'release_notification.release_notification.notification_modal_1';
 
                     if (analyticsPopupConfig.releaseVisible) {
-                        notifiModal.initializeContentAfterAnalytics();
+                        registry.get(notificationModalSelector).initializeContentAfterAnalytics();
                     }
+                },
+
+                /**
+                 * Handle Tab and Shift+Tab key event
+                 *
+                 * Keep the tab actions restricted to the popup modal
+                 * so the user must select an option to dismiss the modal
+                 */
+                handleTabKey: function (event) {
+                    var modal = this,
+                        KEY_TAB = 9;
+
+                    /**
+                     * Handle Shift+Tab to tab backwards
+                     */
+                    function handleBackwardTab() {
+                        if (document.activeElement === modal.firstFocusableElement ||
+                            document.activeElement === $(modal.rootSelector)[0]
+                        ) {
+                            event.preventDefault();
+                            modal.lastFocusableElement.focus();
+                        }
+                    }
+
+                    /**
+                     * Handle Tab forward
+                     */
+                    function handleForwardTab() {
+                        if (document.activeElement === modal.lastFocusableElement) {
+                            event.preventDefault();
+                            modal.firstFocusableElement.focus();
+                        }
+                    }
+
+                    switch (event.keyCode) {
+                        case KEY_TAB:
+                            if (modal.focusableElements.length === 1) {
+                                event.preventDefault();
+                                break;
+                            }
+
+                            if (event.shiftKey) {
+                                handleBackwardTab();
+                                break;
+                            }
+                            handleForwardTab();
+                            break;
+                        default:
+                            break;
+                    }
+                },
+
+                /**
+                 * Handle Esc key
+                 *
+                 * Esc key should not close modal
+                 */
+                handleEscKey: function (event) {
+                    event.preventDefault();
                 }
             }
         );

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -82,7 +82,7 @@ public function __construct(
     }
 
     /**
-     * Initialize requested category and put it into registry
+     * Initialize requested category and put it into registry.
      *
      * Root category can be returned, if inappropriate store/category is specified
      *
@@ -111,6 +111,8 @@ protected function _initCategory($getRootInstead = false)
             }
         }
 
+        $this->registry->unregister('category');
+        $this->registry->unregister('current_category');
         $this->registry->register('category', $category);
         $this->registry->register('current_category', $category);
         $this->wysiwigConfig->setStoreId($storeId);

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -183,29 +183,29 @@ public function execute()
                 $products = json_decode($categoryPostData['category_products'], true);
                 $category->setPostedProducts($products);
             }
-            $this->_eventManager->dispatch(
-                'catalog_category_prepare_save',
-                ['category' => $category, 'request' => $this->getRequest()]
-            );
 
-            /**
-             * Check "Use Default Value" checkboxes values
-             */
-            if (isset($categoryPostData['use_default']) && !empty($categoryPostData['use_default'])) {
-                foreach ($categoryPostData['use_default'] as $attributeCode => $attributeValue) {
-                    if ($attributeValue) {
-                        $category->setData($attributeCode, null);
+            try {
+                $this->_eventManager->dispatch(
+                    'catalog_category_prepare_save',
+                    ['category' => $category, 'request' => $this->getRequest()]
+                );
+                /**
+                 * Check "Use Default Value" checkboxes values
+                 */
+                if (isset($categoryPostData['use_default']) && !empty($categoryPostData['use_default'])) {
+                    foreach ($categoryPostData['use_default'] as $attributeCode => $attributeValue) {
+                        if ($attributeValue) {
+                            $category->setData($attributeCode, null);
+                        }
                     }
                 }
-            }
 
-            /**
-             * Proceed with $_POST['use_config']
-             * set into category model for processing through validation
-             */
-            $category->setData('use_post_data_config', $useConfig);
+                /**
+                 * Proceed with $_POST['use_config']
+                 * set into category model for processing through validation
+                 */
+                $category->setData('use_post_data_config', $useConfig);
 
-            try {
                 $categoryResource = $category->getResource();
                 if ($category->hasCustomDesignTo()) {
                     $categoryResource->getAttribute('custom_design_from')->setMaxValue($category->getCustomDesignTo());
@@ -231,10 +231,16 @@ public function execute()
 
                 $category->save();
                 $this->messageManager->addSuccessMessage(__('You saved the category.'));
+                // phpcs:disable Magento2.Exceptions.ThrowCatch
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addExceptionMessage($e);
                 $this->logger->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
+                // phpcs:disable Magento2.Exceptions.ThrowCatch
+            } catch (\Throwable $e) {
+                $this->messageManager->addErrorMessage(__('Something went wrong while saving the category.'));
+                $this->logger->critical($e);
+                $this->_getSession()->setCategoryData($categoryPostData);
             }
         }
 

app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php

@@ -115,6 +115,9 @@ public function build(RequestInterface $request): ProductInterface
         $store = $this->storeFactory->create();
         $store->load($storeId);
 
+        $this->registry->unregister('product');
+        $this->registry->unregister('current_product');
+        $this->registry->unregister('current_store');
         $this->registry->register('product', $product);
         $this->registry->register('current_product', $product);
         $this->registry->register('current_store', $store);

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -24,6 +24,7 @@
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Store\Model\StoreManagerInterface;
 use Zend_Filter_Input;
+use Magento\Catalog\Model\Product\Authorization as ProductAuthorization;
 
 /**
  * Product helper
@@ -103,6 +104,11 @@ class Helper
      */
     private $attributeFilter;
 
+    /**
+     * @var ProductAuthorization
+     */
+    private $productAuthorization;
+
     /**
      * @var FormatInterface
      */
@@ -123,6 +129,7 @@ class Helper
      * @param LinkTypeProvider|null $linkTypeProvider
      * @param AttributeFilter|null $attributeFilter
      * @param FormatInterface|null $localeFormat
+     * @param ProductAuthorization|null $productAuthorization
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -137,7 +144,8 @@ public function __construct(
         ProductRepositoryInterface $productRepository = null,
         LinkTypeProvider $linkTypeProvider = null,
         AttributeFilter $attributeFilter = null,
-        FormatInterface $localeFormat = null
+        FormatInterface $localeFormat = null,
+        ?ProductAuthorization $productAuthorization = null
     ) {
         $this->request = $request;
         $this->storeManager = $storeManager;
@@ -153,6 +161,7 @@ public function __construct(
         $this->linkTypeProvider = $linkTypeProvider ?: $objectManager->get(LinkTypeProvider::class);
         $this->attributeFilter = $attributeFilter ?: $objectManager->get(AttributeFilter::class);
         $this->localeFormat = $localeFormat ?: $objectManager->get(FormatInterface::class);
+        $this->productAuthorization = $productAuthorization ?? $objectManager->get(ProductAuthorization::class);
     }
 
     /**
@@ -243,8 +252,10 @@ public function initializeFromData(Product $product, array $productData)
     public function initialize(Product $product)
     {
         $productData = $this->request->getPost('product', []);
+        $product = $this->initializeFromData($product, $productData);
+        $this->productAuthorization->authorizeSavingOf($product);
 
-        return $this->initializeFromData($product, $productData);
+        return $product;
     }
 
     /**

app/code/Magento/Catalog/Controller/Category/View.php

@@ -30,6 +30,7 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
 
 /**
  * View a category on storefront. Needs to be accessible by POST because of the store switching.
@@ -96,6 +97,11 @@ class View extends Action implements HttpGetActionInterface, HttpPostActionInter
      */
     private $toolbarMemorizer;
 
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $customLayoutManager;
+
     /**
      * @var CategoryHelper
      */
@@ -119,7 +125,8 @@ class View extends Action implements HttpGetActionInterface, HttpPostActionInter
      * @param ForwardFactory $resultForwardFactory
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
-     * @param ToolbarMemorizer $toolbarMemorizer
+     * @param ToolbarMemorizer|null $toolbarMemorizer
+     * @param LayoutUpdateManager|null $layoutUpdateManager
      * @param CategoryHelper $categoryHelper
      * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -136,6 +143,7 @@ public function __construct(
         Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
         ToolbarMemorizer $toolbarMemorizer = null,
+        ?LayoutUpdateManager $layoutUpdateManager = null,
         CategoryHelper $categoryHelper = null,
         LoggerInterface $logger = null
     ) {
@@ -149,8 +157,9 @@ public function __construct(
         $this->resultForwardFactory = $resultForwardFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
-        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()
-            ->get(ToolbarMemorizer::class);
+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(ToolbarMemorizer::class);
+        $this->customLayoutManager = $layoutUpdateManager
+            ?? ObjectManager::getInstance()->get(LayoutUpdateManager::class);
         $this->categoryHelper = $categoryHelper ?: ObjectManager::getInstance()
             ->get(CategoryHelper::class);
         $this->logger = $logger ?: ObjectManager::getInstance()
@@ -279,5 +288,10 @@ private function applyLayoutUpdates(
                 $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
             }
         }
+
+        //Selected files
+        if ($settings->getPageLayoutHandles()) {
+            $page->addPageLayoutHandles($settings->getPageLayoutHandles());
+        }
     }
 }