NOW MANAGED ON CODEBERG
Sorting: Extracted URL sort helper to own class
Dan Brown5b0cb3dd506c
diff --git a/app/Activity/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.phpindex 641106d7f..66ca30197 100644--- a/app/Activity/Controllers/AuditLogController.php+++ b/app/Activity/Controllers/AuditLogController.php@@ -5,6 +5,7 @@ namespace BookStack\Activity\Controllers;use BookStack\Activity\ActivityType;use BookStack\Activity\Models\Activity;use BookStack\Http\Controller;+use BookStack\Sorting\SortUrl;use BookStack\Util\SimpleListOptions;use Illuminate\Http\Request;@@ -65,6 +66,7 @@ class AuditLogController extends Controller'filters' => $filters,'listOptions' => $listOptions,'activityTypes' => $types,+ 'filterSortUrl' => new SortUrl('settings/audit', array_filter($request->except('page')))]);}}diff --git a/app/App/helpers.php b/app/App/helpers.phpindex 941c267d6..204b3f06a 100644--- a/app/App/helpers.php+++ b/app/App/helpers.php@@ -96,35 +96,3 @@ function theme_path(string $path = ''): ?stringreturn base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));}--/**- * Generate a URL with multiple parameters for sorting purposes.- * Works out the logic to set the correct sorting direction- * Discards empty parameters and allows overriding.- */-function sortUrl(string $path, array $data, array $overrideData = []): string-{- $queryStringSections = [];- $queryData = array_merge($data, $overrideData);-- // Change sorting direction is already sorted on current attribute- if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {- $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';- } elseif (isset($overrideData['sort'])) {- $queryData['order'] = 'asc';- }-- foreach ($queryData as $name => $value) {- $trimmedVal = trim($value);- if ($trimmedVal === '') {- continue;- }- $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);- }-- if (count($queryStringSections) === 0) {- return url($path);- }-- return url($path . '?' . implode('&', $queryStringSections));-}diff --git a/app/Sorting/SortUrl.php b/app/Sorting/SortUrl.phpnew file mode 100644index 000000000..f01df2c36--- /dev/null+++ b/app/Sorting/SortUrl.php@@ -0,0 +1,49 @@+<?php++namespace BookStack\Sorting;++/**+ * Generate a URL with multiple parameters for sorting purposes.+ * Works out the logic to set the correct sorting direction+ * Discards empty parameters and allows overriding.+ */+class SortUrl+{+ public function __construct(+ protected string $path,+ protected array $data,+ protected array $overrideData = []+ ) {+ }++ public function withOverrideData(array $overrideData = []): self+ {+ return new self($this->path, $this->data, $overrideData);+ }++ public function build(): string+ {+ $queryStringSections = [];+ $queryData = array_merge($this->data, $this->overrideData);++ // Change sorting direction if already sorted on current attribute+ if (isset($this->overrideData['sort']) && $this->overrideData['sort'] === $this->data['sort']) {+ $queryData['order'] = ($this->data['order'] === 'asc') ? 'desc' : 'asc';+ } elseif (isset($this->overrideData['sort'])) {+ $queryData['order'] = 'asc';+ }++ foreach ($queryData as $name => $value) {+ $trimmedVal = trim($value);+ if ($trimmedVal !== '') {+ $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);+ }+ }++ if (count($queryStringSections) === 0) {+ return url($this->path);+ }++ return url($this->path . '?' . implode('&', $queryStringSections));+ }+}diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.phpindex 28cdeb8a5..8e4776680 100644--- a/resources/views/settings/audit.blade.php+++ b/resources/views/settings/audit.blade.php@@ -26,11 +26,11 @@class="input-base text-left">{{ $filters['event'] ?: trans('settings.audit_event_filter_no_filter') }}</button><ul refs="dropdown@menu" class="dropdown-menu"><li @if($filters['event'] === '') class="active" @endif><a- href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => '']) }}"+ href="{{ $filterSortUrl->withOverrideData(['event' => ''])->build() }}"class="text-item">{{ trans('settings.audit_event_filter_no_filter') }}</a></li>@foreach($activityTypes as $type)<li @if($type === $filters['event']) class="active" @endif><a- href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => $type]) }}"+ href="{{ $filterSortUrl->withOverrideData(['event' => $type])->build() }}"class="text-item">{{ $type }}</a></li>@endforeach</ul>