diff --git a/src/Http/Controllers/ModuleControlController.php b/src/Http/Controllers/ModuleControlController.php index c3b4bdd..ce87891 100644 --- a/src/Http/Controllers/ModuleControlController.php +++ b/src/Http/Controllers/ModuleControlController.php @@ -4,7 +4,9 @@ namespace mpba\Modules\Http\Controllers; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Routing\Controller; +use Illuminate\Support\Str; use Illuminate\View\View; use mpba\Modules\Support\DatabaseModuleRegistry; @@ -14,10 +16,47 @@ class ModuleControlController extends Controller protected DatabaseModuleRegistry $registry, ) {} - public function index(): View + public function index(Request $request): View { + $search = trim((string) $request->query('search', '')); + $perPage = 4; + $page = max(1, (int) $request->query('page', 1)); + + $allModules = $this->registry->all(); + + $filteredModules = $search === '' + ? $allModules + : $allModules->filter(function (array $module) use ($search): bool { + $haystack = implode(' ', array_filter([ + $module['name'] ?? null, + $module['alias'] ?? null, + $module['description'] ?? null, + $module['disk_description'] ?? null, + $module['version'] ?? null, + $module['database_version'] ?? null, + $module['disk_version'] ?? null, + $module['path'] ?? null, + ])); + + return Str::contains(Str::lower($haystack), Str::lower($search)); + })->values(); + + $modules = new LengthAwarePaginator( + $filteredModules->forPage($page, $perPage)->values(), + $filteredModules->count(), + $perPage, + $page, + [ + 'path' => $request->url(), + 'query' => $request->query(), + ] + ); + return view('modules-control::index', [ - 'modules' => $this->registry->all(), + 'modules' => $modules, + 'allModules' => $allModules, + 'filteredCount' => $filteredModules->count(), + 'search' => $search, ]); } diff --git a/src/resources/views/index.blade.php b/src/resources/views/index.blade.php index a7722ae..5bf9cd6 100644 --- a/src/resources/views/index.blade.php +++ b/src/resources/views/index.blade.php @@ -6,8 +6,8 @@ /> @php - $enabledCount = $modules->where('enabled', true)->count(); - $disabledCount = $modules->count() - $enabledCount; + $enabledCount = $allModules->where('enabled', true)->count(); + $disabledCount = $allModules->count() - $enabledCount; @endphp
@@ -20,7 +20,7 @@
Installed
-
{{ $modules->count() }}
+
{{ $allModules->count() }}
@@ -34,20 +34,52 @@
-
+

Installed modules

- Enabled state, sort order, and custom descriptions are stored only in the database. + Enabled state, sort order, custom descriptions, and version numbers are stored only in the database.

-
- @csrf - -
+
+
+ + + + @if ($search !== '') + + Clear + + @endif +
+ +
+ @csrf + +
+
+
+ +
+
+ Showing {{ $modules->firstItem() ?? 0 }}-{{ $modules->lastItem() ?? 0 }} of {{ $modules->total() }} modules. + @if ($search !== '') + Search: {{ $search }} + @endif +
+
4 modules per page
@@ -148,5 +180,11 @@
@endforelse
+ + @if ($modules->hasPages()) +
+ {{ $modules->links() }} +
+ @endif