From 42ce06e21cef3692f46777ae982b829e2c2da51b Mon Sep 17 00:00:00 2001 From: RMartinOscar <40749467+RMartinOscar@users.noreply.github.com> Date: Mon, 27 Oct 2025 17:12:23 +0000 Subject: [PATCH] Cleanup --- .../Resources/DatabaseHosts/DatabaseHostResource.php | 2 +- app/Filament/Admin/Resources/Mounts/MountResource.php | 2 +- app/Filament/Admin/Resources/Roles/RoleResource.php | 2 +- app/Filament/Admin/Resources/Users/UserResource.php | 2 +- .../Admin/Resources/Webhooks/WebhookResource.php | 2 +- .../Server/Resources/Schedules/ScheduleResource.php | 2 +- app/Policies/Server/ActivityLogPolicy.php | 5 +++-- app/Policies/Server/AllocationPolicy.php | 8 ++++---- app/Policies/Server/BackupPolicy.php | 6 +++--- app/Policies/Server/DatabasePolicy.php | 10 +++++----- app/Policies/Server/DefaultPolicies.php | 4 +++- app/Policies/Server/FilePolicy.php | 8 ++++---- app/Policies/Server/SchedulePolicy.php | 8 ++++---- app/Policies/Server/UserPolicy.php | 8 ++++---- 14 files changed, 36 insertions(+), 33 deletions(-) diff --git a/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php b/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php index b8d0aaee0..52fca5fb8 100644 --- a/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php +++ b/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php @@ -92,7 +92,7 @@ class DatabaseHostResource extends Resource ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count) ->recordActions([ ViewAction::make() - ->hidden(fn ($record) => static::canEdit($record)), + ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), ]) ->groupedBulkActions([ diff --git a/app/Filament/Admin/Resources/Mounts/MountResource.php b/app/Filament/Admin/Resources/Mounts/MountResource.php index d46a94799..6bb27ed8a 100644 --- a/app/Filament/Admin/Resources/Mounts/MountResource.php +++ b/app/Filament/Admin/Resources/Mounts/MountResource.php @@ -95,7 +95,7 @@ class MountResource extends Resource ]) ->recordActions([ ViewAction::make() - ->hidden(fn ($record) => static::canEdit($record)), + ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), ]) ->groupedBulkActions([ diff --git a/app/Filament/Admin/Resources/Roles/RoleResource.php b/app/Filament/Admin/Resources/Roles/RoleResource.php index 5f3651e81..35a400055 100644 --- a/app/Filament/Admin/Resources/Roles/RoleResource.php +++ b/app/Filament/Admin/Resources/Roles/RoleResource.php @@ -98,7 +98,7 @@ class RoleResource extends Resource ]) ->recordActions([ ViewAction::make() - ->hidden(fn ($record) => static::canEdit($record)), + ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), ]) ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0) diff --git a/app/Filament/Admin/Resources/Users/UserResource.php b/app/Filament/Admin/Resources/Users/UserResource.php index 58b7b5ef6..ce987c4c0 100644 --- a/app/Filament/Admin/Resources/Users/UserResource.php +++ b/app/Filament/Admin/Resources/Users/UserResource.php @@ -130,7 +130,7 @@ class UserResource extends Resource ]) ->recordActions([ ViewAction::make() - ->hidden(fn ($record) => static::canEdit($record)), + ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), ]) ->checkIfRecordIsSelectableUsing(fn (User $user) => user()?->id !== $user->id && !$user->servers_count) diff --git a/app/Filament/Admin/Resources/Webhooks/WebhookResource.php b/app/Filament/Admin/Resources/Webhooks/WebhookResource.php index 27384602a..688bbddc0 100644 --- a/app/Filament/Admin/Resources/Webhooks/WebhookResource.php +++ b/app/Filament/Admin/Resources/Webhooks/WebhookResource.php @@ -98,7 +98,7 @@ class WebhookResource extends Resource ]) ->recordActions([ ViewAction::make() - ->hidden(fn (WebhookConfiguration $record) => static::canEdit($record)), + ->hidden(fn (WebhookConfiguration $record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), ReplicateAction::make() ->iconButton() diff --git a/app/Filament/Server/Resources/Schedules/ScheduleResource.php b/app/Filament/Server/Resources/Schedules/ScheduleResource.php index a3db782ac..bf7496769 100644 --- a/app/Filament/Server/Resources/Schedules/ScheduleResource.php +++ b/app/Filament/Server/Resources/Schedules/ScheduleResource.php @@ -336,7 +336,7 @@ class ScheduleResource extends Resource ]) ->recordActions([ ViewAction::make() - ->hidden(fn ($record) => static::canEdit($record)), + ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()), EditAction::make(), DeleteAction::make() ->after(function (Schedule $schedule) { diff --git a/app/Policies/Server/ActivityLogPolicy.php b/app/Policies/Server/ActivityLogPolicy.php index f5b20c09b..30e1b4335 100644 --- a/app/Policies/Server/ActivityLogPolicy.php +++ b/app/Policies/Server/ActivityLogPolicy.php @@ -4,17 +4,18 @@ namespace App\Policies\Server; use App\Models\Permission; use Filament\Facades\Filament; +use Illuminate\Database\Eloquent\Model; class ActivityLogPolicy { protected string $modelName = 'activityLog'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant()); } - public static function view(): bool + public function view(Model $model): bool { return user()?->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant()); } diff --git a/app/Policies/Server/AllocationPolicy.php b/app/Policies/Server/AllocationPolicy.php index 5ed31568c..1eb52ac1d 100644 --- a/app/Policies/Server/AllocationPolicy.php +++ b/app/Policies/Server/AllocationPolicy.php @@ -10,22 +10,22 @@ class AllocationPolicy { protected string $modelName = 'allocation'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_ALLOCATION_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_ALLOCATION_CREATE, Filament::getTenant()); } - public static function edit(Model $record): bool + public function edit(Model $record): bool { return user()?->can(Permission::ACTION_ALLOCATION_UPDATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_ALLOCATION_DELETE, Filament::getTenant()); } diff --git a/app/Policies/Server/BackupPolicy.php b/app/Policies/Server/BackupPolicy.php index 3dd5bf081..6064de07d 100644 --- a/app/Policies/Server/BackupPolicy.php +++ b/app/Policies/Server/BackupPolicy.php @@ -10,17 +10,17 @@ class BackupPolicy { protected string $modelName = 'backup'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_BACKUP_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_BACKUP_CREATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_BACKUP_DELETE, Filament::getTenant()); } diff --git a/app/Policies/Server/DatabasePolicy.php b/app/Policies/Server/DatabasePolicy.php index cafd43113..a3fd33393 100644 --- a/app/Policies/Server/DatabasePolicy.php +++ b/app/Policies/Server/DatabasePolicy.php @@ -10,27 +10,27 @@ class DatabasePolicy { protected string $modelName = 'database'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_DATABASE_READ, Filament::getTenant()); } - public static function view(Model $record): bool + public function view(Model $record): bool { return user()?->can(Permission::ACTION_DATABASE_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_DATABASE_CREATE, Filament::getTenant()); } - public static function edit(Model $record): bool + public function edit(Model $record): bool { return user()?->can(Permission::ACTION_DATABASE_UPDATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_DATABASE_DELETE, Filament::getTenant()); } diff --git a/app/Policies/Server/DefaultPolicies.php b/app/Policies/Server/DefaultPolicies.php index 62b6c12f7..557f66ff3 100644 --- a/app/Policies/Server/DefaultPolicies.php +++ b/app/Policies/Server/DefaultPolicies.php @@ -8,8 +8,10 @@ trait DefaultPolicies * This is a horrendous hack to avoid Laravel's "smart" behavior that does * not call the before() function if there isn't a function matching the * policy permission. + * + * @param array $arguments */ - public function __call(string $name, mixed $arguments): void + public function __call(string $name, array $arguments): void { // do nothing } diff --git a/app/Policies/Server/FilePolicy.php b/app/Policies/Server/FilePolicy.php index 5a8737491..2a2ab30b8 100644 --- a/app/Policies/Server/FilePolicy.php +++ b/app/Policies/Server/FilePolicy.php @@ -10,22 +10,22 @@ class FilePolicy { protected string $modelName = 'file'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_FILE_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_FILE_CREATE, Filament::getTenant()); } - public static function edit(Model $record): bool + public function edit(Model $record): bool { return user()?->can(Permission::ACTION_FILE_UPDATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_FILE_DELETE, Filament::getTenant()); } diff --git a/app/Policies/Server/SchedulePolicy.php b/app/Policies/Server/SchedulePolicy.php index a18807b71..835619649 100644 --- a/app/Policies/Server/SchedulePolicy.php +++ b/app/Policies/Server/SchedulePolicy.php @@ -10,22 +10,22 @@ class SchedulePolicy { protected string $modelName = 'schedule'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_SCHEDULE_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_SCHEDULE_CREATE, Filament::getTenant()); } - public static function edit(Model $record): bool + public function edit(Model $record): bool { return user()?->can(Permission::ACTION_SCHEDULE_UPDATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_SCHEDULE_DELETE, Filament::getTenant()); } diff --git a/app/Policies/Server/UserPolicy.php b/app/Policies/Server/UserPolicy.php index d5971152e..9e2d447fc 100644 --- a/app/Policies/Server/UserPolicy.php +++ b/app/Policies/Server/UserPolicy.php @@ -10,22 +10,22 @@ class UserPolicy { protected string $modelName = 'user'; - public static function viewAny(): bool + public function viewAny(): bool { return user()?->can(Permission::ACTION_USER_READ, Filament::getTenant()); } - public static function create(): bool + public function create(): bool { return user()?->can(Permission::ACTION_USER_CREATE, Filament::getTenant()); } - public static function edit(Model $record): bool + public function edit(Model $record): bool { return user()?->can(Permission::ACTION_USER_UPDATE, Filament::getTenant()); } - public static function delete(Model $record): bool + public function delete(Model $record): bool { return user()?->can(Permission::ACTION_USER_DELETE, Filament::getTenant()); }