From fae340afcbef5345891353f80cdf0672cb33c70e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 20 Oct 2023 18:15:25 +0200
Subject: [PATCH] fix: boarding

---
 app/Http/Livewire/Boarding/Index.php              | 2 +-
 app/Models/Server.php                             | 6 +++---
 config/sentry.php                                 | 2 +-
 config/version.php                                | 2 +-
 resources/views/livewire/boarding/index.blade.php | 8 ++++----
 versions.json                                     | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Http/Livewire/Boarding/Index.php b/app/Http/Livewire/Boarding/Index.php
index 53065918a..1b9093be6 100644
--- a/app/Http/Livewire/Boarding/Index.php
+++ b/app/Http/Livewire/Boarding/Index.php
@@ -213,7 +213,7 @@ public function validateServer()
             ]);
             $this->getProxyType();
         } catch (\Throwable $e) {
-            $this->dockerInstallationStarted = false;
+            // $this->dockerInstallationStarted = false;
             return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
     }
diff --git a/app/Models/Server.php b/app/Models/Server.php
index d5d9709a0..7ff517ef6 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -122,9 +122,9 @@ public function isEmpty()
     public function databases()
     {
         return $this->destinations()->map(function ($standaloneDocker) {
-            $postgresqls = $standaloneDocker->postgresqls;
-            $redis = $standaloneDocker->redis;
-            $mongodbs = $standaloneDocker->mongodbs;
+            $postgresqls = data_get($standaloneDocker,'postgresqls',collect([]));
+            $redis = data_get($standaloneDocker,'redis',collect([]));
+            $mongodbs = data_get($standaloneDocker,'mongodbs',collect([]));
             return $postgresqls->concat($redis)->concat($mongodbs);
         })->flatten();
     }
diff --git a/config/sentry.php b/config/sentry.php
index 1c75b9d50..a7d0a2a84 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // 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.97',
+    'release' => '4.0.0-beta.98',
     // 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 af0296c72..36134c947 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.97';
+return '4.0.0-beta.98';
diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php
index d9a852067..de65ee8bf 100644
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -225,10 +225,10 @@
                     Could not find Docker Engine on your server. Do you want me to install it for you?
                 </x-slot:question>
                 <x-slot:actions>
-                    @if ($dockerInstallationStarted)
                     <x-forms.button class="justify-center box" wire:click="installDocker"
-                        onclick="installDocker.showModal()">
-                        Let's do it!</x-forms.button>
+                    onclick="installDocker.showModal()">
+                    Let's do it!</x-forms.button>
+                    @if ($dockerInstallationStarted)
                         <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
                             Next</x-forms.button>
                     @endif
@@ -314,7 +314,7 @@ class="flex flex-col w-full gap-4 lg:w-96">
                     I will redirect you to the new resource page, where you can create your first resource.
                 </x-slot:question>
                 <x-slot:actions>
-                    <div class="justify-center box" wire:click="showNewResource">Let's do
+                    <div class="items-center justify-center box" wire:click="showNewResource">Let's do
                         it!</div>
                 </x-slot:actions>
                 <x-slot:explanation>
diff --git a/versions.json b/versions.json
index f006c3fdb..e204d7ef1 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.97"
+            "version": "4.0.0-beta.98"
         }
     }
 }