From 0d45d9980c584d042ee0b0ff70d3b1ace05e1a81 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 15 Jun 2023 13:51:31 +0200 Subject: [PATCH] fix --- app/Http/Livewire/Server/Form.php | 15 ++++------ app/Jobs/InstanceProxyCheckJob.php | 2 +- app/Models/Server.php | 2 +- app/Models/ServerSetting.php | 2 +- bootstrap/helpers/remoteProcess.php | 2 +- ...24_140712_create_server_settings_table.php | 4 +-- database/seeders/ProductionSeeder.php | 2 +- database/seeders/ServerSettingSeeder.php | 4 +-- resources/views/components/layout.blade.php | 30 +++++++------------ .../views/livewire/server/form.blade.php | 9 ++---- .../views/livewire/server/proxy.blade.php | 2 +- .../livewire/server/proxy/deploy.blade.php | 2 +- .../livewire/server/proxy/status.blade.php | 2 +- resources/views/server/all.blade.php | 2 +- 14 files changed, 32 insertions(+), 48 deletions(-) diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 71e0ceafb..54961e273 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -12,7 +12,6 @@ class Form extends Component public Server $server; public $uptime; public $dockerVersion; - public $dockerComposeVersion; protected $rules = [ 'server.name' => 'required|min:6', @@ -20,7 +19,7 @@ class Form extends Component 'server.ip' => 'required', 'server.user' => 'required', 'server.port' => 'required', - 'server.settings.is_validated' => 'required', + 'server.settings.is_reachable' => 'required', 'server.settings.is_part_of_swarm' => 'required' ]; public function mount() @@ -36,7 +35,10 @@ class Form extends Component { try { $this->uptime = instant_remote_process(['uptime'], $this->server, false); - if (!$this->uptime) { + if ($this->uptime) { + $this->server->settings->is_reachable = true; + $this->server->settings->save(); + } else { $this->uptime = 'Server not reachable.'; throw new \Exception('Server not reachable.'); } @@ -44,15 +46,10 @@ class Form extends Component if (!$this->dockerVersion) { $this->dockerVersion = 'Not installed.'; } else { - $this->server->settings->is_docker_installed = true; - $this->server->settings->is_validated = true; + $this->server->settings->is_usable = true; $this->server->settings->save(); $this->emit('serverValidated'); } - $this->dockerComposeVersion = instant_remote_process(['docker compose version|head -2|grep -i version'], $this->server, false); - if (!$this->dockerComposeVersion) { - $this->dockerComposeVersion = 'Not installed.'; - } } catch (\Exception $e) { return general_error_handler(err: $e, that: $this); } diff --git a/app/Jobs/InstanceProxyCheckJob.php b/app/Jobs/InstanceProxyCheckJob.php index 4182f12bc..d2cf894f7 100755 --- a/app/Jobs/InstanceProxyCheckJob.php +++ b/app/Jobs/InstanceProxyCheckJob.php @@ -29,7 +29,7 @@ class InstanceProxyCheckJob implements ShouldQueue { try { $container_name = 'coolify-proxy'; - $servers = Server::whereRelation('settings', 'is_validated', true)->where('extra_attributes->proxy_type', ProxyTypes::TRAEFIK_V2)->get(); + $servers = Server::whereRelation('settings', 'is_reachable', true)->where('extra_attributes->proxy_type', ProxyTypes::TRAEFIK_V2)->get(); foreach ($servers as $server) { $status = get_container_status(server: $server, container_id: $container_name); diff --git a/app/Models/Server.php b/app/Models/Server.php index ac9e1c30c..385541634 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -65,7 +65,7 @@ class Server extends BaseModel static public function validated() { - return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_validated', true); + return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true); } static public function destinationsByServer(string $server_id) diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index 02c8e183e..6fdf931e7 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -8,7 +8,7 @@ class ServerSetting extends Model { protected $fillable = [ 'server_id', - 'is_docker_installed', + 'is_usable', ]; public function server() { diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php index 9c63aa438..00ffaa89e 100644 --- a/bootstrap/helpers/remoteProcess.php +++ b/bootstrap/helpers/remoteProcess.php @@ -50,7 +50,7 @@ function remote_process( function save_private_key_for_server(Server $server) { if (data_get($server, 'privateKey.private_key') === null) { - $server->settings->is_validated = false; + $server->settings->is_reachable = false; $server->settings->save(); throw new \Exception("Server {$server->name} does not have a private key"); } diff --git a/database/migrations/2023_03_24_140712_create_server_settings_table.php b/database/migrations/2023_03_24_140712_create_server_settings_table.php index bb5bcb271..a3b1c8b44 100644 --- a/database/migrations/2023_03_24_140712_create_server_settings_table.php +++ b/database/migrations/2023_03_24_140712_create_server_settings_table.php @@ -16,8 +16,8 @@ return new class extends Migration $table->boolean('is_part_of_swarm')->default(false); $table->boolean('is_jump_server')->default(false); $table->boolean('is_build_server')->default(false); - $table->boolean('is_validated')->default(false); - $table->boolean('is_docker_installed')->default(false); + $table->boolean('is_reachable')->default(false); + $table->boolean('is_usable')->default(false); $table->foreignId('server_id'); $table->timestamps(); }); diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index 070a9572d..783b99304 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -85,7 +85,7 @@ class ProductionSeeder extends Seeder 'proxy_status' => ProxyStatus::EXITED->value ]); $server = Server::create($server_details); - $server->settings->is_validated = true; + $server->settings->is_reachable = true; $server->settings->save(); } if (StandaloneDocker::find(0) == null) { diff --git a/database/seeders/ServerSettingSeeder.php b/database/seeders/ServerSettingSeeder.php index ce2f0ee1f..a4c0ac2ad 100644 --- a/database/seeders/ServerSettingSeeder.php +++ b/database/seeders/ServerSettingSeeder.php @@ -15,12 +15,12 @@ class ServerSettingSeeder extends Seeder { $server_2 = Server::find(0)->load(['settings']); $server_2->settings->is_build_server = true; - $server_2->settings->is_validated = true; + $server_2->settings->is_reachable = true; $server_2->settings->save(); $server_3 = Server::find(1)->load(['settings']); $server_3->settings->is_part_of_swarm = false; - $server_3->settings->is_validated = false; + $server_3->settings->is_reachable = false; $server_3->settings->save(); } } diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index 62ea63ce3..e8da7e150 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -79,15 +79,6 @@ }, 2000); } - function changePasswordFieldType(id) { - const input = document.getElementById(id); - if (input.type === 'password') { - input.type = 'text'; - } else { - input.type = 'password'; - } - } - function copyToClipboard(text) { navigator.clipboard.writeText(text); Livewire.emit('message', 'Copied to clipboard.'); @@ -108,18 +99,17 @@ if (message) Toaster.success(message) }) - @else - @endauth + diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index aa2c7ad0b..ae3ea6d85 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -9,7 +9,7 @@ Delete @endif - @if (!$server->settings->is_validated) + @if (!$server->settings->is_reachable)
Validate Server @@ -45,14 +45,14 @@
- @if ($server->settings->is_validated) + @if ($server->settings->is_reachable)

Quick Actions

Check Server Details - @if ($server->settings->is_docker_installed) + @if ($server->settings->is_usable) Reconfigure Docker Engine @else Install Docker Engine @@ -71,9 +71,6 @@ @isset($dockerVersion)

Docker Engine {{ $dockerVersion }}

@endisset - @isset($dockerComposeVersion) -

Compose: {{ $dockerComposeVersion }}

- @endisset
@endisset diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index c634d9088..e573e7b2d 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -1,7 +1,7 @@
- @if ($server->settings->is_validated) + @if ($server->settings->is_reachable) @if ($server->extra_attributes->proxy_type)
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php index 6c9513edd..7d07e317f 100644 --- a/resources/views/livewire/server/proxy/deploy.blade.php +++ b/resources/views/livewire/server/proxy/deploy.blade.php @@ -1,5 +1,5 @@
- @if ($server->settings->is_validated) + @if ($server->settings->is_reachable) @if ($server->extra_attributes->proxy_status === 'running')
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php index d72cdc92d..0d68cfbbf 100644 --- a/resources/views/livewire/server/proxy/status.blade.php +++ b/resources/views/livewire/server/proxy/status.blade.php @@ -1,5 +1,5 @@
- @if ($server->settings->is_validated) + @if ($server->settings->is_reachable)
@if ($server->extra_attributes->proxy_status === 'running') diff --git a/resources/views/server/all.blade.php b/resources/views/server/all.blade.php index 229534913..63f313eea 100644 --- a/resources/views/server/all.blade.php +++ b/resources/views/server/all.blade.php @@ -7,7 +7,7 @@ href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}">
{{ $server->name }}
- @if (!$server->settings->is_validated) + @if (!$server->settings->is_reachable)
not validated
@endif