Improvements user resource (#1732)

* Improve textInput of password,password_confirmation

* Improve textInput of password,password_confirmation

* Drop the label if the field

---------

Co-authored-by: Mohammad Salam <[email protected]>
Co-authored-by: Alex Justesen <[email protected]>

Author: 3 people

app/Filament/Resources/UserResource.php

@@ -43,23 +43,15 @@ public static function form(Form $form): Form
                                 Forms\Components\TextInput::make('password')
                                     ->required()
                                     ->password()
-                                    ->dehydrateStateUsing(fn ($state) => Hash::make($state))
-                                    ->visible(fn ($livewire) => $livewire instanceof CreateUser)
-                                    ->rule(Password::default()),
-                                Forms\Components\TextInput::make('new_password')
-                                    ->password()
-                                    ->label('New Password')
-                                    ->nullable()
-                                    ->rule(Password::default())
-                                    ->visible(fn ($livewire) => $livewire instanceof EditUser)
-                                    ->dehydrated(false),
-                                Forms\Components\TextInput::make('new_password_confirmation')
+                                    ->required(fn (string $context) => $context === 'create')
+                                    ->nullable(fn (string $context) => $context === 'edit')                
+                                    ->maxLength(60),
+                                Forms\Components\TextInput::make('password_confirmation')->label('Confirm Password')
+                                    ->required()
                                     ->password()
-                                    ->label('Confirm New Password')
-                                    ->rule('required', fn ($get) => (bool) $get('new_password'))
+                                    ->required(fn (string $context) => $context === 'create')
+                                    ->nullable(fn (string $context) => $context === 'edit')
                                     ->same('new_password')
-                                    ->visible(fn ($livewire) => $livewire instanceof EditUser)
-                                    ->dehydrated(false),
                             ])
                             ->columns(1)
                             ->columnSpan([

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -18,12 +18,13 @@ protected function getHeaderActions(): array
         ];
     }
 
-    public function beforeSave()
+    protected function mutateFormDataBeforeSave(array $data): array
     {
-        if (! array_key_exists('new_password', $this->data) || ! filled($this->data['new_password'])) {
-            return;
-        }
+        if (!isset($data['password']) || empty( $data['password'])) {
+            unset($data['password']);
+        } 
 
-        $this->record->password = Hash::make($this->data['new_password']);
+        return $data;
     }
+
 }