🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes

Accepted Public Pull Requests: - #21716: [DB] Remove unused variable (by @eduard13) - #21701: Fix Broken Tax Rate Search Filter Admin grid #21521 (by @tuyennn) - #21685: Spelling Correction (by @ansari-krish) - #21611: Advanced-Search-layout-not-proper (by @amol2jcommerce) - #21420: Wishlist review summary (by @Den4ik) - #21638: Minicart search logo not vertically aligned (by @amol2jcommerce) - #21542: Remove Environment emulation for better performance on sitemap generation (by @Nazar65) - #21371: Fix Admin Customizable Options Dropdown sort_order issue (by @omiroshnichenko) - #20938: Fixed Massaction design with submenu on grid pages (by @ananth-iyer) - #19635: Patch 18017 magento 23 (by @niravkrish) - #21074: Added space above error message. (by @suryakant-krish) - #20429: 'fixes-for-#20414' :: Recent orders grid not aligned from left in mob� (by @nainesh2jcommerce) - #13184: [FEATURE] added ability to create default/fixed value nodes during XSD Schema Validation (by @matthiasherold) Fixed GitHub Issues: - #21521: Broken Tax Rate Search Filter - SQLSTATE[23000] (reported by @robyerevan) has been fixed in #21701 by @tuyennn in 2.3-develop branch Related commits: 1. 924dca2 - #20809: Advanced Search layout not proper (reported by @amol2jcommerce) has been fixed in #21611 by @amol2jcommerce in 2.3-develop branch Related commits: 1. 13991bb 2. 1f0f7a1 3. caa0727 4. 23e7e36 - #21419: Wishlist is missing review summary (reported by @Den4ik) has been fixed in #21420 by @Den4ik in 2.3-develop branch Related commits: 1. a168c95 2. 0def6c2 3. 473f9a5 - #20905: Minicart, search & logo not vertically aligned between 640 to767 device pixel. (reported by @Surabhi-Cedcoss) has been fixed in #21638 by @amol2jcommerce in 2.3-develop branch Related commits: 1. a21901a - #20989: Admin Customizable Options Dropdown sort_order issue (reported by @dharmendra-wagento) has been fixed in #21371 by @omiroshnichenko in 2.3-develop branch Related commits: 1. 4e348fd 2. e270dee 3. 795d532 - #20928: Admin product grid Massaction design issue with sub menu (reported by @ananth-iyer) has been fixed in #20938 by @ananth-iyer in 2.3-develop branch Related commits: 1. facfa44 2. 314d3a8 3. 631c6b1 4. 524eef3 - #18017: URL pre-selection of configurable product swatches with associated product images throws JavaScript error (reported by @leoquijano) has been fixed in #19635 by @niravkrish in 2.3-develop branch Related commits: 1. b92bbc4 2. 95d5f44 3. 30c3eac 4. ee64ecd 5. 7feaedd 6. bbceaab 7. 0611394 8. 41c2d90 9. ec5c01f - #20414: Recent orders grid not aligned from left in mobile as all content aligned from left (reported by @irajneeshgupta) has been fixed in #20429 by @nainesh2jcommerce in 2.3-develop branch Related commits: 1. f4d4d9b
magento · Mar 14, 2019 · c7c7e3d · c7c7e3d
2 parents 6d8e725 + 3fb6b28
commit c7c7e3d
Show file tree

Hide file tree

Showing 35 changed files with 158 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -489,7 +489,7 @@ Tests:
     * Fixed an issue where found records in global search in Backend could not be selected via keyboard
     * Fixed an issue where Category menu items went out of screen when page side was reached
     * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
-    * Fixed an issue where popup header was our of window range while creating group product
+    * Fixed an issue where popup header was out of window range while creating group product
     * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
     * Fixed an ability to edit the Order from Admin panel
     * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout

diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -69,7 +69,7 @@
 
                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                         <td if="elem.template"
-                            visible="elem.visible"
+                            visible="elem.visible() && elem.formElement !== 'hidden'"
                             disable="elem.disabled"
                             css="$parent.setClasses(elem)"
                             template="elem.template"

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
                         'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
+                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],

diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -7,10 +7,15 @@
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Sitemap\Controller\Adminhtml\Sitemap;
 use Magento\Store\Model\App\Emulation;
 use Magento\Framework\App\ObjectManager;
 
-class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+/**
+ * Generate sitemap file
+ */
+class Generate extends Sitemap implements HttpGetActionInterface
 {
     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
     private $appEmulation;
@@ -44,23 +49,14 @@ public function execute()
         // if sitemap record exists
         if ($sitemap->getId()) {
             try {
-                //We need to emulate to get the correct frontend URL for the product images
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
                 $sitemap->generateXml();
-
                 $this->messageManager->addSuccessMessage(
                     __('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         } else {
             $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));

diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sitemap\Model;
 
-use Magento\Store\Model\App\Emulation;
 use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
@@ -57,11 +56,6 @@ class Observer
      */
     private $collectionFactory;
 
-    /**
-     * @var Emulation
-     */
-    private $appEmulation;
-
     /**
      * @var $emailNotification
      */
@@ -72,17 +66,14 @@ class Observer
      * @param ScopeConfigInterface $scopeConfig
      * @param CollectionFactory $collectionFactory
      * @param EmailNotification $emailNotification
-     * @param Emulation $appEmulation
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CollectionFactory $collectionFactory,
-        SitemapEmail $emailNotification,
-        Emulation $appEmulation
+        SitemapEmail $emailNotification
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->collectionFactory = $collectionFactory;
-        $this->appEmulation = $appEmulation;
         $this->emailNotification = $emailNotification;
     }
 
@@ -114,17 +105,9 @@ public function scheduledGenerateSitemaps()
         foreach ($collection as $sitemap) {
             /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
             try {
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
-
                 $sitemap->generateXml();
             } catch (\Exception $e) {
                 $errors[] = $e->getMessage();
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         if ($errors && $recipient) {

diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -389,6 +389,7 @@ protected function _prepareProduct(array $productRow, $storeId)
      */
     protected function _loadProductImages($product, $storeId)
     {
+        $this->_storeManager->setCurrentStore($storeId);
         /** @var $helper \Magento\Sitemap\Helper\Data */
         $helper = $this->_sitemapData;
         $imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);

diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -118,7 +118,7 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             ->method('getStoreId')
             ->willReturn($storeId);
 
-        $this->sitemapMock->expects($this->at(1))
+        $this->sitemapMock->expects($this->once())
             ->method('generateXml')
             ->willThrowException(new \Exception($exception));
 
@@ -130,17 +130,6 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             )
             ->willReturn('error-recipient@example.com');
 
-        $this->appEmulationMock->expects($this->at(0))
-            ->method('startEnvironmentEmulation')
-            ->with(
-                $storeId,
-                Area::AREA_FRONTEND,
-                true
-            );
-
-        $this->appEmulationMock->expects($this->at(1))
-            ->method('stopEnvironmentEmulation');
-
         $this->observer->scheduledGenerateSitemaps();
     }
 }
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -1238,6 +1238,11 @@ define([
 
                 if (!_.isUndefined(gallery)) {
                     gallery.updateData(imagesToUpdate);
+                } else {
+                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
+                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                        loadedGallery.updateData(imagesToUpdate);
+                    }.bind(this));
                 }
 
                 if (isInitial) {
@@ -1248,6 +1253,7 @@ define([
                         dataMergeStrategy: this.options.gallerySwitchStrategy
                     });
                 }
+
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }

diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
@@ -143,6 +143,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>

diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -543,6 +543,7 @@ define([
                     data = this.createHeaderTemplate(cell.config);
                     cell.config.labelVisible = false;
                     _.extend(data, {
+                        defaultLabelVisible: data.visible(),
                         label: cell.config.label,
                         name: cell.name,
                         required: !!cell.config.validation,

diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
@@ -245,7 +245,7 @@ define([
                 label = _.findWhere(this.parentComponent().labels(), {
                     name: index
                 });
-                label.visible() !== state ? label.visible(state) : false;
+                label.defaultLabelVisible && label.visible(state);
             } else {
                 elems[curElem].visible(state);
             }

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -41,7 +41,7 @@
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
                         css="$parent.setClasses(elem)"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         template="elem.template"/>
                     <!-- /ko -->

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -58,7 +58,7 @@
 
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         css="$parent.setClasses(elem)"
                         template="elem.template"

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist for item column in customer wishlist
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Model for item column in customer wishlist.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Edit item in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Edit item in customer wishlist table.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Delete item column in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Delete item column in customer wishlist table
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -18,6 +18,7 @@
                 <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
                             <arguments>

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+$product = $block->getItem()->getProduct();
+?>
+<?= $block->getReviewsSummaryHtml($product, 'short') ?>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -7,6 +7,14 @@
 //  Actions -> Action select
 //  _____________________________________________
 
+//
+//  Variables
+//  _____________________________________________
+
+@_dropdown__padding-right: @action__height;
+@_triangle__height: @button-marker-triangle__height;
+@_triangle__width: @button-marker-triangle__width;
+
 //  Action select have the same visual styles and functionality as native <select>
 .action-select-wrap {
     @_action-select__border-color: @button__border-color;
@@ -18,9 +26,9 @@
 
     .action-select {
         .action-toggle-triangle(
-        @_dropdown__padding-right: @_action-select-toggle__size;
-        @_triangle__height: @button-marker-triangle__height;
-        @_triangle__width: @button-marker-triangle__width;
+        @_dropdown__padding-right;
+        @_triangle__height;
+        @_triangle__width;
         );
         .lib-text-overflow-ellipsis();
 
@@ -108,12 +116,9 @@
             min-width: 100%;
             position: static;
 
-            ._parent._visible {
-                position: relative;
-            }
-
             .action-submenu {
                 position: absolute;
+                right: -100%;
             }
         }
     }