tonyair/silverstripe-gridfieldextensions
1
0
Fork 0
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git synced 2024-10-22 17:05:39 +02:00
Code Issues Projects Releases Wiki Activity

FIX Use DataList::orderBy() (#353)

Browse Source
This commit is contained in:
Steve Boyd 2023-01-18 14:00:38 +13:00 committed by GitHub
parent b1fc5ff52c
commit fd24736b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/GridFieldOrderableRows.php
View File

@ -403,7 +403,11 @@ class GridFieldOrderableRows extends RequestHandler implements
} }
} }
return $list->sort($sortterm); if ($list instanceof DataList) {
return $list->orderBy($sortterm);
} elseif (method_exists($list, 'sort')) {
return $list->sort($sortterm);
}
} }
return $list; return $list;
@ -577,7 +581,7 @@ class GridFieldOrderableRows extends RequestHandler implements
} }
$list = $grid->getList(); $list = $grid->getList();
$sortterm .= '"'.$this->getSortTable($list).'"."'.$sortField.'"'; $sortterm .= '"'.$this->getSortTable($list).'"."'.$sortField.'"';
$items = $list->filter('ID', $sortedIDs)->sort($sortterm); $items = $list->filter('ID', $sortedIDs)->orderBy($sortterm);
// Ensure that each provided ID corresponded to an actual object. // Ensure that each provided ID corresponded to an actual object.
if (count($items ?? []) != count($sortedIDs ?? [])) { if (count($items ?? []) != count($sortedIDs ?? [])) {

87
tests/GridFieldOrderableRowsTest.php
View File

@ -6,6 +6,7 @@ use ReflectionMethod;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor; use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use Symbiote\GridFieldExtensions\GridFieldOrderableRows; use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
use Symbiote\GridFieldExtensions\Tests\Stub\PolymorphM2MMapper; use Symbiote\GridFieldExtensions\Tests\Stub\PolymorphM2MMapper;
@ -312,29 +313,12 @@ class GridFieldOrderableRowsTest extends SapphireTest
$this->assertTrue($differenceFound); $this->assertTrue($differenceFound);
} }
public function testGetManipulatedDataWithoutDefaultSort() /**
* @dataProvider provideGetManipulatedData
*/
public function testGetManipulatedData(string $dataClass, string $listClass, array $data, array $expected)
{ {
$sortedList = $this->getTitleSortedListForManipuatedData(TitleObject::class, [ $list = $listClass == DataList::class ? new DataList($dataClass) : new ArrayList();
['Title' => 'C'],
['Title' => 'A'],
['Title' => 'B'],
]);
$this->assertSame(['A', 'B', 'C'], $sortedList->column('Title'));
}
public function testGetManipulatedDataWithDefaultSort()
{
$sortedList = $this->getTitleSortedListForManipuatedData(TitleSortedObject::class, [
['Title' => 'Z', 'Iden' => 'C', 'DefaultSort' => 3],
['Title' => 'Z', 'Iden' => 'A', 'DefaultSort' => 2],
['Title' => 'Z', 'Iden' => 'B', 'DefaultSort' => 1],
]);
$this->assertSame(['B', 'A', 'C'], $sortedList->column('Iden'));
}
private function getTitleSortedListForManipuatedData(string $dataClass, array $data): DataList
{
$list = new DataList($dataClass);
foreach ($data as $values) { foreach ($data as $values) {
$item = new $dataClass(); $item = new $dataClass();
$item->update($values); $item->update($values);
@ -346,6 +330,63 @@ class GridFieldOrderableRowsTest extends SapphireTest
$config->addComponent($orderable); $config->addComponent($orderable);
$grid = new GridField('MyName', 'MyTitle', $list, $config); $grid = new GridField('MyName', 'MyTitle', $list, $config);
$sortedList = $orderable->getManipulatedData($grid, $list); $sortedList = $orderable->getManipulatedData($grid, $list);
return $sortedList; $col = $dataClass === TitleObject::class ? 'Title' : 'Iden';
$this->assertSame($expected, $sortedList->column($col));
}
public function provideGetManipulatedData(): array
{
return [
[
TitleObject::class,
ArrayList::class,
[
['Title' => 'C'],
['Title' => 'A'],
['Title' => 'B']
],
['A', 'B', 'C']
],
[
TitleObject::class,
DataList::class,
[
['Title' => 'C'],
['Title' => 'A'],
['Title' => 'B'],
],
['A', 'B', 'C']
],
[
TitleSortedObject::class,
ArrayList::class,
[
['Title' => '1', 'Iden' => 'C'],
['Title' => '2', 'Iden' => 'A'],
['Title' => '3', 'Iden' => 'B'],
],
['C', 'A', 'B']
],
[
TitleSortedObject::class,
DataList::class,
[
['Title' => '1', 'Iden' => 'C'],
['Title' => '2', 'Iden' => 'A'],
['Title' => '3', 'Iden' => 'B'],
],
['C', 'A', 'B']
],
[
TitleSortedObject::class,
DataList::class,
[
['Title' => 'Z', 'Iden' => 'C', 'DefaultSort' => 3],
['Title' => 'Z', 'Iden' => 'A', 'DefaultSort' => 2],
['Title' => 'Z', 'Iden' => 'B', 'DefaultSort' => 1],
],
['B', 'A', 'C']
],
];
} }
} }