Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix deployment status

Browse Source
This commit is contained in:
Andras Bacsai 2023-06-08 09:23:25 +02:00
parent b2c3c9069f
commit d01486ce42
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Jobs/ApplicationDeploymentJob.php
View File

@ -273,9 +273,14 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory}
private function next(string $status) private function next(string $status)
{ {
if (!Str::of($this->application_deployment_queue->status)->startsWith('cancelled')) { if (!Str::of($this->application_deployment_queue->status)->startsWith('cancelled')) {
ray('Next Status: ' . $status);
$this->application_deployment_queue->update([ $this->application_deployment_queue->update([
'status' => $status, 'status' => $status,
]); ]);
$this->activity->properties = $this->activity->properties->merge([
'status' => $status,
]);
$this->activity->save();
} }
dispatch(new ApplicationContainerStatusJob( dispatch(new ApplicationContainerStatusJob(
application: $this->application, application: $this->application,

3
resources/views/livewire/project/application/deployment-logs.blade.php
View File

@ -1,12 +1,11 @@
<div class="pt-4"> <div class="pt-4">
<h2>Logs</h2>
<livewire:project.application.deployment-navbar :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" /> <livewire:project.application.deployment-navbar :activity="$activity" :application="$application" :deployment_uuid="$deployment_uuid" />
@if (data_get($activity, 'properties.status') === 'in_progress') @if (data_get($activity, 'properties.status') === 'in_progress')
<div class="flex items-center gap-1 pt-2 text-sm">Deployment is <div class="flex items-center gap-1 pt-2 text-sm">Deployment is
<div class="text-warning"> {{ Str::headline(data_get($activity, 'properties.status')) }}.</div> <div class="text-warning"> {{ Str::headline(data_get($activity, 'properties.status')) }}.</div>
<x-loading class="loading-ring" /> <x-loading class="loading-ring" />
</div> </div>
<div>Logs will be updated automatically.</div> <div class="text-sm">Logs will be updated automatically.</div>
@else @else
<div class="pt-2 text-sm">Deployment is <span <div class="pt-2 text-sm">Deployment is <span
class="text-warning">{{ Str::headline(data_get($activity, 'properties.status')) }}</span>. class="text-warning">{{ Str::headline(data_get($activity, 'properties.status')) }}</span>.

3
resources/views/livewire/project/application/deployment-navbar.blade.php
View File

@ -1,4 +1,5 @@
<div class="py-4"> <div class="flex items-center gap-2 pb-4">
<h2>Logs</h2>
@if (data_get($activity, 'properties.status') === 'in_progress') @if (data_get($activity, 'properties.status') === 'in_progress')
<x-forms.button wire:click.prevent="cancel">Cancel deployment</x-forms.button> <x-forms.button wire:click.prevent="cancel">Cancel deployment</x-forms.button>
@else @else

12
resources/views/livewire/project/application/deployments.blade.php
View File

@ -48,14 +48,18 @@
</div> </div>
@endif @endif
<div class="flex flex-col" x-data="elapsedTime('{{ $deployment->deployment_uuid }}', '{{ $deployment->status }}', '{{ $deployment->created_at }}', '{{ $deployment->updated_at }}')"> <div class="flex flex-col" x-data="elapsedTime('{{ $deployment->deployment_uuid }}', '{{ $deployment->status }}', '{{ $deployment->created_at }}', '{{ $deployment->updated_at }}')">
<div>Finished <span x-text="measure_since_started()">0s</span> in <span class="font-bold" <div>
x-text="measure_finished_time()">0s</span></div> @if ($deployment->status !== 'in_progress')
Finished <span x-text="measure_since_started()">0s</span> in
@else
Running for
@endif
<span class="font-bold" x-text="measure_finished_time()">0s</span>
</div>
</div> </div>
</div> </div>
</a> </a>
@endforeach @endforeach
<script src="https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/utc.js"></script> <script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/utc.js"></script>
<script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/relativeTime.js"></script> <script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/relativeTime.js"></script>