mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-15 06:16:04 +00:00
fix(resources): clarify build server hosting restrictions (#10961)
This commit is contained in:
1 parent
7d699818e8
commit
913d033c75
25 files changed
+621
-70
No files matched your search
@@ -25,13 +25,13 @@
|
||||
@foreach ($servers->sortBy('id') as $server)
|
||||
@foreach ($server->destinations() as $destination)
|
||||
<tr class="cursor-pointer hover:bg-coolgray-50 dark:hover:bg-coolgray-200"
|
||||
wire:click="selectServer('{{ $server->id }}', '{{ $destination->id }}')">
|
||||
wire:click="selectServer('{{ $server->id }}', '{{ $destination->uuid }}')">
|
||||
<td class="px-5 py-4 text-sm whitespace-nowrap dark:text-white"
|
||||
:class="'{{ $selectedDestination === $destination->id }}' ?
|
||||
:class="'{{ $selectedDestination === $destination->uuid }}' ?
|
||||
'bg-coollabs text-white' : 'dark:bg-coolgray-100 bg-white'">
|
||||
{{ $server->name }}</td>
|
||||
<td class="px-5 py-4 text-sm whitespace-nowrap dark:text-white "
|
||||
:class="'{{ $selectedDestination === $destination->id }}' ?
|
||||
:class="'{{ $selectedDestination === $destination->uuid }}' ?
|
||||
'bg-coollabs text-white' : 'dark:bg-coolgray-100 bg-white'">
|
||||
{{ $destination->name }}
|
||||
</td>
|
||||
|
||||
@@ -433,28 +433,40 @@
|
||||
server. <a class="underline dark:text-white" href="/servers" {{ wireNavigate() }}>
|
||||
Go to servers page
|
||||
</a> </div>
|
||||
@else
|
||||
@forelse($servers as $server)
|
||||
<div class="w-full coolbox group" wire:click="setServer({{ $server }})">
|
||||
<div class="flex flex-col mx-6">
|
||||
<div class="box-title">
|
||||
{{ $server->name }}
|
||||
</div>
|
||||
<div class="box-description">
|
||||
{{ $server->description }}
|
||||
</div>
|
||||
@endif
|
||||
@forelse($servers as $server)
|
||||
<div class="w-full coolbox group" wire:click="setServer({{ $server }})">
|
||||
<div class="flex flex-col mx-6">
|
||||
<div class="box-title">
|
||||
{{ $server->name }}
|
||||
</div>
|
||||
<div class="box-description">
|
||||
{{ $server->description }}
|
||||
</div>
|
||||
</div>
|
||||
@empty
|
||||
</div>
|
||||
@empty
|
||||
@if ($buildServers?->isEmpty() && ! $onlyBuildServerAvailable)
|
||||
<div>
|
||||
|
||||
<div>No validated & reachable servers found. <a class="underline dark:text-white"
|
||||
href="/servers" {{ wireNavigate() }}>
|
||||
Go to servers page
|
||||
</a></div>
|
||||
</div>
|
||||
@endforelse
|
||||
@endif
|
||||
@endif
|
||||
@endforelse
|
||||
@foreach($buildServers ?? [] as $buildServer)
|
||||
<div class="w-full coolbox opacity-60 cursor-not-allowed">
|
||||
<div class="flex flex-col mx-6">
|
||||
<div class="box-title">{{ $buildServer->name }}</div>
|
||||
<div class="box-description">
|
||||
This server is configured as a build server and cannot host resources.
|
||||
<a class="underline dark:text-white" href="{{ route('server.show', ['server_uuid' => $buildServer->uuid]) }}"
|
||||
{{ wireNavigate() }}>Change server settings</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
@if ($current_step === 'destinations')
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
'destinations' => $s->destinations()->map(
|
||||
fn($d) => [
|
||||
'id' => $d->id,
|
||||
'uuid' => $d->uuid,
|
||||
'name' => $d->name,
|
||||
'server_id' => $s->id,
|
||||
],
|
||||
@@ -77,6 +78,9 @@
|
||||
<template x-for="server in servers" :key="server.id">
|
||||
<option :value="server.id" x-text="`${server.name} (${server.ip})`"></option>
|
||||
</template>
|
||||
@foreach ($buildServers as $buildServer)
|
||||
<option disabled>{{ $buildServer->name }} — Build server — cannot host resources</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -84,8 +88,8 @@
|
||||
<label class="block text-sm font-medium mb-2">Select Network Destination</label>
|
||||
<select x-model="selectedCloneDestination" :disabled="!selectedCloneServer" class="select">
|
||||
<option value="">Choose a destination...</option>
|
||||
<template x-for="destination in availableDestinations" :key="destination.id">
|
||||
<option :value="destination.id" x-text="destination.name"></option>
|
||||
<template x-for="destination in availableDestinations" :key="destination.uuid">
|
||||
<option :value="destination.uuid" x-text="destination.name"></option>
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user