Merge branch 'master' into prepare-phpstan

public/build/assets/app-5cfcf402.js

@@ -0,0 +1 @@
+import{a as f}from"./app-c6af0dee.js";export{f as default};

public/build/assets/dropdown-7dc1f3ea.js

@@ -0,0 +1 @@
+import"./app-c6af0dee.js";

public/build/assets/editor-7dc1f3ea.js

@@ -0,0 +1 @@
+import"./app-c6af0dee.js";

public/build/assets/media-manager-7dc1f3ea.js

@@ -0,0 +1 @@
+import"./app-c6af0dee.js";

public/build/assets/repeater-7dc1f3ea.js

@@ -0,0 +1 @@
+import"./app-c6af0dee.js";

public/build/manifest.json

@@ -7,44 +7,44 @@
     "css": [
       "assets/app-4d04387c.css"
     ],
-    "file": "assets/app-ef45e7b6.js",
+    "file": "assets/app-c6af0dee.js",
     "isEntry": true,
     "src": "resources/js/app.js"
   },
   "resources/js/dropdown.js": {
-    "file": "assets/dropdown-b8b60ec8.js",
+    "file": "assets/dropdown-7dc1f3ea.js",
     "imports": [
       "resources/js/app.js"
     ],
     "isEntry": true,
     "src": "resources/js/dropdown.js"
   },
   "resources/js/editor.js": {
-    "file": "assets/editor-b8b60ec8.js",
+    "file": "assets/editor-7dc1f3ea.js",
     "imports": [
       "resources/js/app.js"
     ],
     "isEntry": true,
     "src": "resources/js/editor.js"
   },
   "resources/js/media-manager.js": {
-    "file": "assets/media-manager-b8b60ec8.js",
+    "file": "assets/media-manager-7dc1f3ea.js",
     "imports": [
       "resources/js/app.js"
     ],
     "isEntry": true,
     "src": "resources/js/media-manager.js"
   },
   "resources/js/repeater.js": {
-    "file": "assets/repeater-b8b60ec8.js",
+    "file": "assets/repeater-7dc1f3ea.js",
     "imports": [
       "resources/js/app.js"
     ],
     "isEntry": true,
     "src": "resources/js/repeater.js"
   },
   "resources/sass/app.scss": {
-    "file": "assets/app-584e3628.js",
+    "file": "assets/app-5cfcf402.js",
     "imports": [
       "resources/js/app.js"
     ],

resources/js/app.js

@@ -20,4 +20,4 @@ window.$http = Axios.create({
 });
 
 // Cookie
-window.$cookie = new Cookie();
+window.$cookie = new Cookie('__root_');

resources/js/theme.js

@@ -2,7 +2,7 @@ document.addEventListener('alpine:init', () => {
     window.Alpine.data('theme', () => {
         return {
             systemMode: window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light',
-            theme: window.$cookie.get('__root_theme', 'system'),
+            theme: window.$cookie.get('theme', 'system'),
             init() {
                 window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (event) => {
                     if (this.theme === 'system') {
@@ -23,7 +23,7 @@ document.addEventListener('alpine:init', () => {
             change(theme) {
                 document.documentElement.classList.add('no-transition');
 
-                window.$cookie.set('__root_theme', theme);
+                window.$cookie.set('theme', theme);
 
                 this.theme = theme;
 

routes/api.php

@@ -1,14 +1,7 @@
 <?php
 
 use Cone\Root\Http\Controllers\NotificationsController;
-use Cone\Root\Http\Controllers\ResourceFieldController;
 use Illuminate\Support\Facades\Route;
 
 // Notifications
 Route::apiResource('notifications', NotificationsController::class)->except(['store']);
-
-// Resource Fields
-Route::any('/{resource}/fields/{field}', ResourceFieldController::class)->where('field', '.*');
-
-// Actions
-// Action Fields

src/Actions/Action.php

@@ -3,16 +3,19 @@
 namespace Cone\Root\Actions;
 
 use Cone\Root\Fields\Field;
+use Cone\Root\Http\Controllers\ActionController;
 use Cone\Root\Interfaces\Form;
 use Cone\Root\Support\Alert;
 use Cone\Root\Traits\AsForm;
 use Cone\Root\Traits\Authorizable;
 use Cone\Root\Traits\Makeable;
+use Cone\Root\Traits\RegistersRoutes;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Concerns\HasAttributes;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Str;
@@ -25,6 +28,9 @@ abstract class Action implements Arrayable, Form, JsonSerializable
     use Authorizable;
     use HasAttributes;
     use Makeable;
+    use RegistersRoutes {
+        RegistersRoutes::registerRoutes as __registerRoutes;
+    }
 
     /**
      * The Blade template.
@@ -46,11 +52,6 @@ abstract class Action implements Arrayable, Form, JsonSerializable
      */
     protected ?Builder $query = null;
 
-    /**
-     * The API URI.
-     */
-    protected ?string $apiUri = null;
-
     /**
      * Handle the action.
      */
@@ -96,24 +97,6 @@ public function getTemplate(): string
         return $this->template;
     }
 
-    /**
-     * Set the API URI.
-     */
-    public function setApiUri(string $apiUri): static
-    {
-        $this->apiUri = $apiUri;
-
-        return $this;
-    }
-
-    /**
-     * Get the API URI.
-     */
-    public function getApiUri(): ?string
-    {
-        return $this->apiUri;
-    }
-
     /**
      * Set the Eloquent query.
      */
@@ -129,7 +112,6 @@ public function setQuery(Builder $query): static
      */
     protected function resolveField(Request $request, Field $field): void
     {
-        $field->setApiUri(sprintf('/%s/fields/%s', $this->getApiUri(), $field->getUriKey()));
         $field->setAttribute('form', $this->getKey());
         $field->resolveErrorsUsing(function (Request $request): MessageBag {
             return $this->errors($request);
@@ -190,6 +172,26 @@ public function perform(Request $request): Response
         );
     }
 
+    /**
+     * 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.
+     */
+    public function routes(Router $router): void
+    {
+        $router->post('/', ActionController::class);
+    }
+
     /**
      * Convert the element to a JSON serializable format.
      */
@@ -210,7 +212,7 @@ public function toArray(): array
             'modalKey' => $this->getModalKey(),
             'name' => $this->getName(),
             'template' => $this->getTemplate(),
-            'url' => $this->getApiUri(),
+            'url' => $this->getUri(),
         ];
     }
 

src/Actions/Actions.php

@@ -2,7 +2,9 @@
 
 namespace Cone\Root\Actions;
 
+use Cone\Root\Traits\RegistersRoutes;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
@@ -27,4 +29,18 @@ public function mapToTableComponents(Request $request): array
     {
         return $this->map->toTableComponent($request)->all();
     }
+
+    /**
+     * Register the action routes.
+     */
+    public function registerRoutes(Request $request, Router $router): void
+    {
+        $router->prefix('actions')->group(function (Router $router) use ($request): void {
+            $this->each(static function (Action $action) use ($request, $router): void {
+                if (in_array(RegistersRoutes::class, class_uses_recursive($action))) {
+                    $action->registerRoutes($request, $router);
+                }
+            });
+        });
+    }
 }

src/Fields/BelongsToMany.php

@@ -31,7 +31,6 @@ public function __construct(string $label, string $modelAttribute = null, Closur
         parent::__construct($label, $modelAttribute, $relation);
 
         $this->setAttribute('multiple', true);
-        $this->name($this->modelAttribute.'[]');
     }
 
     /**
@@ -49,10 +48,8 @@ public function getRelation(Model $model): EloquentRelation
      */
     protected function resolveField(Request $request, Field $field): void
     {
-        if (! is_null($this->apiUri)) {
-            $field->setApiUri(sprintf('%s/%s', $this->apiUri, $field->getUriKey()));
-        }
-
+        $field->setAttribute('form', $this->getAttribute('form'));
+        $field->resolveErrorsUsing($this->errorsResolver);
         $field->setModelAttribute(
             sprintf('%s.*.%s', $this->getModelAttribute(), $field->getModelAttribute())
         );
@@ -105,6 +102,13 @@ public function toOption(Request $request, Model $model, Model $related): array
 
         $option = parent::toOption($request, $model, $related);
 
+        $option['attrs']['name'] = sprintf(
+            '%s[%s][%s]',
+            $this->getAttribute('name'),
+            $related->getKey(),
+            $this->getRelation($model)->getRelatedPivotKeyName()
+        );
+
         $option['fields'] = is_null($this->pivotFieldsResolver)
             ? new Fields()
             : call_user_func_array($this->pivotFieldsResolver, [$request, $model, $related]);

src/Fields/Editor.php

@@ -4,14 +4,19 @@
 
 use Closure;
 use Cone\Root\Models\Medium;
+use Cone\Root\Traits\RegistersRoutes;
 use Cone\Root\Traits\ResolvesFields;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Config;
 
 class Editor extends Field
 {
+    use RegistersRoutes {
+        RegistersRoutes::registerRoutes as __registerRoutes;
+    }
     use ResolvesFields;
 
     /**
@@ -41,17 +46,11 @@ public function __construct(string $label, string $modelAttribute = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Get the URI key.
      */
-    public function setApiUri(string $apiUri): static
+    public function getUriKey(): string
     {
-        if (! is_null($this->media)) {
-            $this->media->setApiUri(
-                sprintf('%s/%s', $apiUri, $this->media->getUriKey())
-            );
-        }
-
-        return parent::setApiUri($apiUri);
+        return str_replace('.', '-', $this->getRequestKey());
     }
 
     /**
@@ -142,6 +141,20 @@ public function __construct(string $modelAttribute)
         };
     }
 
+    /**
+     * Register the routes using the given router.
+     */
+    public function registerRoutes(Request $request, Router $router): void
+    {
+        $this->__registerRoutes($request, $router);
+
+        if (! is_null($this->media)) {
+            $router->prefix($this->getUriKey())->group(function (Router $router) use ($request): void {
+                $this->media->registerRoutes($request, $router);
+            });
+        }
+    }
+
     /**
      * {@inheritdoc}
      */