From 8feece702cda2c853f7a7a85ab7e23d29c1b7550 Mon Sep 17 00:00:00 2001
From: Esteban Ecallard <100437198+EstebX@users.noreply.github.com>
Date: Thu, 23 May 2024 15:15:18 +0200
Subject: [PATCH 1/4] fix: wrong time during a failed deployment

---
 .../project/application/deployment/index.blade.php         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index ea7262a27..9c2d46b9a 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -92,8 +92,13 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                     <div>
                         @if ($deployment->status !== 'in_progress')
                             Finished <span x-text="measure_since_started()">0s</span> in
+                            @if ($deployment->status !== 'failed')
+                                <span class="font-bold" x-text="measure_finished_time()">0s</span>
+                            @else
+                                <span class="font-bold">0s</span>
+                            @endif
                         @else
-                            Running for
+                            Running for <span class="font-bold" x-text="measure_finished_time()">0s</span>
                         @endif
                         <span class="font-bold" x-text="measure_finished_time()">0s</span>
                     </div>

From de3b8a10a0bd931050b91bb31259b2d77741e65f Mon Sep 17 00:00:00 2001
From: Esteban Ecallard <100437198+EstebX@users.noreply.github.com>
Date: Thu, 23 May 2024 15:20:28 +0200
Subject: [PATCH 2/4] Update index.blade.php

---
 .../livewire/project/application/deployment/index.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index 9c2d46b9a..6b66d0183 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -98,7 +98,7 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                 <span class="font-bold">0s</span>
                             @endif
                         @else
-                            Running for <span class="font-bold" x-text="measure_finished_time()">0s</span>
+                            Running for
                         @endif
                         <span class="font-bold" x-text="measure_finished_time()">0s</span>
                     </div>

From a3765c19e39e4ecbee6849f0cdee027be0dbf229 Mon Sep 17 00:00:00 2001
From: Esteban Ecallard <100437198+EstebX@users.noreply.github.com>
Date: Wed, 29 May 2024 12:32:47 +0000
Subject: [PATCH 3/4] feat: if the time seems too long it remains at 0s

---
 .../livewire/project/application/deployment/index.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index 6b66d0183..d4bcdd8e3 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -140,7 +140,11 @@ function goto(url) {
                             }
                         },
                         measure_finished_time() {
-                            return this.finished_time;
+                            if (this.finished_time > 2000) {
+                                return 0;
+                            } else {
+                                return this.finished_time;
+                            }
                         },
                         measure_since_started() {
                             return dayjs.utc(created_at).fromNow();

From e16bd194a3c2bea10cbeeef37ca78ed28584f3b8 Mon Sep 17 00:00:00 2001
From: Esteban Ecallard <100437198+EstebX@users.noreply.github.com>
Date: Wed, 29 May 2024 12:35:32 +0000
Subject: [PATCH 4/4] fix: removal of the failed deployment condition, addition
 of since started instead of finished time

---
 .../project/application/deployment/index.blade.php        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index d4bcdd8e3..93911be61 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -92,15 +92,11 @@ class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                     <div>
                         @if ($deployment->status !== 'in_progress')
                             Finished <span x-text="measure_since_started()">0s</span> in
-                            @if ($deployment->status !== 'failed')
-                                <span class="font-bold" x-text="measure_finished_time()">0s</span>
-                            @else
-                                <span class="font-bold">0s</span>
-                            @endif
+                            <span class="font-bold" x-text="measure_finished_time()">0s</span>
                         @else
                             Running for
                         @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>