From 6a00d8c88c50c17b3cbf9fa4722b8b5e2c202cfe Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 22 Feb 2024 09:38:09 +0100 Subject: [PATCH] Refactor loadData method in Destination.php --- app/Livewire/Project/Shared/Destination.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Project/Shared/Destination.php b/app/Livewire/Project/Shared/Destination.php index 6981886bf..75a56c1a2 100644 --- a/app/Livewire/Project/Shared/Destination.php +++ b/app/Livewire/Project/Shared/Destination.php @@ -19,6 +19,7 @@ class Destination extends Component $teamId = auth()->user()->currentTeam()->id; return [ "echo-private:team.{$teamId},ApplicationStatusChanged" => 'loadData', + "loadData", ]; } public function mount() @@ -40,6 +41,9 @@ class Destination extends Component $this->networks = $this->networks->reject(function ($network) { return $this->resource->destination->server->id == $network->server->id; }); + $this->networks = $this->networks->reject(function ($network) { + return $this->resource->additional_servers->pluck('id')->contains($network->server->id); + }); } public function redeploy(int $network_id, int $server_id) { @@ -68,8 +72,8 @@ class Destination extends Component { $this->resource->additional_networks()->attach($network_id, ['server_id' => $server_id]); $this->resource->load(['additional_networks']); + $this->dispatch('loadData'); ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id')); - $this->loadData(); } public function removeServer(int $network_id, int $server_id) { @@ -81,7 +85,7 @@ class Destination extends Component StopApplicationOneServer::run($this->resource, $server); $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]); $this->resource->load(['additional_networks']); + $this->dispatch('loadData'); ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id')); - $this->loadData(); } }