Merge branch '2.4-develop' into MC-37321

Author: victor-v-rad

app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml

@@ -20,8 +20,14 @@
         </annotations>
 
         <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
+            <!-- Should wait a bit for filters really cleared because waitForPageLoad does not wait for javascripts to be finished -->
+            <!-- Without this test will fail sometimes -->
+            <wait time="5" stepKey="waitFilterReallyCleared"/>
+            <reloadPage stepKey="reloadPage"/>
         </before>
 
         <after>

app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml

@@ -135,7 +135,7 @@ require([
                 content: "{$block->escapeJs(__('Are you sure you want to strip tags?'))}",
                 actions: {
                     confirm: function () {
-                        this.unconvertedText = $('template_text').value;
+                        self.unconvertedText = $('template_text').value;
                         $('convert_button').hide();
                         $('template_text').value =  $('template_text').value.stripScripts().replace(
                             new RegExp('<style[^>]*>[\\S\\s]*?</style>', 'img'), ''

app/code/Magento/Review/Block/Adminhtml/Add.php

@@ -27,15 +27,10 @@ protected function _construct()
         $this->_mode = 'add';
         $this->buttonList->update('save', 'label', __('Save Review'));
         $this->buttonList->update('save', 'id', 'save_button');
+        $this->buttonList->update('save', 'style', 'display: none;');
         $this->buttonList->update('reset', 'id', 'reset_button');
+        $this->buttonList->update('reset', 'style', 'display: none;');
         $this->buttonList->update('reset', 'onclick', 'window.review.formReset()');
-        $this->_formScripts[] = '
-            require(["prototype"], function(){
-                toggleParentVis("add_review_form");
-                toggleVis("save_button");
-                toggleVis("reset_button");
-            });
-        ';
         // @codingStandardsIgnoreStart
         $this->_formInitScripts[] = '
             require(["jquery","Magento_Review/js/rating","prototype"], function(jQuery, rating){

app/code/Magento/Review/Block/Adminhtml/Add/Form.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Review\Block\Adminhtml\Add;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Adminhtml add product review form
  *
@@ -26,24 +29,32 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_systemStore;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Review\Helper\Data $reviewData
      * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Store\Model\System\Store $systemStore,
         \Magento\Review\Helper\Data $reviewData,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
     ) {
         $this->_reviewData = $reviewData;
         $this->_systemStore = $systemStore;
+        $this->secureRenderer = $htmlRenderer ?: ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -59,6 +70,8 @@ protected function _prepareForm()
         $form = $this->_formFactory->create();
 
         $fieldset = $form->addFieldset('add_review_form', ['legend' => __('Review Details')]);
+        $beforeHtml = $this->secureRenderer->renderStyleAsTag('display: none;', '#edit_form');
+        $fieldset->setBeforeElementHtml($beforeHtml);
 
         $fieldset->addField('product_name', 'note', ['label' => __('Product'), 'text' => 'product_name']);
 

app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php

@@ -398,7 +398,11 @@ protected function _renderFiltersBefore()
             $availableProductTypes = $this->salesConfig->getAvailableProductTypes();
             $this->getSelect()->join(
                 ['cat_prod' => $this->getTable('catalog_product_entity')],
-                $this->getConnection()->quoteInto('cat_prod.type_id IN (?)', $availableProductTypes),
+                $this->getConnection()
+                    ->quoteInto(
+                        "cat_prod.type_id IN (?) AND {$mainTableName}.product_id = cat_prod.entity_id",
+                        $availableProductTypes
+                    ),
                 []
             );
         }

dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php

@@ -62,6 +62,23 @@ public function testLoadedProductAttributes()
         $this->assertEquals('Short description', $productOnWishlist->getData('short_description'));
     }
 
+    /**
+     * Tests collection load.
+     * Tests collection load method when product salable filter flag is setted to true
+     * and few products are present.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     * @magentoDbIsolation disabled
+     */
+    public function testLoadWhenFewProductsPresent()
+    {
+        $this->itemCollection->setSalableFilter(true);
+        $this->itemCollection->addCustomerIdFilter(1);
+        $this->itemCollection->load();
+        $this->assertCount(1, $this->itemCollection->getItems());
+    }
+
     /**
      * @param array $attributes
      */