Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90789

Author: OlgaVasyltsun

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

@@ -172,8 +172,10 @@ private function getExistingPrices(array $skus, $groupBySku = false)
         $rawPrices = $this->tierPricePersistence->get($ids);
         $prices = [];
 
+        $linkField = $this->tierPricePersistence->getEntityLinkField();
+        $skuByIdLookup = $this->buildSkuByIdLookup($skus);
         foreach ($rawPrices as $rawPrice) {
-            $sku = $this->retrieveSkuById($rawPrice[$this->tierPricePersistence->getEntityLinkField()], $skus);
+            $sku = $skuByIdLookup[$rawPrice[$linkField]];
             $price = $this->tierPriceFactory->create($rawPrice, $sku);
             if ($groupBySku) {
                 $prices[$sku][] = $price;
@@ -300,21 +302,21 @@ private function isCorrectPriceValue(array $existingPrice, array $price)
     }
 
     /**
-     * Retrieve SKU by product ID.
+     * Generate lookup to retrieve SKU by product ID.
      *
-     * @param int $id
      * @param array $skus
-     * @return string|null
+     * @return array
      */
-    private function retrieveSkuById($id, $skus)
+    private function buildSkuByIdLookup($skus)
     {
+        $lookup = [];
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $sku => $ids) {
-            if (isset($ids[$id])) {
-                return $sku;
+            foreach (array_keys($ids) as $id) {
+                $lookup[$id] = $sku;
             }
         }
 
-        return null;
+        return $lookup;
     }
 
     /**

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -162,6 +162,7 @@ private function getCategoryAsArray($category, $currentCategory, $isParentActive
             'url' => $this->catalogCategory->getCategoryUrl($category),
             'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
             'is_active' => $category->getId() == $currentCategory->getId(),
+            'is_category' => true,
             'is_parent_active' => $isParentActive
         ];
     }

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries()
 
         $expectedResult = [
             [
-                'value_id' => 5,
                 'value_id' => 5,
                 "label" => "new_label_text",
                 'file' => 'filename1',

app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js

@@ -16,6 +16,7 @@ define([
                 categoryUrlSuffix: '',
                 useCategoryPathInUrl: false,
                 product: '',
+                categoryItemSelector: '.category-item',
                 menuContainer: '[data-action="navigation"] > ul'
             },
 
@@ -163,7 +164,10 @@ define([
                     categoryMenuItem = null;
 
                 if (categoryUrl && menu.length) {
-                    categoryMenuItem = menu.find('a[href="' + categoryUrl + '"]');
+                    categoryMenuItem = menu.find(
+                        this.options.categoryItemSelector +
+                        ' > a[href="' + categoryUrl + '"]'
+                    );
                 }
 
                 return categoryMenuItem;

app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php

@@ -174,7 +174,7 @@ private function buildFooter(array $footer)
      * correct HTML format.
      *
      * @param string $content
-     * @returns string
+     * @return string
      */
     private function formatContentWithLinks($content)
     {

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -309,6 +309,10 @@ protected function _getMenuItemClasses(\Magento\Framework\Data\Tree\Node $item)
         $classes[] = 'level' . $item->getLevel();
         $classes[] = $item->getPositionClass();
 
+        if ($item->getIsCategory()) {
+            $classes[] = 'category-item';
+        }
+
         if ($item->getIsFirst()) {
             $classes[] = 'first';
         }

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -721,6 +721,8 @@ define([
          * @param {Number} page - current page
          */
         changePage: function (page) {
+            this.clear();
+
             if (page === 1 && !this.recordData().length) {
                 return false;
             }
@@ -762,15 +764,13 @@ define([
          * Change page to next
          */
         nextPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() + 1);
         },
 
         /**
          * Change page to previous
          */
         previousPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() - 1);
         },
 

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js

@@ -18,7 +18,11 @@ define([
             'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push'])
         },
         defaultContext = require.s.contexts._,
-        menuItem = $('<li class="level0"><a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a></li>')[0],
+        menuItem = $(
+            '<li class="level0 category-item">' +
+            '<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>' +
+            '</li>'
+        )[0],
 
         /**
          * Create context object.