Merge pull request #1563 from coollabsio/next

v4.0.0-beta.171

app/Jobs/ContainerStatusJob.php

@@ -39,7 +39,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function __construct(public Server $server)
     {
-        // $this->handle();
+        $this->handle();
     }
 
     public function handle()

app/Livewire/Project/New/DockerImage.php

@@ -68,7 +68,7 @@ class DockerImage extends Component
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,
             'project_uuid' => $project->uuid,
-        ], navigate: true);
+        ], navigate: false);
     }
     public function render()
     {

app/Livewire/Project/New/EmptyProject.php

@@ -13,6 +13,6 @@ class EmptyProject extends Component
             'name' => generate_random_name(),
             'team_id' => currentTeam()->id,
         ]);
-        return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: true);
+        return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: false);
     }
 }

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -155,7 +155,7 @@ class GithubPrivateRepository extends Component
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ], navigate: false);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -136,7 +136,7 @@ class GithubPrivateRepositoryDeployKey extends Component
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ], navigate: false);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/PublicGitRepository.php

@@ -188,7 +188,7 @@ class PublicGitRepository extends Component
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ], navigate: false);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/Select.php

@@ -123,7 +123,7 @@ class Select extends Component
                 $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);
                 break;
         }
-        if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty') || str($type)->startsWith('docker-image')) {
+        if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty')) {
             $this->isDatabase = true;
             $this->includeSwarm = false;
             $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);

app/Livewire/Project/New/SimpleDockerfile.php

@@ -74,6 +74,6 @@ CMD ["nginx", "-g", "daemon off;"]
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,
             'project_uuid' => $project->uuid,
-        ], navigate: true);
+        ], navigate: false);
     }
 }

app/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -65,7 +65,11 @@ class Show extends Component
 
     public function delete()
     {
-        $this->env->delete();
-        $this->dispatch('refreshEnvs');
+        try {
+            $this->env->delete();
+            $this->dispatch('refreshEnvs');
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
     }
 }

app/Livewire/Project/Shared/Storages/Add.php

@@ -31,14 +31,16 @@ class Add extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $applicationUuid = $this->parameters['application_uuid'];
-        $application = Application::where('uuid', $applicationUuid)->first();
-        if (!$application) {
-            abort(404);
-        }
-        if ($application->destination->server->isSwarm()) {
-            $this->isSwarm = true;
-            $this->rules['host_path'] = 'required|string';
+        if (data_get($this->parameters, 'application_uuid')) {
+            $applicationUuid = $this->parameters['application_uuid'];
+            $application = Application::where('uuid', $applicationUuid)->first();
+            if (!$application) {
+                abort(404);
+            }
+            if ($application->destination->server->isSwarm()) {
+                $this->isSwarm = true;
+                $this->rules['host_path'] = 'required|string';
+            }
         }
     }
 

app/Livewire/Server/Proxy/Status.php

@@ -15,7 +15,6 @@ class Status extends Component
 
     protected $listeners = ['proxyStatusUpdated', 'startProxyPolling'];
     public function mount() {
-        $this->checkProxy();
     }
     public function startProxyPolling()
     {

app/Models/Server.php

@@ -164,6 +164,7 @@ class Server extends BaseModel
         ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax);
 
         $result = $this->validateConnection();
+        ray($result);
         if ($result) {
             if ($this->unreachable_notification_sent === true) {
                 $this->update(['unreachable_notification_sent' => false]);

bootstrap/helpers/shared.php

@@ -1330,7 +1330,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 if ($value?->startsWith('$')) {
                     $foundEnv = EnvironmentVariable::where([
                         'key' => $key,
-                        'service_id' => $resource->id,
+                        'application_id' => $resource->id,
+                        'is_preview' => false,
                     ])->first();
                     $value = Str::of(replaceVariables($value));
                     $key = $value;
@@ -1397,14 +1398,22 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $defaultValue = data_get($foundEnv, 'value');
                         }
                         $isBuildTime = data_get($foundEnv, 'is_build_time', false);
-                        EnvironmentVariable::updateOrCreate([
-                            'key' => $key->value(),
-                            'application_id' => $resource->id,
-                        ], [
-                            'value' => $defaultValue,
-                            'is_build_time' => $isBuildTime,
-                            'application_id' => $resource->id,
-                        ]);
+                        if ($foundEnv) {
+                            $foundEnv->update([
+                                'key' => $key,
+                                'application_id' => $resource->id,
+                                'is_build_time' => $isBuildTime,
+                                'value' => $defaultValue,
+                            ]);
+                        } else {
+                            EnvironmentVariable::create([
+                                'key' => $key,
+                                'value' => $defaultValue,
+                                'is_build_time' => $isBuildTime,
+                                'application_id' => $resource->id,
+                                'is_preview' => false,
+                            ]);
+                        }
                     }
                 }
             }

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.167',
+    'release' => '4.0.0-beta.171',
     // 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.167';
+return '4.0.0-beta.171';

resources/views/livewire/project/new/select.blade.php

@@ -203,13 +203,17 @@
                 <li class="step">Select a Destination</li>
             </ul>
             @if ($isDatabase)
+                <div class="text-center">Swarm clusters are excluded from this type of resource at the moment. It will
+                    be activated soon. Stay tuned.</div>
+            @endif
+            {{-- @if ($isDatabase)
                 <div class="flex items-center justify-center pt-4">
                     <x-forms.checkbox instantSave wire:model="includeSwarm"
                         helper="Swarm clusters are excluded from this list by default. For database, services or complex compose deployments with databases to work with Swarm,
                 you need to set a few things on the server. Read more <a class='text-white underline' href='https://coolify.io/docs/swarm#database-requirements' target='_blank'>here</a>."
                         label="Include Swarm Clusters" />
                 </div>
-            @endif
+            @endif --}}
             <div class="flex flex-col justify-center gap-2 text-left xl:flex-row xl:flex-wrap">
                 @forelse($servers as $server)
                     <div class="box group" wire:click="setServer({{ $server }})">

resources/views/livewire/realtime-connection.blade.php

@@ -18,7 +18,7 @@
                                 clearInterval(checkPusherInterval);
                             }
                         } else {
-                            console.log('Coolify is now connected to the new realtime service introduced in beta.154.');
+                            console.log('Coolify Realtime Service is connected!');
                             clearInterval(checkPusherInterval);
                         }
                     } else {

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

@@ -1,4 +1,4 @@
-<div>
+<div x-init="$wire.checkProxy()">
     @if ($server->isFunctional())
         <div class="flex gap-2">
             @if (data_get($server, 'proxy.status') === 'running')

versions.json

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