🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #14751: Deleting CMS page via webapi/cron should remove related URL rewrites (by @unicoder88)
 - #14742: Allow multiple tabs ui_components on a page (by @FreekVandeursen)
 - magento-partners/magento2ce#68: [2.2] Add support for fotorama 'thumbmargin' setting within a theme's view.xml (by @gil--)
 - #12764: #4389 Widget cache error (by @AlexandrKozyr)
 - #14538: [Forwardport] Fix HTML tags in meta description (by @davidwindell)
 - #14314: #13765 Excess requests 'customer data' on checkout cart page were fixed (by @andrewbess)


Fixed GitHub Issues:
 - #4389: Widget cache error (reported by @twslade) has been fixed in #12764 by @AlexandrKozyr in 2.2-develop branch
   Related commits:
     1. 30b5123

 - #13765: "cart" section data gets loaded 3 times on cart page (2.2.2) (reported by @erikhansen) has been fixed in #14314 by @andrewbess in 2.2-develop branch
   Related commits:
     1. d2c6bd0
     2. 42350cd

Author: magento-engcom-team

app/code/Magento/Catalog/Helper/Product/View.php

@@ -130,7 +130,7 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
         if ($description) {
             $pageConfig->setDescription($description);
         } else {
-            $pageConfig->setDescription($this->string->substr($product->getDescription(), 0, 255));
+            $pageConfig->setDescription($this->string->substr(strip_tags($product->getDescription()), 0, 255));
         }
 
         if ($this->_catalogProduct->canUseCanonicalTag()) {

app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml

@@ -68,6 +68,9 @@
                         "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
                     <?php endif; ?>
+                    <?php if (($block->getVar("gallery/thumbmargin"))): ?>
+                        "thumbmargin": <?= /* @noEscape */ (int)$block->getVar("gallery/thumbmargin"); ?>,
+                    <?php endif; ?>
                     <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
                         "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
                         ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -167,7 +167,9 @@ public function getCacheKeyInfo()
             intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
             $this->getProductsPerPage(),
             $conditions,
-            $this->json->serialize($this->getRequest()->getParams())
+            $this->json->serialize($this->getRequest()->getParams()),
+            $this->getTemplate(),
+            $this->getTitle()
         ];
     }
 

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -87,8 +87,8 @@ protected function setUp()
     {
         $this->collectionFactory =
             $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()->getMock();
+                ->setMethods(['create'])
+                ->disableOriginalConstructor()->getMock();
         $this->visibility = $this->getMockBuilder(\Magento\Catalog\Model\Product\Visibility::class)
             ->setMethods(['getVisibleInCatalogIds'])
             ->disableOriginalConstructor()
@@ -144,6 +144,8 @@ public function testGetCacheKeyInfo()
         $this->productsList->setData('conditions', 'some_serialized_conditions');
 
         $this->productsList->setData('page_var_name', 'page_number');
+        $this->productsList->setTemplate('test_template');
+        $this->productsList->setData('title', 'test_title');
         $this->request->expects($this->once())->method('getParam')->with('page_number')->willReturn(1);
 
         $this->request->expects($this->once())->method('getParams')->willReturn('request_params');
@@ -166,7 +168,9 @@ public function testGetCacheKeyInfo()
             1,
             5,
             'some_serialized_conditions',
-            json_encode('request_params')
+            json_encode('request_params'),
+            'test_template',
+            'test_title'
         ];
         $this->assertEquals($cacheKey, $this->productsList->getCacheKeyInfo());
     }
@@ -251,9 +255,10 @@ public function testGetPagerHtml()
      * Test public `createCollection` method and protected `getPageSize` method via `createCollection`
      *
      * @param bool $pagerEnable
-     * @param int $productsCount
-     * @param int $productsPerPage
-     * @param int $expectedPageSize
+     * @param int  $productsCount
+     * @param int  $productsPerPage
+     * @param int  $expectedPageSize
+     *
      * @dataProvider createCollectionDataProvider
      */
     public function testCreateCollection($pagerEnable, $productsCount, $productsPerPage, $expectedPageSize)
@@ -382,6 +387,7 @@ public function testGetIdentities()
 
     /**
      * @param $collection
+     *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     private function getConditionsForCollection($collection)

app/code/Magento/Checkout/view/frontend/web/js/model/totals.js

@@ -14,17 +14,20 @@ define([
     'use strict';
 
     var quoteItems = ko.observable(quote.totals().items),
-        cartData = customerData.get('cart'),
-        quoteSubtotal = parseFloat(quote.totals().subtotal),
-        subtotalAmount = parseFloat(cartData().subtotalAmount);
+        cartData = customerData.get('cart');
 
     quote.totals.subscribe(function (newValue) {
         quoteItems(newValue.items);
     });
 
-    if (quoteSubtotal !== subtotalAmount) {
-        customerData.reload(['cart'], false);
-    }
+    cartData.subscribe(function () {
+        var quoteSubtotal = parseFloat(quote.totals().subtotal),
+            subtotalAmount = parseFloat(cartData().subtotalAmount);
+
+        if (quoteSubtotal !== subtotalAmount) {
+            customerData.reload(['cart'], false);
+        }
+    }, this);
 
     return {
         totals: quote.totals,

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

@@ -94,17 +94,17 @@ define([
                 this.isLoading(addToCartCalls > 0);
                 sidebarInitialized = false;
                 this.update(updatedCart);
+
+                if (cartData()['website_id'] !== window.checkout.websiteId) {
+                    customerData.reload(['cart'], false);
+                }
                 initSidebar();
             }, this);
             $('[data-block="minicart"]').on('contentLoading', function () {
                 addToCartCalls++;
                 self.isLoading(true);
             });
 
-            if (cartData()['website_id'] !== window.checkout.websiteId) {
-                customerData.reload(['cart'], false);
-            }
-
             return this._super();
         },
         isLoading: ko.observable(false),

app/code/Magento/CmsUrlRewrite/etc/adminhtml/di.xml renamed to app/code/Magento/CmsUrlRewrite/etc/di.xml

@@ -232,9 +232,11 @@ define([
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 
-                if (_.isEmpty(countryData())) {
-                    customerData.reload(['directory-data'], false);
-                }
+                countryData.subscribe(function () {
+                    if (_.isEmpty(countryData())) {
+                        customerData.reload(['directory-data'], false);
+                    }
+                }, this);
             }
         },
 

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -350,15 +350,21 @@ protected function initAreas()
     protected function addNavigationBlock()
     {
         $pageLayout = $this->component->getContext()->getPageLayout();
+
+        $navName = 'tabs_nav';
+        if ($pageLayout->hasElement($navName)) {
+            $navName = $this->component->getName() . '_tabs_nav';
+        }
+
         /** @var \Magento\Ui\Component\Layout\Tabs\Nav $navBlock */
         if (isset($this->navContainerName)) {
             $navBlock = $pageLayout->addBlock(
                 \Magento\Ui\Component\Layout\Tabs\Nav::class,
-                'tabs_nav',
+                $navName,
                 $this->navContainerName
             );
         } else {
-            $navBlock = $pageLayout->addBlock(\Magento\Ui\Component\Layout\Tabs\Nav::class, 'tabs_nav', 'content');
+            $navBlock = $pageLayout->addBlock(\Magento\Ui\Component\Layout\Tabs\Nav::class, $navName, 'content');
         }
         $navBlock->setTemplate('Magento_Ui::layout/tabs/nav/default.phtml');
         $navBlock->setData('data_scope', $this->namespace);