Merge branch 'next' into rename-github-app

app/Actions/Database/StartClickhouse.php

@@ -24,7 +24,7 @@ class StartClickhouse
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartDragonfly.php

@@ -26,7 +26,7 @@ class StartDragonfly
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartKeydb.php

@@ -27,7 +27,7 @@ class StartKeydb
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartMariadb.php

@@ -24,7 +24,7 @@ class StartMariadb
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartMongodb.php

@@ -30,7 +30,7 @@ class StartMongodb
         }
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartMysql.php

@@ -24,7 +24,7 @@ class StartMysql
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Actions/Database/StartPostgresql.php

@@ -25,7 +25,7 @@ class StartPostgresql
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/",
         ];

app/Actions/Database/StartRedis.php

@@ -25,7 +25,7 @@ class StartRedis
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
-            "echo 'Starting {$database->name}.'",
+            "echo 'Starting database.'",
             "mkdir -p $this->configuration_dir",
         ];
 

app/Console/Commands/CloudCleanupSubscriptions.php

@@ -36,7 +36,7 @@ class CloudCleanupSubscriptions extends Command
                 }
                 // If the team has no subscription id and the invoice is paid, we need to reset the invoice paid status
                 if (! (data_get($team, 'subscription.stripe_subscription_id'))) {
-                    $this->info("Resetting invoice paid status for team {$team->id} {$team->name}");
+                    $this->info("Resetting invoice paid status for team {$team->id}");
 
                     $team->subscription->update([
                         'stripe_invoice_paid' => false,
@@ -61,9 +61,9 @@ class CloudCleanupSubscriptions extends Command
                     $this->info('Subscription id: '.data_get($team, 'subscription.stripe_subscription_id'));
                     $confirm = $this->confirm('Do you want to cancel the subscription?', true);
                     if (! $confirm) {
-                        $this->info("Skipping team {$team->id} {$team->name}");
+                        $this->info("Skipping team {$team->id}");
                     } else {
-                        $this->info("Cancelling subscription for team {$team->id} {$team->name}");
+                        $this->info("Cancelling subscription for team {$team->id}");
                         $team->subscription->update([
                             'stripe_invoice_paid' => false,
                             'stripe_trial_already_ended' => false,

app/Livewire/Project/Application/Configuration.php

@@ -16,24 +16,26 @@ class Configuration extends Component
 
     public function mount()
     {
-        $this->application = Application::query()
+        $project = currentTeam()
-            ->whereHas('environment.project', function ($query) {
+            ->projects()
-                $query->where('team_id', currentTeam()->id)
+            ->select('id', 'uuid', 'team_id')
-                    ->where('uuid', request()->route('project_uuid'));
+            ->where('uuid', request()->route('project_uuid'))
-            })
+            ->firstOrFail();
-            ->whereHas('environment', function ($query) {
+        $environment = $project->environments()
-                $query->where('name', request()->route('environment_name'));
+            ->select('id', 'name', 'project_id')
-            })
+            ->where('name', request()->route('environment_name'))
+            ->firstOrFail();
+        $application = $environment->applications()
+            ->with(['destination'])
             ->where('uuid', request()->route('application_uuid'))
-            ->with(['destination' => function ($query) {
-                $query->select('id', 'server_id');
-            }])
             ->firstOrFail();
 
-        if ($this->application->destination && $this->application->destination->server_id) {
+        $this->application = $application;
+        if ($application->destination && $application->destination->server) {
+            $mainServer = $application->destination->server;
             $this->servers = Server::ownedByCurrentTeam()
                 ->select('id', 'name')
-                ->where('id', '!=', $this->application->destination->server_id)
+                ->where('id', '!=', $mainServer->id)
                 ->get();
         } else {
             $this->servers = collect();

app/Models/Team.php

@@ -127,13 +127,6 @@ class Team extends Model implements SendsDiscord, SendsEmail
         ];
     }
 
-    public function name(): Attribute
-    {
-        return new Attribute(
-            get: fn () => sanitize_string($this->getRawOriginal('name')),
-        );
-    }
-
     public function getRecepients($notification)
     {
         $recipients = data_get($notification, 'emails', null);

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.374',
+        'version' => '4.0.0-beta.375',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

resources/views/livewire/switch-team.blade.php

@@ -1,6 +1,6 @@
 <x-forms.select wire:model.live="selectedTeamId" label="Current Team">
     <option value="default" disabled selected>Switch team</option>
     @foreach (auth()->user()->teams as $team)
-        <option  value="{{ $team->id }}">{{ $team->name }}</option>
+        <option value="{{ $team->id }}">{{ $team->name }}</option>
     @endforeach
 </x-forms.select>

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.374"
+            "version": "4.0.0-beta.375"
         },
         "nightly": {
-            "version": "4.0.0-beta.375"
+            "version": "4.0.0-beta.376"
         },
         "helper": {
             "version": "1.0.4"