Merge pull request #244 from pelican-dev/charles/fix-newuser

fix: Creating User
pelican-dev · May 18, 2024 · 89d555f · 89d555f
2 parents 68dbd6e + 9b2e00e
commit 89d555f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 73 deletions.
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
@@ -31,7 +31,6 @@ public static function getPages(): array
     {
         return [
             'index' => Pages\ListUsers::route('/'),
-            'create' => Pages\CreateUser::route('/create'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
     }

diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Resources/UserResource/Pages/CreateUser.php
diff --git a/app/Filament/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Resources/UserResource/Pages/ListUsers.php
@@ -4,10 +4,13 @@
 
 use App\Filament\Resources\UserResource;
 use App\Models\User;
+use App\Services\Users\UserCreationService;
 use Filament\Actions;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Table;
 use Filament\Tables;
+use Filament\Forms;
 
 class ListUsers extends ListRecords
 {
@@ -73,8 +76,49 @@ public function table(Table $table): Table
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->label('Create User'),
+            Actions\CreateAction::make('create')
+                ->label('Create User')
+                ->createAnother(false)
+                ->form([
+                    Forms\Components\Grid::make()
+                        ->schema([
+                            Forms\Components\TextInput::make('username')
+                                ->alphaNum()
+                                ->required()
+                                ->maxLength(191),
+                            Forms\Components\TextInput::make('email')
+                                ->email()
+                                ->required()
+                                ->unique()
+                                ->maxLength(191),
+
+                            Forms\Components\TextInput::make('password')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Providing a user password is optional. New user email will prompt users to create a password the first time they login.')
+                                ->password(),
+
+                            Forms\Components\ToggleButtons::make('root_admin')
+                                ->label('Administrator (Root)')
+                                ->options([
+                                    false => 'No',
+                                    true => 'Admin',
+                                ])
+                                ->colors([
+                                    false => 'primary',
+                                    true => 'danger',
+                                ])
+                                ->inline()
+                                ->required()
+                                ->default(false),
+                        ]),
+                ])
+                ->successRedirectUrl(route('filament.admin.resources.users.index'))
+                ->action(function (array $data) {
+                    resolve(UserCreationService::class)->handle($data);
+                    Notification::make()->title('User Created!')->success()->send();
+
+                    return redirect()->route('filament.admin.resources.users.index');
+                }),
         ];
     }
 }