diff --git a/src/EnumServiceProvider.php b/src/EnumServiceProvider.php index b295b57..e8f12b8 100644 --- a/src/EnumServiceProvider.php +++ b/src/EnumServiceProvider.php @@ -3,11 +3,8 @@ namespace LaravelEnso\Permissions; use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider; -use LaravelEnso\Permissions\Enums\Types; class EnumServiceProvider extends ServiceProvider { - public $register = [ - 'permissionTypes' => Types::class, - ]; + public $register = []; } diff --git a/src/Enums/Type.php b/src/Enums/Type.php new file mode 100644 index 0000000..1c5df26 --- /dev/null +++ b/src/Enums/Type.php @@ -0,0 +1,19 @@ + Type::Read->value, + 'OPTIONS' => Type::Read->value, + 'GET' => Type::Read->value, + 'POST' => Type::Write->value, + 'PATCH' => Type::Write->value, + 'PUT' => Type::Write->value, + 'DELETE' => Type::Delete->value, + }; + } +} diff --git a/src/Enums/Verbs.php b/src/Enums/Verbs.php deleted file mode 100644 index b39191b..0000000 --- a/src/Enums/Verbs.php +++ /dev/null @@ -1,21 +0,0 @@ - Types::Read, - 'OPTIONS' => Types::Read, - 'GET' => Types::Read, - 'POST' => Types::Write, - 'PATCH' => Types::Write, - 'PUT' => Types::Write, - 'DELETE' => Types::Delete, - ]; - } -} diff --git a/src/Models/Permission.php b/src/Models/Permission.php index 6a9caeb..8f8c9be 100644 --- a/src/Models/Permission.php +++ b/src/Models/Permission.php @@ -7,8 +7,8 @@ use Illuminate\Support\Facades\Route; use LaravelEnso\DynamicMethods\Traits\Abilities; use LaravelEnso\Menus\Models\Menu; -use LaravelEnso\Permissions\Enums\Types; -use LaravelEnso\Permissions\Enums\Verbs; +use LaravelEnso\Permissions\Enums\Type; +use LaravelEnso\Permissions\Enums\Verb; use LaravelEnso\Permissions\Exceptions\Permission as Exception; use LaravelEnso\Roles\Traits\HasRoles; use LaravelEnso\Tables\Traits\TableCache; @@ -32,10 +32,10 @@ public function getTypeAttribute() public function type(): string { if ($this->relationLoaded('menu') && $this->menu !== null) { - return __(Types::Menu); + return __(Type::Menu->value); } - return Verbs::get($this->method()) ?? __(Types::Link); + return Verb::tryFrom($this->method())?->map() ?? __(Type::Link->value); } public function method() diff --git a/src/Tables/Templates/permissions.json b/src/Tables/Templates/permissions.json index 4292399..6112118 100644 --- a/src/Tables/Templates/permissions.json +++ b/src/Tables/Templates/permissions.json @@ -10,7 +10,8 @@ "appends": [ "type" ], - "columns": [{ + "columns": [ + { "label": "Name", "name": "name", "data": "permissions.name", @@ -32,7 +33,7 @@ "label": "Type", "name": "type", "data": "type", - "enum": "LaravelEnso\\Permissions\\Enums\\Types", + "enum": "LaravelEnso\\Permissions\\Enums\\Type", "meta": [ "slot" ] @@ -56,4 +57,4 @@ ] } ] -} +} \ No newline at end of file