From b8c2652bc815de79d32ecaad722d0c5b46e73205 Mon Sep 17 00:00:00 2001
From: Ryan Scherler <ryan@eastslope.studio>
Date: Wed, 4 Nov 2020 21:01:41 -0800
Subject: [PATCH] REfine model resources - use trait rather than contract

---
 config/filament.php                      |  3 ++-
 resources/views/components/nav.blade.php |  4 +--
 resources/views/layouts/app.blade.php    |  2 +-
 src/Contracts/FilamentResource.php       |  7 -----
 src/Filament.php                         |  7 ++---
 src/FilamentServiceProvider.php          |  1 +
 src/Traits/FilamentResource.php          | 11 ++++++++
 src/View/Components/Nav.php              | 34 ++++++++++++++++++++++++
 tests/TestCase.php                       |  1 +
 9 files changed, 55 insertions(+), 15 deletions(-)
 delete mode 100644 src/Contracts/FilamentResource.php
 create mode 100644 src/Traits/FilamentResource.php
 create mode 100644 src/View/Components/Nav.php

diff --git a/config/filament.php b/config/filament.php
index 2029c6391c..33249597b4 100644
--- a/config/filament.php
+++ b/config/filament.php
@@ -84,6 +84,7 @@ return [
             'active' => 'filament.dashboard', // string or named route (may also be an array @link https://github.com/dwightwatson/active)
             'label' => 'Dashboard',
             'icon' => 'heroicon-o-home', // optional icon name (Blade UI Kit @link https://github.com/blade-ui-kit/blade-heroicons)
+            'sort' => -1, // sort order used by the navigation
         ],
     
     ],
@@ -99,7 +100,7 @@ return [
     */
 
     'components' => [
-        // 'alert' => Components\Alerts\Alert::class,
+        'nav' => Filament\View\Components\Nav::class,
     ],
 
     /*
diff --git a/resources/views/components/nav.blade.php b/resources/views/components/nav.blade.php
index eaf4832b33..b6d196a259 100644
--- a/resources/views/components/nav.blade.php
+++ b/resources/views/components/nav.blade.php
@@ -1,8 +1,6 @@
-@inject('nav', 'Filament\Navigation')
-
 <nav aria-label="primary" class="flex-grow px-4">
     <ol>
-    @foreach($nav::all() as $item)
+    @foreach($nav as $item)
         <li>
             <x-filament::nav-link 
                 :path="$item->path" 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 3c61cfb9fa..d29f9f9cfa 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,7 +19,7 @@
                 <x-filament::app-icon class="w-10 h-10 fill-current" />
                 <span class="text-sm leading-tight font-semibold">{{ config('app.name') }}</span>
             </a>
-            <x-filament::nav />
+            <x-filament-nav />
             <x-filament::dropdown class="w-full text-left flex-grow flex items-center p-4 space-x-3 text-gray-600 transition-colors duration-200 hover:text-white hover:bg-gray-800" id="dropdown-user">
                 <img src="{{ Auth::user()->avatar(32) }}" alt="{{ Auth::user()->name }}" srcset="{{ Auth::user()->avatar(32) }} 1x, {{ Auth::user()->avatar(64) }} 2x" class="flex-shrink-0 w-8 h-8 rounded" />
                 <span class="flex-grow text-sm leading-tight font-semibold">{{ Auth::user()->name }}</span>
diff --git a/src/Contracts/FilamentResource.php b/src/Contracts/FilamentResource.php
deleted file mode 100644
index 1b6b83c3f9..0000000000
--- a/src/Contracts/FilamentResource.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Filament\Contracts;
-
-interface FilamentResource {
-    public function actions(): array;
-}
\ No newline at end of file
diff --git a/src/Filament.php b/src/Filament.php
index 0854324347..d8c1e16123 100644
--- a/src/Filament.php
+++ b/src/Filament.php
@@ -12,7 +12,7 @@ use Illuminate\Support\{
     Collection,
     HtmlString,
 };
-use Filament\Contracts\FilamentResource;
+use Filament\Traits\FilamentResource;
 
 class Filament
 {
@@ -144,7 +144,8 @@ class Filament
 
     public function getResourceModels(): Collection
     {
-        $models = collect(File::allFiles(app_path()))
+        $app_path = config('filament.paths.models', app_path());
+        $models = collect(File::allFiles($app_path))
             ->map(function ($item) {
                 $path = $item->getRelativePathName();
                 $class = sprintf('\%s%s',
@@ -160,7 +161,7 @@ class Filament
 
                 $reflection = new \ReflectionClass($class);
                 return $reflection->isSubclassOf(Model::class) &&
-                    in_array(FilamentResource::class, class_implements($class)) && 
+                    in_array(FilamentResource::class, class_uses_recursive($class)) && 
                     !$reflection->isAbstract();
             })->mapWithKeys(function ($class) {
                 return [class_basename($class) => $class];
diff --git a/src/FilamentServiceProvider.php b/src/FilamentServiceProvider.php
index 5b39ab71f3..91bae0da89 100644
--- a/src/FilamentServiceProvider.php
+++ b/src/FilamentServiceProvider.php
@@ -131,6 +131,7 @@ class FilamentServiceProvider extends ServiceProvider
                             'active' => $route.'*',
                             'label' => $model->label ?? Str::plural($key),
                             'icon' => $model->icon ?? 'heroicon-o-database',
+                            'sort' => $model->sort ?? 0,
                         ]);
                     }
                 });
diff --git a/src/Traits/FilamentResource.php b/src/Traits/FilamentResource.php
new file mode 100644
index 0000000000..4bcb0639fd
--- /dev/null
+++ b/src/Traits/FilamentResource.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Filament\Traits;
+
+trait FilamentResource
+{   
+    public function actions(): array
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/src/View/Components/Nav.php b/src/View/Components/Nav.php
new file mode 100644
index 0000000000..988d21a6d3
--- /dev/null
+++ b/src/View/Components/Nav.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Filament\View\Components;
+
+use Illuminate\View\Component;
+
+class Nav extends Component
+{
+    public $nav;
+
+    /**
+     * Create the component instance.
+     *
+     * @param  string  $type
+     * @param  string  $message
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->nav = app('Filament\Navigation')
+                        ->orderBy('sort', 'asc')
+                        ->get();
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     *
+     * @return \Illuminate\View\View|\Closure|string
+     */
+    public function render()
+    {
+        return view('filament::components.nav');
+    }
+}
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2eaacfcf72..5777ff7d4a 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -89,6 +89,7 @@ abstract class TestCase extends OrchestraTestCase
             'prefix'   => '',
         ]);
 
+        $app['config']->set('filament.paths.models', __DIR__.'/Database/Models');
         $app['config']->set('auth.providers.users.model', User::class);
         $app['config']->set('filament.models.user', User::class);
     }