refactor: hide password requirements on password update (#120)

ArkEcosystemArchive · Apr 8, 2021 · f4a8e8a · f4a8e8a
1 parent 1e55782
commit f4a8e8a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php
@@ -1,4 +1,4 @@
-<div dusk="update-password-form">
+<div x-data="{isTyping: false}" dusk="update-password-form" @updated-password.window="isTyping = false">
     <div class="flex flex-col space-y-4 mt-4">
         <div>
             <x-ark-flash />
@@ -21,16 +21,25 @@
                 model="state.current_password"
                 :label="trans('fortify::forms.current_password')"
                 :errors="$errors"
+                class="w-full"
             />
 
-            <x-ark-input
-                type="password"
-                name="password"
-                model="state.password"
+            <x:ark-fortify::password-rules
                 class="w-full"
-                :label="trans('fortify::forms.new_password')"
-                :errors="$errors"
-            />
+                :password-rules="$passwordRules"
+                is-typing="isTyping"
+                rules-wrapper-class="grid gap-4 my-4 sm:grid-cols-2 lg:grid-cols-3"
+            >
+                <x-ark-input
+                    type="password"
+                    name="password"
+                    model="state.password"
+                    class="w-full"
+                    :label="trans('fortify::forms.new_password')"
+                    :errors="$errors"
+                    @keydown="isTyping=true"
+                />
+            </x:ark-fortify::password-rules>
 
             <x-ark-input
                 type="password"

diff --git a/src/Components/UpdatePasswordForm.php b/src/Components/UpdatePasswordForm.php
@@ -47,7 +47,7 @@ public function updatePassword(UpdatesUserPasswords $updater)
             'password_confirmation' => '',
         ];
 
-        $this->emit('saved');
+        $this->dispatchBrowserEvent('updated-password');
         $this->resetRules();
 
         flash()->success(trans('fortify::pages.user-settings.password_updated'));

diff --git a/tests/Components/UpdatePasswordFormTest.php b/tests/Components/UpdatePasswordFormTest.php
@@ -23,7 +23,7 @@
         ->set('state.password', 'abcd1234ABCD%')
         ->set('state.password_confirmation', 'abcd1234ABCD%')
         ->call('updatePassword')
-        ->assertEmitted('saved');
+        ->assertDispatchedBrowserEvent('updated-password');
 });
 
 it('clears password rules on update', function () {