Skip to content

Fix grid sorting bc break #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoResponseMate merged 1 commit into from
May 26, 2025
Merged

Fix grid sorting bc break #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Component/Configuration/GridConfigurationSortingHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public function handle(array $gridConfiguration): array
foreach ($gridConfiguration['sorting'] as $sorting => $order) {
Assert::keyExists($gridConfiguration['fields'] ?? [], $sorting);

if (isset($gridConfiguration['fields'][$sorting]['sortable'])) {
continue;
}

$gridConfiguration['fields'][$sorting]['sortable'] = true;
}
Comment on lines 26 to 34

@Florian-Merle Florian-Merle Apr 21, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if using isset here is the right solution.

Looking at the tests, I had to update the line for the author because its sortable value was originally being changed from false to true. However, with these changes, that no longer happens.

Maybe the value should be set to true if it's either not set or currently false.

@loic425 loic425 Apr 25, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe should we throw an error that indicates the field is not sortable.


Expand Down
8 changes: 6 additions & 2 deletions src/Component/Tests/Unit/Configuration/GridConfigurationSortingHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,28 @@ public function testHandle(): void
'title' => [],
'author' => ['sortable' => false],
'price' => ['sortable' => true],
'name' => ['sortable' => 'translation.name'],
],
'sorting' => [
'title' => 'asc',
'author' => 'asc',
'price' => 'asc',
'name' => 'asc',
],
];

$this->assertEquals([
$this->assertSame([
'fields' => [
'title' => ['sortable' => true],
'author' => ['sortable' => true],
'author' => ['sortable' => false],
'price' => ['sortable' => true],
'name' => ['sortable' => 'translation.name'],
],
'sorting' => [
'title' => 'asc',
'author' => 'asc',
'price' => 'asc',
'name' => 'asc',
],
], (new GridConfigurationSortingHandler())->handle($gridConfiguration));
}
Expand Down