dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor getLogs method and update view template

Browse Source
This commit is contained in:
Andras Bacsai
2024-02-27 09:08:15 +01:00
parent c71e1e107e
commit 5275ae8e9c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Livewire/Project/Shared/GetLogs.php
View File

@@ -71,10 +71,12 @@ class GetLogs extends Component
} }
public function getLogs($refresh = false) public function getLogs($refresh = false)
{ {
if (str($this->container)->contains('-pr-')) { if ($this->resource?->getMorphClass() === 'App\Models\Application') {
$this->pull_request = "Pull Request: " . str($this->container)->afterLast('-pr-')->beforeLast('_')->value(); if (str($this->container)->contains('-pr-')) {
} else { $this->pull_request = "Pull Request: " . str($this->container)->afterLast('-pr-')->beforeLast('_')->value();
$this->pull_request = 'branch'; } else {
$this->pull_request = 'branch';
}
} }
if (!$refresh && ($this->resource?->getMorphClass() === 'App\Models\Service' || str($this->container)->contains('-pr-'))) return; if (!$refresh && ($this->resource?->getMorphClass() === 'App\Models\Service' || str($this->container)->contains('-pr-'))) return;
if ($this->container) { if ($this->container) {

4
resources/views/livewire/project/shared/get-logs.blade.php
View File

@@ -2,7 +2,9 @@
<div x-init="$wire.getLogs" id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }"> <div x-init="$wire.getLogs" id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h3>{{ $container }}</h3> <h3>{{ $container }}</h3>
<div>({{ $pull_request }})</div> @if ($pull_request)
<div>({{ $pull_request }})</div>
@endif
@if ($streamLogs) @if ($streamLogs)
<span wire:poll.2000ms='getLogs(true)' class="loading loading-xs text-warning loading-spinner"></span> <span wire:poll.2000ms='getLogs(true)' class="loading loading-xs text-warning loading-spinner"></span>
@endif @endif