Fix server resources tab 500 error with mixed model types (#7674)

Author: andrasbacsai

app/Livewire/Server/Resources.php

@@ -4,7 +4,6 @@
 
 use App\Models\Server;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Resources extends Component
@@ -15,7 +14,7 @@ class Resources extends Component
 
     public $parameters = [];
 
-    public Collection $containers;
+    public array $unmanagedContainers = [];
 
     public $activeTab = 'managed';
 
@@ -64,7 +63,7 @@ public function loadManagedContainers()
     {
         try {
             $this->activeTab = 'managed';
-            $this->containers = $this->server->refresh()->definedResources();
+            $this->server->refresh();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -74,22 +73,20 @@ public function loadUnmanagedContainers()
     {
         $this->activeTab = 'unmanaged';
         try {
-            $this->containers = $this->server->loadUnmanagedContainers();
+            $this->unmanagedContainers = $this->server->loadUnmanagedContainers()->toArray();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
     public function mount()
     {
-        $this->containers = collect();
         $this->parameters = get_route_parameters();
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
                 return redirect()->route('server.index');
             }
-            $this->loadManagedContainers();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

resources/views/livewire/server/resources.blade.php

@@ -32,8 +32,11 @@
                     </div>
                 </div>
             </div>
-            @if ($containers->count() > 0)
-                @if ($activeTab === 'managed')
+            @if ($activeTab === 'managed')
+                @php
+                    $managedResources = $server->definedResources()->sortBy('name', SORT_NATURAL);
+                @endphp
+                @if ($managedResources->count() > 0)
                     <div class="flex flex-col">
                         <div class="flex flex-col">
                             <div class="overflow-x-auto">
@@ -59,7 +62,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                @forelse ($server->definedResources()->sortBy('name',SORT_NATURAL) as $resource)
+                                                @foreach ($managedResources as $resource)
                                                     <tr>
                                                         <td class="px-5 py-4 text-sm whitespace-nowrap">
                                                             {{ data_get($resource->project(), 'name') }}
@@ -83,16 +86,19 @@
                                                             @endif
                                                         </td>
                                                     </tr>
-                                                @empty
-                                                @endforelse
+                                                @endforeach
                                             </tbody>
                                         </table>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                @elseif ($activeTab === 'unmanaged')
+                @else
+                    <div>No managed resources found.</div>
+                @endif
+            @elseif ($activeTab === 'unmanaged')
+                @if (count($unmanagedContainers) > 0)
                     <div class="flex flex-col">
                         <div class="flex flex-col">
                             <div class="overflow-x-auto">
@@ -116,7 +122,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                @forelse ($containers->sortBy('name',SORT_NATURAL) as $resource)
+                                                @foreach (collect($unmanagedContainers)->sortBy('name', SORT_NATURAL) as $resource)
                                                     <tr>
                                                         <td class="px-5 py-4 text-sm whitespace-nowrap">
                                                             {{ data_get($resource, 'Names') }}
@@ -146,19 +152,15 @@
                                                             @endif
                                                         </td>
                                                     </tr>
-                                                @empty
-                                                @endforelse
+                                                @endforeach
                                             </tbody>
                                         </table>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                @endif
-            @else
-                @if ($activeTab === 'managed')
-                    <div>No managed resources found.</div>
-                @elseif ($activeTab === 'unmanaged')
+                    </div>
+                @else
                     <div>No unmanaged resources found.</div>
                 @endif
             @endif