Add {filterKey} on all web routes, fix tests

Author: dvlpp

demo/app/Providers/DemoSharpServiceProvider.php

@@ -7,6 +7,7 @@
 use App\Sharp\AppSearchEngine;
 use App\Sharp\Demo2faNotificationHandler;
 use App\Sharp\DummyGlobalFilter;
+use App\Sharp\DummyGlobalFilter2;
 use App\Sharp\SharpMenu;
 use Code16\Sharp\Config\SharpConfigBuilder;
 use Code16\Sharp\SharpAppServiceProvider;
@@ -19,6 +20,7 @@ protected function configureSharp(SharpConfigBuilder $config): void
             ->setName('Demo project')
             ->discoverEntities()
             ->addGlobalFilter(DummyGlobalFilter::class)
+            ->addGlobalFilter(DummyGlobalFilter2::class)
             ->configureUploadsThumbnailCreation(uploadModelClass: Media::class)
             ->setSharpMenu(SharpMenu::class)
             ->setThemeColor('#004c9b')

demo/app/Sharp/DummyGlobalFilter2.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Sharp;
+
+use Code16\Sharp\Filters\GlobalRequiredFilter;
+
+class DummyGlobalFilter2 extends GlobalRequiredFilter
+{
+    public function values(): array
+    {
+        return [
+            'fr' => 'Français',
+            'de' => 'Allemand',
+        ];
+    }
+
+    public function defaultValue(): mixed
+    {
+        return 'de';
+    }
+
+    public function authorize(): bool
+    {
+        return auth()->id() === 1;
+    }
+}

src/Http/Context/SharpBreadcrumb.php

@@ -319,13 +319,8 @@ protected function getSegmentsFromRequest(): Collection
                 ->values();
         }
 
-        if (request()->isMethod('GET')) {
-            // Have to skip /sharp/{filterKey}
-            return collect(request()->segments())->skip(2)->values();
-        }
-
-        // Have to skip /sharp
-        return collect(request()->segments())->skip(1)->values();
+        // Have to skip /sharp/{filterKey}
+        return collect(request()->segments())->skip(2)->values();
     }
 
     public function forceRequestSegments(array|Collection $segments): void

src/Http/Controllers/Api/DownloadController.php

@@ -6,7 +6,7 @@
 
 class DownloadController extends ApiController
 {
-    public function show(string $entityKey, ?string $instanceId = null)
+    public function show(string $filterKey, string $entityKey, ?string $instanceId = null)
     {
         $this->authorizationManager->check('view', $entityKey, $instanceId);
 

src/Http/Controllers/DashboardFiltersController.php

@@ -4,7 +4,7 @@
 
 class DashboardFiltersController extends SharpProtectedController
 {
-    public function store(string $dashboardKey)
+    public function store(string $filterKey, string $dashboardKey)
     {
         $this->authorizationManager->check('entity', $dashboardKey);
 

src/Http/Controllers/EntityListFiltersController.php

@@ -4,7 +4,7 @@
 
 class EntityListFiltersController extends SharpProtectedController
 {
-    public function store(string $entityKey)
+    public function store(string $filterKey, string $entityKey)
     {
         $this->authorizationManager->check('entity', $entityKey);
 
@@ -13,7 +13,7 @@ public function store(string $entityKey)
         //  in case it is built in the functional code (buildListConfig() for instance)
         sharp()->context()->breadcrumb()->forceRequestSegments(
             collect(request()->segments())
-                ->slice(1, -1)
+                ->slice(2, -1)
                 ->values()
         );
 

src/Http/Controllers/FormController.php

@@ -114,7 +114,7 @@ public function edit(string $filterKey, string $parentUri, EntityKey $entityKey,
         ]);
     }
 
-    public function update(string $parentUri, EntityKey $entityKey, ?string $instanceId = null)
+    public function update(string $filterKey, string $parentUri, EntityKey $entityKey, ?string $instanceId = null)
     {
         $this->authorizationManager->check('update', $entityKey, $instanceId);
 
@@ -142,15 +142,15 @@ public function update(string $parentUri, EntityKey $entityKey, ?string $instanc
         return redirect()->to($this->previousUrlWithHighlightedQuery($previousUrl, $entityKey, $instanceId));
     }
 
-    public function store(string $parentUri, EntityKey $entityKey)
+    public function store(string $filterKey, string $parentUri, EntityKey $entityKey)
     {
         $form = $this->entityManager
             ->entityFor($entityKey)
             ->getFormOrFail($entityKey->multiformKey());
 
         if ($form instanceof SharpSingleForm) {
             // There is no creation in SingleForms
-            return $this->update($parentUri, $entityKey);
+            return $this->update($filterKey, $parentUri, $entityKey);
         }
 
         $this->authorizationManager->check('create', $entityKey);

src/Http/Controllers/GlobalFilterController.php

@@ -8,9 +8,9 @@
 
 class GlobalFilterController extends SharpProtectedController
 {
-    public function update(string $filterKey, GlobalFilters $globalFilters): RedirectResponse
+    public function update(string $filterKey, string $key, GlobalFilters $globalFilters): RedirectResponse
     {
-        $handler = $globalFilters->findFilter($filterKey);
+        $handler = $globalFilters->findFilter($key);
 
         abort_if(! $handler instanceof GlobalRequiredFilter, 404);
 

src/Http/Controllers/ShowController.php

@@ -66,7 +66,7 @@ public function show(string $filterKey, string $parentUri, EntityKey $entityKey,
         ]);
     }
 
-    public function delete(string $parentUri, string $entityKey, string $instanceId)
+    public function delete(string $filterKey, string $parentUri, string $entityKey, string $instanceId)
     {
         $this->authorizationManager->check('delete', $entityKey, $instanceId);
 

src/Http/Middleware/HandleGlobalFilters.php

@@ -14,7 +14,7 @@ public function __construct(private GlobalFilters $globalFiltersHandler) {}
 
     public function handle(Request $request, Closure $next)
     {
-        if ($request->isMethod('GET') && ($filterKey = $request->route('filterKey'))) {
+        if ($filterKey = $request->route('filterKey')) {
             $filterKeys = explode(GlobalFilters::$valuesUrlSeparator, $filterKey);
 
             if ($this->globalFiltersHandler->isEnabled()