Merge pull request #31 from stephenjude/main

Filament v4 Support

Author: stephenjude

composer.json

@@ -16,15 +16,14 @@
         }
     ],
     "require": {
-        "php": "^8.2",
-        "filament/filament": "^3.0",
-        "illuminate/contracts": "^10.0|^11.0|^12.0",
+        "php": "^8.3",
+        "filament/filament": "^4.0",
         "laravel/pennant": "^1.10",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.8",
+        "nunomaduro/collision": "^7.8|^8.0",
         "orchestra/testbench": "^8.8|^10.0",
         "pestphp/pest": "^2.20|^3.7",
         "pestphp/pest-plugin-arch": "^2.0|^3.0",

src/FeatureFlagPlugin.php

@@ -17,7 +17,12 @@ public function getId(): string
 
     public function register(Panel $panel): void
     {
-        $panel->resources(config('filament-feature-flags.resources'));
+        $panel->when(
+            value: fn () => $this->authorized(),
+            callback: function (Panel $panel) {
+                $panel->resources(config('filament-feature-flags.resources'));
+            }
+        );
     }
 
     public function boot(Panel $panel): void {}

src/Resources/FeatureSegmentResource.php

@@ -2,12 +2,14 @@
 
 namespace Stephenjude\FilamentFeatureFlag\Resources;
 
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Resources\Resource;
+use Filament\Schemas\Components\Utilities\Get;
+use Filament\Schemas\Components\Utilities\Set;
+use Filament\Schemas\Schema;
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -41,9 +43,9 @@ public static function getNavigationIcon(): ?string
         return config('filament-feature-flags.panel.icon');
     }
 
-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
     {
-        return $form
+        return $schema
             ->schema([
                 Select::make('feature')
                     ->required()
@@ -70,7 +72,7 @@ public static function form(Form $form): Form
                             ->where('active', $get('active'))
                     )
                     ->validationMessages([
-                        'unique' => 'Feature segmentation already exists! Please note that each feature scope can only have an activated and a deactivated segment. Modify existing segment or remove it and create a new segment.',
+                        'unique' => 'Feature segmentation already exists. Each feature scope can only have one activated segment and one deactivated segment. To continue, please modify the existing segment, or remove it and create a new one.',
                     ])
                     ->required()
                     ->columnSpanFull(),
@@ -106,24 +108,24 @@ public static function table(Table $table): Table
                 Tables\Filters\SelectFilter::make('scope')
                     ->options(FeatureSegment::segmentOptionsList()),
             ])
-            ->actions([
-                Tables\Actions\EditAction::make()
+            ->recordActions([
+                EditAction::make()
                     ->label('Modify')
                     ->modalHeading('Modify Feature Segment')
                     ->after(fn (FeatureSegment $record) => FeatureSegmentModified::dispatch(
                         $record,
                         Filament::auth()->user()
                     )),
 
-                Tables\Actions\DeleteAction::make()
+                DeleteAction::make()
+                    ->label('Remove')
                     ->modalHeading('Removing this feature segment cannot be undone!')
                     ->modalDescription(fn (FeatureSegment $record) => $record->description)
-                    ->label('Remove')
+                    ->after(fn () => FeatureSegmentRemoved::dispatch(Filament::auth()->user()))
                     ->before(fn (FeatureSegment $record) => RemovingFeatureSegment::dispatch(
                         $record,
                         Filament::auth()->user()
-                    ))
-                    ->after(fn () => FeatureSegmentRemoved::dispatch(Filament::auth()->user())),
+                    )),
             ]);
     }
 
@@ -145,15 +147,24 @@ function ($segment) {
                     $key = $segment['source']['key'];
 
                     return Select::make('values')
-                        ->label(str($column)->plural()->title())
-                        ->hidden(fn (Get $get) => $get('scope') !== $column)
-                        ->required()
+                        ->preload()
                         ->multiple()
+                        ->required()
                         ->searchable()
                         ->columnSpanFull()
+                        ->label(str($column)->plural()->title())
+                        ->hidden(fn (Get $get) => $get('scope') !== $column)
+                        ->getOptionLabelsUsing(
+                            fn (array $values): array => $model::query()
+                                ->whereIn($value, $values)
+                                ->pluck($value, $key)
+                                ->all()
+                        )
                         ->getSearchResultsUsing(
-                            fn (string $search): array => $model::where($value, 'like', "%{$search}%")
-                                ->limit(50)->pluck($value, $key)->toArray()
+                            fn (string $search): array => $model::query()
+                                ->where($value, 'like', "%{$search}%")
+                                ->limit(50)->pluck($value, $key)
+                                ->toArray()
                         );
                 }
             )

src/Resources/ManageFeatureSegments.php

@@ -3,6 +3,7 @@
 namespace Stephenjude\FilamentFeatureFlag\Resources;
 
 use Filament\Actions;
+use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Select;
 use Filament\Notifications\Notification;
@@ -27,11 +28,11 @@ protected function getHeaderActions(): array
                 ->label(__('Segment Feature'))
                 ->after(fn (FeatureSegment $record) => $this->afterCreate($record)),
 
-            Actions\Action::make('activate_for_all')
+            Action::make('activate_for_all')
                 ->label(__('Activate'))
                 ->modalWidth('md')
                 ->modalDescription(fn ($record) => __('This action will activate the selected feature for users.'))
-                ->form([
+                ->schema([
                     Select::make('feature')
                         ->label(__('Feature'))
                         ->required()
@@ -41,12 +42,12 @@ protected function getHeaderActions(): array
                 ->modalSubmitActionLabel(__('Activate'))
                 ->action(fn ($data) => $this->activateForAll($data['feature'])),
 
-            Actions\Action::make('deactivate_for_all')
+            Action::make('deactivate_for_all')
                 ->label(__('Deactivate for All'))
                 ->modalWidth('md')
                 ->label(__('Deactivate'))
                 ->modalDescription(fn ($record) => __('This action will deactivate this feature for users.'))
-                ->form([
+                ->schema([
                     Select::make('feature')
                         ->label(__('Feature'))
                         ->required()
@@ -57,11 +58,11 @@ protected function getHeaderActions(): array
                 ->color('danger')
                 ->action(fn ($data) => $this->deactivateForAll($data['feature'])),
 
-            Actions\Action::make('purge_features')
+            Action::make('purge_features')
                 ->modalWidth('md')
                 ->label(__('Purge'))
                 ->modalDescription(fn ($record) => __('This action will purge resolved features from storage.'))
-                ->form([
+                ->schema([
                     Select::make('feature')
                         ->label(__('Feature'))
                         ->selectablePlaceholder(false)