From 81512bb3b72cc2fdf763745629268b066802dbe2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 5 Mar 2024 15:47:43 +0100
Subject: [PATCH 1/2] Update server and version configurations

---
 app/Http/Controllers/Api/Server.php | 39 ++++++++++++++++-------------
 config/sentry.php                   |  2 +-
 config/version.php                  |  2 +-
 versions.json                       |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/Api/Server.php b/app/Http/Controllers/Api/Server.php
index e7b071a43..2cfec183e 100644
--- a/app/Http/Controllers/Api/Server.php
+++ b/app/Http/Controllers/Api/Server.php
@@ -19,11 +19,11 @@ class Server extends Controller
             $server['is_usable'] = $server->settings->is_usable;
             return $server;
         });
-        ray($servers);
         return response()->json($servers);
     }
     public function server_by_uuid(Request $request)
     {
+        $with_resources = $request->query('resources');
         $teamId = get_team_id_from_token();
         if (is_null($teamId)) {
             return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
@@ -32,23 +32,26 @@ class Server extends Controller
         if (is_null($server)) {
             return response()->json(['error' => 'Server not found.'], 404);
         }
-        $server->load(['settings']);
-        $server['resources'] = $server->definedResources()->map(function ($resource) {
-            $payload = [
-                'id' => $resource->id,
-                'uuid' => $resource->uuid,
-                'name' => $resource->name,
-                'type' => $resource->type(),
-                'created_at' => $resource->created_at,
-                'updated_at' => $resource->updated_at,
-            ];
-            if ($resource->type() === 'service') {
-                $payload['status'] = $resource->status();
-            } else {
-                $payload['status'] = $resource->status;
-            }
-            return $payload;
-        });
+        if ($with_resources) {
+            $server['resources'] = $server->definedResources()->map(function ($resource) {
+                $payload = [
+                    'id' => $resource->id,
+                    'uuid' => $resource->uuid,
+                    'name' => $resource->name,
+                    'type' => $resource->type(),
+                    'created_at' => $resource->created_at,
+                    'updated_at' => $resource->updated_at,
+                ];
+                if ($resource->type() === 'service') {
+                    $payload['status'] = $resource->status();
+                } else {
+                    $payload['status'] = $resource->status;
+                }
+                return $payload;
+            });
+        } else {
+            $server->load(['settings']);
+        }
         return response()->json($server);
     }
 }
diff --git a/config/sentry.php b/config/sentry.php
index 5e12f3b14..9414c5afe 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.235',
+    'release' => '4.0.0-beta.236',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 39ca01743..e47e67853 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.235';
+return '4.0.0-beta.236';
diff --git a/versions.json b/versions.json
index 448b90535..dd7d18a89 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.235"
+            "version": "4.0.0-beta.236"
         }
     }
 }

From fadff798a77dbef87abd8467585caea7c6970f81 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 5 Mar 2024 16:23:46 +0100
Subject: [PATCH 2/2] Update server installation method

---
 app/Livewire/Boarding/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index d68d88447..e80042573 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -199,7 +199,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     }
     public function installServer()
     {
-        $this->dispatch('validateServer', true);
+        $this->dispatch('init', true);
     }
     public function validateServer()
     {