From 7af199093581300b7e189c3ee8e20fa86c4cb51a Mon Sep 17 00:00:00 2001 From: Constantin Graf Date: Tue, 8 Oct 2024 19:28:07 +0200 Subject: [PATCH] Added fallback for local env to server overview widget --- app/Filament/Widgets/ServerOverview.php | 14 +++++++++----- .../filament/widgets/server-overview.blade.php | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/Filament/Widgets/ServerOverview.php b/app/Filament/Widgets/ServerOverview.php index 51a6e5a7..0aae7339 100644 --- a/app/Filament/Widgets/ServerOverview.php +++ b/app/Filament/Widgets/ServerOverview.php @@ -16,18 +16,22 @@ class ServerOverview extends Widget */ protected function getViewData(): array { - $currentVersion = Cache::get('latest_version', null); + /** @var string|null $currentVersion */ + $currentVersion = config('app.version'); + /** @var string|null $build */ + $build = config('app.build'); + $latestVersion = Cache::get('latest_version', null); $needsUpdate = false; - if ($currentVersion !== null && version_compare($currentVersion, config('app.version')) > 0) { + if ($latestVersion !== null && $currentVersion !== null && version_compare($latestVersion, $currentVersion) > 0) { $needsUpdate = true; } return [ - 'version' => config('app.version'), - 'build' => config('app.build'), + 'version' => $currentVersion, + 'build' => $build, 'environment' => config('app.env'), - 'currentVersion' => $currentVersion, + 'currentVersion' => $latestVersion, 'needsUpdate' => $needsUpdate, ]; } diff --git a/resources/views/filament/widgets/server-overview.blade.php b/resources/views/filament/widgets/server-overview.blade.php index 56763dbb..876996d8 100644 --- a/resources/views/filament/widgets/server-overview.blade.php +++ b/resources/views/filament/widgets/server-overview.blade.php @@ -1,11 +1,23 @@
- Version v{{ $version }}
- Build {{ $build }} + Version + @if($version !== null) + v{{ $version }} + @else + - + @endif +
+ Build + @if($build !== null) + {{ $build }} + @else + - + @endif +
- @if ($currentVersion !== null) + @if ($currentVersion !== null && $version !== null)
@if ($needsUpdate)