Remove the position from the filter and replaced it with Entity Id

Author: dnyomo

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -101,7 +101,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
         }
 
         if (!$searchCriteria->getSortOrders()) {
-            $this->addDefaultSortOrder($searchCriteria, $isSearch);
+            $this->addDefaultSortOrder($searchCriteria, $args, $isSearch);
         }
 
         $this->addEntityIdSort($searchCriteria, $isSearch);
@@ -199,18 +199,28 @@ private function addFilter(
      * Sort by relevance DESC by default
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $args
      * @param bool $isSearch
      */
-    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, $isSearch = false): void
+    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, array $args, $isSearch = false): void
     {
-        $sortField = $isSearch ? 'relevance' : EavAttributeInterface::POSITION;
-        $sortDirection = $isSearch ? SortOrder::SORT_DESC : SortOrder::SORT_ASC;
-        $defaultSortOrder = $this->sortOrderBuilder
-            ->setField($sortField)
-            ->setDirection($sortDirection)
-            ->create();
+        $defaultSortOrder = [];
+        if ($isSearch) {
+            $defaultSortOrder[] = $this->sortOrderBuilder
+                ->setField('relevance')
+                ->setDirection(SortOrder::SORT_DESC)
+                ->create();
+        } else {
+            $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
+            if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                $defaultSortOrder[] = $this->sortOrderBuilder
+                    ->setField(EavAttributeInterface::POSITION)
+                    ->setDirection(SortOrder::SORT_ASC)
+                    ->create();
+            }
+        }
 
-        $searchCriteria->setSortOrders([$defaultSortOrder]);
+        $searchCriteria->setSortOrders($defaultSortOrder);
     }
 
     /**

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php

@@ -20,6 +20,7 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Exception\InputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
@@ -151,23 +152,26 @@ private function getSearchResultsApplier(
      * @param SearchCriteriaInterface $searchCriteria
      * @param array $args
      * @return array
+     * @throws InputException
      */
     private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
     {
         $ordersArray = [];
         $sortOrders = $searchCriteria->getSortOrders();
         if (is_array($sortOrders)) {
             foreach ($sortOrders as $sortOrder) {
-                if ($sortOrder->getField() !== '_id') {
-                    if ($sortOrder->getField() == EavAttributeInterface::POSITION) {
-                        if (isset($args['sort'][EavAttributeInterface::POSITION])) {
-                            $sortOrder->setDirection($args['sort'][EavAttributeInterface::POSITION]);
-                        } else {
-                            $sortOrder->setDirection(SortOrder::SORT_DESC);
-                        }
+                if ($sortOrder->getField() === '_id') {
+                    $sortOrder->setField('entity_id');
+                    $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
+                    if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                        $sortOrder->setDirection(SortOrder::SORT_ASC);
                     }
-                    $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
                 }
+                $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
+            }
+            if (isset($ordersArray[EavAttributeInterface::POSITION])) {
+                $ordersArray['entity_id'] = $ordersArray[EavAttributeInterface::POSITION];
+                unset($ordersArray[EavAttributeInterface::POSITION]);
             }
         }