Merge remote-tracking branch 'origin/next' into audit-policies

app/Livewire/Project/DeleteEnvironment.php

@@ -4,12 +4,14 @@ namespace App\Livewire\Project;
 
 use App\Models\Environment;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Locked;
 use Livewire\Component;
 
 class DeleteEnvironment extends Component
 {
     use AuthorizesRequests;
 
+    #[Locked]
     public int $environment_id;
 
     public bool $disabled = false;
@@ -20,12 +22,8 @@ class DeleteEnvironment extends Component
 
     public function mount()
     {
-        try {
-            $this->environmentName = Environment::findOrFail($this->environment_id)->name;
-            $this->parameters = get_route_parameters();
-        } catch (\Exception $e) {
-            return handleError($e, $this);
-        }
+        $this->parameters = get_route_parameters();
+        $this->environmentName = Environment::ownedByCurrentTeam()->findOrFail($this->environment_id)->name;
     }
 
     public function delete()
@@ -34,7 +32,7 @@ class DeleteEnvironment extends Component
             $this->validate([
                 'environment_id' => 'required|int',
             ]);
-            $environment = Environment::findOrFail($this->environment_id);
+            $environment = Environment::ownedByCurrentTeam()->findOrFail($this->environment_id);
             $this->authorize('delete', $environment);
 
             if ($environment->isEmpty()) {