From 7aca4930db5a390855d53a450cc26cef24e7ea1b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 31 Mar 2024 18:38:26 +0200
Subject: [PATCH] fix: unfunctional server should see resources

---
 app/Models/Server.php                         |  33 +-
 .../views/livewire/server/resources.blade.php | 282 +++++++++---------
 2 files changed, 157 insertions(+), 158 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 08235a26d..10af2915d 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -550,21 +550,26 @@ public function startUnmanaged($id)
     }
     public function loadUnmanagedContainers()
     {
-        if ($this->isFunctional()) {
-            $containers = instant_remote_process(["docker ps -a  --format '{{json .}}' "], $this);
-            $containers = format_docker_command_output_to_json($containers);
-            $containers = $containers->map(function ($container) {
-                $labels = data_get($container, 'Labels');
-                if (!str($labels)->contains("coolify.managed")) {
-                    return $container;
-                }
-                return null;
-            });
-            $containers = $containers->filter();
-            return collect($containers);
-        } else {
-            return collect([]);
+        try {
+            if ($this->isFunctional()) {
+                $containers = instant_remote_process(["docker ps -a  --format '{{json .}}' "], $this);
+                $containers = format_docker_command_output_to_json($containers);
+                $containers = $containers->map(function ($container) {
+                    $labels = data_get($container, 'Labels');
+                    if (!str($labels)->contains("coolify.managed")) {
+                        return $container;
+                    }
+                    return null;
+                });
+                $containers = $containers->filter();
+                return collect($containers);
+            } else {
+                return collect([]);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e);
         }
+
     }
     public function hasDefinedResources()
     {
diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.php
index 225636ca8..8c888b131 100644
--- a/resources/views/livewire/server/resources.blade.php
+++ b/resources/views/livewire/server/resources.blade.php
@@ -1,165 +1,159 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    @if ($server->isFunctional())
-        <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full">
-            <div class="flex flex-col gap-4">
-                <a :class="activeTab === 'managed' && 'dark:text-white'"
-                    @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
-                <a :class="activeTab === 'unmanaged' && 'dark:text-white'"
-                    @click.prevent="activeTab = 'unmanaged'; window.location.hash = 'unmanaged'"
-                    href="#">Unmanaged</a>
-            </div>
-            <div class="w-full pl-8">
-                <div x-cloak x-show="activeTab === 'managed'" class="h-full">
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full">
+        <div class="flex flex-col gap-4">
+            <a :class="activeTab === 'managed' && 'dark:text-white'"
+                @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
+            <a :class="activeTab === 'unmanaged' && 'dark:text-white'"
+                @click.prevent="activeTab = 'unmanaged'; window.location.hash = 'unmanaged'" href="#">Unmanaged</a>
+        </div>
+        <div class="w-full pl-8">
+            <div x-cloak x-show="activeTab === 'managed'" class="h-full">
+                <div class="flex flex-col">
+                    <div class="flex gap-2">
+                        <h2>Resources</h2>
+                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
+                    </div>
+                    <div class="subtitle">Here you can find all resources that are managed by Coolify.</div>
+                </div>
+                @if ($server->definedResources()->count() > 0)
                     <div class="flex flex-col">
-                        <div class="flex gap-2">
-                            <h2>Resources</h2>
-                            <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
-                        </div>
-                        <div class="subtitle">Here you can find all resources that are managed by Coolify.</div>
-                    </div>
-                    @if ($server->definedResources()->count() > 0)
                         <div class="flex flex-col">
-                            <div class="flex flex-col">
-                                <div class="overflow-x-auto">
-                                    <div class="inline-block min-w-full">
-                                        <div class="overflow-hidden">
-                                            <table class="min-w-full">
-                                                <thead>
+                            <div class="overflow-x-auto">
+                                <div class="inline-block min-w-full">
+                                    <div class="overflow-hidden">
+                                        <table class="min-w-full">
+                                            <thead>
+                                                <tr>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Project
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Environment</th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Name
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Type
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Status
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                @forelse ($server->definedResources()->sortBy('name',SORT_NATURAL) as $resource)
                                                     <tr>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Project
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Environment</th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Name
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Type
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Status
-                                                        </th>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource->project(), 'name') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'environment.name') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap hover:underline">
+                                                            <a class=""
+                                                                href="{{ $resource->link() }}">{{ $resource->name }}
+                                                                <x-internal-link /></a>
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ str($resource->type())->headline() }}</td>
+                                                        <td class="px-5 py-4 text-sm font-medium whitespace-nowrap">
+                                                            @if ($resource->type() === 'service')
+                                                                <x-status.services :service="$resource"
+                                                                    :showRefreshButton="false" />
+                                                            @else
+                                                                <x-status.index :resource="$resource" :showRefreshButton="false" />
+                                                            @endif
+                                                        </td>
                                                     </tr>
-                                                </thead>
-                                                <tbody>
-                                                    @forelse ($server->definedResources()->sortBy('name',SORT_NATURAL) as $resource)
-                                                        <tr>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ data_get($resource->project(), 'name') }}
-                                                            </td>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ data_get($resource, 'environment.name') }}
-                                                            </td>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap hover:underline"><a
-                                                                    class=""
-                                                                    href="{{ $resource->link() }}">{{ $resource->name }}
-                                                                    <x-internal-link /></a>
-                                                            </td>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ str($resource->type())->headline() }}</td>
-                                                            <td class="px-5 py-4 text-sm font-medium whitespace-nowrap">
-                                                                @if ($resource->type() === 'service')
-                                                                    <x-status.services :service="$resource"
-                                                                        :showRefreshButton="false" />
-                                                                @else
-                                                                    <x-status.index :resource="$resource"
-                                                                        :showRefreshButton="false" />
-                                                                @endif
-                                                            </td>
-                                                        </tr>
-                                                    @empty
-                                                    @endforelse
-                                                </tbody>
-                                            </table>
-                                        </div>
+                                                @empty
+                                                @endforelse
+                                            </tbody>
+                                        </table>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    @else
-                        <div>No resources found.</div>
-                    @endif
-                </div>
-                <div x-cloak x-show="activeTab === 'unmanaged'" class="h-full">
-                    <div class="flex flex-col" x-init="$wire.loadUnmanagedContainers()">
-                        <div class="flex gap-2">
-                            <h2>Resources</h2>
-                            <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
-                        </div>
-                        <div class="subtitle">Here you can find all other containers running on the server.</div>
                     </div>
-                    @if ($unmanagedContainers->count() > 0)
+                @else
+                    <div>No resources found.</div>
+                @endif
+            </div>
+            <div x-cloak x-show="activeTab === 'unmanaged'" class="h-full">
+                <div class="flex flex-col" x-init="$wire.loadUnmanagedContainers()">
+                    <div class="flex gap-2">
+                        <h2>Resources</h2>
+                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
+                    </div>
+                    <div class="subtitle">Here you can find all other containers running on the server.</div>
+                </div>
+                @if ($unmanagedContainers->count() > 0)
+                    <div class="flex flex-col">
                         <div class="flex flex-col">
-                            <div class="flex flex-col">
-                                <div class="overflow-x-auto">
-                                    <div class="inline-block min-w-full">
-                                        <div class="overflow-hidden">
-                                            <table class="min-w-full">
-                                                <thead>
+                            <div class="overflow-x-auto">
+                                <div class="inline-block min-w-full">
+                                    <div class="overflow-hidden">
+                                        <table class="min-w-full">
+                                            <thead>
+                                                <tr>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Name
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Image
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Status
+                                                    </th>
+                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                        Action
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                @forelse ($unmanagedContainers->sortBy('name',SORT_NATURAL) as $resource)
                                                     <tr>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Name
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Image
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Status
-                                                        </th>
-                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                            Action
-                                                        </th>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'Names') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'Image') }}
+                                                        </td>
+                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                            {{ data_get($resource, 'State') }}
+                                                        </td>
+                                                        <td class="flex gap-2 px-5 py-4 text-sm whitespace-nowrap">
+                                                            @if (data_get($resource, 'State') === 'running')
+                                                                <x-forms.button
+                                                                    wire:click="restartUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Restart</x-forms.button>
+                                                                <x-forms.button isError
+                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                            @elseif (data_get($resource, 'State') === 'exited')
+                                                                <x-forms.button
+                                                                    wire:click="startUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Start</x-forms.button>
+                                                            @elseif (data_get($resource, 'State') === 'restarting')
+                                                                <x-forms.button
+                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                            @endif
+                                                        </td>
                                                     </tr>
-                                                </thead>
-                                                <tbody>
-                                                    @forelse ($unmanagedContainers->sortBy('name',SORT_NATURAL) as $resource)
-                                                        <tr>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ data_get($resource, 'Names') }}
-                                                            </td>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ data_get($resource, 'Image') }}
-                                                            </td>
-                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                                {{ data_get($resource, 'State') }}
-                                                            </td>
-                                                            <td class="flex gap-2 px-5 py-4 text-sm whitespace-nowrap">
-                                                                @if (data_get($resource, 'State') === 'running')
-                                                                    <x-forms.button
-                                                                        wire:click="restartUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                        wire:key="{{ data_get($resource, 'ID') }}">Restart</x-forms.button>
-                                                                    <x-forms.button isError
-                                                                        wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                        wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
-                                                                @elseif (data_get($resource, 'State') === 'exited')
-                                                                    <x-forms.button
-                                                                        wire:click="startUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                        wire:key="{{ data_get($resource, 'ID') }}">Start</x-forms.button>
-                                                                @elseif (data_get($resource, 'State') === 'restarting')
-                                                                    <x-forms.button
-                                                                        wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                        wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
-                                                                @endif
-                                                            </td>
-                                                        </tr>
-                                                    @empty
-                                                    @endforelse
-                                                </tbody>
-                                            </table>
-                                        </div>
+                                                @empty
+                                                @endforelse
+                                            </tbody>
+                                        </table>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    @else
-                        <div>No resources found.</div>
-                    @endif
-                </div>
+                    </div>
+                @else
+                    <div>No resources found.</div>
+                @endif
             </div>
         </div>
-    @else
-        <div>Server is not validated. Validate first.</div>
-    @endif
+    </div>
 </div>