From f3500497d040f89346db678cdf352980ebeed560 Mon Sep 17 00:00:00 2001 From: Jamie Wood Date: Sat, 5 Apr 2025 19:57:29 +0100 Subject: [PATCH] fix(site/workers): add-all-ssh-users-to-worker-edit (#567) * fix(site/workers): add-all-ssh-users-to-worker-edit * adjust site users and server users for workers --------- Co-authored-by: Saeed Vaziry <61919774+saeedvaziry@users.noreply.github.com> Co-authored-by: Saeed Vaziry --- app/Web/Pages/Servers/Workers/Actions/Create.php | 6 +++++- app/Web/Pages/Servers/Workers/Widgets/WorkersList.php | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Web/Pages/Servers/Workers/Actions/Create.php b/app/Web/Pages/Servers/Workers/Actions/Create.php index c328825..d0ffb8b 100644 --- a/app/Web/Pages/Servers/Workers/Actions/Create.php +++ b/app/Web/Pages/Servers/Workers/Actions/Create.php @@ -24,7 +24,11 @@ public static function form(Server $server, ?Site $site = null): array ->helperText('Example: php /home/vito/your-site/artisan queue:work'), Select::make('user') ->rules(fn (callable $get) => CreateWorker::rules($server, $site)['user']) - ->options(array_combine($server->getSshUsers(), $server->getSshUsers())), + ->options( + $site instanceof Site ? + array_combine($site->getSshUsers(), $site->getSshUsers()) : + array_combine($server->getSshUsers(), $server->getSshUsers()) + ), TextInput::make('numprocs') ->default(1) ->rules(CreateWorker::rules($server, $site)['numprocs']) diff --git a/app/Web/Pages/Servers/Workers/Widgets/WorkersList.php b/app/Web/Pages/Servers/Workers/Widgets/WorkersList.php index a74287a..0a56951 100644 --- a/app/Web/Pages/Servers/Workers/Widgets/WorkersList.php +++ b/app/Web/Pages/Servers/Workers/Widgets/WorkersList.php @@ -147,10 +147,11 @@ private function editAction(): Action ->helperText('Example: php /home/vito/your-site/artisan queue:work'), Select::make('user') ->rules(fn (callable $get) => EditWorker::rules($this->server, $this->site)['user']) - ->options([ - 'vito' => $this->server->ssh_user, - 'root' => 'root', - ]), + ->options( + $this->site instanceof Site ? + array_combine($this->site->getSshUsers(), $this->site->getSshUsers()) : + array_combine($this->server->getSshUsers(), $this->server->getSshUsers()) + ), TextInput::make('numprocs') ->default(1) ->rules(EditWorker::rules($this->server, $this->site)['numprocs'])