WIP

Author: tabuna

resources/views/footer.blade.php

@@ -29,7 +29,7 @@
         <p class="small mb-0">
             {{ __('The application code is published under the MIT license.') }} 2016 - {{date('Y')}}<br>
             <a href="http://orchid.software" target="_blank" rel="noopener">
-                {{ __('Version') }}: {{\Orchid\Platform\Dashboard::version()}}
+                {{ __('Version') }}: {{ Dashboard::version() }}
             </a>
         </p>
     </div>

resources/views/partials/update-assets.blade.php

@@ -1,4 +1,4 @@
-@if(!\Orchid\Platform\Dashboard::assetsAreCurrent())
+@if(!Dashboard::assetsAreCurrent())
     <div class="alert alert-warning rounded shadow-sm mb-3 p-4" data-turbo-temporary>
         <div class="d-flex align-items-center mb-2 text-body-emphasis">
             <x-orchid-icon path="bs.exclamation-triangle" width="2em" height="2em" class="me-2"/>

src/Access/RoleAccess.php

@@ -8,7 +8,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 use Orchid\Platform\Models\User;
 
 trait RoleAccess

src/Access/UserAccess.php

@@ -12,7 +12,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 use Orchid\Platform\Events\AddRoleEvent;
 use Orchid\Platform\Events\RemoveRoleEvent;
 use Orchid\Platform\Models\Role;

src/Attachment/Attachable.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Orchid\Attachment\Models\Attachment;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 
 /**
  * This trait is used to relate or attach multiple files with Eloquent models.

src/Attachment/File.php

@@ -13,7 +13,7 @@
 use Orchid\Attachment\Contracts\Engine;
 use Orchid\Attachment\Engines\Generator;
 use Orchid\Attachment\Models\Attachment;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 use Orchid\Platform\Events\ReplicateFileEvent;
 use Orchid\Platform\Events\UploadFileEvent;
 

src/Attachment/Models/Attachment.php

@@ -15,7 +15,7 @@
 use Orchid\Filters\Filterable;
 use Orchid\Filters\Types\Like;
 use Orchid\Platform\Concerns\Sortable;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 use Orchid\Platform\Models\User;
 use Orchid\Screen\AsSource;
 

src/Platform/Commands/InstallCommand.php

@@ -7,7 +7,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Traits\Conditionable;
-use Orchid\Platform\Dashboard;
+use Orchid\Support\Facades\Dashboard;
 use Orchid\Platform\Events\InstallEvent;
 use Orchid\Platform\Providers\ConsoleServiceProvider;
 use Symfony\Component\Console\Attribute\AsCommand;

src/Platform/Configuration/ManagesMenu.php

@@ -2,27 +2,18 @@
 
 namespace Orchid\Platform\Configuration;
 
-use Illuminate\Support\Collection;
 use Orchid\Screen\Actions\Menu;
+use Orchid\Support\Attributes\ClearsOctaneState;
 
 trait ManagesMenu
 {
     /**
      * The collection of menu items.
      *
-     * @var Collection<Menu>
+     * @var array<Menu>
      */
-    private ?Collection $menuItems;
-
-    /**
-     * @return Collection<Menu>
-     */
-    public function menu(): Collection
-    {
-        $this->menuItems = $this->menuItems ?? collect();
-
-        return $this->menuItems;
-    }
+    #[ClearsOctaneState]
+    protected array $menuItems = [];
 
     /**
      * Register a menu element with the Dashboard.
@@ -34,10 +25,10 @@ public function menu(): Collection
     public function registerMenuElement(Menu $menu): static
     {
         if ($menu->get('sort', 0) === 0) {
-            $menu->sort($this->menu->count() + 1);
+            $menu->sort(count($this->menuItems) + 1);
         }
 
-        $this->menu()->add($menu);
+        $this->menuItems[] = $menu;
 
         return $this;
     }
@@ -51,7 +42,7 @@ public function registerMenuElement(Menu $menu): static
      */
     public function renderMenu(): string
     {
-        return $this->menu()
+        return collect($this->menuItems)
             ->sort(fn (Menu $current, Menu $next) => $current->get('sort', 0) <=> $next->get('sort', 0))
             ->map(fn (Menu $menu) => (string) $menu->render())
             ->implode('');
@@ -64,7 +55,7 @@ public function renderMenu(): string
      */
     public function isEmptyMenu(): bool
     {
-        return $this->menu()->isEmpty();
+        return empty($this->menuItems);
     }
 
     /**
@@ -77,10 +68,11 @@ public function isEmptyMenu(): bool
      */
     public function addMenuSubElements(string $slug, array $list): static
     {
-        $this->menuItems = $this->menu()
+        $this->menuItems = collect($this->menuItems)
             ->map(fn (Menu $menu) => $slug === $menu->get('slug')
                 ? $menu->list($list)
-                : $menu);
+                : $menu)
+            ->all();
 
         return $this;
     }

src/Platform/Configuration/ManagesModelOptions.php

@@ -6,31 +6,38 @@
 
 trait ManagesModelOptions
 {
+    protected array $registeredReplaceModels = [];
+
     /**
      * Get the model instance for a given key or class name.
      *
+     * @param string      $key
+     * @param string|null $default
+     *
      * @return mixed
      */
-    public static function modelClass(string $key, ?string $default = null)
+    public function modelClass(string $key, ?string $default = null): mixed
     {
-        $model = static::model($key, $default);
+        $model = $this->model($key, $default);
 
         return class_exists($model) ? new $model : $model;
     }
 
     /**
      * Get the class name for a given Dashboard model.
      */
-    public static function model(string $key, ?string $default = null): string
+    public function model(string $key, ?string $default = null): string
     {
-        return Arr::get(static::$options, 'models.'.$key, $default ?? $key);
+        return Arr::get($this->registeredReplaceModels, $key, $default ?? $key);
     }
 
     /**
      * Get the user model class name.
      */
-    public static function useModel(string $key, string $custom): void
+    public function useModel(string $key, string $custom): static
     {
-        static::$options['models'][$key] = $custom;
+       $this->registeredReplaceModels[$key] = $custom;
+
+       return $this;
     }
 }