refactoring

coderflexx · Nov 8, 2023 · e4fab70 · e4fab70
1 parent 60355f4
commit e4fab70
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 50 deletions.
diff --git a/resources/views/components/turnstile.blade.php b/resources/views/components/turnstile.blade.php
@@ -1,5 +1,4 @@
 @php
-    $id = $getId();
     $statePath = $getStatePath();
     $fieldWrapperView = $getFieldWrapperView();
 
@@ -13,6 +12,7 @@
     <div x-data="{
             state: $wire.entangle('{{ $statePath }}').defer 
         }"
+        wire:ignore
         x-init="(() => {
             let options= {
                 callback: function (token) {
@@ -27,14 +27,12 @@
             window.onloadTurnstileCallback = () => {
                 turnstile.render($refs.turnstile, options)
             }
-        })"
-        wire:ignore
+        })()"
     >
-        <div id="turnstile-widget"
-            data-sitekey="{{config('turnstile.turnstile_site_key')}}"
-            :data-theme="$theme"
-            :data-language="$language"
-            :data-size="$size"
+        <div data-sitekey="{{config('turnstile.turnstile_site_key')}}"
+            data-theme="{{ $theme }}"
+            data-language="{{ $language }}"
+            data-size="{{ $size }}"
             x-ref="turnstile"
             >
         </div>

diff --git a/src/Forms/Components/Turnstile.php b/src/Forms/Components/Turnstile.php
@@ -23,7 +23,9 @@ protected function setUp(): void
 
         $this->label('');
 
-        $this->rules(['required', new TurnstileCheck()]);
+        $this->required();
+
+        $this->rule(new TurnstileCheck());
 
         $this->dehydrated(false);
     }

diff --git a/tests/Fixtures/ContactUs.php b/tests/Fixtures/ContactUs.php
@@ -4,19 +4,12 @@
 
 use Coderflex\FilamentTurnstile\Forms\Components\Turnstile;
 use Coderflex\FilamentTurnstile\Tests\Models\Contact;
-use Filament\Actions\Action;
-use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Forms;
 use Filament\Forms\Form;
-use Filament\Pages\Concerns\InteractsWithFormActions;
-use Filament\Pages\SimplePage;
-use Illuminate\Contracts\View\View;
+use Filament\Forms\FormsComponent;
 
-class ContactUs extends SimplePage
+class ContactUs extends FormsComponent
 {
-    use InteractsWithActions;
-    use InteractsWithFormActions;
-
     public ?array $data = [];
 
     public function mount(): void
@@ -58,30 +51,8 @@ public function send()
         Contact::create($this->form->getState());
     }
 
-    /**
-     * @return array<Action | ActionGroup>
-     */
-    protected function getFormActions(): array
-    {
-        return [
-            $this->getSendFormAction(),
-        ];
-    }
-
-    protected function getSendFormAction(): Action
-    {
-        return Action::make('Send')
-            ->label(__('Send'))
-            ->submit('send');
-    }
-
-    protected function hasFullWidthFormActions(): bool
-    {
-        return true;
-    }
-
-    public function render(): View
+    public function render()
     {
-        return view('fixtures.contact-us');
+        return 'fixtures.contact-us';
     }
 }
diff --git a/tests/TurnstileTest.php b/tests/TurnstileTest.php
@@ -20,18 +20,26 @@
     /**
      * Setting Turnstile keys to always pass the request
      *
-     * @see https://developers.cloudflare.com/turnstile/reference/testing/#dummy-sitekeys-and-secret-keys
+     * @link https://developers.cloudflare.com/turnstile/reference/testing/#dummy-sitekeys-and-secret-keys
      */
     Config::set('turnstile', [
         'turnstile_site_key' => '1x00000000000000000000AA',
         'turnstile_secret_key' => '1x0000000000000000000000000000000AA',
     ]);
 
+    /**
+     * In this context, Alpine.js didn't function as expected due to the need to pass the `cf-captcha` field.
+     * The value of the mentioned key is dynamically determined by the response from Cloudflare (CF) in the UI.
+     * For more information, refer to the Cloudflare Turnstile documentation:
+     *
+     * @link https://developers.cloudflare.com/turnstile/
+     */
     livewire(ContactUs::class)
         ->fillForm([
             'name' => 'John Doe',
             'email' => '[email protected]',
             'content' => 'This is a simple message',
+            'cf-captcha' => 'XXXX.DUMMY.TOKEN.XXXX',
         ])
         ->call('send')
         ->assertHasNoFormErrors();
@@ -44,7 +52,7 @@
     /**
      * Setting Turnstile keys to always block the request
      *
-     * @see https://developers.cloudflare.com/turnstile/reference/testing/#dummy-sitekeys-and-secret-keys
+     * @link https://developers.cloudflare.com/turnstile/reference/testing/#dummy-sitekeys-and-secret-keys
      */
     Config::set('turnstile', [
         'turnstile_site_key' => '2x00000000000000000000AB',

diff --git a/tests/resources/views/fixtures/contact-us.blade.php b/tests/resources/views/fixtures/contact-us.blade.php
@@ -1,10 +1,7 @@
-<x-filament-panels::page.simple>
+<div>
     <x-filament-panels::form wire:submit="send">
         {{ $this->form }}
 
-        <x-filament-panels::form.actions
-            :actions="$this->getCachedFormActions()"
-            :full-width="$this->hasFullWidthFormActions()"
-        />
+        <button>Send</button>
     </x-filament-panels::form>
-</x-filament-panels::page.simple>
+</div>