Merge pull request #14 from TappNetwork/form-show-bug

scottgrayson · web-flow · commit 561904a1938f · 2025-05-29T12:59:26.000-04:00
Middleware for form show that handles guest entries
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ phpstan.neon
 testbench.yaml
 vendor
 node_modules
+.DS_Store
+**/.DS_Store
diff --git a/database/.DS_Store b/database/.DS_Store
diff --git a/routes/routes.php b/routes/routes.php
@@ -3,11 +3,12 @@
 use Illuminate\Support\Facades\Route;
 use Tapp\FilamentFormBuilder\Livewire\FilamentForm\Form as FilamentForm;
 use Tapp\FilamentFormBuilder\Livewire\FilamentFormUser\Entry as FilamentFormUserEntry;
+use Tapp\FilamentFormBuilder\Middleware\CheckFormGuestAccess;
 
 Route::get(config('filament-form-builder.filament-form-user-uri').'/{entry}', FilamentFormUserEntry::class)
     ->middleware('web')
     ->name('filament-form-users.show');
 
 Route::get(config('filament-form-builder.filament-form-uri').'/{form}', FilamentForm::class)
-    ->middleware('web')
+    ->middleware(['web', CheckFormGuestAccess::class])
     ->name('filament-form-builder.show');
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/Enums/FilamentFieldTypeEnum.php b/src/Enums/FilamentFieldTypeEnum.php
@@ -32,7 +32,7 @@ public static function fromString(string $type): ?self
         return null;  // Return null if no match is found
     }
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return $this->fieldName();
     }
diff --git a/src/Exports/FilamentFormUsersExport.php b/src/Exports/FilamentFormUsersExport.php
@@ -37,6 +37,7 @@ public function map($entry): array
         ];
 
         foreach ($this->form->filamentFormFields as $field) {
+            /** @phpstan-ignore-next-line */
             $entriesFieldKey = array_search($field->id, array_column($entry->entry, 'field_id'));
 
             if ($entriesFieldKey === false) {
@@ -58,6 +59,7 @@ public function headings(): array
         ];
 
         foreach ($this->form->filamentFormFields as $field) {
+            /** @phpstan-ignore-next-line */
             array_push($headings, $field->label);
         }
 
diff --git a/src/Livewire/FilamentForm/Form.php b/src/Livewire/FilamentForm/Form.php
@@ -16,6 +16,7 @@ public function mount(FilamentForm $form)
 
     public function render()
     {
+        /** @phpstan-ignore-next-line */
         return view('filament-form-builder::livewire.filament-form.form');
     }
 }
diff --git a/src/Livewire/FilamentForm/Show.php b/src/Livewire/FilamentForm/Show.php
@@ -12,7 +12,6 @@
 use Tapp\FilamentFormBuilder\Enums\FilamentFieldTypeEnum;
 use Tapp\FilamentFormBuilder\Events\EntrySaved;
 use Tapp\FilamentFormBuilder\Models\FilamentForm;
-use Tapp\FilamentFormBuilder\Models\FilamentFormField;
 use Tapp\FilamentFormBuilder\Models\FilamentFormUser;
 
 /**
@@ -40,10 +39,6 @@ public function mount(FilamentForm $form, bool $blockRedirect = false, bool $pre
         $this->form->fill($this->data);
 
         $this->blockRedirect = $blockRedirect;
-
-        if (! $this->filamentForm->permit_guest_entries && ! Auth::check()) {
-            return redirect('/', 401);
-        }
     }
 
     public function form(Form $form): Form
@@ -57,6 +52,7 @@ public function getSchema(): array
     {
         $schema = [];
 
+        /** @var \Tapp\FilamentFormBuilder\Models\FilamentFormField $fieldData */
         foreach ($this->filamentForm->filamentFormFields as $fieldData) {
             $filamentField = $fieldData->type->className()::make($fieldData->id);
 
@@ -118,10 +114,15 @@ public function create()
         $entry = [];
 
         foreach ($this->form->getState() as $key => $value) {
+            /** @var \Tapp\FilamentFormBuilder\Models\FilamentFormField|null $field */
             $field = $this->filamentForm
                 ->filamentFormFields
                 ->find($key);
 
+            if (! $field) {
+                continue;
+            }
+
             $valueData = $this->parseValue($field, $value);
 
             array_push($entry, [
@@ -153,6 +154,7 @@ public function create()
 
         // Handle file uploads
         foreach ($this->filamentForm->filamentFormFields as $field) {
+            /** @var \Tapp\FilamentFormBuilder\Models\FilamentFormField $field */
             if ($field->type === FilamentFieldTypeEnum::FILE_UPLOAD) {
                 $fileKey = $field->id;
                 $fileData = $this->data[$fileKey] ?? null;
@@ -193,7 +195,7 @@ public function create()
         }
     }
 
-    public function parseValue(FilamentFormField $field, string|array|null $value): string|array
+    public function parseValue(\Tapp\FilamentFormBuilder\Models\FilamentFormField $field, string|array|null $value): string|array
     {
         if ($value === null && ! $field->type->isBool()) {
             return '';
@@ -216,6 +218,7 @@ public function parseValue(FilamentFormField $field, string|array|null $value):
 
     public function render()
     {
+        /** @phpstan-ignore-next-line */
         return view('filament-form-builder::livewire.filament-form.show');
     }
 }
diff --git a/src/Livewire/FilamentFormUser/Entry.php b/src/Livewire/FilamentFormUser/Entry.php
@@ -16,6 +16,7 @@ public function mount(FilamentFormUser $entry)
 
     public function render()
     {
+        /** @phpstan-ignore-next-line */
         return view('filament-form-builder::livewire.filament-form-user.entry');
     }
 }
diff --git a/src/Livewire/FilamentFormUser/Show.php b/src/Livewire/FilamentFormUser/Show.php
@@ -64,11 +64,9 @@ public function entryInfoList(Infolist $infolist): Infolist
             ]);
     }
 
-    public function render(): \Illuminate\Contracts\View\View
+    public function render()
     {
-        /** @var view-string */
-        $view = 'filament-form-builder::livewire.filament-form-user.show';
-
-        return view($view);
+        /** @phpstan-ignore-next-line */
+        return view('filament-form-builder::livewire.filament-form-user.show');
     }
 }
diff --git a/src/Middleware/CheckFormGuestAccess.php b/src/Middleware/CheckFormGuestAccess.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tapp\FilamentFormBuilder\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Tapp\FilamentFormBuilder\Models\FilamentForm;
+
+class CheckFormGuestAccess
+{
+    public function handle(Request $request, Closure $next)
+    {
+        // If user is authenticated, allow access
+        if (Auth::check()) {
+            return $next($request);
+        }
+
+        $form = $request->route('form');
+
+        // If form allows guest entries, allow access
+        if ($form instanceof FilamentForm && $form->permit_guest_entries) {
+            return $next($request);
+        }
+
+        // Otherwise, redirect to login
+        return redirect()->guest(route('login'));
+    }
+}
diff --git a/src/Traits/HasFilamentForms.php b/src/Traits/HasFilamentForms.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Tapp\FilamentFormBuilder\Models\FilamentForm;
 
+/** @phpstan-ignore-next-line */
 trait HasFilamentForms
 {
     public function FilamentForms(): BelongsToMany

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static function fromString(string $type): ?self`
`32`	`32`	`return null; // Return null if no match is found`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function getLabel(): ?string`
	`35`	`+ public function getLabel(): string`
`36`	`36`	`{`
`37`	`37`	`return $this->fieldName();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public function mount(FilamentForm $form)`
`16`	`16`
`17`	`17`	`public function render()`
`18`	`18`	`{`
	`19`	`+ /** @phpstan-ignore-next-line */`
`19`	`20`	`return view('filament-form-builder::livewire.filament-form.form');`
`20`	`21`	`}`
`21`	`22`	`}`