From ff20cb0b7cce823bd93cccfc25dfc5e2de061050 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Fri, 30 May 2025 14:15:07 +0200 Subject: [PATCH] fix(application-configuration): prevent access to preview deployments for deploy_key applications and update menu visibility accordingly --- app/Livewire/Project/Application/Configuration.php | 5 +++++ .../livewire/project/application/configuration.blade.php | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php index b50d7b736..5d7f3fd31 100644 --- a/app/Livewire/Project/Application/Configuration.php +++ b/app/Livewire/Project/Application/Configuration.php @@ -50,6 +50,11 @@ class Configuration extends Component $this->project = $project; $this->environment = $environment; $this->application = $application; + + if ($this->application->deploymentType() === 'deploy_key' && $this->currentRoute === 'project.application.preview-deployments') { + return redirect()->route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]); + } + if ($this->application->build_pack === 'dockercompose' && $this->currentRoute === 'project.application.healthcheck') { return redirect()->route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]); } diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php index f4cd0afd0..b907117e3 100644 --- a/resources/views/livewire/project/application/configuration.blade.php +++ b/resources/views/livewire/project/application/configuration.blade.php @@ -51,9 +51,11 @@ Tasks Webhooks - Preview - Deployments + @if ($application->deploymentType() !== 'deploy_key') + Preview + Deployments + @endif @if ($application->build_pack !== 'dockercompose') Healthcheck