From d86c989977339c856802e85faa6b445aa06abd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=2E=20Nagy=20Gerg=C5=91?= <hello@iamgergo.com>
Date: Fri, 24 Nov 2023 15:12:04 +0100
Subject: [PATCH] wip

---
 resources/views/table/filters.blade.php |  2 +-
 resources/views/table/table.blade.php   |  2 +-
 src/Fields/Relation.php                 | 21 ++++++++++++++++++++-
 src/Filters/Filter.php                  | 23 ++++++++++++++++++++++-
 src/Filters/MediaSearch.php             |  4 ++++
 src/Filters/Search.php                  |  2 ++
 src/Filters/Sort.php                    |  2 ++
 src/Resources/Resource.php              | 25 +++++++++++++++++++++++--
 8 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/resources/views/table/filters.blade.php b/resources/views/table/filters.blade.php
index 6fdba421..8a45f80f 100644
--- a/resources/views/table/filters.blade.php
+++ b/resources/views/table/filters.blade.php
@@ -1,4 +1,4 @@
-<form method="GET" action="{{ URL::full() }}" id="{{ $key }}" class="app-card__actions" onchange="this.requestSubmit()">
+<form method="GET" action="{{ $url }}" id="{{ $key }}" class="app-card__actions" onchange="this.requestSubmit()">
     @if(! empty($filters))
         <div class="data-table-filter" x-data="{ open: false }" x-on:click.outside="open = false">
             <button
diff --git a/resources/views/table/table.blade.php b/resources/views/table/table.blade.php
index 0b6bc94c..812fb784 100644
--- a/resources/views/table/table.blade.php
+++ b/resources/views/table/table.blade.php
@@ -83,7 +83,7 @@ class="form-check__control"
                                 form="{{ $key }}"
                                 class="form-control form-control--sm"
                                 id="per_page"
-                                name="per_page"
+                                name="{{ $perPageKey }}"
                                 onchange="this.form.requestSubmit()"
                             >
                                 @foreach($perPageOptions as $option)
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
index 49568765..ac4fdc5a 100644
--- a/src/Fields/Relation.php
+++ b/src/Fields/Relation.php
@@ -3,6 +3,7 @@
 namespace Cone\Root\Fields;
 
 use Closure;
+use Cone\Root\Filters\Filter;
 use Cone\Root\Filters\RenderableFilter;
 use Cone\Root\Filters\Search;
 use Cone\Root\Filters\Sort;
@@ -361,6 +362,14 @@ protected function resolveField(Request $request, Field $field): void
         }
     }
 
+    /**
+     * Handle the callback for the filter resolution.
+     */
+    protected function resolveFilter(Request $request, Filter $filter): void
+    {
+        $filter->setKey(sprintf('%s:%s', $this->getRequestKey(), $filter->getKey()));
+    }
+
     /**
      * Set the query resolver.
      */
@@ -438,6 +447,14 @@ public function getPerPageOptions(): array
         return [5, 10, 15, 25];
     }
 
+    /**
+     * Get the per page key.
+     */
+    public function getPerPageKey(): string
+    {
+        return sprintf('%s:per_page', $this->getRequestKey());
+    }
+
     /**
      * The relations to be eagerload.
      */
@@ -469,7 +486,7 @@ public function paginate(Request $request, Model $model): LengthAwarePaginator
                 ->with($this->with)
                 ->withCount($this->withCount)
                 ->latest();
-        })->paginate($request->input('per_page', 5))->withQueryString();
+        })->paginate($request->input($this->getPerPageKey(), 5))->withQueryString();
     }
 
     /**
@@ -627,6 +644,7 @@ public function toIndex(Request $request, Model $model): array
                 return $this->mapRelated($request, $model, $related);
             }),
             'perPageOptions' => $this->getPerPageOptions(),
+            'perPageKey' => $this->getPerPageKey(),
             'filters' => $this->resolveFilters($request)
                 ->authorized($request)
                 ->renderable()
@@ -635,6 +653,7 @@ public function toIndex(Request $request, Model $model): array
                 })
                 ->all(),
             'activeFilters' => $this->resolveFilters($request)->active($request)->count(),
+            'url' => $this->modelUrl($model),
         ]);
     }
 
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
index 5862d8a0..077534bf 100644
--- a/src/Filters/Filter.php
+++ b/src/Filters/Filter.php
@@ -13,17 +13,38 @@ abstract class Filter
     use Authorizable;
     use Makeable;
 
+    /**
+     * The filter key.
+     */
+    protected string $key;
+
+    /**
+     * Create a new filter instance.
+     */
+    public function __construct()
+    {
+        $this->key = Str::of(static::class)->classBasename()->snake()->value();
+    }
+
     /**
      * Apply the filter on the query.
      */
     abstract public function apply(Request $request, Builder $query, mixed $value): Builder;
 
+    /**
+     * Set the filter key.
+     */
+    public function setKey(string $key): void
+    {
+        $this->key = $key;
+    }
+
     /**
      * Get the key.
      */
     public function getKey(): string
     {
-        return Str::of(static::class)->classBasename()->snake()->value();
+        return $this->key;
     }
 
     /**
diff --git a/src/Filters/MediaSearch.php b/src/Filters/MediaSearch.php
index 6fc603dd..2c1930fb 100644
--- a/src/Filters/MediaSearch.php
+++ b/src/Filters/MediaSearch.php
@@ -2,6 +2,8 @@
 
 namespace Cone\Root\Filters;
 
+use Cone\Root\Fields\Fields;
+
 class MediaSearch extends Search
 {
     /**
@@ -17,6 +19,8 @@ class MediaSearch extends Search
     public function __construct(array $attributes = ['file_name'])
     {
         $this->attributes = $attributes;
+
+        parent::__construct(new Fields());
     }
 
     /**
diff --git a/src/Filters/Search.php b/src/Filters/Search.php
index 768429ce..7d36fdd2 100644
--- a/src/Filters/Search.php
+++ b/src/Filters/Search.php
@@ -21,6 +21,8 @@ class Search extends RenderableFilter
     public function __construct(Fields $fields)
     {
         $this->fields = $fields;
+
+        parent::__construct();
     }
 
     /**
diff --git a/src/Filters/Sort.php b/src/Filters/Sort.php
index b68698ad..ef593684 100644
--- a/src/Filters/Sort.php
+++ b/src/Filters/Sort.php
@@ -23,6 +23,8 @@ class Sort extends Filter
     public function __construct(Fields $fields)
     {
         $this->fields = $fields;
+
+        parent::__construct();
     }
 
     /**
diff --git a/src/Resources/Resource.php b/src/Resources/Resource.php
index d0aa05c1..a1cdd540 100644
--- a/src/Resources/Resource.php
+++ b/src/Resources/Resource.php
@@ -5,6 +5,7 @@
 use Cone\Root\Actions\Action;
 use Cone\Root\Fields\Field;
 use Cone\Root\Fields\Relation;
+use Cone\Root\Filters\Filter;
 use Cone\Root\Filters\RenderableFilter;
 use Cone\Root\Filters\Search;
 use Cone\Root\Filters\Sort;
@@ -268,6 +269,14 @@ protected function resolveField(Request $request, Field $field): void
         $field->resolveErrorsUsing(fn (Request $request): MessageBag => $this->errors($request));
     }
 
+    /**
+     * Handle the callback for the filter resolution.
+     */
+    protected function resolveFilter(Request $request, Filter $filter): void
+    {
+        $filter->setKey(sprintf('%s:%s', $this->getKey(), $filter->getKey()));
+    }
+
     /**
      * Handle the callback for the action resolution.
      */
@@ -289,6 +298,14 @@ public function getPerPageOptions(): array
             ->toArray();
     }
 
+    /**
+     * Get the per page key.
+     */
+    public function getPerPageKey(): string
+    {
+        return sprintf('%s:per_page', $this->getKey());
+    }
+
     /**
      * Perform the query and the pagination.
      */
@@ -296,7 +313,7 @@ public function paginate(Request $request): LengthAwarePaginator
     {
         return $this->resolveFilteredQuery($request)
             ->latest()
-            ->paginate($request->input('per_page'))
+            ->paginate($request->input($this->getPerPageKey()))
             ->withQueryString()
             ->through(function (Model $model) use ($request): array {
                 return [
@@ -376,6 +393,7 @@ public function toIndex(Request $request): array
                 ->visible('index')
                 ->toArray(),
             'perPageOptions' => $this->getPerPageOptions(),
+            'perPageKey' => $this->getPerPageKey(),
             'filters' => $this->resolveFilters($request)
                 ->authorized($request)
                 ->renderable()
@@ -384,6 +402,7 @@ public function toIndex(Request $request): array
                 })
                 ->all(),
             'activeFilters' => $this->resolveFilters($request)->active($request)->count(),
+            'url' => trim(sprintf('%s?%s', $this->getUri(), $request->getQueryString()), '?'),
         ]);
     }
 
@@ -431,7 +450,9 @@ public function toShow(Request $request, Model $model): array
                 ->subResource()
                 ->authorized($request, $model)
                 ->map(static function (Relation $relation) use ($request, $model): array {
-                    return $relation->toSubResource($request, $model);
+                    return array_merge($relation->toSubResource($request, $model), [
+                        'url' => trim(sprintf('%s?%s', $relation->modelUrl($model), $request->getQueryString()), '?'),
+                    ]);
                 }),
         ]);
     }