Skip to content

Commit ad8e281

Browse files
simonhampclaude
simonhamp
and
claude
committed
Fix Filament 5 compatibility and update tests for Livewire migration
- Migrate Filament action imports from Tables\Actions to Actions namespace - Update tests to use Livewire test helpers instead of removed controller routes - Remove redundant factory methods (onboarded/completedOnboarding) that duplicate defaults - Fix PurchaseHistoryTest for Livewire-based dashboard Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent de2c37d commit ad8e281

36 files changed

Lines changed: 523 additions & 690 deletions

‎app/Filament/Resources/ArticleResource.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
use App\Filament\Resources\ArticleResource\Actions\UnpublishAction;
88
use App\Filament\Resources\ArticleResource\Pages;
99
use App\Models\Article;
10+
use Filament\Actions;
1011
use Filament\Actions\ActionGroup;
1112
use Filament\Forms\Components\MarkdownEditor;
1213
use Filament\Forms\Components\Textarea;
1314
use Filament\Forms\Components\TextInput;
1415
use Filament\Forms\Set;
1516
use Filament\Resources\Resource;
1617
use Filament\Schemas\Schema;
17-
use Filament\Tables;
1818
use Filament\Tables\Columns\TextColumn;
1919
use Filament\Tables\Table;
2020
use Illuminate\Contracts\Database\Eloquent\Builder;
@@ -98,14 +98,14 @@ public static function table(Table $table): Table
9898
->actions([
9999
ActionGroup::make([
100100
PreviewAction::make('preview'),
101-
Tables\Actions\EditAction::make()->url(fn ($record) => static::getUrl('edit', ['record' => $record->id])),
101+
Actions\EditAction::make()->url(fn ($record) => static::getUrl('edit', ['record' => $record->id])),
102102
UnpublishAction::make('unpublish'),
103103
PublishAction::make('publish'),
104104
]),
105105
])
106106
->bulkActions([
107-
Tables\Actions\BulkActionGroup::make([
108-
Tables\Actions\DeleteBulkAction::make(),
107+
Actions\BulkActionGroup::make([
108+
Actions\DeleteBulkAction::make(),
109109
]),
110110
])
111111
->defaultSort('published_at', 'desc');

‎app/Filament/Resources/LeadResource.php‎

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

55
use App\Filament\Resources\LeadResource\Pages;
66
use App\Models\Lead;
7+
use Filament\Actions;
78
use Filament\Infolists;
89
use Filament\Resources\Resource;
910
use Filament\Schemas\Schema;
@@ -95,11 +96,11 @@ public static function table(Table $table): Table
9596
->options(Lead::BUDGETS),
9697
])
9798
->actions([
98-
Tables\Actions\ViewAction::make(),
99+
Actions\ViewAction::make(),
99100
])
100101
->bulkActions([
101-
Tables\Actions\BulkActionGroup::make([
102-
Tables\Actions\DeleteBulkAction::make(),
102+
Actions\BulkActionGroup::make([
103+
Actions\DeleteBulkAction::make(),
103104
]),
104105
])
105106
->defaultSort('created_at', 'desc');

‎app/Filament/Resources/LicenseResource.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Filament\Resources\LicenseResource\Pages;
66
use App\Filament\Resources\LicenseResource\RelationManagers;
77
use App\Models\License;
8+
use Filament\Actions;
89
use Filament\Forms;
910
use Filament\Resources\Resource;
1011
use Filament\Schemas;
@@ -90,9 +91,9 @@ public static function table(Table $table): Table
9091
->label('Suspended'),
9192
])
9293
->actions([
93-
Tables\Actions\ActionGroup::make([
94-
Tables\Actions\EditAction::make(),
95-
Tables\Actions\Action::make('viewUser')
94+
Actions\ActionGroup::make([
95+
Actions\EditAction::make(),
96+
Actions\Action::make('viewUser')
9697
->label('View User')
9798
->icon('heroicon-o-user')
9899
->color('primary')

‎app/Filament/Resources/OpenCollectiveDonationResource.php‎

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

55
use App\Filament\Resources\OpenCollectiveDonationResource\Pages;
66
use App\Models\OpenCollectiveDonation;
7+
use Filament\Actions;
78
use Filament\Infolists;
89
use Filament\Resources\Resource;
910
use Filament\Schemas\Schema;
@@ -135,7 +136,7 @@ public static function table(Table $table): Table
135136
->query(fn (Builder $query): Builder => $query->whereNotNull('interval')),
136137
])
137138
->actions([
138-
Tables\Actions\ViewAction::make(),
139+
Actions\ViewAction::make(),
139140
]);
140141
}
141142

‎app/Filament/Resources/PluginBundleResource.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use App\Models\PluginLicense;
1111
use App\Models\User;
1212
use App\Notifications\BundleGranted;
13+
use Filament\Actions;
1314
use Filament\Forms;
1415
use Filament\Notifications\Notification;
1516
use Filament\Resources\Resource;
@@ -158,18 +159,18 @@ public static function table(Table $table): Table
158159
Tables\Filters\TernaryFilter::make('is_featured'),
159160
])
160161
->actions([
161-
Tables\Actions\ViewAction::make(),
162-
Tables\Actions\EditAction::make(),
163-
Tables\Actions\ActionGroup::make([
164-
Tables\Actions\Action::make('viewListing')
162+
Actions\ViewAction::make(),
163+
Actions\EditAction::make(),
164+
Actions\ActionGroup::make([
165+
Actions\Action::make('viewListing')
165166
->label('View Listing Page')
166167
->icon('heroicon-o-eye')
167168
->color('gray')
168169
->url(fn (PluginBundle $record) => route('bundles.show', $record))
169170
->openUrlInNewTab()
170171
->visible(fn (PluginBundle $record) => $record->is_active && $record->published_at?->isPast()),
171172

172-
Tables\Actions\Action::make('grantToUser')
173+
Actions\Action::make('grantToUser')
173174
->label('Grant to User')
174175
->icon('heroicon-o-gift')
175176
->color('success')
@@ -235,8 +236,8 @@ public static function table(Table $table): Table
235236
->icon('heroicon-m-ellipsis-vertical'),
236237
])
237238
->bulkActions([
238-
Tables\Actions\BulkActionGroup::make([
239-
Tables\Actions\DeleteBulkAction::make(),
239+
Actions\BulkActionGroup::make([
240+
Actions\DeleteBulkAction::make(),
240241
]),
241242
])
242243
->defaultSort('created_at', 'desc');

‎app/Filament/Resources/PluginBundleResource/RelationManagers/PluginsRelationManager.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
namespace App\Filament\Resources\PluginBundleResource\RelationManagers;
44

5+
use App\Models\Plugin;
6+
use App\Models\PluginBundle;
7+
use Filament\Actions;
58
use Filament\Forms;
69
use Filament\Resources\RelationManagers\RelationManager;
710
use Filament\Tables;
@@ -46,10 +49,10 @@ public function table(Table $table): Table
4649
->reorderable('sort_order')
4750
->defaultSort('sort_order')
4851
->headerActions([
49-
Tables\Actions\AttachAction::make()
52+
Actions\AttachAction::make()
5053
->preloadRecordSelect()
5154
->recordSelectSearchColumns(['name'])
52-
->form(fn (Tables\Actions\AttachAction $action): array => [
55+
->form(fn (Actions\AttachAction $action): array => [
5356
$action->getRecordSelect(),
5457
Forms\Components\Toggle::make('grant_to_existing_owners')
5558
->label('Grant to existing bundle owners')
@@ -61,10 +64,10 @@ public function table(Table $table): Table
6164
return;
6265
}
6366

64-
/** @var \App\Models\PluginBundle $bundle */
67+
/** @var PluginBundle $bundle */
6568
$bundle = $this->getOwnerRecord();
6669

67-
$plugin = \App\Models\Plugin::find($data['recordId']);
70+
$plugin = Plugin::find($data['recordId']);
6871

6972
if (! $plugin) {
7073
return;
@@ -77,11 +80,11 @@ public function table(Table $table): Table
7780
}),
7881
])
7982
->actions([
80-
Tables\Actions\DetachAction::make(),
83+
Actions\DetachAction::make(),
8184
])
8285
->bulkActions([
83-
Tables\Actions\BulkActionGroup::make([
84-
Tables\Actions\DetachBulkAction::make(),
86+
Actions\BulkActionGroup::make([
87+
Actions\DetachBulkAction::make(),
8588
]),
8689
]);
8790
}

‎app/Filament/Resources/PluginBundleResource/RelationManagers/PricesRelationManager.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Filament\Resources\PluginBundleResource\RelationManagers;
44

55
use App\Enums\PriceTier;
6+
use Filament\Actions;
67
use Filament\Forms;
78
use Filament\Resources\RelationManagers\RelationManager;
89
use Filament\Schemas\Schema;
@@ -87,15 +88,15 @@ public function table(Table $table): Table
8788
->label('Active'),
8889
])
8990
->headerActions([
90-
Tables\Actions\CreateAction::make(),
91+
Actions\CreateAction::make(),
9192
])
9293
->actions([
93-
Tables\Actions\EditAction::make(),
94-
Tables\Actions\DeleteAction::make(),
94+
Actions\EditAction::make(),
95+
Actions\DeleteAction::make(),
9596
])
9697
->bulkActions([
97-
Tables\Actions\BulkActionGroup::make([
98-
Tables\Actions\DeleteBulkAction::make(),
98+
Actions\BulkActionGroup::make([
99+
Actions\DeleteBulkAction::make(),
99100
]),
100101
])
101102
->defaultSort('tier');

‎app/Filament/Resources/PluginResource.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use App\Models\User;
1515
use App\Notifications\PluginGranted;
1616
use App\Notifications\PluginReviewChecksIncomplete;
17+
use Filament\Actions;
18+
use Filament\Actions\Action;
1719
use Filament\Forms;
1820
use Filament\Notifications\Notification;
1921
use Filament\Resources\Resource;
@@ -46,7 +48,7 @@ public static function form(Schema $schema): Schema
4648
Forms\Components\Placeholder::make('logo_preview')
4749
->label('Logo')
4850
->content(fn (?Plugin $record) => $record?->hasLogo()
49-
? new \Illuminate\Support\HtmlString('<img src="'.e($record->getLogoUrl()).'" alt="Logo" class="w-16 h-16 rounded-lg object-cover" />')
51+
? new HtmlString('<img src="'.e($record->getLogoUrl()).'" alt="Logo" class="w-16 h-16 rounded-lg object-cover" />')
5052
: 'No logo')
5153
->visible(fn (?Plugin $record) => $record !== null),
5254

@@ -127,7 +129,7 @@ public static function form(Schema $schema): Schema
127129
])
128130
->columns(4)
129131
->headerActions([
130-
\Filament\Actions\Action::make('emailReviewChecks')
132+
Action::make('emailReviewChecks')
131133
->label('Email Developer')
132134
->icon('heroicon-o-envelope')
133135
->color('warning')
@@ -257,8 +259,8 @@ public static function table(Table $table): Table
257259
->label('Active'),
258260
])
259261
->actions([
260-
Tables\Actions\ActionGroup::make([
261-
Tables\Actions\Action::make('resync')
262+
Actions\ActionGroup::make([
263+
Action::make('resync')
262264
->label('Re-sync from GitHub')
263265
->icon('heroicon-o-arrow-path')
264266
->color('primary')
@@ -276,7 +278,7 @@ public static function table(Table $table): Table
276278
->send();
277279
}),
278280

279-
Tables\Actions\Action::make('grantToUser')
281+
Action::make('grantToUser')
280282
->label('Grant to User')
281283
->icon('heroicon-o-gift')
282284
->color('success')
@@ -332,7 +334,7 @@ public static function table(Table $table): Table
332334
->modalDescription(fn (Plugin $record): string => "Grant '{$record->name}' to a user for free.")
333335
->modalSubmitActionLabel('Grant'),
334336

335-
Tables\Actions\Action::make('runReviewChecks')
337+
Action::make('runReviewChecks')
336338
->label('Run Review Checks')
337339
->icon('heroicon-o-clipboard-document-check')
338340
->color('primary')
@@ -391,7 +393,7 @@ public static function table(Table $table): Table
391393
->color('primary')
392394
->tooltip('Quick Actions'),
393395

394-
Tables\Actions\EditAction::make(),
396+
Actions\EditAction::make(),
395397
])
396398
->bulkActions([
397399

‎app/Filament/Resources/PluginResource/RelationManagers/PricesRelationManager.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Filament\Resources\PluginResource\RelationManagers;
44

55
use App\Enums\PriceTier;
6+
use Filament\Actions;
67
use Filament\Forms;
78
use Filament\Resources\RelationManagers\RelationManager;
89
use Filament\Schemas\Schema;
@@ -87,15 +88,15 @@ public function table(Table $table): Table
8788
->label('Active'),
8889
])
8990
->headerActions([
90-
Tables\Actions\CreateAction::make(),
91+
Actions\CreateAction::make(),
9192
])
9293
->actions([
93-
Tables\Actions\EditAction::make(),
94-
Tables\Actions\DeleteAction::make(),
94+
Actions\EditAction::make(),
95+
Actions\DeleteAction::make(),
9596
])
9697
->bulkActions([
97-
Tables\Actions\BulkActionGroup::make([
98-
Tables\Actions\DeleteBulkAction::make(),
98+
Actions\BulkActionGroup::make([
99+
Actions\DeleteBulkAction::make(),
99100
]),
100101
])
101102
->defaultSort('tier');

‎app/Filament/Resources/ProductResource.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use App\Models\ProductLicense;
99
use App\Models\User;
1010
use App\Notifications\ProductGranted;
11+
use Filament\Actions;
1112
use Filament\Forms;
1213
use Filament\Notifications\Notification;
1314
use Filament\Resources\Resource;
@@ -144,18 +145,18 @@ public static function table(Table $table): Table
144145
Tables\Filters\TernaryFilter::make('is_featured'),
145146
])
146147
->actions([
147-
Tables\Actions\ViewAction::make(),
148-
Tables\Actions\EditAction::make(),
149-
Tables\Actions\ActionGroup::make([
150-
Tables\Actions\Action::make('viewListing')
148+
Actions\ViewAction::make(),
149+
Actions\EditAction::make(),
150+
Actions\ActionGroup::make([
151+
Actions\Action::make('viewListing')
151152
->label('View Listing Page')
152153
->icon('heroicon-o-eye')
153154
->color('gray')
154155
->url(fn (Product $record) => route('products.show', $record))
155156
->openUrlInNewTab()
156157
->visible(fn (Product $record) => $record->is_active && $record->published_at?->isPast()),
157158

158-
Tables\Actions\Action::make('grantToUser')
159+
Actions\Action::make('grantToUser')
159160
->label('Grant to User')
160161
->icon('heroicon-o-gift')
161162
->color('success')
@@ -214,8 +215,8 @@ public static function table(Table $table): Table
214215
->icon('heroicon-m-ellipsis-vertical'),
215216
])
216217
->bulkActions([
217-
Tables\Actions\BulkActionGroup::make([
218-
Tables\Actions\DeleteBulkAction::make(),
218+
Actions\BulkActionGroup::make([
219+
Actions\DeleteBulkAction::make(),
219220
]),
220221
])
221222
->defaultSort('created_at', 'desc');

0 commit comments

Comments
 (0)