Skip to content

Commit 403d1b4

Browse files
ThiritinThiritin
authored
Filament Update (#150)
1 parent d39da01 commit 403d1b4

67 files changed

Lines changed: 1374 additions & 850 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Filament/Resources/ActivityResource.php‎

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

33
namespace App\Filament\Resources;
44

5-
use App\Filament\Resources\ActivityResource\Pages;
5+
use App\Filament\Resources\ActivityResource\Pages\ListActivities;
66
use Filament\Resources\Resource;
77
use Filament\Tables\Columns\Column;
88
use Filament\Tables\Columns\TextColumn;
@@ -45,7 +45,7 @@ public static function table(Table $table): Table
4545
public static function getPages(): array
4646
{
4747
return [
48-
'index' => Pages\ListActivities::route('/'),
48+
'index' => ListActivities::route('/'),
4949
];
5050
}
5151

‎app/Filament/Resources/ActivityResource/Pages/EditActivity.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\ActivityResource\Pages;
44

55
use App\Filament\Resources\ActivityResource;
6-
use Filament\Pages\Actions\DeleteAction;
6+
use Filament\Actions\DeleteAction;
77
use Filament\Resources\Pages\EditRecord;
88

99
class EditActivity extends EditRecord

‎app/Filament/Resources/ActivityResource/Pages/ListActivities.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\ActivityResource\Pages;
44

55
use App\Filament\Resources\ActivityResource;
6-
use Filament\Pages\Actions\CreateAction;
6+
use Filament\Actions\CreateAction;
77
use Filament\Resources\Pages\ListRecords;
88

99
class ListActivities extends ListRecords

‎app/Filament/Resources/AppResource.php‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22

33
namespace App\Filament\Resources;
44

5-
use App\Filament\Resources\AppResource\Pages;
5+
use App\Filament\Resources\AppResource\Pages\CreateApp;
6+
use App\Filament\Resources\AppResource\Pages\EditApp;
7+
use App\Filament\Resources\AppResource\Pages\ListApps;
68
use App\Filament\Resources\AppResource\RelationManagers\GroupsRelationManager;
79
use App\Models\App;
810
use App\Services\Hydra\Client;
9-
use Filament\Forms\Components\Card;
1011
use Filament\Forms\Components\Checkbox;
1112
use Filament\Forms\Components\CheckboxList;
1213
use Filament\Forms\Components\DateTimePicker;
13-
use Filament\Forms\Components\Group;
1414
use Filament\Forms\Components\Placeholder;
15-
use Filament\Forms\Components\Section;
1615
use Filament\Forms\Components\Select;
17-
use Filament\Forms\Components\Tabs;
1816
use Filament\Forms\Components\TagsInput;
1917
use Filament\Forms\Components\TextInput;
20-
use Filament\Forms\Form;
2118
use Filament\Resources\Resource;
19+
use Filament\Schemas\Components\Group;
20+
use Filament\Schemas\Components\Section;
21+
use Filament\Schemas\Components\Tabs;
22+
use Filament\Schemas\Components\Tabs\Tab;
23+
use Filament\Schemas\Schema;
2224
use Filament\Tables\Columns\TextColumn;
2325
use Filament\Tables\Table;
2426

@@ -30,20 +32,20 @@ class AppResource extends Resource
3032

3133
protected static ?string $recordTitleAttribute = 'client_id';
3234

33-
protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
35+
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-rectangle-stack';
3436

35-
public static function form(Form $form): Form
37+
public static function form(Schema $schema): Schema
3638
{
37-
return $form
38-
->schema([
39+
return $schema
40+
->components([
3941
Group::make()->columnSpan(2)->schema([
4042
Group::make()->columns()->schema([
4143
TextInput::make('client_id')->label('Client ID')->disabled(),
4244
TextInput::make('data.client_secret')->disabled(),
4345
TextInput::make('data.client_name')->columnSpan(2)->required(),
4446
]),
4547
Tabs::make('Tabs')->tabs([
46-
Tabs\Tab::make('Information')->icon('heroicon-o-paper-clip')->schema([
48+
Tab::make('Information')->icon('heroicon-o-paper-clip')->schema([
4749
TextInput::make('data.client_uri')
4850
->url()
4951
->helperText('A URL string of a web page providing information about the client'),
@@ -57,7 +59,7 @@ public static function form(Form $form): Form
5759
->url()
5860
->helperText('A URL string that references the terms of service for the client'),
5961
]),
60-
Tabs\Tab::make('Login')->icon('heroicon-o-arrow-left-on-rectangle')->schema([
62+
Tab::make('Login')->icon('heroicon-o-arrow-left-on-rectangle')->schema([
6163
TagsInput::make('data.redirect_uris')->columnSpan(2),
6264
Select::make('data.subject_type')->options([
6365
'public' => 'public',
@@ -75,7 +77,7 @@ public static function form(Form $form): Form
7577
'token' => 'token',
7678
])->columnSpan(2),
7779
]),
78-
Tabs\Tab::make('Token')->icon('heroicon-o-lock-closed')->schema([
80+
Tab::make('Token')->icon('heroicon-o-lock-closed')->schema([
7981
Select::make('data.token_endpoint_auth_method')->options([
8082
'client_secret_post' => 'client_secret_post',
8183
'client_secret_basic' => 'client_secret_basic',
@@ -96,7 +98,7 @@ public static function form(Form $form): Form
9698
}),
9799

98100
]),
99-
Tabs\Tab::make('Logout')->icon('heroicon-o-arrow-right-on-rectangle')->schema([
101+
Tab::make('Logout')->icon('heroicon-o-arrow-right-on-rectangle')->schema([
100102
TagsInput::make('data.post_logout_redirect_uris')->columnSpan(2),
101103
Section::make('Frontchannel Logout')
102104
->description('Configure frontchannel logout.')
@@ -119,7 +121,7 @@ public static function form(Form $form): Form
119121
]),
120122
]),
121123

122-
Tabs\Tab::make('Request')->icon('heroicon-o-signal')->schema([
124+
Tab::make('Request')->icon('heroicon-o-signal')->schema([
123125
TagsInput::make('data.request_uris')->columnSpan(2),
124126
Select::make('data.request_object_signing_alg')->options([
125127
'none' => 'none',
@@ -128,11 +130,11 @@ public static function form(Form $form): Form
128130
])->columnSpan(2),
129131
]),
130132

131-
Tabs\Tab::make('CORS')->icon('heroicon-o-globe-alt')->schema([
133+
Tab::make('CORS')->icon('heroicon-o-globe-alt')->schema([
132134
TagsInput::make('data.allowed_cors_origins')->columnSpan(2),
133135
]),
134136

135-
Tabs\Tab::make('Audience')->schema([
137+
Tab::make('Audience')->schema([
136138
TagsInput::make('data.audience')->columnSpan(1),
137139
]),
138140
]),
@@ -168,7 +170,7 @@ public static function form(Form $form): Form
168170
})->hint('Request new Icons @ Thiritin')->required(),
169171
TextInput::make('url')->url(),
170172
]),
171-
Card::make()->schema([
173+
Section::make()->schema([
172174
Placeholder::make('created_at')
173175
->label('Created At')
174176
->content(fn (?App $record): string => $record?->created_at?->diffForHumans() ?? '-'),
@@ -195,9 +197,9 @@ public static function table(Table $table): Table
195197
public static function getPages(): array
196198
{
197199
return [
198-
'index' => Pages\ListApps::route('/'),
199-
'create' => Pages\CreateApp::route('/create'),
200-
'edit' => Pages\EditApp::route('/{record}/edit'),
200+
'index' => ListApps::route('/'),
201+
'create' => CreateApp::route('/create'),
202+
'edit' => EditApp::route('/{record}/edit'),
201203
];
202204
}
203205

‎app/Filament/Resources/AppResource/Pages/EditApp.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\AppResource\Pages;
44

55
use App\Filament\Resources\AppResource;
6-
use Filament\Pages\Actions\DeleteAction;
6+
use Filament\Actions\DeleteAction;
77
use Filament\Resources\Pages\EditRecord;
88

99
class EditApp extends EditRecord

‎app/Filament/Resources/AppResource/Pages/ListApps.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\AppResource\Pages;
44

55
use App\Filament\Resources\AppResource;
6-
use Filament\Pages\Actions\CreateAction;
6+
use Filament\Actions\CreateAction;
77
use Filament\Resources\Pages\ListRecords;
88

99
class ListApps extends ListRecords

‎app/Filament/Resources/AppResource/RelationManagers/GroupsRelationManager.php‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

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

5-
use Filament\Forms;
6-
use Filament\Forms\Form;
5+
use Filament\Actions\AttachAction;
6+
use Filament\Actions\DetachAction;
7+
use Filament\Actions\DetachBulkAction;
8+
use Filament\Forms\Components\TextInput;
79
use Filament\Resources\RelationManagers\RelationManager;
8-
use Filament\Tables;
10+
use Filament\Schemas\Schema;
11+
use Filament\Tables\Columns\TextColumn;
912
use Filament\Tables\Table;
1013

1114
class GroupsRelationManager extends RelationManager
@@ -14,11 +17,11 @@ class GroupsRelationManager extends RelationManager
1417

1518
protected static ?string $recordTitleAttribute = 'name';
1619

17-
public function form(Form $form): Form
20+
public function form(Schema $schema): Schema
1821
{
19-
return $form
20-
->schema([
21-
Forms\Components\TextInput::make('name')
22+
return $schema
23+
->components([
24+
TextInput::make('name')
2225
->required()
2326
->maxLength(255),
2427
]);
@@ -28,19 +31,19 @@ public function table(Table $table): Table
2831
{
2932
return $table
3033
->columns([
31-
Tables\Columns\TextColumn::make('name'),
34+
TextColumn::make('name'),
3235
])
3336
->filters([
3437
//
3538
])
3639
->headerActions([
37-
Tables\Actions\AttachAction::make(),
40+
AttachAction::make(),
3841
])
39-
->actions([
40-
Tables\Actions\DetachAction::make(),
42+
->recordActions([
43+
DetachAction::make(),
4144
])
42-
->bulkActions([
43-
Tables\Actions\DetachBulkAction::make(),
45+
->toolbarActions([
46+
DetachBulkAction::make(),
4447
]);
4548
}
4649
}

‎app/Filament/Resources/GroupResource.php‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
namespace App\Filament\Resources;
44

55
use App\Enums\GroupTypeEnum;
6-
use App\Filament\Resources\GroupResource\Pages;
6+
use App\Filament\Resources\GroupResource\Pages\CreateGroup;
7+
use App\Filament\Resources\GroupResource\Pages\EditGroup;
8+
use App\Filament\Resources\GroupResource\Pages\ListGroups;
79
use App\Filament\Resources\GroupResource\RelationManagers\UsersRelationManager;
810
use App\Models\Group;
9-
use Filament\Forms\Components\Group as FilamentGroup;
11+
use Filament\Actions\EditAction;
1012
use Filament\Forms\Components\Placeholder;
11-
use Filament\Forms\Components\Section;
1213
use Filament\Forms\Components\Select;
1314
use Filament\Forms\Components\Textarea;
1415
use Filament\Forms\Components\TextInput;
15-
use Filament\Forms\Form;
1616
use Filament\Resources\Resource;
17-
use Filament\Tables\Actions\EditAction;
17+
use Filament\Schemas\Components\Group as SchemaGroup;
18+
use Filament\Schemas\Components\Section;
19+
use Filament\Schemas\Schema;
1820
use Filament\Tables\Columns\TextColumn;
1921
use Filament\Tables\Table;
2022

@@ -26,15 +28,15 @@ class GroupResource extends Resource
2628

2729
protected static ?string $recordTitleAttribute = 'name';
2830

29-
protected static ?string $navigationIcon = 'heroicon-o-users';
31+
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-users';
3032

31-
public static function form(Form $form): Form
33+
public static function form(Schema $schema): Schema
3234
{
33-
return $form
34-
->schema([
35-
FilamentGroup::make()->columnSpan(2)->schema([
35+
return $schema
36+
->components([
37+
SchemaGroup::make()->columnSpan(2)->schema([
3638
Section::make()->schema([
37-
FilamentGroup::make()->columns()->schema([
39+
SchemaGroup::make()->columns()->schema([
3840
Placeholder::make('id')
3941
->label('Internal ID')
4042
->content(fn (?Group $record): string => $record?->id ?? '-'),
@@ -60,7 +62,7 @@ public static function form(Form $form): Form
6062
]),
6163
]),
6264

63-
FilamentGroup::make()->columnSpan(1)->schema([
65+
SchemaGroup::make()->columnSpan(1)->schema([
6466
Section::make()->schema([
6567

6668
Select::make('type')->options([
@@ -92,17 +94,17 @@ public static function table(Table $table): Table
9294
->sortable()
9395
->formatStateUsing(fn ($state) => ucfirst($state->value)),
9496
])
95-
->actions([
97+
->recordActions([
9698
EditAction::make(),
9799
]);
98100
}
99101

100102
public static function getPages(): array
101103
{
102104
return [
103-
'index' => Pages\ListGroups::route('/'),
104-
'create' => Pages\CreateGroup::route('/create'),
105-
'edit' => Pages\EditGroup::route('/{record}/edit'),
105+
'index' => ListGroups::route('/'),
106+
'create' => CreateGroup::route('/create'),
107+
'edit' => EditGroup::route('/{record}/edit'),
106108
];
107109
}
108110

‎app/Filament/Resources/GroupResource/Pages/EditGroup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\GroupResource\Pages;
44

55
use App\Filament\Resources\GroupResource;
6-
use Filament\Pages\Actions\DeleteAction;
6+
use Filament\Actions\DeleteAction;
77
use Filament\Resources\Pages\EditRecord;
88

99
class EditGroup extends EditRecord

‎app/Filament/Resources/GroupResource/Pages/ListGroups.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Resources\GroupResource\Pages;
44

55
use App\Filament\Resources\GroupResource;
6-
use Filament\Pages\Actions\CreateAction;
6+
use Filament\Actions\CreateAction;
77
use Filament\Resources\Pages\ListRecords;
88

99
class ListGroups extends ListRecords

0 commit comments

Comments
 (0)