From 92a53a151e0bcb6f6fd1b82862277f30877896ec Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 24 Sep 2023 10:48:54 +0200 Subject: [PATCH] fix: server validation with cf tunnels --- app/Http/Livewire/Server/Form.php | 8 ++-- .../views/components/server/navbar.blade.php | 4 +- .../views/livewire/server/form.blade.php | 2 +- .../livewire/server/proxy/deploy.blade.php | 4 +- .../livewire/server/proxy/status.blade.php | 38 ++++++++++--------- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 029d029a3..9f6cb594f 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -45,6 +45,8 @@ class Form extends Component $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage; } public function instantSave() { + refresh_server_connection($this->server->privateKey); + $this->validateServer(); $this->server->settings->save(); } public function installDocker() @@ -62,21 +64,19 @@ class Form extends Component $this->uptime = $uptime; $this->emit('success', 'Server is reachable.'); } else { - ray($this->uptime); - $this->emit('error', 'Server is not reachable.'); - return; } if ($dockerVersion) { $this->dockerVersion = $dockerVersion; - $this->emit('proxyStatusUpdated'); $this->emit('success', 'Docker Engine 23+ is installed!'); } else { $this->emit('error', 'No Docker Engine or older than 23 version installed.'); } } catch (\Throwable $e) { return handleError($e, $this, customErrorMessage: "Server is not reachable: "); + } finally { + $this->emit('proxyStatusUpdated'); } } diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php index baac76ea4..d36a35b8f 100644 --- a/resources/views/components/server/navbar.blade.php +++ b/resources/views/components/server/navbar.blade.php @@ -2,9 +2,7 @@

Server

- @if ($server->settings->is_reachable) - - @endif +
{{ data_get($server, 'name') }}