resolves #407

bezhanSalleh · Sep 2, 2024 · b074108 · b074108
1 parent d9f7929
commit b074108
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 88 deletions.
diff --git a/composer.json b/composer.json
@@ -55,7 +55,8 @@
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest --no-coverage",
         "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/pint"
+        "format": "vendor/bin/pint",
+        "finalize": "composer format && composer analyse && composer test"
     },
     "config": {
         "sort-packages": true,

diff --git a/config/filament-shield.php b/config/filament-shield.php
@@ -83,7 +83,7 @@
     ],
 
     'register_role_policy' => [
-        'enabled' => false,
+        'enabled' => true,
     ],
 
 ];
diff --git a/resources/ckb/filament-shield.php → resources/lang/ckb/filament-shield.php b/resources/ckb/filament-shield.php → resources/lang/ckb/filament-shield.php
diff --git a/resources/lang/filament-shield_pt_PT.php b/resources/lang/filament-shield_pt_PT.php
diff --git a/resources/ku/filament-shield.php → resources/lang/ku/filament-shield.php b/resources/ku/filament-shield.php → resources/lang/ku/filament-shield.php
diff --git a/resources/lang/sk/filament-shield.php b/resources/lang/sk/filament-shield.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 return [
     /*

diff --git a/src/Commands/Concerns/CanGeneratePolicy.php b/src/Commands/Concerns/CanGeneratePolicy.php
@@ -22,13 +22,10 @@ protected function generatePolicyPath(array $entity): string
     {
         $path = (new \ReflectionClass($entity['fqcn']::getModel()))->getFileName();
 
-        $policyPath = Str::of(config('filament-shield.generator.policy_directory', 'Policies'))
-            ->replace('\\', DIRECTORY_SEPARATOR);
-
         if (Str::of($path)->contains(['vendor', 'src'])) {
             $basePolicyPath = app_path(
                 (string) Str::of($entity['model'])
-                    ->prepend($policyPath->append('\\'))
+                    ->prepend(str(Utils::getPolicyPath())->append('\\'))
                     ->replace('\\', DIRECTORY_SEPARATOR),
             );
 
@@ -37,7 +34,7 @@ protected function generatePolicyPath(array $entity): string
 
         /** @phpstan-ignore-next-line */
         $basePath = Str::of($path)
-            ->replace('Models', $policyPath)
+            ->replace('Models', Utils::getPolicyPath())
             ->replaceLast('.php', 'Policy.php')
             ->replace('\\', DIRECTORY_SEPARATOR);
 

diff --git a/src/Support/Utils.php b/src/Support/Utils.php
@@ -191,7 +191,7 @@ public static function getExcludedWidgets(): array
 
     public static function isRolePolicyRegistered(): bool
     {
-        return (bool) config('filament-shield.register_role_policy.enabled', true);
+        return static::isRolePolicyGenerated() && config('filament-shield.register_role_policy.enabled', false);
     }
 
     public static function doesResourceHaveCustomPermissions(string $resourceClass): bool
@@ -242,4 +242,18 @@ public static function discoverAllPages(): bool
     {
         return config('filament-shield.discovery.discover_all_pages', false);
     }
+
+    public static function getPolicyPath(): string
+    {
+        return Str::of(config('filament-shield.generator.policy_directory', 'Policies'))
+            ->replace('\\', DIRECTORY_SEPARATOR)
+            ->toString();
+    }
+
+    protected static function isRolePolicyGenerated(): bool
+    {
+        $filesystem = new Filesystem();
+
+        return (bool) $filesystem->exists(app_path(static::getPolicyPath() . DIRECTORY_SEPARATOR . 'RolePolicy.php'));
+    }
 }