From af482f0572a3d07b6f018d4d55729b901586e6c0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 7 Jan 2025 10:43:21 +0100 Subject: [PATCH] fix: show if only build servers are added to your team --- app/Livewire/Project/New/Select.php | 8 ++++ .../livewire/project/new/select.blade.php | 43 +++++++++++-------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php index 2c098d6bc..b645a8915 100644 --- a/app/Livewire/Project/New/Select.php +++ b/app/Livewire/Project/New/Select.php @@ -23,6 +23,8 @@ class Select extends Component public Collection|null|Server $servers; + public bool $onlyBuildServerAvailable = false; + public ?Collection $standaloneDockers; public ?Collection $swarmDockers; @@ -325,5 +327,11 @@ class Select extends Component { $this->servers = Server::isUsable()->get()->sortBy('name'); $this->allServers = $this->servers; + + if ($this->allServers && $this->allServers->isNotEmpty()) { + $this->onlyBuildServerAvailable = $this->allServers->every(function ($server) { + return $server->isBuildServer(); + }); + } } } diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index e6067817d..d48c3bbec 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -216,28 +216,33 @@

Select a server

- @forelse($servers as $server) -
-
-
- {{ $server->name }} + @if ($onlyBuildServerAvailable) +
Only build servers are available, you need at least one server that is not set as build + server. + Go to servers page +
+ @else + @forelse($servers as $server) +
+
+
+ {{ $server->name }} +
+
+ {{ $server->description }}
-
- {{ $server->description }}
-
- @empty -
-
No validated & reachable servers found. - Go to servers page -
-
- @endforelse + @empty +
+ +
No validated & reachable servers found. + Go to servers page +
+
+ @endforelse + @endif
- {{-- @if ($isDatabase) -
Swarm clusters are excluded from this type of resource at the moment. It will - be activated soon. Stay tuned.
- @endif --}} @endif @if ($current_step === 'destinations')

Select a destination