wip

src/Fields/BelongsToMany.php

@@ -3,16 +3,13 @@
 namespace Cone\Root\Fields;
 
 use Closure;
-use Cone\Root\Traits\ResolvesFields;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as EloquentRelation;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 
 class BelongsToMany extends Relation
 {
-    use ResolvesFields;
-
     /**
      * The pivot fields resolver callback.
      */

src/Fields/Fields.php

@@ -67,6 +67,28 @@ public function sortable(): static
         return $this->filter->isSortable();
     }
 
+    /**
+     * Filter the relation fields.
+     */
+    public function relation(): static
+    {
+        return $this->filter(static function (Field $field): bool {
+            return $field instanceof Relation;
+        });
+    }
+
+    /**
+     * Filter the subresource fields.
+     */
+    public function subResource(bool $value = true): static
+    {
+        return $this->filter(static function (Field $field) use ($value): bool {
+            return $value
+                ? $field instanceof Relation && $field->isSubResource()
+                : ! $field instanceof Relation || ! $field->isSubResource();
+        });
+    }
+
     /**
      * Map the fields to validate.
      */
@@ -82,15 +104,15 @@ public function mapToValidate(Request $request, Model $model): array
      */
     public function mapToDisplay(Request $request, Model $model): array
     {
-        return $this->map->toDisplay($request, $model)->all();
+        return $this->map->toDisplay($request, $model)->filter()->values()->all();
     }
 
     /**
      * Map the fields to form inputs.
      */
     public function mapToInputs(Request $request, Model $model): array
     {
-        return $this->map->toInput($request, $model)->all();
+        return $this->map->toInput($request, $model)->filter()->values()->all();
     }
 
     /**

src/Fields/Media.php

@@ -10,8 +10,6 @@
 use Cone\Root\Http\Controllers\MediaController;
 use Cone\Root\Models\Medium;
 use Cone\Root\Traits\HasMedia;
-use Cone\Root\Traits\RegistersRoutes;
-use Cone\Root\Traits\ResolvesFilters;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
@@ -24,11 +22,6 @@
 
 class Media extends File
 {
-    use RegistersRoutes {
-        RegistersRoutes::registerRoutes as __registerRoutes;
-    }
-    use ResolvesFilters;
-
     /**
      * Indicates if the component is multiple.
      */
@@ -44,14 +37,6 @@ class Media extends File
      */
     protected ?Closure $filtersResolver = null;
 
-    /**
-     * Get the URI key.
-     */
-    public function getUriKey(): string
-    {
-        return str_replace('.', '-', $this->getRequestKey());
-    }
-
     /**
      * Get the route parameter name.
      */
@@ -218,18 +203,6 @@ public function buildUri(Request $request, Model $model): ?string
         return rtrim($uri, '?');
     }
 
-    /**
-     * Register the routes using the given router.
-     */
-    public function registerRoutes(Request $request, Router $router): void
-    {
-        $this->__registerRoutes($request, $router);
-
-        $router->prefix($this->getUriKey())->group(function (Router $router) use ($request): void {
-            $this->resolveFields($request)->registerRoutes($request, $router);
-        });
-    }
-
     /**
      * The routes that should be registered.
      */

src/Fields/Relation.php

@@ -3,16 +3,29 @@
 namespace Cone\Root\Fields;
 
 use Closure;
+use Cone\Root\Filters\RenderableFilter;
 use Cone\Root\Root;
+use Cone\Root\Traits\RegistersRoutes;
+use Cone\Root\Traits\ResolvesActions;
+use Cone\Root\Traits\ResolvesFields;
+use Cone\Root\Traits\ResolvesFilters;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation as EloquentRelation;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 abstract class Relation extends Field
 {
+    use ResolvesActions;
+    use ResolvesFilters;
+    use ResolvesFields;
+    use RegistersRoutes {
+        RegistersRoutes::registerRoutes as __registerRoutes;
+    }
+
     /**
      * The relation name on the model.
      */
@@ -53,6 +66,11 @@ abstract class Relation extends Field
      */
     protected string|Closure|null $groupResolver = null;
 
+    /**
+     * Indicates wheter the relation is a sub resource.
+     */
+    protected bool $asSubResource = false;
+
     /**
      * The query scopes.
      */
@@ -106,6 +124,32 @@ public function getRelationName(): string
             : $this->relation;
     }
 
+    /**
+     * Get the URI key.
+     */
+    public function getUriKey(): string
+    {
+        return str_replace('.', '-', $this->getRequestKey());
+    }
+
+    /**
+     * Set the as subresource attribute.
+     */
+    public function asSubResource(bool $value = true): static
+    {
+        $this->asSubResource = $value;
+
+        return $this;
+    }
+
+    /**
+     * Determine if the relation is a subresource.
+     */
+    public function isSubResource(): bool
+    {
+        return $this->asSubResource;
+    }
+
     /**
      * Set the nullable attribute.
      */
@@ -299,6 +343,44 @@ public function newOption(Model $related, string $label): Option
         return new Option($related->getKey(), $label);
     }
 
+    /**
+     * Get the per page options.
+     */
+    public function getPerPageOptions(): array
+    {
+        return [5, 10, 15, 25];
+    }
+
+    /**
+     * Paginate the results.
+     */
+    public function paginate(Request $request, Model $model): array
+    {
+        return [
+            //
+        ];
+    }
+
+    /**
+     * Register the routes using the given router.
+     */
+    public function registerRoutes(Request $request, Router $router): void
+    {
+        $this->__registerRoutes($request, $router);
+
+        $router->prefix($this->getUriKey())->group(function (Router $router) use ($request): void {
+            $this->resolveFields($request)->registerRoutes($request, $router);
+        });
+    }
+
+    /**
+     * Register the routes.
+     */
+    public function routes(Router $router): void
+    {
+        //
+    }
+
     /**
      * Get the option representation of the model and the related model.
      */
@@ -321,4 +403,28 @@ public function toInput(Request $request, Model $model): array
             'options' => $this->resolveOptions($request, $model),
         ]);
     }
+
+    /**
+     * Get the index representation of the relation.
+     */
+    public function toIndex(Request $request, Model $model): array
+    {
+        return array_merge($this->toArray(), [
+            'title' => $this->getRelatedName(),
+            'actions' => $this->resolveActions($request)
+                ->authorized($request, $model)
+                ->visible('index')
+                ->mapToForms($request, $model),
+            'data' => $this->paginate($request, $model),
+            'perPageOptions' => $this->getPerPageOptions(),
+            'filters' => $this->resolveFilters($request)
+                ->authorized($request)
+                ->renderable()
+                ->map(static function (RenderableFilter $filter) use ($request, $model): array {
+                    return $filter->toField()->toInput($request, $model);
+                })
+                ->all(),
+            'activeFilters' => $this->resolveFilters($request)->active($request)->count(),
+        ]);
+    }
 }

src/Resources/Resource.php

@@ -4,9 +4,9 @@
 
 use Cone\Root\Actions\Action;
 use Cone\Root\Fields\Field;
+use Cone\Root\Fields\Relation;
 use Cone\Root\Filters\RenderableFilter;
 use Cone\Root\Interfaces\Form;
-use Cone\Root\Interfaces\Table;
 use Cone\Root\Root;
 use Cone\Root\Traits\AsForm;
 use Cone\Root\Traits\Authorizable;
@@ -26,7 +26,7 @@
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Str;
 
-abstract class Resource implements Arrayable, Form, Table
+abstract class Resource implements Arrayable, Form
 {
     use AsForm;
     use Authorizable;
@@ -275,6 +275,7 @@ public function paginate(Request $request): LengthAwarePaginator
                     'url' => $this->modelUrl($model),
                     'model' => $model,
                     'fields' => $this->resolveFields($request)
+                        ->subResource(false)
                         ->authorized($request, $model)
                         ->visible('index')
                         ->mapToDisplay($request, $model),
@@ -365,6 +366,7 @@ public function toCreate(Request $request): array
             'action' => $this->getUri(),
             'method' => 'POST',
             'fields' => $this->resolveFields($request)
+                ->subResource(false)
                 ->authorized($request, $model)
                 ->visible('create')
                 ->mapToInputs($request, $model),
@@ -382,6 +384,7 @@ public function toShow(Request $request, Model $model): array
             'action' => $this->modelUrl($model),
             'method' => 'PATCH',
             'fields' => $this->resolveFields($request)
+                ->subResource(false)
                 ->authorized($request, $model)
                 ->visible('show')
                 ->mapToDisplay($request, $model),
@@ -393,6 +396,12 @@ public function toShow(Request $request, Model $model): array
                 ->authorized($request, $model)
                 ->visible('show')
                 ->toArray(),
+            'relations' => $this->resolveFields($request)
+                ->subResource()
+                ->authorized($request, $model)
+                ->map(static function (Relation $relation) use ($request, $model): array {
+                    return $relation->toIndex($request, $model);
+                }),
         ]);
     }
 
@@ -407,6 +416,7 @@ public function toEdit(Request $request, Model $model): array
             'action' => $this->modelUrl($model),
             'method' => 'PATCH',
             'fields' => $this->resolveFields($request)
+                ->subResource(false)
                 ->authorized($request, $model)
                 ->visible('update')
                 ->mapToInputs($request, $model),