From 388929be302c14dfabf73d3bfdb23f0aa0f7dec5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 22 Oct 2024 10:58:23 +0200
Subject: [PATCH] Refactor status component to use title instead of
 lastDeploymentInfo

---
 resources/views/components/resources/breadcrumbs.blade.php  | 2 +-
 resources/views/components/status/index.blade.php           | 6 +++---
 resources/views/components/status/restarting.blade.php      | 4 ++--
 resources/views/components/status/running.blade.php         | 4 ++--
 .../views/livewire/project/application/heading.blade.php    | 2 +-
 resources/views/livewire/server/form.blade.php              | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php
index ea12495a1..f9733f63a 100644
--- a/resources/views/components/resources/breadcrumbs.blade.php
+++ b/resources/views/components/resources/breadcrumbs.blade.php
@@ -44,7 +44,7 @@
         @if ($resource->getMorphClass() == 'App\Models\Service')
             <x-status.services :service="$resource" />
         @else
-            <x-status.index :resource="$resource" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
+            <x-status.index :resource="$resource" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
         @endif
     </ol>
 </nav>
diff --git a/resources/views/components/status/index.blade.php b/resources/views/components/status/index.blade.php
index 0ef652897..fcc2688e1 100644
--- a/resources/views/components/status/index.blade.php
+++ b/resources/views/components/status/index.blade.php
@@ -1,14 +1,14 @@
 @props([
-    'lastDeploymentInfo' => null,
+    'title' => null,
     'lastDeploymentLink' => null,
     'resource' => null,
 ])
 @if (str($resource->status)->startsWith('running'))
-    <x-status.running :status="$resource->status" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
+    <x-status.running :status="$resource->status" :title="$title" :lastDeploymentLink="$lastDeploymentLink" />
 @elseif(str($resource->status)->startsWith('restarting') ||
         str($resource->status)->startsWith('starting') ||
         str($resource->status)->startsWith('degraded'))
-    <x-status.restarting :status="$resource->status" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
+    <x-status.restarting :status="$resource->status" :title="$title" :lastDeploymentLink="$lastDeploymentLink" />
 @else
     <x-status.stopped :status="$resource->status" />
 @endif
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php
index c9b6c2127..4314efa8b 100644
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@@ -1,6 +1,6 @@
 @props([
     'status' => 'Restarting',
-    'lastDeploymentInfo' => null,
+    'title' => null,
     'lastDeploymentLink' => null,
     'noLoading' => false,
 ])
@@ -10,7 +10,7 @@
     @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-warning "></div>
-        <div class="pl-2 pr-1 text-xs font-bold tracking-wider dark:text-warning" @if($lastDeploymentInfo) title="{{$lastDeploymentInfo}}" @endif>
+        <div class="pl-2 pr-1 text-xs font-bold tracking-wider dark:text-warning" @if($title) title="{{$title}}" @endif>
             @if ($lastDeploymentLink)
               <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
                   {{ str($status)->before(':')->headline() }}
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 8bb45b884..0e0f08fa4 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -1,6 +1,6 @@
 @props([
     'status' => 'Running',
-    'lastDeploymentInfo' => null,
+    'title' => null,
     'lastDeploymentLink' => null,
     'noLoading' => false,
 ])
@@ -10,7 +10,7 @@
     @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
     <div class="badge badge-success "></div>
-    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success" @if($lastDeploymentInfo) title="{{$lastDeploymentInfo}}" @endif>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success" @if($title) title="{{$title}}" @endif>
     @if ($lastDeploymentLink)
         <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
             {{ str($status)->before(':')->headline() }}
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 04b65eef9..8f3d1d15c 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -1,5 +1,5 @@
 <nav wire:poll.10000ms="check_status">
-    <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
+    <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
     <div class="navbar-main">
         <nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
             <a href="{{ route('project.application.configuration', $parameters) }}">
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index a184a308a..7365fc1b1 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -165,10 +165,10 @@
                     <div class="flex gap-2 items-center"
                         wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
                         @if ($server->isSentinelLive())
-                            <x-status.running status="In-sync" noLoading />
+                            <x-status.running status="In sync" noLoading title="{{$server->sentinel_updated_at}}" />
                             <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
                         @else
-                            <x-status.stopped status="Out-of-sync" noLoading />
+                            <x-status.stopped status="Out of sync" noLoading title="{{$server->sentinel_updated_at}}" />
                             <x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
                         @endif
                     </div>