🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento/magento2#13468: [2.3] Fix Sort by Product Name (by @ihor-sviziev)
 - magento/magento2#13437: [2.3] Add fallback for product links position attribute (by @ihor-sviziev)
 - magento/magento2#13351: [2.3] Update the Emogrifier dependency to ^2.0.0 (by @oliverklee)

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php

@@ -31,6 +31,7 @@ class SaveHandler
     private $linkResource;
 
     /**
+     * SaveHandler constructor.
      * @param MetadataPool $metadataPool
      * @param Link $linkResource
      * @param ProductLinkRepositoryInterface $productLinkRepository
@@ -55,17 +56,50 @@ public function execute($entityType, $entity)
     {
         $link = $entity->getData($this->metadataPool->getMetadata($entityType)->getLinkField());
         if ($this->linkResource->hasProductLinks($link)) {
-            /** @var \Magento\Catalog\Api\Data\ProductInterface $entity*/
+            /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
             foreach ($this->productLinkRepository->getList($entity) as $link) {
                 $this->productLinkRepository->delete($link);
             }
         }
-        $productLinks = $entity->getProductLinks();
+
+        // Build links per type
+        $linksByType = [];
+        foreach ($entity->getProductLinks() as $link) {
+            $linksByType[$link->getLinkType()][] = $link;
+        }
+
+        // Set array position as a fallback position if necessary
+        foreach ($linksByType as $linkType => $links) {
+            if (!$this->hasPosition($links)) {
+                array_walk($linksByType[$linkType], function ($productLink, $position) {
+                    $productLink->setPosition(++$position);
+                });
+            }
+        }
+
+        // Flatten multi-dimensional linksByType in ProductLinks
+        $productLinks = array_reduce($linksByType, 'array_merge', []);
+
         if (count($productLinks) > 0) {
             foreach ($entity->getProductLinks() as $link) {
                 $this->productLinkRepository->save($link);
             }
         }
         return $entity;
     }
+
+    /**
+     * Check if at least one link without position
+     * @param array $links
+     * @return bool
+     */
+    private function hasPosition(array $links)
+    {
+        foreach ($links as $link) {
+            if (!array_key_exists('position', $link->getData())) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -366,15 +366,21 @@ protected function _renderFiltersBefore()
                 'search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
             );
         }
+        return parent::_renderFiltersBefore();
+    }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _beforeLoad()
+    {
         /*
          * This order is required to force search results be the same
          * for the same requests and products with the same relevance
          * NOTE: this does not replace existing orders but ADDs one more
          */
         $this->setOrder('entity_id');
-
-        return parent::_renderFiltersBefore();
+        return parent::_beforeLoad();
     }
 
     /**

composer.json

@@ -41,7 +41,7 @@
         "magento/zendframework1": "~1.13.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
-        "pelago/emogrifier": "1.2.0",
+        "pelago/emogrifier": "^2.0.0",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "3.6.1",
         "sjparkinson/static-review": "~4.1",