MC-15250: Explicit product sorting in PageBuilder Products Content type

Author: eug123

app/code/Magento/PageBuilder/Model/Catalog/Sorting.php

@@ -17,7 +17,7 @@ class Sorting
      * @var array
      */
     protected $sortClasses = [
-        'default' => Sorting\DefaultSorting::class
+        'date_newest_top' => Sorting\Date\NewestTop::class
     ];
 
     /**
@@ -72,7 +72,7 @@ public function getSortingInstance($sortOption): Sorting\SortInterface
         if (isset($this->sortInstances[$sortOption])) {
             return $this->sortInstances[$sortOption];
         }
-        return $this->sortInstances['default'];
+        return $this->sortInstances['date_newest_top'];
     }
 
     /**
@@ -87,7 +87,7 @@ public function applySorting(
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
         $sortBuilder = $this->getSortingInstance($option);
-        $_collection = $sortBuilder->sort($collection->setCurPage(0));
+        $_collection = $sortBuilder->sort($collection);
 
         if ($_collection->isLoaded()) {
             $_collection->clear();

app/code/Magento/PageBuilder/Model/Catalog/Sorting/DefaultSorting.php

@@ -28,6 +28,6 @@ protected function getSortDirection()
      */
     public function getLabel(): string
     {
-        return __('Price: High to low');
+        return __('Price: high to low');
     }
 }

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price/HighToLow.php

@@ -28,6 +28,6 @@ protected function getSortDirection()
      */
     public function getLabel(): string
     {
-        return __('Price: Low to high');
+        return __('Price: low to high');
     }
 }

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price/LowToHigh.php

@@ -36,6 +36,6 @@ protected function getSortDirection()
      */
     public function getLabel(): string
     {
-        return __('SKU: Ascending');
+        return __('SKU: ascending');
     }
 }

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Sku/Ascending.php

@@ -36,6 +36,6 @@ protected function getSortDirection()
      */
     public function getLabel(): string
     {
-        return __('SKU: Descending');
+        return __('SKU: descending');
     }
 }

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Sku/Descending.php

@@ -32,6 +32,7 @@ public function sort(
 
         $baseSet = clone $collection;
         $finalSet = clone $collection;
+        $collection->setCurPage(0);
 
         $collection->joinField(
             'child_id',

app/code/Magento/PageBuilder/Model/Catalog/Sorting/StockAbstract.php

@@ -295,9 +295,9 @@ OK,OK
 "Oldest products first","Oldest products first"
 "Name: A - Z","Name: A - Z"
 "Name: Z - A","Name: Z - A"
-"Price: High to low","Price: High to low"
-"Price: Low to high","Price: Low to high"
-"SKU: Ascending","SKU: Ascending"
-"SKU: Descending","SKU: Descending"
+"Price: high to low","Price: high to low"
+"Price: low to high","Price: low to high"
+"SKU: ascending","SKU: ascending"
+"SKU: descending","SKU: descending"
 "Stock: low stock first","Stock: low stock first"
 "Stock: high stock first","Stock: high stock first"