diff --git a/app/Filament/Admin/Resources/Users/UserResource.php b/app/Filament/Admin/Resources/Users/UserResource.php index 8a530f62d..5c5337426 100644 --- a/app/Filament/Admin/Resources/Users/UserResource.php +++ b/app/Filament/Admin/Resources/Users/UserResource.php @@ -299,11 +299,15 @@ class UserResource extends Resource $id = $schema->getId(); $name = $schema->getName(); + + $color = $schema->getHexColor(); + $color = is_string($color) ? Color::hex($color) : null; + $actions[] = Action::make("oauth_$id") ->label(trans('profile.unlink', ['name' => $name])) ->icon('tabler-unlink') ->requiresConfirmation() - ->color(Color::hex($schema->getHexColor())) + ->color($color) ->action(function ($livewire) use ($oauthService, $user, $name, $schema) { $oauthService->unlinkUser($user, $schema); $livewire->form->fill($user->attributesToArray()); diff --git a/app/Filament/Pages/Auth/EditProfile.php b/app/Filament/Pages/Auth/EditProfile.php index 97e9549f3..dfd48dc4f 100644 --- a/app/Filament/Pages/Auth/EditProfile.php +++ b/app/Filament/Pages/Auth/EditProfile.php @@ -181,12 +181,15 @@ class EditProfile extends BaseEditProfile $id = $schema->getId(); $name = $schema->getName(); + $color = $schema->getHexColor(); + $color = is_string($color) ? Color::hex($color) : null; + $unlink = array_key_exists($id, $this->getUser()->oauth ?? []); $actions[] = Action::make("oauth_$id") ->label(trans('profile.' . ($unlink ? 'unlink' : 'link'), ['name' => $name])) ->icon($unlink ? 'tabler-unlink' : 'tabler-link') - ->color(Color::hex($schema->getHexColor())) + ->color($color) ->action(function (UserUpdateService $updateService) use ($id, $name, $unlink) { if ($unlink) { $oauth = user()?->oauth; diff --git a/app/Filament/Pages/Auth/Login.php b/app/Filament/Pages/Auth/Login.php index 883982e92..582b0b3e7 100644 --- a/app/Filament/Pages/Auth/Login.php +++ b/app/Filament/Pages/Auth/Login.php @@ -76,10 +76,13 @@ class Login extends BaseLogin $id = $schema->getId(); + $color = $schema->getHexColor(); + $color = is_string($color) ? Color::hex($color) : null; + $actions[] = Action::make("oauth_$id") ->label($schema->getName()) ->icon($schema->getIcon()) - ->color(Color::hex($schema->getHexColor())) + ->color($color) ->url(route('auth.oauth.redirect', ['driver' => $id], false)); }