cleanup and fix some actions

Boy132 · Boy132 · commit 47f93e0a2599 · 2026-02-24T11:50:54.000+01:00
diff --git a/announcements/src/Filament/Admin/Resources/Announcements/AnnouncementResource.php b/announcements/src/Filament/Admin/Resources/Announcements/AnnouncementResource.php
@@ -4,6 +4,7 @@
 
 use Boy132\Announcements\Filament\Admin\Resources\Announcements\Pages\ManageAnnouncements;
 use Boy132\Announcements\Models\Announcement;
+use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -70,10 +71,14 @@ public static function table(Table $table): Table
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
                 DeleteAction::make(),
             ])
+            ->toolbarActions([
+                CreateAction::make()
+                    ->createAnother(false),
+            ])
             ->emptyStateIcon('tabler-speakerphone')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('announcements::strings.no_announcements'));
diff --git a/announcements/src/Filament/Admin/Resources/Announcements/Pages/ManageAnnouncements.php b/announcements/src/Filament/Admin/Resources/Announcements/Pages/ManageAnnouncements.php
@@ -3,20 +3,9 @@
 namespace Boy132\Announcements\Filament\Admin\Resources\Announcements\Pages;
 
 use Boy132\Announcements\Filament\Admin\Resources\Announcements\AnnouncementResource;
-use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ManageRecords;
 
 class ManageAnnouncements extends ManageRecords
 {
     protected static string $resource = AnnouncementResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->createAnother(false)
-                ->hiddenLabel()
-                ->icon('tabler-plus'),
-        ];
-    }
 }
diff --git a/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/GenericOIDCProviderResource.php b/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/GenericOIDCProviderResource.php
@@ -7,6 +7,8 @@
 use Boy132\GenericOIDCProviders\Filament\Admin\Resources\GenericOIDCProviders\Pages\EditGenericOIDCProvider;
 use Boy132\GenericOIDCProviders\Filament\Admin\Resources\GenericOIDCProviders\Pages\ListGenericOIDCProviders;
 use Boy132\GenericOIDCProviders\Models\GenericOIDCProvider;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
@@ -192,7 +194,10 @@ public static function table(Table $table): Table
                 DeleteAction::make(),
             ])
             ->toolbarActions([
-                DeleteBulkAction::make(),
+                CreateAction::make(),
+                BulkActionGroup::make([
+                    DeleteBulkAction::make('exclude_bulk_delete'),
+                ]),
             ])
             ->emptyStateIcon('tabler-brand-oauth')
             ->emptyStateDescription('')
diff --git a/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/CreateGenericOIDCProvider.php b/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/CreateGenericOIDCProvider.php
@@ -16,12 +16,10 @@ class CreateGenericOIDCProvider extends CreateRecord
     protected function getHeaderActions(): array
     {
         return [
-            Action::make('create')
+            $this->getCreateFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
                 ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon('tabler-file-plus'),
+                ->icon('tabler-plus'),
         ];
     }
 
diff --git a/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/EditGenericOIDCProvider.php b/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/EditGenericOIDCProvider.php
@@ -19,12 +19,14 @@ protected function getFormActions(): array
     protected function getHeaderActions(): array
     {
         return [
+            $this->getCancelFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
+                ->hiddenLabel()
+                ->icon('tabler-arrow-left'),
             DeleteAction::make(),
-            Action::make('save')
+            $this->getSaveFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
                 ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
                 ->icon('tabler-device-floppy'),
         ];
     }
diff --git a/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/ListGenericOIDCProviders.php b/generic-oidc-providers/src/Filament/Admin/Resources/GenericOIDCProviders/Pages/ListGenericOIDCProviders.php
@@ -3,20 +3,9 @@
 namespace Boy132\GenericOIDCProviders\Filament\Admin\Resources\GenericOIDCProviders\Pages;
 
 use Boy132\GenericOIDCProviders\Filament\Admin\Resources\GenericOIDCProviders\GenericOIDCProviderResource;
-use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
 class ListGenericOIDCProviders extends ListRecords
 {
     protected static string $resource = GenericOIDCProviderResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->createAnother(false)
-                ->hiddenLabel()
-                ->icon('tabler-plus'),
-        ];
-    }
 }
diff --git a/player-counter/src/Filament/Admin/Resources/GameQueries/GameQueryResource.php b/player-counter/src/Filament/Admin/Resources/GameQueries/GameQueryResource.php
@@ -5,6 +5,7 @@
 use Boy132\PlayerCounter\Extensions\Query\QueryTypeService;
 use Boy132\PlayerCounter\Filament\Admin\Resources\GameQueries\Pages\ManageGameQueries;
 use Boy132\PlayerCounter\Models\GameQuery;
+use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -61,10 +62,14 @@ public static function table(Table $table): Table
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
                 DeleteAction::make(),
             ])
+            ->toolbarActions([
+                CreateAction::make()
+                    ->createAnother(false),
+            ])
             ->emptyStateIcon('tabler-device-desktop-search')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('player-counter::query.no_queries'));
diff --git a/player-counter/src/Filament/Admin/Resources/GameQueries/Pages/ManageGameQueries.php b/player-counter/src/Filament/Admin/Resources/GameQueries/Pages/ManageGameQueries.php
@@ -3,20 +3,9 @@
 namespace Boy132\PlayerCounter\Filament\Admin\Resources\GameQueries\Pages;
 
 use Boy132\PlayerCounter\Filament\Admin\Resources\GameQueries\GameQueryResource;
-use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ManageRecords;
 
 class ManageGameQueries extends ManageRecords
 {
     protected static string $resource = GameQueryResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->createAnother(false)
-                ->hiddenLabel()
-                ->icon('tabler-plus'),
-        ];
-    }
 }
diff --git a/subdomains/src/Filament/Admin/Resources/CloudflareDomains/CloudflareDomainResource.php b/subdomains/src/Filament/Admin/Resources/CloudflareDomains/CloudflareDomainResource.php
@@ -6,6 +6,7 @@
 use Boy132\Subdomains\Models\CloudflareDomain;
 use Exception;
 use Filament\Actions\Action;
+use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
@@ -68,7 +69,7 @@ public static function table(Table $table): Table
             ])
             ->recordActions([
                 Action::make('sync')
-                    ->label(trans('subdomains::strings.sync'))
+                    ->tooltip(trans('subdomains::strings.sync'))
                     ->icon('tabler-refresh')
                     ->visible(fn (CloudflareDomain $domain) => is_null($domain->cloudflare_id))
                     ->action(function (CloudflareDomain $domain) {
@@ -90,6 +91,23 @@ public static function table(Table $table): Table
                     }),
                 DeleteAction::make(),
             ])
+            ->toolbarActions([
+                CreateAction::make()
+                    ->createAnother(false)
+                    //->hidden(fn () => is_null(config('subdomains.token')))
+                    ->using(function (array $data) {
+                        try {
+                            return CloudflareDomain::create($data);
+                        } catch (Exception $exception) {
+                            Notification::make()
+                                ->title(trans('subdomains::strings.notifications.not_synced'))
+                                ->body($exception->getMessage())
+                                ->warning()
+                                ->persistent()
+                                ->send();
+                        }
+                    }),
+            ])
             ->emptyStateIcon('tabler-world-www')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('subdomains::strings.no_domains'));
diff --git a/subdomains/src/Filament/Admin/Resources/CloudflareDomains/Pages/ManageCloudflareDomains.php b/subdomains/src/Filament/Admin/Resources/CloudflareDomains/Pages/ManageCloudflareDomains.php
@@ -3,36 +3,9 @@
 namespace Boy132\Subdomains\Filament\Admin\Resources\CloudflareDomains\Pages;
 
 use Boy132\Subdomains\Filament\Admin\Resources\CloudflareDomains\CloudflareDomainResource;
-use Boy132\Subdomains\Models\CloudflareDomain;
-use Exception;
-use Filament\Actions\CreateAction;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ManageRecords;
 
 class ManageCloudflareDomains extends ManageRecords
 {
     protected static string $resource = CloudflareDomainResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->createAnother(false)
-                ->hiddenLabel()
-                ->icon('tabler-plus')
-                ->hidden(fn () => is_null(config('subdomains.token')))
-                ->using(function (array $data) {
-                    try {
-                        return CloudflareDomain::create($data);
-                    } catch (Exception $exception) {
-                        Notification::make()
-                            ->title(trans('subdomains::strings.notifications.not_synced'))
-                            ->body($exception->getMessage())
-                            ->warning()
-                            ->persistent()
-                            ->send();
-                    }
-                }),
-        ];
-    }
 }
diff --git a/tickets/src/Filament/Admin/Resources/Tickets/Pages/CreateTicket.php b/tickets/src/Filament/Admin/Resources/Tickets/Pages/CreateTicket.php
@@ -15,11 +15,9 @@ class CreateTicket extends CreateRecord
     protected function getHeaderActions(): array
     {
         return [
-            Action::make('create')
+            $this->getCreateFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
                 ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
                 ->icon('tabler-plus'),
         ];
     }
diff --git a/tickets/src/Filament/Admin/Resources/Tickets/Pages/EditTicket.php b/tickets/src/Filament/Admin/Resources/Tickets/Pages/EditTicket.php
@@ -15,18 +15,16 @@ class EditTicket extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
+            $this->getCancelFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
+                ->hiddenLabel()
+                ->icon('tabler-arrow-left'),
             AnswerAction::make(),
             AssignToMeAction::make(),
-            Action::make('save')
+            $this->getSaveFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
                 ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
                 ->icon('tabler-device-floppy'),
-            $this->getCancelFormAction()->formId('form')
-                ->tooltip(trans('filament-panels::auth/pages/edit-profile.actions.cancel.label'))
-                ->hiddenLabel()
-                ->icon('tabler-arrow-left'),
         ];
     }
 
diff --git a/tickets/src/Filament/Admin/Resources/Tickets/Pages/ListTickets.php b/tickets/src/Filament/Admin/Resources/Tickets/Pages/ListTickets.php
@@ -5,7 +5,6 @@
 use Boy132\Tickets\Enums\TicketStatus;
 use Boy132\Tickets\Filament\Admin\Resources\Tickets\TicketResource;
 use Boy132\Tickets\Models\Ticket;
-use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Schemas\Components\Tabs\Tab;
 use Illuminate\Database\Eloquent\Builder;
@@ -14,16 +13,6 @@ class ListTickets extends ListRecords
 {
     protected static string $resource = TicketResource::class;
 
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->createAnother(false)
-                ->hiddenLabel()
-                ->icon('tabler-plus'),
-        ];
-    }
-
     public function getTabs(): array
     {
         return [
diff --git a/tickets/src/Filament/Admin/Resources/Tickets/Pages/ViewTicket.php b/tickets/src/Filament/Admin/Resources/Tickets/Pages/ViewTicket.php
@@ -13,9 +13,7 @@ class ViewTicket extends ViewRecord
     protected function getHeaderActions(): array
     {
         return [
-            EditAction::make()
-                ->hiddenLabel()
-                ->icon('tabler-edit'),
+            EditAction::make(),
         ];
     }
 }
diff --git a/tickets/src/Filament/Admin/Resources/Tickets/TicketResource.php b/tickets/src/Filament/Admin/Resources/Tickets/TicketResource.php
@@ -16,6 +16,7 @@
 use Boy132\Tickets\Filament\Components\Actions\AnswerAction;
 use Boy132\Tickets\Filament\Components\Actions\AssignToMeAction;
 use Boy132\Tickets\Models\Ticket;
+use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -109,12 +110,16 @@ public static function table(Table $table): Table
                     ->toggleable(),
             ])
             ->recordActions([
-                ViewAction::make(),
+                ViewAction::make()
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
                 AnswerAction::make(),
                 AssignToMeAction::make(),
                 DeleteAction::make(),
             ])
+            ->toolbarActions([
+                CreateAction::make(),
+            ])
             ->groups([
                 Group::make('category')
                     ->label(trans('tickets::tickets.category')),
diff --git a/tickets/src/Filament/Components/Actions/AnswerAction.php b/tickets/src/Filament/Components/Actions/AnswerAction.php
@@ -23,7 +23,7 @@ protected function setUp(): void
 
         $this->hidden(fn (Ticket $ticket) => $ticket->status === TicketStatus::Closed || $ticket->assigned_user_id !== auth()->user()->id);
 
-        $this->label(trans('tickets::tickets.answer_verb'));
+        $this->tooltip(trans('tickets::tickets.answer_verb'));
 
         $this->icon('tabler-edit');
 
diff --git a/tickets/src/Filament/Server/Resources/Tickets/Pages/CreateTicket.php b/tickets/src/Filament/Server/Resources/Tickets/Pages/CreateTicket.php
@@ -3,6 +3,7 @@
 namespace Boy132\Tickets\Filament\Server\Resources\Tickets\Pages;
 
 use Boy132\Tickets\Filament\Server\Resources\Tickets\TicketResource;
+use Filament\Actions\Action;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateTicket extends CreateRecord
@@ -11,6 +12,16 @@ class CreateTicket extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
+    protected function getHeaderActions(): array
+    {
+        return [
+            $this->getCreateFormAction()->formId('form')
+                ->tooltip(fn (Action $action) => $action->getLabel())
+                ->hiddenLabel()
+                ->icon('tabler-plus'),
+        ];
+    }
+
     public function getBreadcrumbs(): array
     {
         return [];
diff --git a/tickets/src/Filament/Server/Resources/Tickets/Pages/ListTickets.php b/tickets/src/Filament/Server/Resources/Tickets/Pages/ListTickets.php
diff --git a/tickets/src/Filament/Server/Resources/Tickets/TicketResource.php b/tickets/src/Filament/Server/Resources/Tickets/TicketResource.php
diff --git a/user-creatable-servers/src/Filament/Admin/Resources/UserResourceLimits/Pages/ManageUserResourceLimits.php b/user-creatable-servers/src/Filament/Admin/Resources/UserResourceLimits/Pages/ManageUserResourceLimits.php
diff --git a/user-creatable-servers/src/Filament/Admin/Resources/UserResourceLimits/UserResourceLimitsResource.php b/user-creatable-servers/src/Filament/Admin/Resources/UserResourceLimits/UserResourceLimitsResource.php
diff --git a/user-creatable-servers/src/Filament/Admin/Resources/Users/RelationManagers/UserResourceLimitRelationManager.php b/user-creatable-servers/src/Filament/Admin/Resources/Users/RelationManagers/UserResourceLimitRelationManager.php
