diff --git a/app/Filament/Admin/Resources/ApiKeyResource.php b/app/Filament/Admin/Resources/ApiKeyResource.php index 0a8c244df..c02af4f54 100644 --- a/app/Filament/Admin/Resources/ApiKeyResource.php +++ b/app/Filament/Admin/Resources/ApiKeyResource.php @@ -106,9 +106,9 @@ class ApiKeyResource extends Resource collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource) ->label(str($resource)->replace('_', ' ')->title())->inline() ->options([ - 0 => 'None', - 1 => 'Read', - 3 => 'Read & Write', + 0 => trans('admin/apikey.permissions.none'), + 1 => trans('admin/apikey.permissions.read'), + 3 => trans('admin/apikey.permissions.read_write'), ]) ->icons([ 0 => 'tabler-book-off', diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php index eead5cf3b..157bc1b9d 100644 --- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php +++ b/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php @@ -41,7 +41,7 @@ class CreateDatabaseHost extends CreateRecord return $this->service->handle($data); } catch (PDOException $exception) { Notification::make() - ->title('Error connecting to database host') + ->title(trans('admin/databasehost.error')) ->body($exception->getMessage()) ->color('danger') ->icon('tabler-database') diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php index b8e3de281..edc0b9b2b 100644 --- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php +++ b/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php @@ -28,7 +28,7 @@ class EditDatabaseHost extends EditRecord { return [ DeleteAction::make() - ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? 'Database Host Has Databases' : trans('filament-actions::delete.single.label')) + ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? trans('admin/databasehost.delete_help') : trans('filament-actions::delete.single.modal.actions.delete.label')) ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0), $this->getSaveFormAction()->formId('form'), ]; @@ -60,7 +60,7 @@ class EditDatabaseHost extends EditRecord return $this->hostUpdateService->handle($record, $data); } catch (PDOException $exception) { Notification::make() - ->title('Error connecting to database host') + ->title(trans('admin/databasehost.error')) ->body($exception->getMessage()) ->color('danger') ->icon('tabler-database') diff --git a/app/Filament/Admin/Resources/MountResource.php b/app/Filament/Admin/Resources/MountResource.php index aa34de4ee..6ad032e5a 100644 --- a/app/Filament/Admin/Resources/MountResource.php +++ b/app/Filament/Admin/Resources/MountResource.php @@ -131,24 +131,6 @@ class MountResource extends Resource ->required() ->helperText(trans('admin/mount.target_help')) ->maxLength(255), - ToggleButtons::make('user_mountable') - ->hidden() - ->label('User mountable?') - ->options([ - false => 'No', - true => 'Yes', - ]) - ->icons([ - false => 'tabler-user-cancel', - true => 'tabler-user-bolt', - ]) - ->colors([ - false => 'success', - true => 'warning', - ]) - ->default(false) - ->inline() - ->required(), Textarea::make('description') ->label(trans('admin/mount.description')) ->helperText(trans('admin/mount.description_help')) diff --git a/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php b/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php index 693ba4a0e..67fb04b58 100644 --- a/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php +++ b/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php @@ -28,6 +28,7 @@ class CreateMount extends CreateRecord protected function handleRecordCreation(array $data): Model { $data['uuid'] ??= Str::uuid()->toString(); + $data['user_mountable'] = 1; return parent::handleRecordCreation($data); } diff --git a/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php b/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php index 90ce7fba1..1bee1277a 100644 --- a/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php +++ b/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php @@ -50,8 +50,7 @@ class EditRole extends EditRecord return [ DeleteAction::make() ->disabled(fn (Role $role) => $role->isRootAdmin() || $role->users_count >= 1) - ->label(fn (Role $role) => $role->isRootAdmin() ? 'Can\'t delete Root Admin' : ($role->users_count >= 1 ? 'In Use' : 'Delete')), - $this->getSaveFormAction()->formId('form'), + ->label(fn (Role $role) => $role->isRootAdmin() ? trans('admin/role.root_admin_delete') : ($role->users_count >= 1 ? trans('admin/role.in_use') : trans('filament-actions::delete.single.label'))), $this->getSaveFormAction()->formId('form'), ]; } diff --git a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php b/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php index 652a04020..67d8e6d41 100644 --- a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php +++ b/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php @@ -24,7 +24,7 @@ class EditUser extends EditRecord { return [ DeleteAction::make() - ->label(fn (User $user) => auth()->user()->id === $user->id ? 'Can\'t Delete Yourself' : ($user->servers()->count() > 0 ? 'User Has Servers' : 'Delete')) + ->label(fn (User $user) => auth()->user()->id === $user->id ? trans('admin/user.self_delete') : ($user->servers()->count() > 0 ? trans('admin/user.has_servers') : trans('filament-actions::delete.single.modal.actions.delete.label'))) ->disabled(fn (User $user) => auth()->user()->id === $user->id || $user->servers()->count() > 0), $this->getSaveFormAction()->formId('form'), ]; diff --git a/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php b/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php index 07ba7e5b3..bc9f69528 100644 --- a/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php +++ b/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php @@ -13,11 +13,7 @@ class EditWebhookConfiguration extends EditRecord protected function getHeaderActions(): array { return [ - DeleteAction::make() - ->label('Delete') - ->modalHeading('Are you sure you want to delete this?') - ->modalDescription('') - ->modalSubmitActionLabel('Delete'), + DeleteAction::make(), $this->getSaveFormAction()->formId('form'), ]; }