Skip to content

Commit 29ebf81

Browse files
committed
more action fixes
1 parent 3d4b19d commit 29ebf81

10 files changed

Lines changed: 35 additions & 31 deletions

File tree

announcements/src/Filament/Admin/Resources/Announcements/AnnouncementResource.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Boy132\Announcements\Filament\Admin\Resources\Announcements\Pages\ManageAnnouncements;
66
use Boy132\Announcements\Models\Announcement;
7-
use Filament\Actions\ActionGroup;
87
use Filament\Actions\DeleteAction;
98
use Filament\Actions\EditAction;
109
use Filament\Actions\ViewAction;
@@ -70,12 +69,10 @@ public static function table(Table $table): Table
7069
->dateTime(),
7170
])
7271
->recordActions([
73-
ActionGroup::make([
74-
ViewAction::make()
75-
->hidden(fn ($record) => static::canEdit($record)),
76-
EditAction::make(),
77-
DeleteAction::make(),
78-
]),
72+
ViewAction::make()
73+
->hidden(fn ($record) => static::canEdit($record)),
74+
EditAction::make(),
75+
DeleteAction::make(),
7976
])
8077
->emptyStateIcon('tabler-speakerphone')
8178
->emptyStateDescription('')

legal-pages/src/Filament/Admin/Pages/LegalPages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ public function getFormSchema(): array
7676
->label($legalPageType->getLabel())
7777
->disabled(fn () => !user()?->can('update legalPage'))
7878
->hintActions([
79-
Action::make('view')
79+
Action::make('hint_view')
8080
->label(trans('filament-actions::view.single.label'))
8181
->icon('tabler-eye')
8282
->url($legalPageType->getUrl(), true)
8383
->visible(fn (Get $get) => $get($legalPageType->getId())),
84-
Action::make('clear')
84+
Action::make('hint_clear')
8585
->label(trans('legal-pages::strings.clear'))
8686
->authorize(fn () => user()?->can('update legalPage'))
8787
->color('danger')

mclogs-uploader/src/Filament/Components/Actions/UploadLogsAction.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ protected function setUp(): void
2828
return $server->retrieveStatus()->isOffline();
2929
});
3030

31+
$this->hiddenLabel();
32+
3133
$this->tooltip(fn () => trans('mclogs-uploader::upload.upload_logs'));
3234

3335
$this->icon('tabler-upload');

minecraft-modrinth/src/Filament/Server/Pages/MinecraftModrinthProjectPage.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ public function table(Table $table): Table
106106
->recordUrl(fn (array $record) => "https://modrinth.com/{$record['project_type']}/{$record['slug']}", true)
107107
->recordActions([
108108
Action::make('download')
109+
->tooltip(trans('minecraft-modrinth::strings.actions.download'))
110+
->icon('tabler-download')
111+
->modalSubmitAction(false)
109112
->schema(function (array $record) {
110113
$schema = [];
111114

@@ -149,7 +152,8 @@ public function table(Table $table): Table
149152
->state($versionData['changelog']),
150153
])
151154
->headerActions([
152-
Action::make('download')
155+
Action::make('exclude_download')
156+
->label(trans('minecraft-modrinth::strings.actions.download'))
153157
->visible(!is_null($primaryFile))
154158
->action(function (DaemonFileRepository $fileRepository) use ($server, $versionData, $primaryFile) {
155159
try {

player-counter/lang/en/query.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
'map' => 'Map',
1414
'unknown' => 'Unknown',
1515

16+
'kick' => 'Kick',
17+
1618
'whitelisted' => 'Whitelisted',
1719
'add_to_whitelist' => 'Add to whitelist',
1820
'remove_from_whitelist' => 'Remove from whitelist',

player-counter/src/Filament/Server/Pages/PlayersPage.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,9 @@ public function table(Table $table): Table
164164
]),
165165
])
166166
->recordActions([
167-
Action::make('kick')
167+
Action::make('exclude_kick')
168168
->visible(fn () => $isMinecraft)
169+
->label(trans('player-counter::query.kick'))
169170
->icon('tabler-door-exit')
170171
->color('danger')
171172
->action(function (array $record) {
@@ -192,7 +193,7 @@ public function table(Table $table): Table
192193
->send();
193194
}
194195
}),
195-
Action::make('whitelist')
196+
Action::make('exclude_whitelist')
196197
->visible(fn () => $isMinecraft)
197198
->label(fn (array $record) => in_array($record['name'], $whitelist) ? trans('player-counter::query.remove_from_whitelist') : trans('player-counter::query.add_to_whitelist'))
198199
->icon(fn (array $record) => in_array($record['name'], $whitelist) ? 'tabler-playlist-x' : 'tabler-playlist-add')
@@ -223,7 +224,7 @@ public function table(Table $table): Table
223224
->send();
224225
}
225226
}),
226-
Action::make('op')
227+
Action::make('exclude_op')
227228
->visible(fn () => $isMinecraft)
228229
->label(fn (array $record) => in_array($record['name'], $ops) ? trans('player-counter::query.remove_from_ops') : trans('player-counter::query.add_to_ops'))
229230
->icon(fn (array $record) => in_array($record['name'], $ops) ? 'tabler-shield-minus' : 'tabler-shield-plus')

rust-umod/src/Filament/Server/Pages/RustUModPluginsPage.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ public function table(Table $table): Table
9797
->recordUrl(fn (array $record) => $record['url'], true)
9898
->recordActions([
9999
Action::make('download')
100+
->tooltip('Download')
101+
->icon('tabler-download')
100102
->action(function (array $record, DaemonFileRepository $fileRepository) {
101103
try {
102104
/** @var Server $server */

tickets/src/Filament/Components/Actions/AssignToMeAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected function setUp(): void
2121

2222
$this->hidden(fn (Ticket $ticket) => $ticket->assignedUser);
2323

24-
$this->label(trans('tickets::tickets.assign_to_me'));
24+
$this->tooltip(trans('tickets::tickets.assign_to_me'));
2525

2626
$this->icon('tabler-user-share');
2727

user-creatable-servers/src/Filament/Admin/Resources/UserResourceLimits/UserResourceLimitsResource.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use App\Models\User;
77
use Boy132\UserCreatableServers\Filament\Admin\Resources\UserResourceLimits\Pages\ManageUserResourceLimits;
88
use Boy132\UserCreatableServers\Models\UserResourceLimits;
9-
use Filament\Actions\ActionGroup;
109
use Filament\Actions\DeleteAction;
1110
use Filament\Actions\EditAction;
1211
use Filament\Actions\ViewAction;
@@ -73,12 +72,10 @@ public static function table(Table $table): Table
7372
->formatStateUsing(fn ($state) => $state > 0 ? $state . $suffix : trans('user-creatable-servers::strings.unlimited')),
7473
])
7574
->recordActions([
76-
ActionGroup::make([
77-
ViewAction::make()
78-
->hidden(fn ($record) => static::canEdit($record)),
79-
EditAction::make(),
80-
DeleteAction::make(),
81-
]),
75+
ViewAction::make()
76+
->hidden(fn ($record) => static::canEdit($record)),
77+
EditAction::make(),
78+
DeleteAction::make(),
8279
])
8380
->emptyStateIcon('tabler-cube-plus')
8481
->emptyStateDescription('');

user-creatable-servers/src/Filament/Admin/Resources/Users/RelationManagers/UserResourceLimitRelationManager.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Boy132\UserCreatableServers\Filament\Admin\Resources\Users\RelationManagers;
44

55
use Boy132\UserCreatableServers\Filament\Admin\Resources\UserResourceLimits\UserResourceLimitsResource;
6-
use Filament\Actions\ActionGroup;
76
use Filament\Actions\DeleteAction;
87
use Filament\Actions\EditAction;
98
use Filament\Actions\ViewAction;
@@ -29,29 +28,29 @@ public static function canViewForRecord(Model $ownerRecord, string $pageClass):
2928

3029
public function table(Table $table): Table
3130
{
31+
$suffix = config('panel.use_binary_prefix') ? ' MiB' : ' MB';
32+
3233
return $table
3334
->heading(trans_choice('user-creatable-servers::strings.user_resource_limits', 2))
3435
->columns([
3536
TextColumn::make('cpu')
3637
->label(trans('user-creatable-servers::strings.cpu'))
3738
->badge()
38-
->suffix('%'),
39+
->formatStateUsing(fn ($state) => $state > 0 ? $state . '%' : trans('user-creatable-servers::strings.unlimited')),
3940
TextColumn::make('memory')
4041
->label(trans('user-creatable-servers::strings.memory'))
4142
->badge()
42-
->suffix(config('panel.use_binary_prefix') ? ' MiB' : ' MB'),
43+
->formatStateUsing(fn ($state) => $state > 0 ? $state . $suffix : trans('user-creatable-servers::strings.unlimited')),
4344
TextColumn::make('disk')
4445
->label(trans('user-creatable-servers::strings.disk'))
4546
->badge()
46-
->suffix(config('panel.use_binary_prefix') ? ' MiB' : ' MB'),
47+
->formatStateUsing(fn ($state) => $state > 0 ? $state . $suffix : trans('user-creatable-servers::strings.unlimited')),
4748
])
4849
->recordActions([
49-
ActionGroup::make([
50-
ViewAction::make()
51-
->hidden(fn ($record) => static::canEdit($record)),
52-
EditAction::make(),
53-
DeleteAction::make(),
54-
]),
50+
ViewAction::make()
51+
->hidden(fn ($record) => static::canEdit($record)),
52+
EditAction::make(),
53+
DeleteAction::make(),
5554
])
5655
->emptyStateIcon('tabler-cube-plus')
5756
->emptyStateDescription('');

0 commit comments

Comments
 (0)