mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-15 20:15:45 +00:00
Merge remote-tracking branch 'origin/next' into jean/docker-network-ui
This commit is contained in:
commit
1fc224cd75
470 files changed
+27066
-9804
No files matched your search
@@ -3,6 +3,7 @@
|
||||
namespace App\Livewire\Destination;
|
||||
|
||||
use App\Models\Server;
|
||||
use Illuminate\Support\Collection;
|
||||
use Livewire\Attributes\Locked;
|
||||
use Livewire\Component;
|
||||
|
||||
@@ -11,9 +12,15 @@ class Index extends Component
|
||||
#[Locked]
|
||||
public $servers;
|
||||
|
||||
public function mount()
|
||||
#[Locked]
|
||||
public Collection $destinations;
|
||||
|
||||
public function mount(): void
|
||||
{
|
||||
$this->servers = Server::isUsable()->get();
|
||||
$this->destinations = $this->servers
|
||||
->flatMap(fn (Server $server) => $server->standaloneDockers->concat($server->swarmDockers))
|
||||
->values();
|
||||
}
|
||||
|
||||
public function render()
|
||||
|
||||
@@ -33,44 +33,49 @@ class Docker extends Component
|
||||
#[Validate(['required', 'boolean'])]
|
||||
public bool $isSwarm = false;
|
||||
|
||||
public function mount(?string $server_id = null)
|
||||
public function mount(?string $server_id = null): void
|
||||
{
|
||||
$this->network = new Cuid2;
|
||||
$this->network = (string) new Cuid2;
|
||||
$this->servers = Server::isUsable()->get();
|
||||
if ($server_id) {
|
||||
$foundServer = $this->servers->find($server_id) ?: $this->servers->first();
|
||||
if (! $foundServer) {
|
||||
throw new \Exception('Server not found.');
|
||||
|
||||
if (filled($server_id)) {
|
||||
$this->selectedServer = Server::ownedByCurrentTeam()->whereKey($server_id)->firstOrFail();
|
||||
|
||||
if (! $this->servers->contains('id', $this->selectedServer->id)) {
|
||||
$this->servers->push($this->selectedServer);
|
||||
}
|
||||
$this->selectedServer = $foundServer;
|
||||
$this->serverId = $this->selectedServer->id;
|
||||
|
||||
$this->serverId = (string) $this->selectedServer->id;
|
||||
} else {
|
||||
$foundServer = $this->servers->first();
|
||||
if (! $foundServer) {
|
||||
throw new \Exception('Server not found.');
|
||||
}
|
||||
$this->selectedServer = $foundServer;
|
||||
$this->serverId = $this->selectedServer->id;
|
||||
$this->serverId = (string) $this->selectedServer->id;
|
||||
}
|
||||
$this->generateName();
|
||||
}
|
||||
|
||||
public function updatedServerId()
|
||||
public function updatedServerId(): void
|
||||
{
|
||||
$this->selectedServer = $this->servers->find($this->serverId);
|
||||
if (! $this->selectedServer) {
|
||||
throw new \Exception('Server not found.');
|
||||
}
|
||||
$this->generateName();
|
||||
}
|
||||
|
||||
public function generateName()
|
||||
public function generateName(): void
|
||||
{
|
||||
$name = data_get($this->selectedServer, 'name', new Cuid2);
|
||||
$this->name = str("{$name}-{$this->network}")->kebab();
|
||||
}
|
||||
|
||||
public function submit()
|
||||
public function submit(): mixed
|
||||
{
|
||||
try {
|
||||
$this->authorize('create', StandaloneDocker::class);
|
||||
$this->authorize('create', $this->isSwarm ? SwarmDocker::class : StandaloneDocker::class);
|
||||
$this->validate();
|
||||
if ($this->isSwarm) {
|
||||
$found = $this->selectedServer->swarmDockers()->where('network', $this->network)->first();
|
||||
|
||||
Reference in new issue
Block a user