Add user server deletion capability (#33)

* Add user server deletion capability

Introduces the ability for users to delete their own servers if permitted by configuration. Adds related configuration, language strings, UI actions, and updates resource limit logic for improved robustness. Also updates plugin settings to allow toggling this feature.

* Allow admins to delete any server

Updated the delete action logic to permit root admins to delete any server, not just those they own. This change ensures that both server owners and admins can perform deletions when enabled in the configuration.

* Fix null user check in DeleteServerAction

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* remove hardcoded language

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Translate success notification messages for server deletion

* Remove unused DeleteServerAction class.

Deleted the DeleteServerAction class from the Filament components. This action is no longer needed or has been replaced elsewhere in the codebase.

* Remove redundant user check in canView method

Eliminated the unnecessary null check for the authenticated user in the canView method, as auth()->user() is assumed to always return a user in this context.

* Update server delete permission check

Replaces isRootAdmin() with can('delete servers') for determining if a user can delete a server, allowing for more flexible permission management.

* Redirect to default panel URL after server creation

Updated the post-creation redirect to use Filament's default panel URL instead of the root path. This ensures users are redirected to the appropriate panel home after creating a server.

* Remove redundant null check for user in cpuLeft

Eliminates an unnecessary check for a null user in the cpuLeft method, assuming the user relationship is always present when this method is called.

* cleanup

* cleanup

* cleanup

---------

Co-authored-by: Felix <154911483+invalidfelix@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Boy132 <mail@boy132.de>

Author: 3 people

user-creatable-servers/config/user-creatable-servers.php

@@ -6,4 +6,5 @@
     'backup_limit' => env('UCS_DEFAULT_BACKUP_LIMIT', 0),
 
     'can_users_update_servers' => env('UCS_CAN_USERS_UPDATE_SERVERS', true),
+    'can_users_delete_servers' => env('UCS_CAN_USERS_DELETE_SERVERS', false),
 ];

user-creatable-servers/lang/en/strings.php

@@ -13,4 +13,10 @@
     'name' => 'Server Name',
     'egg' => 'Egg',
     'left' => 'left',
+    'delete_server' => 'Delete Server',
+    'delete_server_confirm' => 'Are you sure you want to delete this server?',
+    'delete_server_warning' => 'This action cannot be undone and all data will be permanently lost.',
+    'server_deleted' => 'Server Deleted',
+    'server_deleted_success' => 'The server has been deleted successfully.',
+    'server_delete_error' => 'Could not delete server',
 ];

user-creatable-servers/plugin.json

@@ -12,4 +12,4 @@
     "panels": null,
     "panel_version": null,
     "composer_packages": null
-}
+}

user-creatable-servers/src/Filament/Server/Pages/ServerResourcePage.php

@@ -5,8 +5,10 @@
 use App\Filament\Server\Pages\ServerFormPage;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
+use App\Services\Servers\ServerDeletionService;
 use Boy132\UserCreatableServers\Filament\App\Widgets\UserResourceLimitsOverview;
 use Boy132\UserCreatableServers\Models\UserResourceLimits;
+use Exception;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\TextInput;
@@ -103,12 +105,46 @@ protected function getHeaderWidgets(): array
 
     protected function getHeaderActions(): array
     {
+        /** @var Server $server */
+        $server = Filament::getTenant();
+
         return [
             Action::make('save')
-                ->label(__('filament-panels::resources/pages/edit-record.form.actions.save.label'))
+                ->label(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
                 ->submit('save')
                 ->formId('form')
                 ->keyBindings(['mod+s']),
+            Action::make('delete_server')
+                ->visible(fn () => config('user-creatable-servers.can_users_delete_servers'))
+                ->authorize(fn () => $server->owner_id === auth()->user()->id || auth()->user()->can('delete server', $server))
+                ->label(trans('user-creatable-servers::strings.delete_server'))
+                ->color('danger')
+                ->icon('tabler-trash')
+                ->requiresConfirmation()
+                ->modalHeading(trans('user-creatable-servers::strings.delete_server_confirm'))
+                ->modalDescription(trans('user-creatable-servers::strings.delete_server_warning'))
+                ->modalSubmitActionLabel(trans('user-creatable-servers::strings.delete_server'))
+                ->action(function (ServerDeletionService $service) use ($server) {
+                    try {
+                        $service->handle($server);
+
+                        Notification::make()
+                            ->title(trans('user-creatable-servers::strings.server_deleted'))
+                            ->body(trans('user-creatable-servers::strings.server_deleted_success'))
+                            ->success()
+                            ->send();
+
+                        redirect(Filament::getDefaultPanel()->getUrl());
+                    } catch (Exception $exception) {
+                        report($exception);
+
+                        Notification::make()
+                            ->title(trans('user-creatable-servers::strings.server_delete_error'))
+                            ->body($exception->getMessage())
+                            ->danger()
+                            ->send();
+                    }
+                }),
         ];
     }
 

user-creatable-servers/src/Models/UserResourceLimits.php

@@ -42,7 +42,7 @@ public function getCpuLeft(): ?int
         if ($this->cpu > 0) {
             $sum_cpu = $this->user->servers->sum('cpu');
 
-            return $this->cpu - $sum_cpu;
+            return max(0, $this->cpu - $sum_cpu);
         }
 
         return null;
@@ -53,7 +53,7 @@ public function getMemoryLeft(): ?int
         if ($this->memory > 0) {
             $sum_memory = $this->user->servers->sum('memory');
 
-            return $this->memory - $sum_memory;
+            return max(0, $this->memory - $sum_memory);
         }
 
         return null;
@@ -64,7 +64,7 @@ public function getDiskLeft(): ?int
         if ($this->disk > 0) {
             $sum_disk = $this->user->servers->sum('disk');
 
-            return $this->disk - $sum_disk;
+            return max(0, $this->disk - $sum_disk);
         }
 
         return null;

user-creatable-servers/src/UserCreatableServersPlugin.php

@@ -57,6 +57,12 @@ public function getSettingsForm(): array
                 ->hintIconTooltip('If checked users can update the resource limits of theirs servers after creation.')
                 ->inline(false)
                 ->default(fn () => config('user-creatable-servers.can_users_update_servers')),
+            Toggle::make('can_users_delete_servers')
+                ->label('Can users delete servers?')
+                ->hintIcon('tabler-question-mark')
+                ->hintIconTooltip('If checked users can delete their own servers.')
+                ->inline(false)
+                ->default(fn () => config('user-creatable-servers.can_users_delete_servers')),
         ];
     }
 
@@ -67,6 +73,7 @@ public function saveSettings(array $data): void
             'UCS_DEFAULT_ALLOCATION_LIMIT' => $data['allocation_limit'],
             'UCS_DEFAULT_BACKUP_LIMIT' => $data['backup_limit'],
             'UCS_CAN_USERS_UPDATE_SERVERS' => $data['can_users_update_servers'] ? 'true' : 'false',
+            'UCS_CAN_USERS_DELETE_SERVERS' => $data['can_users_delete_servers'] ? 'true' : 'false',
         ]);
 
         Notification::make()