Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: db proxy status shown better in the UI

Browse Source
This commit is contained in:
Andras Bacsai 2024-06-14 14:09:56 +02:00
parent 49d91c498e
commit b17be37aee
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Database/StopDatabaseProxy.php
View File

@ -2,6 +2,7 @@
namespace App\Actions\Database; namespace App\Actions\Database;
use App\Events\DatabaseStatusChanged;
use App\Models\ServiceDatabase; use App\Models\ServiceDatabase;
use App\Models\StandaloneClickhouse; use App\Models\StandaloneClickhouse;
use App\Models\StandaloneDragonfly; use App\Models\StandaloneDragonfly;
@ -28,5 +29,6 @@ class StopDatabaseProxy
instant_remote_process(["docker rm -f {$uuid}-proxy"], $server); instant_remote_process(["docker rm -f {$uuid}-proxy"], $server);
$database->is_public = false; $database->is_public = false;
$database->save(); $database->save();
DatabaseStatusChanged::dispatch();
} }
} }

1
app/Livewire/Project/Database/Heading.php
View File

@ -12,7 +12,6 @@ use App\Actions\Database\StartPostgresql;
use App\Actions\Database\StartRedis; use App\Actions\Database\StartRedis;
use App\Actions\Database\StopDatabase; use App\Actions\Database\StopDatabase;
use App\Actions\Docker\GetContainersStatus; use App\Actions\Docker\GetContainersStatus;
use App\Jobs\ContainerStatusJob;
use Livewire\Component; use Livewire\Component;
class Heading extends Component class Heading extends Component

27
app/Livewire/Project/Database/Postgresql/General.php
View File

@ -25,7 +25,17 @@ class General extends Component
public ?string $db_url_public = null; public ?string $db_url_public = null;
protected $listeners = ['refresh', 'save_init_script', 'delete_init_script']; public function getListeners()
{
$userId = auth()->user()->id;
return [
"echo-private:user.{$userId},DatabaseStatusChanged" => 'database_stopped',
"refresh",
"save_init_script",
"delete_init_script",
];
}
protected $rules = [ protected $rules = [
'database.name' => 'required', 'database.name' => 'required',
@ -68,11 +78,14 @@ class General extends Component
} }
$this->server = data_get($this->database, 'destination.server'); $this->server = data_get($this->database, 'destination.server');
} }
public function database_stopped()
{
$this->dispatch('success', 'Database proxy stopped. Database is no longer publicly accessible.');
}
public function instantSaveAdvanced() public function instantSaveAdvanced()
{ {
try { try {
if (! $this->server->isLogDrainEnabled()) { if (!$this->server->isLogDrainEnabled()) {
$this->database->is_log_drain_enabled = false; $this->database->is_log_drain_enabled = false;
$this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
@ -89,14 +102,14 @@ class General extends Component
public function instantSave() public function instantSave()
{ {
try { try {
if ($this->database->is_public && ! $this->database->public_port) { if ($this->database->is_public && !$this->database->public_port) {
$this->dispatch('error', 'Public port is required.'); $this->dispatch('error', 'Public port is required.');
$this->database->is_public = false; $this->database->is_public = false;
return; return;
} }
if ($this->database->is_public) { if ($this->database->is_public) {
if (! str($this->database->status)->startsWith('running')) { if (!str($this->database->status)->startsWith('running')) {
$this->dispatch('error', 'Database must be started to be publicly accessible.'); $this->dispatch('error', 'Database must be started to be publicly accessible.');
$this->database->is_public = false; $this->database->is_public = false;
@ -112,7 +125,7 @@ class General extends Component
} }
$this->database->save(); $this->database->save();
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->database->is_public = ! $this->database->is_public; $this->database->is_public = !$this->database->is_public;
return handleError($e, $this); return handleError($e, $this);
} }
@ -157,7 +170,7 @@ class General extends Component
return; return;
} }
if (! isset($this->database->init_scripts)) { if (!isset($this->database->init_scripts)) {
$this->database->init_scripts = []; $this->database->init_scripts = [];
} }
$this->database->init_scripts = array_merge($this->database->init_scripts, [ $this->database->init_scripts = array_merge($this->database->init_scripts, [