From bc2171511c1a5e5153aabdf2e1a10b2741505da6 Mon Sep 17 00:00:00 2001
From: "Joseph.Rawlings" <root0091@gmail.com>
Date: Tue, 2 Dec 2025 07:21:01 -0500
Subject: [PATCH] refactor: remove DHCP management logic from Proxmox Firewall
 component to simplify configuration handling and improve clarity

---
 extensions/Servers/Proxmox/Livewire/Firewall.php  | 15 ---------------
 extensions/Servers/Proxmox/Livewire/Overview.php  |  2 +-
 .../Servers/Proxmox/views/overview.blade.php      |  4 ++--
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/extensions/Servers/Proxmox/Livewire/Firewall.php b/extensions/Servers/Proxmox/Livewire/Firewall.php
index 2e73162c5..8a3bdea1f 100644
--- a/extensions/Servers/Proxmox/Livewire/Firewall.php
+++ b/extensions/Servers/Proxmox/Livewire/Firewall.php
@@ -737,7 +737,6 @@ class Firewall extends Component
             $segments = array_filter(array_map('trim', explode(',', $currentConfig)));
             $newSegments = [];
             $firewallFound = false;
-            $dhcpFound = false;
             $currentFirewallState = $this->adapterFirewallStates[$adapterName] ?? false;
             $newFirewallState = !$currentFirewallState;
             
@@ -755,15 +754,6 @@ class Firewall extends Component
                         $newSegments[] = 'firewall=1';
                     }
                     // If disabling, we skip adding firewall=1, effectively removing it
-                } elseif (strtolower($segmentKey) === 'dhcp') {
-                    $dhcpFound = true;
-                    // If enabling firewall, disable DHCP
-                    if ($newFirewallState) {
-                        $newSegments[] = 'dhcp=0';
-                    } else {
-                        // Keep existing DHCP setting when disabling firewall
-                        $newSegments[] = $segment;
-                    }
                 } else {
                     $newSegments[] = $segment;
                 }
@@ -774,11 +764,6 @@ class Firewall extends Component
                 $newSegments[] = 'firewall=1';
             }
             
-            // If DHCP wasn't in the config and we're enabling firewall, explicitly disable DHCP
-            if (!$dhcpFound && $newFirewallState) {
-                $newSegments[] = 'dhcp=0';
-            }
-            
             $newConfig = implode(',', $newSegments);
             
             $proxmox->request(
diff --git a/extensions/Servers/Proxmox/Livewire/Overview.php b/extensions/Servers/Proxmox/Livewire/Overview.php
index 9219bb89f..a31faf9ab 100644
--- a/extensions/Servers/Proxmox/Livewire/Overview.php
+++ b/extensions/Servers/Proxmox/Livewire/Overview.php
@@ -46,7 +46,7 @@ class Overview extends Component
             $this->loadVmStatus();
         }
 
-        $this->hostname = $server->hostname ?? $this->status->name ?? '';
+        $this->hostname = $server->hostname ?? ($this->status->name ?? '');
         
         // Load notes from Proxmox VM description
         try {
diff --git a/extensions/Servers/Proxmox/views/overview.blade.php b/extensions/Servers/Proxmox/views/overview.blade.php
index 3ce42a767..8f9a86e6e 100644
--- a/extensions/Servers/Proxmox/views/overview.blade.php
+++ b/extensions/Servers/Proxmox/views/overview.blade.php
@@ -401,7 +401,7 @@
                             <label class="text-sm font-semibold text-base/80">Status</label>
                             <div class="flex items-center gap-2 px-3 py-2 text-sm text-base/80">
                                 <div class="relative inline-flex size-5">
-                                    @if ($status->status === 'running')
+                                    @if ($status && $status->status === 'running')
                                         <span class="absolute inset-0 rounded-full bg-success/20 animate-ping"></span>
                                         <span class="relative flex items-center justify-center size-5 p-1 rounded-full text-success bg-success/20">
                                             <x-ri-circle-fill />
@@ -413,7 +413,7 @@
                                     @endif
                                 </div>
                                 <span class="truncate flex-1">
-                                    {{ $status->status === 'running' ? 'Running' : 'Stopped' }}
+                                    {{ $status && $status->status === 'running' ? 'Running' : 'Stopped' }}
                                 </span>
                             </div>
                         </div>