diff --git a/app/Data/Permissions/PermissionData.php b/app/Data/Permissions/PermissionData.php index 7ed32be..6081afa 100644 --- a/app/Data/Permissions/PermissionData.php +++ b/app/Data/Permissions/PermissionData.php @@ -14,7 +14,7 @@ class PermissionData extends Data public function __construct( public int $id, public string $name, - public ConnectedAppPermissonEnum $type, + public ?ConnectedAppPermissonEnum $type, ) {} public static function fromModel(Permission $permission): self diff --git a/app/Helpers/AppPermission.php b/app/Helpers/AppPermission.php index 4ac0c67..b34bd8f 100644 --- a/app/Helpers/AppPermission.php +++ b/app/Helpers/AppPermission.php @@ -22,10 +22,10 @@ public static function name(ConnectedAppPermissonEnum $permission, string|Connec /** * @param string $permissionName This should be the name constructed by the {@see self::name()} method. */ - public static function type(string $permissionName): ConnectedAppPermissonEnum + public static function type(string $permissionName): ?ConnectedAppPermissonEnum { $permission = explode('-', $permissionName); - return ConnectedAppPermissonEnum::from($permission[0]); + return ConnectedAppPermissonEnum::tryFrom($permission[0]); } } diff --git a/resources/views/pages/access-manager/users/⚡index.blade.php b/resources/views/pages/access-manager/users/⚡index.blade.php index 02eee3a..f764e33 100644 --- a/resources/views/pages/access-manager/users/⚡index.blade.php +++ b/resources/views/pages/access-manager/users/⚡index.blade.php @@ -199,7 +199,7 @@ public function saveRoles(): void @scope('cell_roles', $row)
@foreach($row->roles as $role) - + @endforeach
@endscope