Merge branch '2.4-develop' into ref-AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTes

Author: Gabriel da Gama

.editorconfig

@@ -16,3 +16,7 @@ indent_size = 2
 
 [{composer, auth}.json]
 indent_size = 4
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false

.github/stale.yml

@@ -39,8 +39,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 14 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AwsS3AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest" extends="AdminImportSimpleAndConfigurableProductsWithAssignedImagesTest">
+        <annotations>
+            <features value="AwsS3"/>
+            <stories value="Import Products"/>
+            <title value="S3 - Import Configurable Product With Simple Child Products With Images"/>
+            <description value="Imports a .csv file containing a configurable product with 3 child simple products that
+            have images. Verifies that products are imported successfully and that the images are attached to the
+            products as expected."/>
+            <severity value="MAJOR"/>
+            <group value="importExport"/>
+            <group value="remote_storage_aws_s3"/>
+            <skip>
+                <issueId value="MC-39280"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <!-- Enable AWS S3 Remote Storage -->
+            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
+        </before>
+
+        <after>
+            <!-- Disable AWS S3 Remote Storage -->
+            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
+        </after>
+    </test>
+</tests>

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -225,7 +225,8 @@ protected function _redirectIfNeededAfterLogin(\Magento\Framework\App\RequestInt
 
         // Checks, whether secret key is required for admin access or request uri is explicitly set
         if ($this->_url->useSecretKey()) {
-            $requestUri = $this->_url->getUrl('*/*/*', ['_current' => true]);
+            $requestParts = explode('/', trim($request->getRequestUri(), '/'), 2);
+            $requestUri = $this->_url->getUrl(array_pop($requestParts));
         } elseif ($request) {
             $requestUri = $request->getRequestUri();
         }

app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

@@ -49,11 +49,10 @@ public function execute()
         }
 
         $requestUrl = $this->getRequest()->getUri();
-        $backendUrl = $this->getUrl('*');
-        // redirect according to rewrite rule
-        if ($requestUrl != $backendUrl) {
-            return $this->getRedirect($backendUrl);
+        if (!$requestUrl->isValid()) {
+            return $this->getRedirect($this->getUrl('*'));
         }
+
         return $this->resultPageFactory->create();
     }
 

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -7,6 +7,9 @@
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Store\Model\Group as StoreGroup;
+use Magento\Store\Model\Store;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Save
@@ -33,6 +36,17 @@ private function processWebsiteSave($postData)
             $websiteModel->setId(null);
         }
 
+        $groupModel = $this->_objectManager->create(StoreGroup::class);
+        $groupModel->load($websiteModel->getDefaultGroupId());
+        $storeModel = $this->_objectManager->create(Store::class);
+        $storeModel->load($groupModel->getDefaultStoreId());
+
+        if ($websiteModel->getIsDefault() && !$storeModel->isActive()) {
+            throw new LocalizedException(
+                __('Please enable your Store View before using this Web Site as Default')
+            );
+        }
+
         $websiteModel->save();
         $this->messageManager->addSuccessMessage(__('You saved the website.'));
 
@@ -43,13 +57,13 @@ private function processWebsiteSave($postData)
      * Process Store model save
      *
      * @param array $postData
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return array
      */
     private function processStoreSave($postData)
     {
-        /** @var \Magento\Store\Model\Store $storeModel */
-        $storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
+        /** @var Store $storeModel */
+        $storeModel = $this->_objectManager->create(Store::class);
         $postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
         if ($postData['store']['store_id']) {
             $storeModel->load($postData['store']['store_id']);
@@ -59,13 +73,13 @@ private function processStoreSave($postData)
             $storeModel->setId(null);
         }
         $groupModel = $this->_objectManager->create(
-            \Magento\Store\Model\Group::class
+            StoreGroup::class
         )->load(
             $storeModel->getGroupId()
         );
         $storeModel->setWebsiteId($groupModel->getWebsiteId());
         if (!$storeModel->isActive() && $storeModel->isDefault()) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('The default store cannot be disabled')
             );
         }
@@ -79,14 +93,14 @@ private function processStoreSave($postData)
      * Process StoreGroup model save
      *
      * @param array $postData
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return array
      */
     private function processGroupSave($postData)
     {
         $postData['group']['name'] = $this->filterManager->removeTags($postData['group']['name']);
-        /** @var \Magento\Store\Model\Group $groupModel */
-        $groupModel = $this->_objectManager->create(\Magento\Store\Model\Group::class);
+        /** @var StoreGroup $groupModel */
+        $groupModel = $this->_objectManager->create(StoreGroup::class);
         if ($postData['group']['group_id']) {
             $groupModel->load($postData['group']['group_id']);
         }
@@ -95,10 +109,11 @@ private function processGroupSave($postData)
             $groupModel->setId(null);
         }
         if (!$this->isSelectedDefaultStoreActive($postData, $groupModel)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('An inactive store view cannot be saved as default store view')
             );
         }
+
         $groupModel->save();
         $this->messageManager->addSuccessMessage(__('You saved the store.'));
 
@@ -135,7 +150,7 @@ public function execute()
                 }
                 $redirectResult->setPath('adminhtml/*/');
                 return $redirectResult;
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_getSession()->setPostData($postData);
             } catch (\Exception $e) {
@@ -156,10 +171,10 @@ public function execute()
      * Verify if selected default store is active
      *
      * @param array $postData
-     * @param \Magento\Store\Model\Group $groupModel
+     * @param StoreGroup $groupModel
      * @return bool
      */
-    private function isSelectedDefaultStoreActive(array $postData, \Magento\Store\Model\Group $groupModel)
+    private function isSelectedDefaultStoreActive(array $postData, StoreGroup $groupModel)
     {
         if (!empty($postData['group']['default_store_id'])) {
             $defaultStoreId = $postData['group']['default_store_id'];

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClearGridFiltersActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminClearGridFiltersActionGroup">
+        <annotations>
+            <description>Click the Clear filters on the grid.</description>
+        </annotations>
+
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/i18n/en_US.csv

@@ -198,6 +198,7 @@ System,System
 "All Stores","All Stores"
 "You saved the website.","You saved the website."
 "The default store cannot be disabled","The default store cannot be disabled"
+"Please enable your Store View before using this Web Site as Default","Please enable your Store View before using this Web Site as Default"
 "You saved the store view.","You saved the store view."
 "An inactive store view cannot be saved as default store view","An inactive store view cannot be saved as default store view"
 "You saved the store.","You saved the store."

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -14,12 +14,13 @@
  *  getPagerVisibility()
  *  getVarNamePage()
  */
-$numColumns = count($block->getColumns());
 
 /**
  * @var \Magento\Backend\Block\Widget\Grid\Extended $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
+$numColumns = count($block->getColumns());
+
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
@@ -285,7 +286,9 @@ $numColumns = count($block->getColumns());
         </table>
 
     </div>
+        <?php if ($block->canDisplayContainer()): ?>
 </div>
+        <?php endif; ?>
     <?php
     /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
     $jsonHelper = $block->getData('jsonHelper');

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -184,10 +184,6 @@ public function getJsonConfig()
                 $configValue = $preConfiguredValues->getData('bundle_option/' . $optionId);
                 if ($configValue) {
                     $defaultValues[$optionId] = $configValue;
-                    $configQty = $preConfiguredValues->getData('bundle_option_qty/' . $optionId);
-                    if ($configQty) {
-                        $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
-                    }
                 }
                 $options = $this->processOptions($optionId, $options, $preConfiguredValues);
             }