bug #223 [Sorting] Allow for sorting on disabled, declared fields (to…

… preserve bc) (lchrusciel) This PR was merged into the 1.10 branch. Discussion ---------- Commits ------- 15dd9c1 [Sorting] Allow for sorting on disabled, declared fields (to preserve bc)
Sylius · Mar 15, 2022 · f567be2 · f567be2
2 parents 52df113 + 15dd9c1
commit f567be2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/src/Bundle/Tests/Functional/SortingTest.php b/src/Bundle/Tests/Functional/SortingTest.php
@@ -45,6 +45,14 @@ public function it_returns_correct_amount_of_sorted_authors_by_book_title_with_u
         self::assertCount(10, $this->getItemsFromCurrentResponse());
     }
 
+    /** @test */
+    public function it_allows_for_sorting_by_disabled_field(): void
+    {
+        $this->client->request('GET', '/authors/?sorting[id]=asc');
+
+        self::assertCount(10, $this->getItemsFromCurrentResponse());
+    }
+
     private function getItemsFromCurrentResponse(): array
     {
         return json_decode($this->client->getResponse()->getContent(), true)['_embedded']['items'];

diff --git a/src/Bundle/test/config/db.sql b/src/Bundle/test/config/db.sql
diff --git a/src/Bundle/test/config/sylius/grids.yaml b/src/Bundle/test/config/sylius/grids.yaml
@@ -61,6 +61,11 @@ sylius_grid:
             sorting:
                 name: asc
             fields:
+                id:
+                    type: string
+                    label: ID
+                    sortable: ~
+                    enabled: false
                 name:
                     type: string
                     label: Name

diff --git a/src/Component/Sorting/Sorter.php b/src/Component/Sorting/Sorter.php
@@ -35,7 +35,7 @@ public function __construct(?SortingParametersValidatorInterface $sortingValidat
 
     public function sort(DataSourceInterface $dataSource, Grid $grid, Parameters $parameters): void
     {
-        $enabledFields = $grid->getEnabledFields();
+        $enabledFields = $grid->getFields();
 
         $expressionBuilder = $dataSource->getExpressionBuilder();
 

diff --git a/src/Component/spec/Sorting/SorterSpec.php b/src/Component/spec/Sorting/SorterSpec.php
@@ -49,7 +49,7 @@ function it_sorts_the_data_source_via_expression_builder_based_on_the_grid_defin
         $dataSource->getExpressionBuilder()->willReturn($expressionBuilder);
 
         $grid->getSorting()->willReturn(['name' => 'desc']);
-        $grid->getEnabledFields()->willReturn(['name'=> $field, 'code' => $anotherField]);
+        $grid->getFields()->willReturn(['name'=> $field, 'code' => $anotherField]);
 
         $sortingValidator->validateSortingParameters(['name' => 'desc'], ['name' => $field , 'code' => $anotherField])->shouldBeCalled();
         $fieldValidator->validateFieldName('name', ['name' => $field , 'code' => $anotherField])->shouldBeCalled();
@@ -78,7 +78,7 @@ function it_sorts_the_data_source_via_expression_builder_based_on_sorting_parame
         $dataSource->getExpressionBuilder()->willReturn($expressionBuilder);
 
         $grid->getSorting()->willReturn(['code' => 'asc']);
-        $grid->getEnabledFields()->willReturn(['name' => $field , 'code' => $anotherField]);
+        $grid->getFields()->willReturn(['name' => $field , 'code' => $anotherField]);
 
         $sortingValidator->validateSortingParameters(['name' => 'asc'], ['name' => $field , 'code' => $anotherField])->shouldBeCalled();
         $fieldValidator->validateFieldName('name', ['name' => $field , 'code' => $anotherField])->shouldBeCalled();