From 4bc9786046f3427576077d04c7d8dfc709a34f7a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sun, 13 Apr 2025 14:24:27 +0200
Subject: [PATCH] refactor(DynamicConfigurations): improve handling of dynamic
 configuration content by ensuring fallback to empty string when content is
 null

---
 app/Livewire/Server/Proxy/DynamicConfigurations.php            | 3 ++-
 .../livewire/server/proxy/dynamic-configurations.blade.php     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Server/Proxy/DynamicConfigurations.php b/app/Livewire/Server/Proxy/DynamicConfigurations.php
index 6277a24bd..7db890638 100644
--- a/app/Livewire/Server/Proxy/DynamicConfigurations.php
+++ b/app/Livewire/Server/Proxy/DynamicConfigurations.php
@@ -38,7 +38,8 @@ public function loadDynamicConfigurations()
         $contents = collect([]);
         foreach ($files as $file) {
             $without_extension = str_replace('.', '|', $file);
-            $contents[$without_extension] = instant_remote_process(["cat {$proxy_path}/dynamic/{$file}"], $this->server);
+            $content = instant_remote_process(["cat {$proxy_path}/dynamic/{$file}"], $this->server);
+            $contents[$without_extension] = $content ?? '';
         }
         $this->contents = $contents;
         $this->dispatch('$refresh');
diff --git a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
index 30400ef73..1dddbe433 100644
--- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
+++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
@@ -38,7 +38,7 @@
                                         wire:model="contents.{{ $fileName }}" rows="5" />
                                 @else
                                     <livewire:server.proxy.dynamic-configuration-navbar :server_id="$server->id"
-                                        :fileName="$fileName" :value="$value" :newFile="false"
+                                        :fileName="$fileName" :value="$value ?? ''" :newFile="false"
                                         wire:key="{{ $fileName }}-{{ $loop->index }}" />
                                     <x-forms.textarea disabled wire:model="contents.{{ $fileName }}"
                                         rows="10" />