Skip to content
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

FIX Include default_sort in sortChildren method #1282

Merged
merged 1 commit into from
Jul 26, 2022
Merged

FIX Include default_sort in sortChildren method #1282

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
58 changes: 39 additions & 19 deletions code/GraphQL/Resolvers/FolderTypeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use InvalidArgumentException;
use Exception;
use Closure;
use SilverStripe\ORM\DataQuery;

class FolderTypeResolver
{
Expand Down Expand Up @@ -130,35 +131,54 @@ public static function resolveFolderParents($object, array $args, $context, Reso
public static function sortChildren(array $context): Closure
{
$fieldName = $context['fieldName'];
return function (?Sortable $list, array $args) use ($fieldName) {
return function (?DataList $list, array $args) use ($fieldName) {
if ($list === null) {
return null;
}

$sortArgs = $args[$fieldName] ?? [];

// ensure that folders appear first
$className = DB::get_conn()->quoteString(Folder::class);
$classNameField = "(CASE WHEN \"ClassName\"={$className} THEN 1 ELSE 0 END)";
$sortArgs = array_merge([$classNameField => 'DESC'], $sortArgs);
$list = $list->alterDataQuery(static function (DataQuery $dataQuery) use ($sortArgs) {
$query = $dataQuery->query();
$existingOrderBys = [];
foreach ($query->getOrderBy() as $field => $direction) {
if (strpos($field, '.') === false) {
// some fields may be surrogates added by extending augmentSQL
// we have to preserve those expressions rather than auto-generated names
// that SQLSelect::addOrderBy leaves for them (e.g. _SortColumn0)
$field = $query->expressionForField(trim($field, '"')) ?: $field;
}
$existingOrderBys[$field] = $direction;
}

// Folders always go first
$dataQuery->sort(
sprintf(
'(CASE WHEN "ClassName"=%s THEN 1 ELSE 0 END)',
DB::get_conn()->quoteString(Folder::class)
),
'DESC',
true
);

$sort = [];
foreach ($sortArgs as $field => $dir) {
if ($field == $classNameField) {
$normalised = $classNameField;
} else {
foreach ($sortArgs as $field => $dir) {
$normalised = FieldAccessor::singleton()->normaliseField(File::singleton(), $field);
Schema::invariant(
$normalised,
'Could not find field %s on %s',
$field,
File::class
);
$dataQuery->sort($field, $dir, false);
}

// respect default_sort
foreach ($existingOrderBys as $field => $dir) {
$dataQuery->sort($field, $dir, false);
}
Schema::invariant(
$normalised,
'Could not find field %s on %s',
$field,
File::class
);
$sort[$normalised] = $dir;
}
$list = $list->sort($sort);

return $dataQuery;
});
return $list;
};
}
Expand Down