diff --git a/src/Http/Livewire/TeamMemberManager.php b/src/Http/Livewire/TeamMemberManager.php index b80a75d69..62fe67c38 100644 --- a/src/Http/Livewire/TeamMemberManager.php +++ b/src/Http/Livewire/TeamMemberManager.php @@ -251,7 +251,15 @@ public function getUserProperty() */ public function getRolesProperty() { - return array_values(Jetstream::$roles); + return collect(Jetstream::$roles)->transform(function ($role) { + return with($role->jsonSerialize(), function ($data) { + return (new Role( + $data['key'], + $data['name'], + $data['permission'] + ))->description($data['description']); + }); + })->values()->all(); } /** diff --git a/stubs/app/Providers/JetstreamWithTeamsServiceProvider.php b/stubs/app/Providers/JetstreamWithTeamsServiceProvider.php index 541a517af..abad0ddb9 100644 --- a/stubs/app/Providers/JetstreamWithTeamsServiceProvider.php +++ b/stubs/app/Providers/JetstreamWithTeamsServiceProvider.php @@ -51,17 +51,17 @@ protected function configurePermissions() { Jetstream::defaultApiTokenPermissions(['read']); - Jetstream::role('admin', __('Administrator'), [ + Jetstream::role('admin', 'Administrator', [ 'create', 'read', 'update', 'delete', - ])->description(__('Administrator users can perform any action.')); + ])->description('Administrator users can perform any action.'); - Jetstream::role('editor', __('Editor'), [ + Jetstream::role('editor', 'Editor', [ 'read', 'create', 'update', - ])->description(__('Editor users have the ability to read, create, and update.')); + ])->description('Editor users have the ability to read, create, and update.'); } }