🔃 [Magento Community Engineering] Community Contributions - 2.3-develop

Accepted Community Pull Requests:
 - magento/magento2#24359: Fixed the Spacing issue in grid (by @Nagamaiah333)
 - magento/magento2#24449: Resolve Scope icon and store view specific label text alignment issue (issue24440) (by @edenduong)
 - magento/magento2#24160: tear price change with tier price (by @sunilit42)
 - magento/magento2#24451: #24441 : Minicart height calculated incorrectly when child items contain margins (by @konarshankar07)
 - magento/magento2#24399: Remove "Add Review" if System has no Product issue24310 (by @edenduong)
 - magento/magento2#24308: Resolved edit configurable product from cart doesn't show selected swatch options #24306 (by @rani-webkul)
 - magento/magento2#24318: #23990: Reset not working properly in Add review from admin (by @konarshankar07)
 - magento/magento2#24489: magento/magento2#: Fix release notification README (by @atwixfirster)


Fixed GitHub Issues:
 - magento/magento2#24152: Spacing Issue with the Admin grids pages (reported by @sudheer-gajjala) has been fixed in magento/magento2#24359 by @Nagamaiah333 in 2.3-develop branch
   Related commits:
     1. 785cdcd

 - magento/magento2#24440: Scope icon and store view specific label text alignment issue (reported by @bhavik43) has been fixed in magento/magento2#24449 by @edenduong in 2.3-develop branch
   Related commits:
     1. 4314d4b

 - magento/magento2#23567: Tear Price? Tier Price? (reported by @dyuk1987) has been fixed in magento/magento2#24160 by @sunilit42 in 2.3-develop branch
   Related commits:
     1. 1666ce8
     2. 5ac00d1
     3. 4ad2885
     4. 93265e6
     5. 09b94a6
     6. ca9de51
     7. 8d90e19
     8. 4ccf306
     9. fb99abc
     10. 8c1ddd1
     11. db48e4c
     12. aa1f52f

 - magento/magento2#24441: Minicart height calculated incorrectly when child items contain margins (reported by @gwharton) has been fixed in magento/magento2#24451 by @konarshankar07 in 2.3-develop branch
   Related commits:
     1. 25a90fb

 - magento/magento2#24310: New Review form is redirected to review grid (reported by @konarshankar07) has been fixed in magento/magento2#24399 by @edenduong in 2.3-develop branch
   Related commits:
     1. 38cf8d6

 - magento/magento2#24306: Edit configurable product from cart doesn't show selected swatch options (reported by @rani-webkul) has been fixed in magento/magento2#24308 by @rani-webkul in 2.3-develop branch
   Related commits:
     1. b6f2b5c

 - magento/magento2#23990: Reset not working properly in Add review from admin (reported by @sdzhepa) has been fixed in magento/magento2#24318 by @konarshankar07 in 2.3-develop branch
   Related commits:
     1. 5f7029d
     2. bd5a012
     3. e115b06
     4. 2f4f8e8
     5. ea22c90

 - magento/magento2#5246: Enable Merge CSS Files make adminl panel very slow (reported by @hungvt) has been fixed in magento/magento2#24489 by @atwixfirster in 2.3-develop branch
   Related commits:
     1. e7fb5d7

Author: magento-engcom-team

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -50,7 +50,13 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
 
     const VALIDATOR_WEBSITE = 'validator_website';
 
-    const VALIDATOR_TEAR_PRICE = 'validator_tear_price';
+    /**
+     * @deprecated
+     * @see VALIDATOR_TIER_PRICE
+     */
+    private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';
+
+    private const VALIDATOR_TIER_PRICE = 'validator_tier_price';
 
     /**
      * Validation failure message template definitions.
@@ -221,7 +227,7 @@ public function __construct(
         $this->_catalogProductEntity = $this->_resourceFactory->create()->getTable('catalog_product_entity');
         $this->_oldSkus = $this->retrieveOldSkus();
         $this->_validators[self::VALIDATOR_WEBSITE] = $websiteValidator;
-        $this->_validators[self::VALIDATOR_TEAR_PRICE] = $tierPriceValidator;
+        $this->_validators[self::VALIDATOR_TIER_PRICE] = $tierPriceValidator;
         $this->errorAggregator = $errorAggregator;
 
         foreach (array_merge($this->errorMessageTemplates, $this->_messageTemplates) as $errorCode => $message) {
@@ -536,7 +542,7 @@ protected function getWebSiteId($websiteCode)
      */
     protected function getCustomerGroupId($customerGroup)
     {
-        $customerGroups = $this->_getValidator(self::VALIDATOR_TEAR_PRICE)->getCustomerGroups();
+        $customerGroups = $this->_getValidator(self::VALIDATOR_TIER_PRICE)->getCustomerGroups();
         return $customerGroup == self::VALUE_ALL_GROUPS ? 0 : $customerGroups[$customerGroup];
     }
 

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -15,6 +15,9 @@
  */
 class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractImportTestCase
 {
+    /**
+     * DB Table data
+     */
     const TABLE_NAME = 'tableName';
     const LINK_FIELD = 'linkField';
 
@@ -54,7 +57,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
     protected $websiteValidator;
 
     /**
-     * @var AdvancedPricing\Validator\TearPrice |\PHPUnit_Framework_MockObject_MockObject
+     * @var AdvancedPricing\Validator\TierPrice |\PHPUnit_Framework_MockObject_MockObject
      */
     protected $tierPriceValidator;
 

app/code/Magento/Catalog/Model/Product/Type/Price.php

@@ -204,7 +204,7 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
     }
 
     /**
-     * Gets the 'tear_price' array from the product
+     * Gets the 'tier_price' array from the product
      *
      * @param Product $product
      * @param string $key

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php

@@ -65,11 +65,11 @@ public function testGetAffectedFields()
         $attribute->expects($this->any())->method('getAttributeId')->will($this->returnValue($attributeId));
         $attribute->expects($this->any())->method('isStatic')->will($this->returnValue(false));
         $attribute->expects($this->any())->method('getBackendTable')->will($this->returnValue('table'));
-        $attribute->expects($this->any())->method('getName')->will($this->returnValue('tear_price'));
+        $attribute->expects($this->any())->method('getName')->will($this->returnValue('tier_price'));
         $this->_model->setAttribute($attribute);
 
         $object = new \Magento\Framework\DataObject();
-        $object->setTearPrice([['price_id' => 10]]);
+        $object->setTierPrice([['price_id' => 10]]);
         $object->setId(555);
 
         $this->assertEquals(

app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php

@@ -39,7 +39,7 @@ class BasePriceTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Catalog\Pricing\Price\TierPrice|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $tearPriceMock;
+    protected $tierPriceMock;
 
     /**
      * @var \Magento\Catalog\Pricing\Price\SpecialPrice|\PHPUnit_Framework_MockObject_MockObject
@@ -60,7 +60,7 @@ protected function setUp()
         $this->saleableItemMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $this->priceInfoMock = $this->createMock(\Magento\Framework\Pricing\PriceInfo\Base::class);
         $this->regularPriceMock = $this->createMock(\Magento\Catalog\Pricing\Price\RegularPrice::class);
-        $this->tearPriceMock = $this->createMock(\Magento\Catalog\Pricing\Price\TierPrice::class);
+        $this->tierPriceMock = $this->createMock(\Magento\Catalog\Pricing\Price\TierPrice::class);
         $this->specialPriceMock = $this->createMock(\Magento\Catalog\Pricing\Price\SpecialPrice::class);
         $this->calculatorMock = $this->createMock(\Magento\Framework\Pricing\Adjustment\Calculator::class);
 
@@ -69,7 +69,7 @@ protected function setUp()
             ->will($this->returnValue($this->priceInfoMock));
         $this->prices = [
             'regular_price' => $this->regularPriceMock,
-            'tear_price' => $this->tearPriceMock,
+            'tier_price' => $this->tierPriceMock,
             'special_price' => $this->specialPriceMock,
         ];
 
@@ -97,7 +97,7 @@ public function testGetValue($specialPriceValue, $expectedResult)
         $this->regularPriceMock->expects($this->exactly(3))
             ->method('getValue')
             ->will($this->returnValue(100));
-        $this->tearPriceMock->expects($this->exactly(2))
+        $this->tierPriceMock->expects($this->exactly(2))
             ->method('getValue')
             ->will($this->returnValue(99));
         $this->specialPriceMock->expects($this->any())

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php

@@ -252,7 +252,7 @@ public function testUpdateCatalogRuleGroupWebsiteData()
         );
         $resourceMock->expects($this->any())
             ->method('getMainTable')
-            ->will($this->returnValue('catalog_product_entity_tear_price'));
+            ->will($this->returnValue('catalog_product_entity_tier_price'));
         $backendModelMock->expects($this->any())
             ->method('getResource')
             ->will($this->returnValue($resourceMock));

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -347,7 +347,7 @@ define([
                 if ($(this).find('.options').length > 0) {
                     $(this).collapsible();
                 }
-                outerHeight = $(this).outerHeight();
+                outerHeight = $(this).outerHeight(true);
 
                 if (counter-- > 0) {
                     height += outerHeight;

app/code/Magento/ReleaseNotification/README.md

@@ -1,4 +1,4 @@
- # Magento_ReleaseNotification Module
+# Magento_ReleaseNotification module
 
 The **Release Notification Module** serves to provide a notification delivery platform for displaying new features of a Magento installation or upgrade as well as any other required release notifications.
 

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

@@ -17,33 +17,32 @@ class Add extends \Magento\Backend\Block\Widget\Form\Container
      * Initialize add review
      *
      * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function _construct()
     {
         parent::_construct();
-
         $this->_blockGroup = 'Magento_Review';
         $this->_controller = 'adminhtml';
         $this->_mode = 'add';
-
         $this->buttonList->update('save', 'label', __('Save Review'));
         $this->buttonList->update('save', 'id', 'save_button');
-
         $this->buttonList->update('reset', 'id', 'reset_button');
-
+        $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","prototype"], function(jQuery){
+            require(["jquery","Magento_Review/js/rating","prototype"], function(jQuery, rating){
             window.review = function() {
                 return {
+                    reviewFormEditSelector: "#edit_form",
+                    ratingSelector: "[data-widget=ratingControl]",
                     productInfoUrl : null,
                     formHidden : true,
                     gridRowClick : function(data, click) {
@@ -72,6 +71,10 @@ protected function _construct()
                         toggleVis("save_button");
                         toggleVis("reset_button");
                     },
+                    formReset: function() {
+                        jQuery(review.reviewFormEditSelector).trigger(\'reset\');
+                        jQuery(review.ratingSelector).ratingControl(\'removeRating\');
+                    },
                     updateRating: function() {
                         elements = [$("select_stores"), $("rating_detail").getElementsBySelector("input[type=\'radio\']")].flatten();
                         $(\'save_button\').disabled = true;

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

@@ -3,12 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
  * Adminhtml review main block
  */
 namespace Magento\Review\Block\Adminhtml;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+
+/**
+ * Class \Magento\Review\Block\Adminhtml\Main
+ */
 class Main extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**
@@ -37,26 +44,37 @@ class Main extends \Magento\Backend\Block\Widget\Grid\Container
      */
     protected $_customerViewHelper;
 
+    /**
+     * Product Collection
+     *
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
     /**
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param array $data
+     * @param ProductCollectionFactory $productCollectionFactory
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Framework\Registry $registry,
         \Magento\Customer\Helper\View $customerViewHelper,
-        array $data = []
+        array $data = [],
+        ProductCollectionFactory $productCollectionFactory = null
     ) {
         $this->_coreRegistry = $registry;
         $this->customerRepository = $customerRepository;
         $this->_productFactory = $productFactory;
         $this->_customerViewHelper = $customerViewHelper;
+        $this->productCollectionFactory = $productCollectionFactory ?: ObjectManager::getInstance()
+            ->get(ProductCollectionFactory::class);
         parent::__construct($context, $data);
     }
 
@@ -73,6 +91,10 @@ protected function _construct()
         $this->_blockGroup = 'Magento_Review';
         $this->_controller = 'adminhtml';
 
+        if (!$this->productCollectionFactory->create()->getSize()) {
+            $this->removeButton('add');
+        }
+
         // lookup customer, if id is specified
         $customerId = $this->getRequest()->getParam('customerId', false);
         $customerName = '';

app/code/Magento/Review/Test/Unit/Block/Adminhtml/MainTest.php

@@ -3,39 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Review\Test\Unit\Block\Adminhtml;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Helper\View as ViewHelper;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Review\Block\Adminhtml\Main as MainBlock;
+use Magento\Framework\DataObject;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
+/**
+ * Unit Test For Main Block
+ *
+ * Class \Magento\Review\Test\Unit\Block\Adminhtml\MainTest
+ */
 class MainTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Review\Block\Adminhtml\Main
+     * @var MainBlock
      */
     protected $model;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $request;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerRepository;
 
     /**
-     * @var \Magento\Customer\Helper\View|\PHPUnit_Framework_MockObject_MockObject
+     * @var ViewHelper|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerViewHelper;
 
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactory;
+
     public function testConstruct()
     {
         $this->customerRepository = $this
-            ->getMockForAbstractClass(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $this->customerViewHelper = $this->createMock(\Magento\Customer\Helper\View::class);
-        $dummyCustomer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+            ->getMockForAbstractClass(CustomerRepositoryInterface::class);
+        $this->customerViewHelper = $this->createMock(ViewHelper::class);
+        $this->collectionFactory = $this->createMock(CollectionFactory::class);
+        $dummyCustomer = $this->getMockForAbstractClass(CustomerInterface::class);
 
         $this->customerRepository->expects($this->once())
             ->method('getById')
@@ -44,8 +64,8 @@ public function testConstruct()
         $this->customerViewHelper->expects($this->once())
             ->method('getCustomerName')
             ->with($dummyCustomer)
-            ->will($this->returnValue(new \Magento\Framework\DataObject()));
-        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+            ->will($this->returnValue(new DataObject()));
+        $this->request = $this->getMockForAbstractClass(RequestInterface::class);
         $this->request->expects($this->at(0))
             ->method('getParam')
             ->with('customerId', false)
@@ -54,14 +74,21 @@ public function testConstruct()
             ->method('getParam')
             ->with('productId', false)
             ->will($this->returnValue(false));
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($productCollection));
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $objectManagerHelper->getObject(
-            \Magento\Review\Block\Adminhtml\Main::class,
+            MainBlock::class,
             [
                 'request' => $this->request,
                 'customerRepository' => $this->customerRepository,
-                'customerViewHelper' => $this->customerViewHelper
+                'customerViewHelper' => $this->customerViewHelper,
+                'productCollectionFactory' => $this->collectionFactory
             ]
         );
     }

app/code/Magento/Review/view/adminhtml/web/js/rating.js

@@ -62,6 +62,15 @@ define([
 
             checkedInputs.nextAll('label').addBack().css('color', this.options.colorFilled).data('checked', true);
             checkedInputs.prevAll('label').css('color', this.options.colorUnfilled).data('checked', false);
+        },
+
+        /**
+         * Remove rating when form reset
+         */
+        removeRating: function () {
+            var checkedInputs = this.element.find('input[type="radio"]');
+
+            checkedInputs.nextAll('label').css('color', this.options.colorUnfilled).data('checked', false);
         }
     });
 

app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php

@@ -81,7 +81,7 @@ protected function _addStoresFieldset($model, $form)
         if (!$this->_storeManager->isSingleStoreMode()) {
             $fieldset = $form->addFieldset(
                 'store_labels_fieldset',
-                ['legend' => __('Store View Specific Labels'), 'class' => 'store-scope']
+                ['legend' => __('Store View Specific Labels'), 'class' => 'store-scope no-margin-top-tooltip']
             );
         } else {
             $fieldset = $form->addFieldset(

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -750,7 +750,7 @@ define([
 
             $(document).trigger('updateMsrpPriceBlock',
                 [
-                    parseInt($this.attr('index'), 10) + 1,
+                    _.findKey($widget.options.jsonConfig.index, $widget.options.jsonConfig.defaultValues),
                     $widget.options.jsonConfig.optionPrices
                 ]);