dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: dashboard refactor

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-03 21:11:35 +01:00
parent b8a35be095
commit cc7c25aafd
2 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Livewire/Dashboard.php
View File

@@ -16,28 +16,28 @@ class Dashboard extends Component
public Collection $servers; public Collection $servers;
public Collection $private_keys; public Collection $privateKeys;
public $deployments_per_server; public array $deploymentsPerServer = [];
public function mount() public function mount()
{ {
$this->private_keys = PrivateKey::ownedByCurrentTeam()->get(); $this->privateKeys = PrivateKey::ownedByCurrentTeam()->get();
$this->servers = Server::ownedByCurrentTeam()->get(); $this->servers = Server::ownedByCurrentTeam()->get();
$this->projects = Project::ownedByCurrentTeam()->get(); $this->projects = Project::ownedByCurrentTeam()->get();
$this->get_deployments(); $this->loadDeployments();
} }
public function cleanup_queue() public function cleanupQueue()
{ {
Artisan::queue('cleanup:deployment-queue', [ Artisan::queue('cleanup:deployment-queue', [
'--team-id' => currentTeam()->id, '--team-id' => currentTeam()->id,
]); ]);
} }
public function get_deployments() public function loadDeployments()
{ {
$this->deployments_per_server = ApplicationDeploymentQueue::whereIn('status', ['in_progress', 'queued'])->whereIn('server_id', $this->servers->pluck('id'))->get([ $this->deploymentsPerServer = ApplicationDeploymentQueue::whereIn('status', ['in_progress', 'queued'])->whereIn('server_id', $this->servers->pluck('id'))->get([
'id', 'id',
'application_id', 'application_id',
'application_name', 'application_name',

30
resources/views/livewire/dashboard.blade.php
View File

@@ -94,7 +94,7 @@
@endforeach @endforeach
</div> </div>
@else @else
@if ($private_keys->count() === 0) @if ($privateKeys->count() === 0)
<div class="flex flex-col gap-1"> <div class="flex flex-col gap-1">
<div class='font-bold dark:text-warning'>No private keys found.</div> <div class='font-bold dark:text-warning'>No private keys found.</div>
<div class="flex items-center gap-1">Before you can add your server, first <x-modal-input <div class="flex items-center gap-1">Before you can add your server, first <x-modal-input
@@ -126,26 +126,17 @@
<section> <section>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h3 class="pb-2">Deployments</h3> <h3 class="pb-2">Deployments</h3>
@if (count($deployments_per_server) > 0) @if (count($deploymentsPerServer) > 0)
<x-loading /> <x-loading />
@endif @endif
<x-modal-confirmation <x-modal-confirmation title="Confirm Cleanup Queues?" buttonTitle="Cleanup Queues" isErrorButton
title="Confirm Cleanup Queues?" submitAction="cleanupQueue" :actions="['All running Deployment Queues will be cleaned up.']" :confirmWithText="false" :confirmWithPassword="false"
buttonTitle="Cleanup Queues" step2ButtonText="Permanently Cleanup Deployment Queues" :dispatchEvent="true"
isErrorButton dispatchEventType="success" dispatchEventMessage="Deployment Queues cleanup started." />
submitAction="cleanup_queue"
:actions="['All running Deployment Queues will be cleaned up.']"
:confirmWithText="false"
:confirmWithPassword="false"
step2ButtonText="Permanently Cleanup Deployment Queues"
:dispatchEvent="true"
dispatchEventType="success"
dispatchEventMessage="Deployment Queues cleanup started."
/>
</div> </div>
<div wire:poll.3000ms="get_deployments" class="grid grid-cols-1"> <div wire:poll.3000ms="loadDeployments" class="grid grid-cols-1">
@forelse ($deployments_per_server as $server_name => $deployments) @forelse ($deploymentsPerServer as $serverName => $deployments)
<h4 class="pb-2">{{ $server_name }}</h4> <h4 class="pb-2">{{ $serverName }}</h4>
<div class="grid grid-cols-1 gap-2 lg:grid-cols-3"> <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
@foreach ($deployments as $deployment) @foreach ($deployments as $deployment)
<a href="{{ data_get($deployment, 'deployment_url') }}" @class([ <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
@@ -187,7 +178,4 @@
} }
} }
</script> </script>
{{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
</div> </div>