From 592221b4bff7503c474f6f97e26e0672cb934a11 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 22 Feb 2024 14:46:11 +0100
Subject: [PATCH] fix: server validation

---
 app/Livewire/Server/ValidateAndInstall.php    |  4 ++--
 app/Models/Server.php                         |  2 +-
 .../views/livewire/server/form.blade.php      | 20 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php
index bc2af95d2..4fa92644d 100644
--- a/app/Livewire/Server/ValidateAndInstall.php
+++ b/app/Livewire/Server/ValidateAndInstall.php
@@ -11,7 +11,7 @@ class ValidateAndInstall extends Component
 {
     public Server $server;
     public int $number_of_tries = 0;
-    public int $max_tries = 2;
+    public int $max_tries = 1;
     public bool $install = true;
     public $uptime = null;
     public $supported_os_type = null;
@@ -99,7 +99,7 @@ class ValidateAndInstall extends Component
                     $this->error = 'Docker Engine could not be installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
                     return;
                 } else {
-                    if ($this->number_of_tries == 0 ) {
+                    if ($this->number_of_tries == 0) {
                         $activity = $this->server->installDocker();
                         $this->number_of_tries++;
                         $this->dispatch('newActivityMonitor', $activity->id, 'init');
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 27f0432a3..016efd5f7 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -469,7 +469,7 @@ class Server extends BaseModel
             return false;
         }
         try {
-            $dockerRunning = instant_remote_process(["docker version"], $this);
+            instant_remote_process(["docker version"], $this);
         } catch (\Throwable $e) {
             $this->settings->is_usable = false;
             $this->settings->save();
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 9d97a88fa..4e4e11845 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -10,15 +10,17 @@
                 </x-new-modal>
             @else
                 <x-forms.button type="submit">Save</x-forms.button>
-                <x-slide-over closeWithX fullScreen>
-                    <x-slot:title>Validate & configure</x-slot:title>
-                    <x-slot:content>
-                        <livewire:server.validate-and-install :server="$server" ask />
-                    </x-slot:content>
-                    <x-forms.button @click="slideOverOpen=true" wire:click.prevent='validateServer' isHighlighted>
-                        Revalidate server
-                    </x-forms.button>
-                </x-slide-over>
+                @if ($server->isFunctional())
+                    <x-slide-over closeWithX fullScreen>
+                        <x-slot:title>Validate & configure</x-slot:title>
+                        <x-slot:content>
+                            <livewire:server.validate-and-install :server="$server" ask />
+                        </x-slot:content>
+                        <x-forms.button @click="slideOverOpen=true" wire:click.prevent='validateServer' isHighlighted>
+                            Revalidate server
+                        </x-forms.button>
+                    </x-slide-over>
+                @endif
             @endif
         </div>
         @if ($server->isFunctional())