MC-16244: CMS Block don't show on category page with Display Mode CMS Block only

Author: zakdma

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php

@@ -79,7 +79,7 @@ public function resolve(): SearchCriteria
         $this->builder->setPageSize($this->size);
         $searchCriteria = $this->builder->create();
         $searchCriteria->setRequestName($this->searchRequestName);
-        $searchCriteria->setSortOrders(array_merge(['relevance' => 'DESC'], $this->orders ?: []));
+        $searchCriteria->setSortOrders($this->orders);
         $searchCriteria->setCurrentPage($this->currentPage - 1);
 
         return $searchCriteria;

app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverTest.php

@@ -35,10 +35,10 @@ protected function setUp()
 
     /**
      * @param array|null $orders
-     * @param array $expected
+     * @param array|null $expected
      * @dataProvider resolveSortOrderDataProvider
      */
-    public function testResolve($orders, array $expected)
+    public function testResolve($orders, $expected)
     {
         $searchRequestName = 'test';
         $currentPage = 1;
@@ -93,11 +93,11 @@ public function resolveSortOrderDataProvider()
         return [
             [
                 null,
-                ['relevance' => 'DESC'],
+                null,
             ],
             [
                 ['test' => 'ASC'],
-                ['relevance' => 'DESC', 'test' => 'ASC'],
+                ['test' => 'ASC'],
             ],
         ];
     }