chore: Refactor code for improved readability and maintainability, an…

…d add policy support
ferdiunal · Sep 8, 2024 · e5bc0df · e5bc0df
1 parent d1d2293
commit e5bc0df
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/src/Http/Controllers/SettingsController.php b/src/Http/Controllers/SettingsController.php
@@ -26,7 +26,13 @@ public function get(string $group, NovaRequest $request)
                 unset($resource['settings']);
 
                 return $resource;
-            })->values();
+            })
+            ->filter(function ($resource) use ($request) {
+                $policy = str($resource['title'])->camel()->append('::view')->toString();
+
+                return $request->user()->can($policy);
+            })
+            ->values();
 
         abort_unless($resources->isNotEmpty(), 404);
 

diff --git a/src/NovaSettings.php b/src/NovaSettings.php
@@ -28,18 +28,25 @@ public function boot()
      */
     public function menu(Request $request)
     {
-        $resources = settingsResources()->pluck('group')->unique()->map(
-            fn ($group) => MenuItem::make(
-                str($group)->title()
-                    ->when(
-                        str($group)->lower()->endsWith('settings'),
-                        fn ($title) => str($title)->replace(' settings', '')->ucfirst()->__toString()
-                    )
-                    ->append(' Settings')
-                    ->__toString(),
-                str($group)->lower()->slug()->prepend('/nova-settings/')->__toString()
-            )
-        );
+        $resources = settingsResources()
+            ->filter(function ($resource) use ($request) {
+                $policy = str($resource['title'])->camel()->append('::view')->toString();
+
+                return $request->user()->can($policy);
+            })
+            ->pluck('group')
+            ->unique()->map(
+                fn ($group) => MenuItem::make(
+                    str($group)->title()
+                        ->when(
+                            str($group)->lower()->endsWith('settings'),
+                            fn ($title) => str($title)->replace(' settings', '')->ucfirst()->__toString()
+                        )
+                        ->append(' Settings')
+                        ->__toString(),
+                    str($group)->lower()->slug()->prepend('/nova-settings/')->__toString()
+                )
+            );
 
         return MenuSection::make('Nova Settings', $resources->toArray())
             ->collapsable()

diff --git a/src/NovaSettingsToolServiceProvider.php b/src/NovaSettingsToolServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Ferdiunal\NovaSettings\Console\MakeSettingResource;
 use Ferdiunal\NovaSettings\Http\Middleware\Authorize;
-use Illuminate\Log\Context\Repository as ContextRepository;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Nova\Events\ServingNova;
@@ -36,10 +35,6 @@ public function boot()
 
         $this->app->booted(function () {
             $this->routes();
-            // $this->app->make(ContextRepository::class)->add(
-            //     'nova-settings-resources',
-            //     $this->resources()
-            // );
         });
 
         Nova::serving(function (ServingNova $event) {