From d914d726dc41d5574607c84ebdc6c2e34c1e1492 Mon Sep 17 00:00:00 2001
From: RMartinOscar <40749467+RMartinOscar@users.noreply.github.com>
Date: Thu, 23 Jan 2025 01:21:06 +0000
Subject: [PATCH] Add roles to owner selector on Create/Edit Server page

---
 .../Admin/Resources/ServerResource/Pages/CreateServer.php       | 2 +-
 .../Admin/Resources/ServerResource/Pages/EditServer.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php
index caca65cce0..8ef3e62f91 100644
--- a/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php
+++ b/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php
@@ -136,7 +136,7 @@ public function form(Form $form): Form
                                 ])
                                 ->relationship('user', 'username')
                                 ->searchable(['username', 'email'])
-                                ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . ($user->isRootAdmin() ? '(admin)' : ''))
+                                ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . (blank($user->roles) ? '' : '(' . $user->roles->map(fn ($role) => $role->name)->join(', ') . ')'))
                                 ->createOptionForm([
                                     TextInput::make('username')
                                         ->alphaNum()
diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
index 09f2335910..85e2fcd888 100644
--- a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
+++ b/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
@@ -107,7 +107,7 @@ public function form(Form $form): Form
                                     ])
                                     ->relationship('user', 'username')
                                     ->searchable(['username', 'email'])
-                                    ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . ($user->isRootAdmin() ? '(admin)' : ''))
+                                    ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . (blank($user->roles) ? '' : '(' . $user->roles->map(fn ($role) => $role->name)->join(', ') . ')'))
                                     ->preload()
                                     ->required(),