Skip to content

Custom default sort direction #200

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

Closed
ezra-obiwale wants to merge 4 commits into from
Closed

Custom default sort direction #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4008c80
Custom default sort direction
ezra-obiwale May 20, 2022
9783640
Adds test
ezra-obiwale May 20, 2022
374da5f
Uses query parameter for direction change
ezra-obiwale Jul 6, 2022
e070b51
Updates test
ezra-obiwale Jul 6, 2022
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
9 changes: 5 additions & 4 deletions src/ColumnSortable/SortableLink.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class SortableLink
{

/**
/**
* @param array $parameters
*
* @return string
Expand All @@ -29,7 +29,7 @@ public static function render(array $parameters)
request()->merge([$mergeTitleAs => $title]);
}

list($icon, $direction) = self::determineDirection($sortColumn, $sortParameter);
list($icon, $direction) = self::determineDirection($sortColumn, $sortParameter, $queryParameters);

$trailingTag = self::formTrailingTag($icon);

Expand Down Expand Up @@ -122,10 +122,11 @@ private static function applyFormatting($title, $sortColumn)
/**
* @param $sortColumn
* @param $sortParameter
* @param $queryParameters
*
* @return array
*/
private static function determineDirection($sortColumn, $sortParameter)
private static function determineDirection($sortColumn, $sortParameter, $queryParameters)
{
$icon = self::selectIcon($sortColumn);

Expand All @@ -137,7 +138,7 @@ private static function determineDirection($sortColumn, $sortParameter)
return [$icon, $direction];
} else {
$icon = config('columnsortable.sortable_icon');
$direction = config('columnsortable.default_direction_unsorted', 'asc');
$direction = $queryParameters['direction'] ?? config('columnsortable.default_direction_unsorted', 'asc');

return [$icon, $direction];
}
Expand Down
8 changes: 8 additions & 0 deletions tests/SortableLinkTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ public function testCustomHrefAttribute()

$this->assertSame('<a href="http://localhost/custom-path?a=b&sort=column&direction=asc" c="d">ColumnTitle</a> <i class="fa fa-sort"></i>', $link);
}


public function testCustomHrefWithCustomSortDirectionAttribute()
{
$link = SortableLink::render(['column', 'ColumnTitle', ['a' => 'b', 'direction' => 'desc'], ['c' => 'd', 'href' => 'http://localhost/custom-path']]);

$this->assertSame('<a href="http://localhost/custom-path?a=b&direction=desc&sort=column" c="d">ColumnTitle</a> <i class="fa fa-sort"></i>', $link);
}


public function testParseParameters()
Expand Down