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

Merge pull request #2278 from EstebX/wrong-time-during-a-failed-deployment

Browse Source 
fix: wrong time during a failed deployment
This commit is contained in:
Andras Bacsai 2024-05-31 12:57:37 +02:00 committed by GitHub
commit 82c5497a06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
resources/views/livewire/project/application/deployment/index.blade.php
View File

@ -93,10 +93,11 @@
<div> <div>
@if ($deployment->status !== 'in_progress') @if ($deployment->status !== 'in_progress')
Finished <span x-text="measure_since_started()">0s</span> in Finished <span x-text="measure_since_started()">0s</span> in
<span class="font-bold" x-text="measure_finished_time()">0s</span>
@else @else
Running for Running for
@endif @endif
<span class="font-bold" x-text="measure_finished_time()">0s</span> <span class="font-bold" x-text="measure_since_started()">0s</span>
</div> </div>
</div> </div>
</div> </div>
@ -118,11 +119,31 @@
dayjs.extend(window.dayjs_plugin_relativeTime); dayjs.extend(window.dayjs_plugin_relativeTime);
Alpine.data('elapsedTime', (uuid, status, created_at, updated_at) => ({ Alpine.data('elapsedTime', (uuid, status, created_at, updated_at) => ({
finished_time: 'calculating...', finished_time: 'calculating...',
started_time: 'calculating...', started_time: 'calculating...',
init() { init() {
if (timers[uuid]) { if (timers[uuid]) {
clearInterval(timers[uuid]); clearInterval(timers[uuid]);
}
if (status === 'in_progress') {
timers[uuid] = setInterval(() => {
this.finished_time = dayjs().diff(dayjs.utc(created_at),
'second') + 's'
}, 1000);
} else {
let seconds = dayjs.utc(updated_at).diff(dayjs.utc(created_at), 'second')
this.finished_time = seconds + 's';
}
},
measure_finished_time() {
if (this.finished_time > 2000) {
return 0;
} else {
return this.finished_time;
}
},
measure_since_started() {
return dayjs.utc(created_at).fromNow();
} }
if (status === 'in_progress') { if (status === 'in_progress') {
timers[uuid] = setInterval(() => { timers[uuid] = setInterval(() => {