From c89ea2a1f01b494245fba9fb372c21f58b8543b0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 23 May 2023 10:15:12 +0200 Subject: [PATCH] fix --- .../Livewire/Project/DeleteEnvironment.php | 31 ++++++++++++++++ .../Project/{Delete.php => DeleteProject.php} | 11 ++++-- resources/views/components/navbar.blade.php | 36 ++++++++++--------- .../project/delete-environment.blade.php | 12 +++++++ ...ete.blade.php => delete-project.blade.php} | 1 - resources/views/project/resources.blade.php | 4 +-- resources/views/project/show.blade.php | 11 ++++-- 7 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 app/Http/Livewire/Project/DeleteEnvironment.php rename app/Http/Livewire/Project/{Delete.php => DeleteProject.php} (59%) create mode 100644 resources/views/livewire/project/delete-environment.blade.php rename resources/views/livewire/project/{delete.blade.php => delete-project.blade.php} (99%) diff --git a/app/Http/Livewire/Project/DeleteEnvironment.php b/app/Http/Livewire/Project/DeleteEnvironment.php new file mode 100644 index 000000000..a6cb3716c --- /dev/null +++ b/app/Http/Livewire/Project/DeleteEnvironment.php @@ -0,0 +1,31 @@ +parameters = getParameters(); + } + public function delete() + { + $this->validate([ + 'environment_id' => 'required|int', + ]); + $environment = Environment::findOrFail($this->environment_id); + if ($environment->applications->count() > 0) { + return $this->emit('error', 'Environment has resources defined, please delete them first.'); + } + $environment->delete(); + return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]); + } +} diff --git a/app/Http/Livewire/Project/Delete.php b/app/Http/Livewire/Project/DeleteProject.php similarity index 59% rename from app/Http/Livewire/Project/Delete.php rename to app/Http/Livewire/Project/DeleteProject.php index 9677052eb..8e4910b6d 100644 --- a/app/Http/Livewire/Project/Delete.php +++ b/app/Http/Livewire/Project/DeleteProject.php @@ -5,11 +5,16 @@ namespace App\Http\Livewire\Project; use App\Models\Project; use Livewire\Component; -class Delete extends Component +class DeleteProject extends Component { + public array $parameters; public int $project_id; public int $resource_count = 0; + public function mount() + { + $this->parameters = getParameters(); + } public function delete() { $this->validate([ @@ -17,9 +22,9 @@ class Delete extends Component ]); $project = Project::findOrFail($this->project_id); if ($project->applications->count() > 0) { - return $this->emit('error', 'Project has applications, please delete them first.'); + return $this->emit('error', 'Project has resources defined, please delete them first.'); } $project->delete(); - return redirect()->route('dashboard'); + return redirect()->route('projects'); } } diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 70d966150..4b7a3de3d 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -1,6 +1,6 @@ @auth