From 54cec2e302db1ef13de4cd5fa75fef0d65f18bbd Mon Sep 17 00:00:00 2001 From: "Joseph.Rawlings" Date: Thu, 4 Dec 2025 22:25:58 -0500 Subject: [PATCH] feat: add formatted timestamp display for firewall logs --- .../Servers/Proxmox/Livewire/Firewall.php | 17 +++++++++++++++++ .../Servers/Proxmox/views/firewall.blade.php | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/extensions/Servers/Proxmox/Livewire/Firewall.php b/extensions/Servers/Proxmox/Livewire/Firewall.php index ad4e08b4b..9a6c9d3d4 100644 --- a/extensions/Servers/Proxmox/Livewire/Firewall.php +++ b/extensions/Servers/Proxmox/Livewire/Firewall.php @@ -1460,6 +1460,7 @@ class Firewall extends Component 'raw' => $line, 'timestamp' => $fields['timestamp'] ?? '-', 'timestamp_iso' => $this->convertTimestamp($fields['timestamp'] ?? ''), + 'timestamp_display' => $this->formatTimestampForDisplay($fields['timestamp'] ?? ''), 'action' => $fields['action'] ?? '-', 'level' => $fields['level'] ?? 0, 'level_label' => $this->getLevelLabel($fields['level'] ?? 0), @@ -1498,6 +1499,22 @@ class Firewall extends Component } } + protected function formatTimestampForDisplay(string $timestamp): string + { + try { + // Parse the Proxmox timestamp format: 04/Dec/2025:06:49:07 -1000 + $dt = Carbon::createFromFormat('d/M/Y:H:i:s O', $timestamp); + + // Convert to user's timezone (using app timezone) + $dt->setTimezone(config('app.timezone', 'UTC')); + + // Format as: Dec 04, 2025 16:49:07 (or use a more readable format) + return $dt->format('M d, Y H:i:s'); + } catch (\Exception $e) { + return $timestamp; + } + } + protected function getLevelLabel(int $level): string { return match($level) { diff --git a/extensions/Servers/Proxmox/views/firewall.blade.php b/extensions/Servers/Proxmox/views/firewall.blade.php index 046af3d72..f15e77518 100644 --- a/extensions/Servers/Proxmox/views/firewall.blade.php +++ b/extensions/Servers/Proxmox/views/firewall.blade.php @@ -850,7 +850,7 @@ @foreach($this->paginatedLogs as $log) - {{ $log['timestamp'] ?? '-' }} + {{ $log['timestamp_display'] ?? $log['timestamp'] ?? '-' }} {{ $log['action'] ?? '-' }}