From b1dc8dec88ee66b986d2efc1f24574c41d053763 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:30:17 +0100 Subject: [PATCH] fix preselect environment if there is only one --- app/Livewire/Dashboard.php | 9 +++++++++ app/Livewire/Project/Index.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php index 0dc69087b..c3cb797bf 100644 --- a/app/Livewire/Dashboard.php +++ b/app/Livewire/Dashboard.php @@ -52,6 +52,15 @@ class Dashboard extends Component public function navigateToProject($projectUuid) { + $project = Project::where('uuid', $projectUuid)->first(); + + if ($project && $project->environments->count() === 1) { + return Redirect::route('project.resource.index', [ + 'project_uuid' => $projectUuid, + 'environment_uuid' => $project->environments->first()->uuid, + ]); + } + return Redirect::route('project.show', ['project_uuid' => $projectUuid]); } diff --git a/app/Livewire/Project/Index.php b/app/Livewire/Project/Index.php index 8808037b7..06bf88219 100644 --- a/app/Livewire/Project/Index.php +++ b/app/Livewire/Project/Index.php @@ -34,6 +34,15 @@ class Index extends Component public function navigateToProject($projectUuid) { + $project = Project::where('uuid', $projectUuid)->first(); + + if ($project && $project->environments->count() === 1) { + return Redirect::route('project.resource.index', [ + 'project_uuid' => $projectUuid, + 'environment_uuid' => $project->environments->first()->uuid, + ]); + } + return Redirect::route('project.show', ['project_uuid' => $projectUuid]); } }