From 0b26ea423cb71bfff904dcc192a5bed812eb755c Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 28 Apr 2025 10:44:17 +0200 Subject: [PATCH 001/831] chore(versions): update realtime version to 1.0.8 in versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 31e0e279d..6dc9e7a02 100644 --- a/versions.json +++ b/versions.json @@ -10,7 +10,7 @@ "version": "1.0.8" }, "realtime": { - "version": "1.0.7" + "version": "1.0.8" }, "sentinel": { "version": "0.0.15" From f4472909ede6589f869a49fbb865d76dc330f5ee Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 28 Apr 2025 10:55:31 +0200 Subject: [PATCH 002/831] chore(docker): update soketi image version to 1.0.8 in production configuration files --- docker-compose.prod.yml | 2 +- other/nightly/docker-compose.prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 35fea6403..965fca276 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -61,7 +61,7 @@ services: retries: 10 timeout: 2s soketi: - image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.6' + image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.8' ports: - "${SOKETI_PORT:-6001}:6001" - "6002:6002" diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml index 35fea6403..fa30677ad 100644 --- a/other/nightly/docker-compose.prod.yml +++ b/other/nightly/docker-compose.prod.yml @@ -61,7 +61,7 @@ services: retries: 10 timeout: 2s soketi: - image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.6' + image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.8' ports: - "${SOKETI_PORT:-6001}:6001" - "6002:6002" From 8efcaf642af27edf22aad0524df385a7665d2118 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 28 Apr 2025 10:55:34 +0200 Subject: [PATCH 003/831] chore(versions): update coolify version to 4.0.0-beta.414 and nightly version to 4.0.0-beta.415 in configuration files --- config/constants.php | 2 +- other/nightly/versions.json | 4 ++-- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/constants.php b/config/constants.php index a849ae93e..018971370 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.413', + 'version' => '4.0.0-beta.414', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/other/nightly/versions.json b/other/nightly/versions.json index 6dc9e7a02..aabcec3d8 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.413" + "version": "4.0.0-beta.414" }, "nightly": { - "version": "4.0.0-beta.414" + "version": "4.0.0-beta.415" }, "helper": { "version": "1.0.8" diff --git a/versions.json b/versions.json index 6dc9e7a02..aabcec3d8 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.413" + "version": "4.0.0-beta.414" }, "nightly": { - "version": "4.0.0-beta.414" + "version": "4.0.0-beta.415" }, "helper": { "version": "1.0.8" From 75200717ddedced73320874dea25db0f32384e69 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 28 Apr 2025 20:43:00 +0200 Subject: [PATCH 004/831] fix(ApplicationDeploymentJob): ensure source is an object before checking GitHub app properties --- app/Jobs/ApplicationDeploymentJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index c29093ce0..7c34271a7 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -1377,7 +1377,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue private function check_git_if_build_needed() { - if ($this->source->getMorphClass() === \App\Models\GithubApp::class && $this->source->is_public === false) { + if (is_object($this->source) && $this->source->getMorphClass() === \App\Models\GithubApp::class && $this->source->is_public === false) { $repository = githubApi($this->source, "repos/{$this->customRepository}"); $data = data_get($repository, 'data'); if (isset($data->id)) { From d47946a0ad00cc6344256fb053307c9209a6702a Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 29 Apr 2025 09:04:24 +0200 Subject: [PATCH 005/831] fix(ui): Disable livewire navigate feature (causing spam of setInterval()) --- app/Livewire/Dashboard.php | 2 +- app/Livewire/Project/Application/Heading.php | 4 +- app/Livewire/Project/Index.php | 2 +- config/constants.php | 2 +- other/nightly/versions.json | 4 +- resources/views/components/navbar.blade.php | 32 +++---- .../components/notification/navbar.blade.php | 7 +- .../resources/breadcrumbs.blade.php | 2 - .../components/security/navbar.blade.php | 4 +- .../views/components/server/navbar.blade.php | 6 +- .../components/server/sidebar-proxy.blade.php | 6 +- .../views/components/server/sidebar.blade.php | 16 ++-- .../components/settings/navbar.blade.php | 6 +- .../views/components/team/navbar.blade.php | 7 +- resources/views/livewire/dashboard.blade.php | 26 +++-- .../livewire/destination/index.blade.php | 4 +- .../application/configuration.blade.php | 57 +++++------ .../application/deployment/index.blade.php | 95 +++++++++++-------- .../project/application/heading.blade.php | 8 +- .../project/database/configuration.blade.php | 32 +++---- .../project/database/heading.blade.php | 7 +- .../database/scheduled-backups.blade.php | 3 +- .../project/environment-edit.blade.php | 4 +- .../views/livewire/project/index.blade.php | 9 +- .../livewire/project/resource/index.blade.php | 43 +++------ .../project/service/configuration.blade.php | 42 ++++---- .../livewire/project/service/index.blade.php | 7 +- .../livewire/project/service/navbar.blade.php | 6 +- .../livewire/project/shared/metrics.blade.php | 2 +- .../shared/scheduled-task/all.blade.php | 4 +- .../views/livewire/project/show.blade.php | 2 - .../security/private-key/index.blade.php | 23 ++--- .../views/livewire/server/index.blade.php | 2 +- .../environment/index.blade.php | 6 +- .../livewire/shared-variables/index.blade.php | 6 +- .../shared-variables/project/index.blade.php | 1 - .../livewire/source/github/change.blade.php | 2 +- .../views/livewire/storage/index.blade.php | 2 +- .../views/livewire/tags/deployments.blade.php | 2 +- resources/views/livewire/tags/show.blade.php | 8 +- resources/views/source/all.blade.php | 4 +- versions.json | 4 +- 42 files changed, 235 insertions(+), 276 deletions(-) diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php index d89f2b970..edbdd25fe 100644 --- a/app/Livewire/Dashboard.php +++ b/app/Livewire/Dashboard.php @@ -51,7 +51,7 @@ class Dashboard extends Component public function navigateToProject($projectUuid) { - return $this->redirect(collect($this->projects)->firstWhere('uuid', $projectUuid)->navigateTo(), true); + return $this->redirect(collect($this->projects)->firstWhere('uuid', $projectUuid)->navigateTo(), navigate: false); } public function render() diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index 475d2dfa8..5b0ae12ef 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -100,7 +100,7 @@ class Heading extends Component 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_uuid' => $this->parameters['environment_uuid'], - ], navigate: true); + ], navigate: false); } protected function setDeploymentUuid() @@ -147,7 +147,7 @@ class Heading extends Component 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_uuid' => $this->parameters['environment_uuid'], - ], navigate: true); + ], navigate: false); } public function render() diff --git a/app/Livewire/Project/Index.php b/app/Livewire/Project/Index.php index 8bf511a66..5347d74f0 100644 --- a/app/Livewire/Project/Index.php +++ b/app/Livewire/Project/Index.php @@ -35,6 +35,6 @@ class Index extends Component { $project = collect($this->projects)->firstWhere('uuid', $projectUuid); - return $this->redirect($project->navigateTo(), true); + return $this->redirect($project->navigateTo(), navigate: false); } } diff --git a/config/constants.php b/config/constants.php index 018971370..1479ae201 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.414', + 'version' => '4.0.0-beta.415', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/other/nightly/versions.json b/other/nightly/versions.json index aabcec3d8..fc4d28de4 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.414" + "version": "4.0.0-beta.415" }, "nightly": { - "version": "4.0.0-beta.415" + "version": "4.0.0-beta.416" }, "helper": { "version": "1.0.8" diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 4148a61d3..9a75200b1 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -123,7 +123,7 @@