From de8f2cc0bb1258f9c63b0ca0a91a596c47c7f677 Mon Sep 17 00:00:00 2001 From: notCharles Date: Wed, 5 Nov 2025 17:00:38 -0500 Subject: [PATCH] more changes, add 404 catch --- .../Admin/Resources/Nodes/Pages/EditNode.php | 14 +++++++++++--- lang/en/admin/node.php | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php b/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php index 4731863ba..2d394ef9f 100644 --- a/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php +++ b/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php @@ -637,12 +637,11 @@ class EditNode extends EditRecord ->heading(trans('admin/node.tabs.diagnostics')) ->columnSpanFull() ->columns(3) - ->collapsible()->collapsed() ->headerActions([ Action::make('pull') ->label(trans('admin/node.diagnostics.pull')) ->icon('tabler-cloud-download')->iconButton()->iconSize(IconSize::ExtraLarge) - ->visible(fn (Get $get) => !($get('pulled') ?? false)) + ->hidden(fn (Get $get) => ($get('pulled'))) ->action(function (Get $get, Set $set, Node $node) { $includeEndpoints = $get('include_endpoints') ?? true; $includeLogs = $get('include_logs') ?? true; @@ -651,12 +650,21 @@ class EditNode extends EditRecord try { $response = $this->daemonSystemRepository->setNode($node)->getDiagnostics($logLines, $includeEndpoints, $includeLogs); + if (str_contains($response->body(), '404')) { + Notification::make() + ->title(trans('admin/node.diagnostics.404')) + ->warning() + ->send(); + + return; + } + $set('pulled', true); $set('uploaded', false); $set('log', $response->body()); Notification::make() - ->title('Logs Pulled') + ->title(trans('admin/node.diagnostics.logs_pulled')) ->success() ->send(); } catch (ConnectionException $e) { diff --git a/lang/en/admin/node.php b/lang/en/admin/node.php index da4314b9e..4dbf8cc98 100644 --- a/lang/en/admin/node.php +++ b/lang/en/admin/node.php @@ -126,11 +126,13 @@ return [ 'include_logs_hint' => 'Including logs will show recent wing logs and help track down possible issues.', 'run_diagnostics' => 'Run Diagnostics', 'upload_to_pelican' => 'Upload Logs', + 'logs_pulled' => 'Logs Pulled!', 'logs_uploaded' => 'Logs Uploaded', 'upload_failed' => 'Log Upload Failed', 'view_logs' => 'View Logs', 'pull' => 'Pull', 'upload' => 'Upload', + '404' => 'The requested diagnostic report could not be found. Make sure wings is up to date and try again.', ], 'cloudflare_issue' => [