feat(livewire): add selectedActions parameter and error handling to delete methods

- Add `$selectedActions = []` parameter to delete/remove methods in multiple
  Livewire components to support optional deletion actions
- Return error message string when password verification fails instead of
  silent return
- Return `true` on successful deletion to indicate completion
- Handle selectedActions to set component properties for cascading deletions
  (delete_volumes, delete_networks, delete_configurations, docker_cleanup)
- Add test coverage for Danger component delete functionality with password
  validation and selected actions handling
This commit is contained in:
Andras Bacsai committed 2026-03-11 15:04:45 +01:00
1 parent b926f23824
commit 8366e150b1
12 files changed
+130 -26

No files matched your search

+2 -2
View File
@@ -146,12 +146,12 @@ class BackupEdit extends Component
}
}
public function delete($password)
public function delete($password, $selectedActions = [])
{
$this->authorize('manageBackups', $this->backup->database);
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
try {
@@ -65,10 +65,10 @@ class BackupExecutions extends Component
}
}
public function deleteBackup($executionId, $password)
public function deleteBackup($executionId, $password, $selectedActions = [])
{
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
$execution = $this->backup->executions()->where('id', $executionId)->first();
@@ -96,7 +96,11 @@ class BackupExecutions extends Component
$this->refreshBackupExecutions();
} catch (\Exception $e) {
$this->dispatch('error', 'Failed to delete backup: '.$e->getMessage());
return true;
}
return true;
}
public function download_file($exeuctionId)
+4 -2
View File
@@ -134,12 +134,12 @@ class FileStorage extends Component
}
}
public function delete($password)
public function delete($password, $selectedActions = [])
{
$this->authorize('update', $this->resource);
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
try {
@@ -158,6 +158,8 @@ class FileStorage extends Component
} finally {
$this->dispatch('refreshStorages');
}
return true;
}
public function submit()
+4 -4
View File
@@ -194,13 +194,13 @@ class Index extends Component
}
}
public function deleteDatabase($password)
public function deleteDatabase($password, $selectedActions = [])
{
try {
$this->authorize('delete', $this->serviceDatabase);
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
$this->serviceDatabase->delete();
@@ -398,13 +398,13 @@ class Index extends Component
}
}
public function deleteApplication($password)
public function deleteApplication($password, $selectedActions = [])
{
try {
$this->authorize('delete', $this->serviceApplication);
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
$this->serviceApplication->delete();
+9 -4
View File
@@ -88,16 +88,21 @@ class Danger extends Component
}
}
public function delete($password)
public function delete($password, $selectedActions = [])
{
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
if (! $this->resource) {
$this->addError('resource', 'Resource not found.');
return 'Resource not found.';
}
return;
if (! empty($selectedActions)) {
$this->delete_volumes = in_array('delete_volumes', $selectedActions);
$this->delete_connected_networks = in_array('delete_connected_networks', $selectedActions);
$this->delete_configurations = in_array('delete_configurations', $selectedActions);
$this->docker_cleanup = in_array('docker_cleanup', $selectedActions);
}
try {
+4 -2
View File
@@ -134,11 +134,11 @@ class Destination extends Component
$this->dispatch('refresh');
}
public function removeServer(int $network_id, int $server_id, $password)
public function removeServer(int $network_id, int $server_id, $password, $selectedActions = [])
{
try {
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
@@ -152,6 +152,8 @@ class Destination extends Component
$this->loadData();
$this->dispatch('refresh');
ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
return true;
} catch (\Exception $e) {
return handleError($e, $this);
}
@@ -77,15 +77,17 @@ class Show extends Component
$this->dispatch('success', 'Storage updated successfully');
}
public function delete($password)
public function delete($password, $selectedActions = [])
{
$this->authorize('update', $this->resource);
if (! verifyPasswordConfirmation($password, $this)) {
return;
return 'The provided password is incorrect.';
}
$this->storage->delete();
$this->dispatch('refreshStorages');
return true;
}
}