wip

src/Actions/Action.php

@@ -2,6 +2,7 @@
 
 namespace Cone\Root\Actions;
 
+use Closure;
 use Cone\Root\Exceptions\QueryResolutionException;
 use Cone\Root\Fields\Field;
 use Cone\Root\Fields\Relation;
@@ -59,9 +60,9 @@ abstract class Action implements Arrayable, Form, JsonSerializable
     protected bool $standalone = false;
 
     /**
-     * The Eloquent query.
+     * The query resolver.
      */
-    protected ?Builder $query = null;
+    protected ?Closure $queryResolver = null;
 
     /**
      * Handle the action.
@@ -101,25 +102,25 @@ public function getModalKey(): string
     }
 
     /**
-     * Set the Eloquent query.
+     * Resolve the query.
      */
-    public function setQuery(Builder $query): static
+    public function resolveQuery(Request $request): Builder
     {
-        $this->query = $query;
+        if (is_null($this->queryResolver)) {
+            throw new QueryResolutionException();
+        }
 
-        return $this;
+        return call_user_func_array($this->queryResolver, [$request]);
     }
 
     /**
-     * Get the Eloquent query.
+     * Set the query resolver callback.
      */
-    public function getQuery(): Builder
+    public function withQuery(Closure $callback): static
     {
-        if (is_null($this->query)) {
-            throw new QueryResolutionException();
-        }
+        $this->queryResolver = $callback;
 
-        return $this->query;
+        return $this;
     }
 
     /**
@@ -203,8 +204,8 @@ public function handleFormRequest(Request $request, Model $model): void
 
         $models = match (true) {
             $this->isStandalone() => new Collection([$model]),
-            $request->boolean('all') => $this->getQuery()->get(),
-            default => $this->getQuery()->findMany($request->input('models', [])),
+            $request->boolean('all') => $this->resolveQuery($request)->get(),
+            default => $this->resolveQuery($request)->findMany($request->input('models', [])),
         };
 
         $this->handle($request, $models);
@@ -215,7 +216,7 @@ public function handleFormRequest(Request $request, Model $model): void
      */
     public function perform(Request $request): Response
     {
-        $this->handleFormRequest($request, $this->getQuery()->getModel());
+        $this->handleFormRequest($request, $this->resolveQuery($request)->getModel());
 
         return Redirect::back()->with(
             sprintf('alerts.action-%s', $this->getKey()),
@@ -273,7 +274,6 @@ public function toArray(): array
             'modalKey' => $this->getModalKey(),
             'name' => $this->getName(),
             'template' => $this->template,
-            'url' => $this->getUri(),
         ];
     }
 
@@ -283,6 +283,7 @@ public function toArray(): array
     public function toForm(Request $request, Model $model): array
     {
         return array_merge($this->toArray(), [
+            'url' => ! is_null($request->route()) ? $this->replaceRoutePlaceholders($request->route()) : null,
             'open' => $this->errors($request)->isNotEmpty(),
             'fields' => $this->resolveFields($request)->mapToInputs($request, $model),
         ]);

src/Fields/Relation.php

@@ -3,6 +3,7 @@
 namespace Cone\Root\Fields;
 
 use Closure;
+use Cone\Root\Actions\Action;
 use Cone\Root\Exceptions\SaveFormDataException;
 use Cone\Root\Filters\Filter;
 use Cone\Root\Filters\RenderableFilter;
@@ -409,6 +410,18 @@ protected function resolveField(Request $request, Field $field): void
         }
     }
 
+    /**
+     * Handle the callback for the field resolution.
+     */
+    protected function resolveAction(Request $request, Action $action): void
+    {
+        $action->withQuery(function (Request $request): Builder {
+            $model = $request->route('resourceModel');
+
+            return $this->resolveFilters($request)->apply($request, $this->getRelation($model)->getQuery());
+        });
+    }
+
     /**
      * Handle the callback for the filter resolution.
      */

src/Resources/Resource.php

@@ -344,7 +344,7 @@ protected function resolveFilter(Request $request, Filter $filter): void
      */
     protected function resolveAction(Request $request, Action $action): void
     {
-        $action->setQuery($this->resolveFilteredQuery($request));
+        $action->withQuery(fn (): Builder => $this->resolveFilteredQuery($request));
     }
 
     /**

src/Widgets/Metric.php

@@ -49,7 +49,7 @@ public function resolveQuery(Request $request): Builder
     /**
      * Set the query resolver callback.
      */
-    public function resolverQueryUsing(Closure $callback): static
+    public function withQuery(Closure $callback): static
     {
         $this->queryResolver = $callback;