Refactor status component to use title instead of lastDeploymentInfo
This commit is contained in:
@@ -44,7 +44,7 @@
|
|||||||
@if ($resource->getMorphClass() == 'App\Models\Service')
|
@if ($resource->getMorphClass() == 'App\Models\Service')
|
||||||
<x-status.services :service="$resource" />
|
<x-status.services :service="$resource" />
|
||||||
@else
|
@else
|
||||||
<x-status.index :resource="$resource" :lastDeploymentInfo="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
|
<x-status.index :resource="$resource" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
|
||||||
@endif
|
@endif
|
||||||
</ol>
|
</ol>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
@props([
|
@props([
|
||||||
'lastDeploymentInfo' => null,
|
'title' => null,
|
||||||
'lastDeploymentLink' => null,
|
'lastDeploymentLink' => null,
|
||||||
'resource' => null,
|
'resource' => null,
|
||||||
])
|
])
|
||||||
@if (str($resource->status)->startsWith('running'))
|
@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') ||
|
@elseif(str($resource->status)->startsWith('restarting') ||
|
||||||
str($resource->status)->startsWith('starting') ||
|
str($resource->status)->startsWith('starting') ||
|
||||||
str($resource->status)->startsWith('degraded'))
|
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
|
@else
|
||||||
<x-status.stopped :status="$resource->status" />
|
<x-status.stopped :status="$resource->status" />
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@props([
|
@props([
|
||||||
'status' => 'Restarting',
|
'status' => 'Restarting',
|
||||||
'lastDeploymentInfo' => null,
|
'title' => null,
|
||||||
'lastDeploymentLink' => null,
|
'lastDeploymentLink' => null,
|
||||||
'noLoading' => false,
|
'noLoading' => false,
|
||||||
])
|
])
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
@endif
|
@endif
|
||||||
<span wire:loading.remove.delay.longer class="flex items-center">
|
<span wire:loading.remove.delay.longer class="flex items-center">
|
||||||
<div class="badge badge-warning "></div>
|
<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)
|
@if ($lastDeploymentLink)
|
||||||
<a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
|
<a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
|
||||||
{{ str($status)->before(':')->headline() }}
|
{{ str($status)->before(':')->headline() }}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@props([
|
@props([
|
||||||
'status' => 'Running',
|
'status' => 'Running',
|
||||||
'lastDeploymentInfo' => null,
|
'title' => null,
|
||||||
'lastDeploymentLink' => null,
|
'lastDeploymentLink' => null,
|
||||||
'noLoading' => false,
|
'noLoading' => false,
|
||||||
])
|
])
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
@endif
|
@endif
|
||||||
<span wire:loading.remove.delay.longer class="flex items-center">
|
<span wire:loading.remove.delay.longer class="flex items-center">
|
||||||
<div class="badge badge-success "></div>
|
<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)
|
@if ($lastDeploymentLink)
|
||||||
<a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
|
<a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
|
||||||
{{ str($status)->before(':')->headline() }}
|
{{ str($status)->before(':')->headline() }}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<nav wire:poll.10000ms="check_status">
|
<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">
|
<div class="navbar-main">
|
||||||
<nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
|
<nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
|
||||||
<a href="{{ route('project.application.configuration', $parameters) }}">
|
<a href="{{ route('project.application.configuration', $parameters) }}">
|
||||||
|
|||||||
@@ -165,10 +165,10 @@
|
|||||||
<div class="flex gap-2 items-center"
|
<div class="flex gap-2 items-center"
|
||||||
wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
|
wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
|
||||||
@if ($server->isSentinelLive())
|
@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>
|
<x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
|
||||||
@else
|
@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>
|
<x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user