Datagrid default order now uses the native SortDirection enum (#4840)

Author: henzigo

src/Component/Datagrid/Datagrid.php

@@ -13,10 +13,12 @@
 use Shopsys\AdministrationBundle\Component\Datagrid\Adapter\AdapterInterface;
 use Shopsys\AdministrationBundle\Component\Datagrid\Adapter\EntityClassAwareAdapterInterface;
 use Shopsys\AdministrationBundle\Component\Datagrid\Field\FieldDescriptor;
+use Shopsys\FrameworkBundle\Component\Grid\DataSourceInterface;
 use Shopsys\FrameworkBundle\Component\Grid\GridFactory;
 use Shopsys\FrameworkBundle\Component\Grid\GridView;
 use Shopsys\FrameworkBundle\Component\Grid\Ordering\Exception\EntityIsNotOrderableException;
 use Shopsys\FrameworkBundle\Component\Grid\Ordering\OrderableEntityInterface;
+use SortDirection;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -45,7 +47,7 @@ final class Datagrid
     private array $fieldsOrder = [];
 
     /**
-     * @var array{field: string, order: \Shopsys\AdministrationBundle\Component\Datagrid\OrderingEnum}|null
+     * @var array{field: string, order: \SortDirection}|null
      */
     private ?array $defaultOrder = null;
 
@@ -116,7 +118,7 @@ public function setPagination(bool $pagination): self
     /**
      * Set default order of datagrid
      */
-    public function setDefaultOrder(string $field, OrderingEnum $order): self
+    public function setDefaultOrder(string $field, SortDirection $order): self
     {
         if ($this->dragAndDropEntityClass !== null) {
             throw new InvalidArgumentException(
@@ -164,7 +166,7 @@ public function enableDragAndDrop(string $field): self
         $this->dragAndDropEntityClass = $entityClass;
         $this->defaultOrder = [
             'field' => $field,
-            'order' => OrderingEnum::ASC,
+            'order' => SortDirection::Ascending,
         ];
 
         return $this;
@@ -303,7 +305,13 @@ public function createView(): GridView
         }
 
         if ($this->dragAndDropEntityClass === null && $this->defaultOrder !== null) {
-            $grid->setDefaultOrder($this->defaultOrder['field'], $this->defaultOrder['order']->value);
+            $grid->setDefaultOrder(
+                $this->defaultOrder['field'],
+                match ($this->defaultOrder['order']) {
+                    SortDirection::Ascending => DataSourceInterface::ORDER_ASC,
+                    SortDirection::Descending => DataSourceInterface::ORDER_DESC,
+                },
+            );
         }
 
         if (count($this->fieldsOrder) > 0) {

src/Component/Datagrid/OrderingEnum.php

@@ -9,7 +9,6 @@
 use Shopsys\AdministrationBundle\Component\Config\CrudConfig;
 use Shopsys\AdministrationBundle\Component\Crud\Form\CrudFormConfigurator;
 use Shopsys\AdministrationBundle\Component\Datagrid\Datagrid;
-use Shopsys\AdministrationBundle\Component\Datagrid\OrderingEnum;
 use Shopsys\AdministrationBundle\Model\Blog\Author\BlogArticleAuthorCrudHandler;
 use Shopsys\FrameworkBundle\Component\Grid\DataSourceInterface;
 use Shopsys\FrameworkBundle\Component\Grid\Grid;
@@ -22,6 +21,7 @@
 use Shopsys\FrameworkBundle\Model\Blog\Article\BlogArticleRepository;
 use Shopsys\FrameworkBundle\Model\Blog\Author\BlogArticleAuthor;
 use Shopsys\FrameworkBundle\Model\Localization\Localization;
+use SortDirection;
 
 #[CrudController(BlogArticleAuthor::class)]
 #[ForRole(AdminRoleConstant::ROLE_BLOG_ARTICLE_AUTHOR)]
@@ -52,7 +52,7 @@ protected function configureDatagrid(Datagrid $datagrid): void
             'label' => t('Name'),
         ]);
 
-        $datagrid->setDefaultOrder('name', OrderingEnum::ASC);
+        $datagrid->setDefaultOrder('name', SortDirection::Ascending);
     }
 
     #[Override]