Merge pull request #1350 from coollabsio/next

v4.0.0-beta.98

app/Http/Livewire/Boarding/Index.php

@@ -213,7 +213,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             ]);
             $this->getProxyType();
         } catch (\Throwable $e) {
-            $this->dockerInstallationStarted = false;
+            // $this->dockerInstallationStarted = false;
             return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
         }
     }

app/Models/Server.php

@@ -122,9 +122,9 @@ class Server extends BaseModel
     public function databases()
     {
         return $this->destinations()->map(function ($standaloneDocker) {
-            $postgresqls = $standaloneDocker->postgresqls;
+            $postgresqls = data_get($standaloneDocker,'postgresqls',collect([]));
-            $redis = $standaloneDocker->redis;
+            $redis = data_get($standaloneDocker,'redis',collect([]));
-            $mongodbs = $standaloneDocker->mongodbs;
+            $mongodbs = data_get($standaloneDocker,'mongodbs',collect([]));
             return $postgresqls->concat($redis)->concat($mongodbs);
         })->flatten();
     }

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.97',
+    'release' => '4.0.0-beta.98',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.97';
+return '4.0.0-beta.98';

resources/views/livewire/boarding/index.blade.php

@@ -225,12 +225,12 @@
                     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()">
+                    onclick="installDocker.showModal()">
-                        Let's do it!</x-forms.button>
+                    Let's do it!</x-forms.button>
+                    @if ($dockerInstallationStarted)
                         <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
-                            Next</x-forms.button>
+                            Validate Server & Continue</x-forms.button>
                     @endif
                 </x-slot:actions>
                 <x-slot:explanation>
@@ -314,7 +314,7 @@
                     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>

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.97"
+            "version": "4.0.0-beta.98"
         }
     }
 }