Beautiful Open-Source Form Builder
Improved submissions and exports (#855)
Chirag Chhatralac6dfa0ab9e06
diff --git a/.cursor/rules/back-end.mdc b/.cursor/rules/back-end.mdcindex de99269b0..77fb3c3f3 100644--- a/.cursor/rules/back-end.mdc+++ b/.cursor/rules/back-end.mdc@@ -2,57 +2,88 @@description: Laravel Back-endglobs: api/**/*.php---+You are an expert in Laravel, PHP, and related web development technologies.Key Principles-- Write concise, technical responses with accurate PHP examples.-- Adhere to Laravel 11+ best practices and conventions.-- Use object-oriented programming with a focus on SOLID principles.-- Prefer iteration and modularization over duplication.-- Use descriptive variable and method names.-- Use lowercase with dashes for directories (e.g., app/Http/Controllers).-- Favor dependency injection and service containers.++- Write concise, technical responses with accurate PHP examples.+- Adhere to Laravel 11+ best practices and conventions.+- Use object-oriented programming with a focus on SOLID principles.+- Prefer iteration and modularization over duplication.+- Use descriptive variable and method names.+- Use lowercase with dashes for directories (e.g., app/Http/Controllers).+- Favor dependency injection and service containers.PHP/Laravel-- Use PHP 8.2+ features when appropriate (e.g., typed properties, match expressions).-- Follow PSR-12 coding standards.-- Utilize Laravel's built-in features and helpers when possible.-- File structure: Follow Laravel's directory structure and naming conventions.-- Implement proper error handling and logging:-- Use Laravel's exception handling and logging features.-- Create custom exceptions when necessary.-- Use try-catch blocks for expected exceptions.-- Use Laravel's validation features for form and request validation.-- Implement middleware for request filtering and modification.-- Utilize Laravel's Eloquent ORM for database interactions.-- Use Laravel's query builder for complex database queries.-- Implement proper database migrations and seeders.++- Use PHP 8.2+ features when appropriate (e.g., typed properties, match expressions).+- Follow PSR-12 coding standards.+- Utilize Laravel's built-in features and helpers when possible.+- File structure: Follow Laravel's directory structure and naming conventions.+- Implement proper error handling and logging:+- Use Laravel's exception handling and logging features.+- Create custom exceptions when necessary.+- Use try-catch blocks for expected exceptions.+- Use Laravel's validation features for form and request validation.+- Implement middleware for request filtering and modification.+- Utilize Laravel's Eloquent ORM for database interactions.+- Use Laravel's query builder for complex database queries.+- Implement proper database migrations and seeders.Dependencies-- Laravel (latest stable version)-- Composer for dependency management++- Laravel (latest stable version)+- Composer for dependency managementLaravel Best Practices-- Use Eloquent ORM instead of raw SQL queries when possible.-- Use Laravel's built-in authentication and authorization features.-- Utilize Laravel's caching mechanisms for improved performance.-- Implement job queues for long-running tasks.-- Use Pest for unit and feature tests.-- Use Laravel's localization features for multi-language support.-- Implement proper database indexing for improved query performance.-- Use Laravel's built-in pagination features.-- Implement proper error logging and monitoring.++- Use Eloquent ORM instead of raw SQL queries when possible.+- Use Laravel's built-in authentication and authorization features.+- Utilize Laravel's caching mechanisms for improved performance.+- Implement job queues for long-running tasks.+- Use Pest for unit and feature tests.+- Use Laravel's localization features for multi-language support.+- Implement proper database indexing for improved query performance.+- Use Laravel's built-in pagination features.+- Implement proper error logging and monitoring.Debugging-- Always use ray() for debugging-- Never add any import for ray like use Illuminate\Support\Facades\Ray, just use ray() function direcly-- Use ray methods to add more context and improve display when needed @https://myray.app/docs/php/vanilla-php/reference++- Always use ray() for debugging+- Never add any import for ray like use Illuminate\Support\Facades\Ray, just use ray() function direcly+- Use ray methods to add more context and improve display when needed @https://myray.app/docs/php/vanilla-php/reference++Route Model Binding++- Configure route model bindings in AppServiceProvider's boot() method for performance optimization.+- Preload relationships in route bindings to avoid N+1 queries:+ ```php+ Route::bind('workspace', function ($value) {+ return \App\Models\Workspace::with([+ 'users' => fn ($q) => $q->withPivot('role')+ ])->findOrFail((int) $value);+ });+ ```+- Support multiple resolution strategies (ID vs slug) when needed:+ ```php+ Route::bind('form', function ($value) {+ $query = \App\Models\Forms\Form::with(['workspace.users' => fn ($q) => $q->withPivot('role')]);+ return is_numeric($value)+ ? $query->findOrFail((int) $value)+ : $query->where('slug', $value)->firstOrFail();+ });+ ```+- Always use `findOrFail()` or `firstOrFail()` in route bindings for proper 404 error handling.+- Cast numeric values to integers when appropriate for type safety.Key Conventions+1. Follow Laravel's MVC architecture.2. Use Laravel's routing system for defining application endpoints.3. Implement proper request validation using Form Requests.4. Implement proper database relationships using Eloquent.5. Use Laravel's event and listener system for decoupled code.6. Implement proper database transactions for data integrity.-7. Use Laravel's built-in scheduling features for recurring tasks.\ No newline at end of file+7. Use Laravel's built-in scheduling features for recurring tasks.+8. Use route model binding for automatic model resolution and relationship preloading.diff --git a/api/.env.example b/api/.env.exampleindex d62674c3b..03ce6194c 100644--- a/api/.env.example+++ b/api/.env.example@@ -21,7 +21,6 @@ DB_USERNAME=postgresDB_PASSWORD=postgresFILESYSTEM_DRIVER=s3-FILESYSTEM_DISK=s3BROADCAST_CONNECTION=logCACHE_STORE=filediff --git a/api/app/Http/Controllers/Admin/BillingController.php b/api/app/Http/Controllers/Admin/BillingController.phpindex 2b090ca6a..97fb971b3 100644--- a/api/app/Http/Controllers/Admin/BillingController.php+++ b/api/app/Http/Controllers/Admin/BillingController.php@@ -15,9 +15,8 @@ class BillingController extends Controller$this->middleware('moderator');}- public function getEmail($userId)+ public function getEmail(User $user){- $user = User::find($userId);if (!$user->hasStripeId()) {return $this->error([@@ -55,9 +54,8 @@ class BillingController extends Controllerreturn $this->success(['message' => 'Billing email updated successfully']);}- public function getSubscriptions($userId)+ public function getSubscriptions(User $user){- $user = User::find($userId);if (!$user->hasStripeId()) {return $this->error(["message" => "Stripe user not created",@@ -79,9 +77,8 @@ class BillingController extends Controller]);}- public function getPayments($userId)+ public function getPayments(User $user){- $user = User::find($userId);if (!$user->hasStripeId()) {return $this->error(["message" => "Stripe user not created",diff --git a/api/app/Http/Controllers/Admin/FormController.php b/api/app/Http/Controllers/Admin/FormController.phpindex 556f3f618..c149adbe2 100644--- a/api/app/Http/Controllers/Admin/FormController.php+++ b/api/app/Http/Controllers/Admin/FormController.php@@ -8,9 +8,8 @@ use App\Models\User;class FormController extends Controller{- public function getDeletedForms($userId)+ public function getDeletedForms(User $user){- $user = User::find($userId);$deletedForms = $user->forms()->with('creator')->onlyTrashed()->get()->map(function ($form) {return ["id" => $form->id,diff --git a/api/app/Http/Controllers/Admin/ImpersonationController.php b/api/app/Http/Controllers/Admin/ImpersonationController.phpindex a0bb49b82..273bab6cc 100644--- a/api/app/Http/Controllers/Admin/ImpersonationController.php+++ b/api/app/Http/Controllers/Admin/ImpersonationController.php@@ -12,14 +12,9 @@ class ImpersonationController extends Controller$this->middleware('moderator');}- public function impersonate($userId)+ public function impersonate(User $user){- $user = User::find($userId);- if (!$user) {- return $this->error([- 'message' => 'User not found.',- ]);- } elseif ($user->admin) {+ if ($user->admin) {return $this->error(['message' => 'You cannot impersonate an admin.',]);diff --git a/api/app/Http/Controllers/Auth/UserController.php b/api/app/Http/Controllers/Auth/UserController.phpindex 1ccb24894..fe51e2b9d 100644--- a/api/app/Http/Controllers/Auth/UserController.php+++ b/api/app/Http/Controllers/Auth/UserController.php@@ -14,7 +14,17 @@ class UserController extends Controller*/public function current(Request $request){- return new UserResource($request->user());+ // Eager load active licenses and workspaces to prevent N+1 queries in UserResource+ $user = $request->user()->load([+ 'licenses' => function ($query) {+ $query->active();+ },+ 'workspaces' => function ($query) {+ $query->withPivot('role');+ }+ ]);++ return new UserResource($user);}public function deleteAccount()diff --git a/api/app/Http/Controllers/Auth/UserInviteController.php b/api/app/Http/Controllers/Auth/UserInviteController.phpindex 81f600465..749dfd0f4 100644--- a/api/app/Http/Controllers/Auth/UserInviteController.php+++ b/api/app/Http/Controllers/Auth/UserInviteController.php@@ -15,17 +15,15 @@ class UserInviteController extends Controller$this->middleware('auth');}- public function listInvites(Request $request, $workspaceId)+ public function listInvites(Request $request, Workspace $workspace){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('view', $workspace);return (new WorkspaceHelper($workspace))->getAllInvites();}- public function resendInvite($workspaceId, $inviteId)+ public function resendInvite(Workspace $workspace, $inviteId){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('adminAction', $workspace);$userInvite = $workspace->invites()->find($inviteId);if (!$userInvite) {@@ -41,9 +39,8 @@ class UserInviteController extends Controllerreturn $this->success(['message' => 'Invite email resent successfully.']);}- public function cancelInvite($workspaceId, $inviteId)+ public function cancelInvite(Workspace $workspace, $inviteId){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('adminAction', $workspace);$userInvite = $workspace->invites()->find($inviteId);if (!$userInvite) {diff --git a/api/app/Http/Controllers/Forms/FormController.php b/api/app/Http/Controllers/Forms/FormController.phpindex cd6caa36b..3775971cc 100644--- a/api/app/Http/Controllers/Forms/FormController.php+++ b/api/app/Http/Controllers/Forms/FormController.php@@ -8,6 +8,7 @@ use App\Http\Requests\UpdateFormRequest;use App\Http\Requests\UploadAssetRequest;use App\Http\Resources\FormResource;use App\Models\Forms\Form;+use App\Models\Forms\FormSubmission;use App\Models\Workspace;use App\Notifications\Forms\MobileEditorEmail;use App\Service\Forms\FormCleaner;@@ -28,51 +29,25 @@ class FormController extends Controller$this->formCleaner = new FormCleaner();}- public function index($workspaceId)+ public function index(Workspace $workspace){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('ownsWorkspace', $workspace);$this->authorize('viewAny', Form::class);- $workspaceIsPro = $workspace->is_pro;$forms = $workspace->forms()+ ->with(['workspace.users' => fn ($q) => $q->withPivot('role')])+ ->withCount(['submissions as submissions_count' => fn ($q) => $q->where('status', FormSubmission::STATUS_COMPLETED)])+ ->withTotalViews()->orderByDesc('updated_at')- ->paginate(10)->through(function (Form $form) use ($workspace, $workspaceIsPro) {-- // Add attributes for faster loading- $form->extra = (object) [- 'loadedWorkspace' => $workspace,- 'workspaceIsPro' => $workspaceIsPro,- 'userIsOwner' => true,- 'cleanings' => $this->formCleaner- ->processForm(request(), $form)- ->simulateCleaning($workspace)- ->getPerformedCleanings(),- ];-- return $form;- });+ ->paginate(10);return FormResource::collection($forms);}- public function show($slug)+ public function show(Form $form){- $form = Form::whereSlug($slug)->firstOrFail();$this->authorize('view', $form);- // Add attributes for faster loading- $workspace = $form->workspace;- $form->extra = (object)[- 'loadedWorkspace' => $workspace,- 'workspaceIsPro' => $workspace->is_pro,- 'userIsOwner' => true,- 'cleanings' => $this->formCleaner- ->processForm(request(), $form)- ->simulateCleaning($workspace)- ->getPerformedCleanings(),- ];-return new FormResource($form);}@@ -140,9 +115,8 @@ class FormController extends Controller]);}- public function update(UpdateFormRequest $request, string $id)+ public function update(UpdateFormRequest $request, Form $form){- $form = Form::findOrFail($id);$this->authorize('update', $form);$formData = $this->formCleaner@@ -173,9 +147,8 @@ class FormController extends Controller]);}- public function destroy($id)+ public function destroy(Form $form){- $form = Form::findOrFail($id);$this->authorize('delete', $form);$form->delete();@@ -185,9 +158,8 @@ class FormController extends Controller]);}- public function duplicate($id)+ public function duplicate(Form $form){- $form = Form::findOrFail($id);$this->authorize('update', $form);// Create copy@@ -209,9 +181,8 @@ class FormController extends Controller]);}- public function regenerateLink($id, $option)+ public function regenerateLink(Form $form, $option){- $form = Form::findOrFail($id);$this->authorize('update', $form);if ($option == 'slug') {@@ -252,9 +223,8 @@ class FormController extends Controller/*** File uploads retrieval*/- public function viewFile($id, $fileName)+ public function viewFile(Form $form, $fileName){- $form = Form::findOrFail($id);$this->authorize('view', $form);$path = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $form->id) . '/' . $fileName;@@ -270,15 +240,12 @@ class FormController extends Controller/*** Updates a form's workspace*/- public function updateWorkspace($id, $workspace_id)+ public function updateWorkspace(Form $form, Workspace $workspace){- $form = Form::findOrFail($id);- $workspace = Workspace::findOrFail($workspace_id);-$this->authorize('update', $form);$this->authorize('ownsWorkspace', $workspace);- $form->workspace_id = $workspace_id;+ $form->workspace_id = $workspace->id;$form->creator_id = auth()->user()->id;$form->save();@@ -287,9 +254,8 @@ class FormController extends Controller]);}- public function mobileEditorEmail($id)+ public function mobileEditorEmail(Form $form){- $form = Form::findOrFail($id);$this->authorize('update', $form);$form->creator->notify(new MobileEditorEmail($form->slug));diff --git a/api/app/Http/Controllers/Forms/FormPaymentController.php b/api/app/Http/Controllers/Forms/FormPaymentController.phpindex 7cd374da4..35bb3eba2 100644--- a/api/app/Http/Controllers/Forms/FormPaymentController.php+++ b/api/app/Http/Controllers/Forms/FormPaymentController.php@@ -3,11 +3,10 @@namespace App\Http\Controllers\Forms;use App\Http\Controllers\Controller;+use App\Models\Forms\Form;use App\Models\OAuthProvider;use App\Http\Requests\Forms\GetStripeAccountRequest;-use App\Http\Requests\Forms\CreatePaymentIntentRequest;use Illuminate\Support\Facades\Auth;-use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;use Stripe\Stripe;use Stripe\PaymentIntent;@@ -24,14 +23,12 @@ class FormPaymentController extends Controller* @param GetStripeAccountRequest $request* @return \Illuminate\Http\JsonResponse*/- public function getAccount(GetStripeAccountRequest $request)+ public function getAccount(GetStripeAccountRequest $request, Form $form){// Disable payment features on self-hosted instancesif (config('app.self_hosted')) {return $this->error(['message' => 'Payment features are not available in the self-hosted version.'], 403);}-- $form = $request->form;$provider = null;// Case 1: Editor Preview (Validated by GetStripeAccountRequest)@@ -78,15 +75,13 @@ class FormPaymentController extends Controllerreturn $this->success(['stripeAccount' => $provider->provider_user_id]);}- public function createIntent(CreatePaymentIntentRequest $request)+ public function createIntent(Form $form){// Disable payment features on self-hosted instancesif (config('app.self_hosted')) {return $this->error(['message' => 'Payment features are not available in the self-hosted version.'], 403);}- $form = $request->form;-// Verify form exists and is accessibleif ($form->workspace === null || $form->visibility !== 'public') {Log::warning('Attempt to create payment for invalid form', [diff --git a/api/app/Http/Controllers/Forms/FormStatsController.php b/api/app/Http/Controllers/Forms/FormStatsController.phpindex b408f897f..a92db97f3 100644--- a/api/app/Http/Controllers/Forms/FormStatsController.php+++ b/api/app/Http/Controllers/Forms/FormStatsController.php@@ -5,9 +5,11 @@ namespace App\Http\Controllers\Forms;use App\Http\Controllers\Controller;use App\Http\Requests\FormStatsRequest;use App\Models\Forms\FormSubmission;+use App\Models\Workspace;use Carbon\CarbonPeriod;use Illuminate\Http\Request;use Illuminate\Support\Facades\Cache;+use App\Models\Forms\Form;use Illuminate\Support\Facades\DB;class FormStatsController extends Controller@@ -17,9 +19,8 @@ class FormStatsController extends Controller$this->middleware('auth');}- public function getFormStats(FormStatsRequest $request)+ public function getFormStats(FormStatsRequest $request, Workspace $workspace, Form $form){- $form = $request->form; // Added by ProForm middleware$this->authorize('view', $form);$formStats = $form->statistics()->whereBetween('date', [$request->date_from, $request->date_to])->get();@@ -40,9 +41,8 @@ class FormStatsController extends Controllerreturn $periodStats;}- public function getFormStatsDetails(Request $request)+ public function getFormStatsDetails(Request $request, Workspace $workspace, Form $form){- $form = $request->form; // Added by ProForm middleware$this->authorize('view', $form);$totalViews = $form->views_count;diff --git a/api/app/Http/Controllers/Forms/FormSubmissionController.php b/api/app/Http/Controllers/Forms/FormSubmissionController.phpindex 4278e6a63..5375f7b83 100644--- a/api/app/Http/Controllers/Forms/FormSubmissionController.php+++ b/api/app/Http/Controllers/Forms/FormSubmissionController.php@@ -7,14 +7,17 @@ use App\Http\Controllers\Controller;use App\Http\Requests\AnswerFormRequest;use App\Http\Requests\FormSubmissionExportRequest;use App\Http\Resources\FormSubmissionResource;+use App\Http\Resources\ExportJobStatusResource;use App\Jobs\Form\StoreFormSubmissionJob;+use App\Jobs\Form\ExportFormSubmissionsJob;use App\Models\Forms\Form;use App\Models\Forms\FormSubmission;-use App\Service\Forms\FormSubmissionFormatter;+use App\Service\Forms\FormExportService;use Illuminate\Support\Facades\Storage;+use Illuminate\Support\Facades\Cache;+use Illuminate\Support\Facades\Auth;use Illuminate\Support\Str;use Maatwebsite\Excel\Facades\Excel;-use Vinkla\Hashids\Facades\Hashids;use Illuminate\Http\Request;class FormSubmissionController extends Controller@@ -25,25 +28,57 @@ class FormSubmissionController extends Controller$this->middleware('signed', ['only' => ['submissionFile']]);}- public function submissions(string $id)+ public function submissions(Form $form){- $form = Form::findOrFail((int) $id);$this->authorize('view', $form);- return FormSubmissionResource::collection($form->submissions()->paginate(100));+ $query = $form->submissions()->with('form');++ // Handle search parameter - search only in JSON values, not keys+ if (request()->has('search') && !empty(request()->get('search'))) {+ $searchTerm = request()->get('search');++ if (config('database.default') === 'mysql') {+ // MySQL: Use JSON_SEARCH to find values containing the search term+ $query->whereRaw("JSON_SEARCH(data, 'one', ?) IS NOT NULL", ["%{$searchTerm}%"]);+ } else {+ // PostgreSQL: Use jsonb_each_text to search only in values+ $query->whereRaw("EXISTS (+ SELECT 1 FROM jsonb_each_text(data) AS kv(key, value)+ WHERE kv.value ILIKE ?+ )", ["%{$searchTerm}%"]);+ }+ }++ // Handle status filtering for pro forms with partial submissions+ if (request()->has('status') && request()->get('status') !== 'all') {+ $status = request()->get('status');+ if ($status === FormSubmission::STATUS_COMPLETED) {+ $query->where('status', '!=', FormSubmission::STATUS_PARTIAL);+ } elseif ($status === FormSubmission::STATUS_PARTIAL) {+ $query->where('status', FormSubmission::STATUS_PARTIAL);+ }+ }++ // Default ordering by created_at desc+ $query->orderByDesc('created_at');++ // Use configurable per_page, default to 50 for better performance+ $perPage = min((int) request()->get('per_page', 100), 100);++ return FormSubmissionResource::collection($query->paginate($perPage));}- public function update(AnswerFormRequest $request, $id, $submissionId)+ public function update(AnswerFormRequest $request, Form $form, $submission_id){- $form = $request->form;$this->authorize('update', $form);$submissionData = $request->validated();- $submissionData['submission_id'] = $submissionId;- $job = new StoreFormSubmissionJob($request->form, $submissionData);+ $submissionData['submission_id'] = $submission_id;+ $job = new StoreFormSubmissionJob($form, $submissionData);$job->handle();- $data = new FormSubmissionResource(FormSubmission::findOrFail($submissionId));+ $data = new FormSubmissionResource(FormSubmission::with('form')->findOrFail($submission_id));return $this->success(['message' => 'Record successfully updated.',@@ -51,33 +86,63 @@ class FormSubmissionController extends Controller]);}- public function export(FormSubmissionExportRequest $request, string $id)+ // ===== EXPORT METHODS =====++ public function export(FormSubmissionExportRequest $request, Form $form, FormExportService $exportService){- $form = $request->form;$this->authorize('view', $form);- $allRows = [];$displayColumns = collect($request->columns)->filter(fn ($value, $key) => $value === true)->toArray();- foreach ($form->submissions->toArray() as $row) {- $formatter = (new FormSubmissionFormatter($form, $row['data']))- ->outputStringsOnly()- ->setEmptyForNoValue()- ->showRemovedFields()- ->showHiddenFields()- ->useSignedUrlForFiles();- $formattedData = $formatter->getCleanKeyValue();- $filteredData = ['id' => Hashids::encode($row['id'])];- foreach ($displayColumns as $column => $value) {- $key = collect($formattedData)->keys()->first(fn ($key) => str_contains($key, $column));- if ($key) {- $filteredData[$key] = $formattedData[$key];- }- }- if (isset($displayColumns['created_at'])) {- $filteredData['created_at'] = date('Y-m-d H:i', strtotime($row['created_at']));- }- $allRows[] = $filteredData;++ // Check if we should process asynchronously+ if ($exportService->shouldExportAsync($form)) {+ return $this->startAsyncExport($form, $displayColumns, $exportService);}++ // Process synchronously for small exports+ return $this->processSyncExport($form, $displayColumns, $exportService);+ }++ public function exportStatus(Form $form, string $jobId, FormExportService $exportService)+ {+ $this->authorize('view', $form);++ $cacheKey = $exportService->getCacheKey($jobId);+ $jobData = Cache::get($cacheKey);++ if (!$jobData) {+ return $this->error([+ 'message' => 'Export job not found or has expired.'+ ], 404);+ }++ // Add job_id to the response data+ $jobData['job_id'] = $jobId;++ return new ExportJobStatusResource($jobData);+ }++ private function startAsyncExport(Form $form, array $displayColumns, FormExportService $exportService)+ {+ $jobId = $exportService->initializeAsyncExport($form, Auth::id());++ ExportFormSubmissionsJob::dispatch($form, $displayColumns, $jobId, Auth::id());++ return $this->success([+ 'message' => 'Export started. Large export will be processed in the background.',+ 'job_id' => $jobId,+ 'is_async' => true+ ]);+ }++ private function processSyncExport(Form $form, array $displayColumns, FormExportService $exportService)+ {+ $allRows = [];+ // Use query builder with orderBy for consistency with async export+ foreach ($form->submissions()->orderByDesc('created_at')->get() as $submission) {+ $allRows[] = $exportService->formatSubmissionForExport($form, $submission, $displayColumns);+ }+$csvExport = (new FormSubmissionExport($allRows));return Excel::download(@@ -87,10 +152,10 @@ class FormSubmissionController extends Controller);}- public function submissionFile($id, $fileName)+ public function submissionFile(Form $form, $filename){- $fileName = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $id) . '/'- . urldecode($fileName);+ $fileName = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $form->id) . '/'+ . urldecode($filename);if (! Storage::exists($fileName)) {return $this->error([@@ -107,12 +172,11 @@ class FormSubmissionController extends Controller);}- public function destroy($id, $submissionId)+ public function destroy(Form $form, $submission_id){- $form = Form::findOrFail((int) $id);$this->authorize('delete', $form);- $submission = $form->submissions()->where('id', $submissionId)->firstOrFail();+ $submission = $form->submissions()->where('id', $submission_id)->firstOrFail();$submission->delete();return $this->success([@@ -120,7 +184,7 @@ class FormSubmissionController extends Controller]);}- public function destroyMulti(Request $request, $id)+ public function destroyMulti(Request $request, Form $form){$request->validate(['submissionIds' => 'required|array',@@ -128,7 +192,6 @@ class FormSubmissionController extends Controller'submissionIds.*' => 'exists:form_submissions,id',]);- $form = Form::findOrFail((int) $id);$this->authorize('delete', $form);$submissionIds = $request->submissionIds;diff --git a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.phpindex b8fa22161..693573f59 100644--- a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsController.php@@ -15,9 +15,8 @@ class FormIntegrationsController extends Controller$this->middleware('auth');}- public function index(string $id)+ public function index(Form $form){- $form = Form::findOrFail((int)$id);$this->authorize('view', $form);$integrations = FormIntegration::query()@@ -28,9 +27,8 @@ class FormIntegrationsController extends Controllerreturn FormIntegrationResource::collection($integrations);}- public function create(FormIntegrationsRequest $request, string $id)+ public function create(FormIntegrationsRequest $request, Form $form){- $form = Form::findOrFail((int)$id);$this->authorize('update', $form);/** @var FormIntegration $formIntegration */@@ -49,9 +47,8 @@ class FormIntegrationsController extends Controller]);}- public function update(FormIntegrationsRequest $request, string $id, string $integrationid)+ public function update(FormIntegrationsRequest $request, Form $form, string $integrationid){- $form = Form::findOrFail((int)$id);$this->authorize('update', $form);$formIntegration = FormIntegration::findOrFail((int)$integrationid);@@ -64,9 +61,8 @@ class FormIntegrationsController extends Controller]);}- public function destroy(string $id, string $integrationid)+ public function destroy(Form $form, string $integrationid){- $form = Form::findOrFail((int)$id);$this->authorize('update', $form);$formIntegration = FormIntegration::findOrFail((int)$integrationid);diff --git a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.phpindex 9f06c0126..cc4f0e11e 100644--- a/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormIntegrationsEventController.php@@ -14,9 +14,8 @@ class FormIntegrationsEventController extends Controller$this->middleware('auth');}- public function index(string $id, string $integrationid)+ public function index(Form $form, string $integrationid){- $form = Form::findOrFail((int)$id);$this->authorize('view', $form);return FormIntegrationsEventResource::collection(diff --git a/api/app/Http/Controllers/Forms/PublicFormController.php b/api/app/Http/Controllers/Forms/PublicFormController.phpindex c0082a927..ff8e66ea0 100644--- a/api/app/Http/Controllers/Forms/PublicFormController.php+++ b/api/app/Http/Controllers/Forms/PublicFormController.php@@ -4,10 +4,10 @@ namespace App\Http\Controllers\Forms;use App\Http\Controllers\Controller;use App\Http\Requests\AnswerFormRequest;+use App\Models\Forms\Form;use App\Http\Resources\FormResource;use App\Http\Resources\FormSubmissionResource;use App\Jobs\Form\StoreFormSubmissionJob;-use App\Models\Forms\Form;use App\Models\Forms\FormSubmission;use App\Service\Forms\Analytics\UserAgentHelper;use App\Service\Forms\FormSubmissionProcessor;@@ -25,9 +25,12 @@ class PublicFormController extends Controllerpublic const TMP_FILE_UPLOAD_PATH = 'tmp/';- public function show(Request $request, string $slug)+ public function show(Request $request, Form $form){- $form = Form::whereSlug($slug)->whereIn('visibility', ['public', 'closed'])->firstOrFail();+ // Ensure form is public or closed+ if (!in_array($form->visibility, ['public', 'closed'])) {+ abort(404);+ }if ($form->workspace == null) {// Workspace deletedreturn $this->error([@@ -49,9 +52,13 @@ class PublicFormController extends Controller->setCleanings($formCleaner->getPerformedCleanings());}- public function view(Request $request, string $slug)+ public function view(Request $request, Form $form){- $form = Form::whereSlug($slug)->where('visibility', 'public')->firstOrFail();+ // Ensure form is public+ if ($form->visibility !== 'public') {+ abort(404);+ }+if ($form->workspace == null) {return $this->error(['message' => 'Form not found.',@@ -73,10 +80,9 @@ class PublicFormController extends Controller]);}- public function listUsers(Request $request)+ public function listUsers(Request $request, Form $form){// Check that form has user field- $form = $request->form;if (!$form->has_user_field) {return [];}@@ -112,9 +118,8 @@ class PublicFormController extends Controller* @param Request $request* @return \Illuminate\Http\JsonResponse*/- private function handlePartialSubmissions(Request $request)+ private function handlePartialSubmissions(Request $request, Form $form){- $form = $request->form;// Process submission data to extract submission ID$submissionData = $this->processSubmissionIdentifiers($request, $request->all());@@ -149,15 +154,14 @@ class PublicFormController extends Controller]);}- public function answer(AnswerFormRequest $request, FormSubmissionProcessor $formSubmissionProcessor)+ public function answer(AnswerFormRequest $request, Form $form, FormSubmissionProcessor $formSubmissionProcessor){- $form = $request->form;$isFirstSubmission = ($form->submissions_count === 0);// Handle partial submissions$isPartial = $request->get('is_partial') ?? false;if ($isPartial && $form->enable_partial_submissions && $form->is_pro) {- return $this->handlePartialSubmissions($request);+ return $this->handlePartialSubmissions($request, $form);}// Get validated data (includes all metadata)@@ -221,13 +225,16 @@ class PublicFormController extends Controllerreturn $submissionData;}- public function fetchSubmission(Request $request, string $slug, string $submissionId)+ public function fetchSubmission(Request $request, Form $form, string $submission_id){// Decode the submission ID using the same approach as in processSubmissionIdentifiers- $decodedId = Hashids::decode($submissionId);+ $decodedId = Hashids::decode($submission_id);$submissionId = !empty($decodedId) ? (int)($decodedId[0]) : false;- $form = Form::whereSlug($slug)->whereVisibility('public')->firstOrFail();+ // Ensure form is public and allows editable submissions+ if ($form->visibility !== 'public') {+ abort(404);+ }if ($form->workspace == null || !$form->editable_submissions || !$submissionId) {return $this->error(['message' => 'Not allowed.',diff --git a/api/app/Http/Controllers/WorkspaceController.php b/api/app/Http/Controllers/WorkspaceController.phpindex 3d2fb4bfa..7cf1a5af1 100644--- a/api/app/Http/Controllers/WorkspaceController.php+++ b/api/app/Http/Controllers/WorkspaceController.php@@ -20,7 +20,21 @@ class WorkspaceController extends Controller{$this->authorize('viewAny', Workspace::class);- return WorkspaceResource::collection(Auth::user()->workspaces);+ // Eager load users with pivot roles to prevent N+1 queries in WorkspaceResource+ // Make this query identical to UserController to avoid duplicate database work+ $user = Auth::user()->load([+ 'workspaces' => function ($query) {+ $query->withPivot('role')->with([+ 'users' => function ($subQuery) {+ $subQuery->withPivot('role');+ }+ ]);+ }+ ]);++ $workspaces = $user->workspaces;++ return WorkspaceResource::collection($workspaces);}public function saveCustomDomain(CustomDomainRequest $request)@@ -50,9 +64,8 @@ class WorkspaceController extends Controllerreturn new WorkspaceResource($request->workspace);}- public function delete($id)+ public function delete(Workspace $workspace){- $workspace = Workspace::findOrFail($id);$this->authorize('delete', $workspace);$id = $workspace->id;@@ -94,9 +107,8 @@ class WorkspaceController extends Controller]);}- public function update(Request $request, $id)+ public function update(Request $request, Workspace $workspace){- $workspace = Auth::user()->workspaces()->findOrFail($id);$this->authorize('update', $workspace);$this->validate($request, [diff --git a/api/app/Http/Controllers/WorkspaceUserController.php b/api/app/Http/Controllers/WorkspaceUserController.phpindex 6478fc4f3..6ea65ffe6 100644--- a/api/app/Http/Controllers/WorkspaceUserController.php+++ b/api/app/Http/Controllers/WorkspaceUserController.php@@ -19,17 +19,15 @@ class WorkspaceUserController extends Controller$this->middleware('auth');}- public function listUsers(Request $request, $workspaceId)+ public function listUsers(Request $request, Workspace $workspace){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('view', $workspace);return (new WorkspaceHelper($workspace))->getAllUsers();}- public function addUser(Request $request, $workspaceId)+ public function addUser(Request $request, Workspace $workspace){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('inviteUser', $workspace);$this->validate($request, [@@ -90,10 +88,8 @@ class WorkspaceUserController extends Controller]);}- public function updateUserRole(Request $request, $workspaceId, $userId)+ public function updateUserRole(Request $request, Workspace $workspace, User $user){- $workspace = Workspace::findOrFail($workspaceId);- $user = User::findOrFail($userId);$this->authorize('adminAction', $workspace);$this->validate($request, [@@ -111,13 +107,11 @@ class WorkspaceUserController extends Controller]);}- public function removeUser(Request $request, $workspaceId, $userId)+ public function removeUser(Request $request, Workspace $workspace, User $user){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('adminAction', $workspace);- $user = User::findOrFail($userId);- $workspace->users()->detach($userId);+ $workspace->users()->detach($user->id);$this->ensureUserHasWorkspace($user);WorkspaceUsersUpdated::dispatch($workspace);@@ -126,9 +120,8 @@ class WorkspaceUserController extends Controller]);}- public function leaveWorkspace(Request $request, $workspaceId)+ public function leaveWorkspace(Request $request, Workspace $workspace){- $workspace = Workspace::findOrFail($workspaceId);$this->authorize('view', $workspace);$user = $request->user();diff --git a/api/app/Http/Middleware/Form/ProForm.php b/api/app/Http/Middleware/Form/ProForm.phpindex 59fff8baa..43f7eb677 100644--- a/api/app/Http/Middleware/Form/ProForm.php+++ b/api/app/Http/Middleware/Form/ProForm.php@@ -2,7 +2,6 @@namespace App\Http\Middleware\Form;-use App\Models\Forms\Form;use Closure;use Illuminate\Http\Request;@@ -16,7 +15,7 @@ class ProForm*/public function handle(Request $request, Closure $next){- if ($request->route('formId') && $form = Form::findOrFail($request->route('formId'))) {+ if ($request->route('form') && $form = $request->route('form')) {if ($form->is_pro) {$request->merge(['form' => $form,diff --git a/api/app/Http/Middleware/Form/ProtectedForm.php b/api/app/Http/Middleware/Form/ProtectedForm.phpindex 6f1018888..c8b4126b9 100644--- a/api/app/Http/Middleware/Form/ProtectedForm.php+++ b/api/app/Http/Middleware/Form/ProtectedForm.php@@ -19,14 +19,11 @@ class ProtectedForm*/public function handle(Request $request, Closure $next){- if (! $request->route('slug')) {+ if (! $request->route('form')) {return $next($request);}- $form = Form::where('slug', $request->route('slug'))->firstOrFail();- $request->merge([- 'form' => $form,- ]);+ $form = $request->route('form');$userIsFormOwner = Auth::check() && Auth::user()->ownsForm($form);if (! $userIsFormOwner && $this->isProtected($request, $form)) {return response([diff --git a/api/app/Http/Middleware/Form/ResolveFormMiddleware.php b/api/app/Http/Middleware/Form/ResolveFormMiddleware.phpdeleted file mode 100644index 63d05c17e..000000000--- a/api/app/Http/Middleware/Form/ResolveFormMiddleware.php+++ /dev/null@@ -1,26 +0,0 @@-<?php--namespace App\Http\Middleware\Form;--use App\Models\Forms\Form;-use Closure;-use Illuminate\Http\Request;--class ResolveFormMiddleware-{- /**- * Handle an incoming request.- *- * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next- * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse- */- public function handle(Request $request, Closure $next, string $routeParamName = 'id')- {- $form = Form::where($routeParamName, $request->route($routeParamName))->firstOrFail();- $request->merge([- 'form' => $form,- ]);-- return $next($request);- }-}diff --git a/api/app/Http/Requests/AnswerFormRequest.php b/api/app/Http/Requests/AnswerFormRequest.phpindex 6443bdd95..6c5adf70c 100644--- a/api/app/Http/Requests/AnswerFormRequest.php+++ b/api/app/Http/Requests/AnswerFormRequest.php@@ -27,7 +27,8 @@ class AnswerFormRequest extends FormRequestpublic function __construct(Request $request){- $this->form = $request->form;+ // Get form from route model binding instead of middleware+ $this->form = $request->route('form') ?? $request->form;$this->maxFileSize = $this->form->workspace->max_file_size;}@@ -72,7 +73,7 @@ class AnswerFormRequest extends FormRequest// User custom validationif (!(Str::of($property['type'])->startsWith('nf-')) && isset($property['validation'])) {- $rules[] = (new CustomFieldValidationRule($property['validation'], $data));+ $rules[] = (new CustomFieldValidationRule($property['validation'], $data, $this->form));}// For get values instead of Id for select/multi select optionsdiff --git a/api/app/Http/Requests/FormSubmissionExportRequest.php b/api/app/Http/Requests/FormSubmissionExportRequest.phpindex 24fda167e..13a02e7b6 100644--- a/api/app/Http/Requests/FormSubmissionExportRequest.php+++ b/api/app/Http/Requests/FormSubmissionExportRequest.php@@ -12,7 +12,7 @@ class FormSubmissionExportRequest extends FormRequestpublic function __construct(Request $request){- $this->form = Form::findOrFail($request->route('id'));+ $this->form = $request->route('form');}public function rules()diff --git a/api/app/Http/Requests/Forms/CreatePaymentIntentRequest.php b/api/app/Http/Requests/Forms/CreatePaymentIntentRequest.phpdeleted file mode 100644index a011acdb9..000000000--- a/api/app/Http/Requests/Forms/CreatePaymentIntentRequest.php+++ /dev/null@@ -1,30 +0,0 @@-<?php--namespace App\Http\Requests\Forms;--use Illuminate\Foundation\Http\FormRequest;--class CreatePaymentIntentRequest extends FormRequest-{- /**- * Determine if the user is authorized to make this request.- */- public function authorize(): bool- {- // Allow public access for now, protected by middleware- return true;- }-- /**- * Get the validation rules that apply to the request.- *- * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>- */- public function rules(): array- {- // No body parameters need validation as they are derived from the form itself.- return [- // Keep empty for now, can add header/other validation later if needed.- ];- }-}diff --git a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php b/api/app/Http/Requests/Integration/FormIntegrationsRequest.phpindex bb7b82926..bfba08f9f 100644--- a/api/app/Http/Requests/Integration/FormIntegrationsRequest.php+++ b/api/app/Http/Requests/Integration/FormIntegrationsRequest.php@@ -19,7 +19,7 @@ class FormIntegrationsRequest extends FormRequestpublic function __construct(Request $request){- $this->form = Form::findOrFail(request()->route('id'));+ $this->form = request()->route('form');if ($request->integration_id) {// Load integration class, and get rules$integration = FormIntegration::getIntegration($request->integration_id);diff --git a/api/app/Http/Requests/Integration/Zapier/PollSubmissionRequest.php b/api/app/Http/Requests/Integration/Zapier/PollSubmissionRequest.phpindex 14898aa19..2d622f1f9 100644--- a/api/app/Http/Requests/Integration/Zapier/PollSubmissionRequest.php+++ b/api/app/Http/Requests/Integration/Zapier/PollSubmissionRequest.php@@ -25,6 +25,7 @@ class PollSubmissionRequest extends FormRequestpublic function form(): Form{- return Form::findOrFail($this->input('form_id'));+ // Use firstOrFail with query optimization instead of findOrFail+ return Form::where('id', $this->input('form_id'))->firstOrFail();}}diff --git a/api/app/Http/Requests/UserFormRequest.php b/api/app/Http/Requests/UserFormRequest.phpindex 100a98e34..4bc9b7c65 100644--- a/api/app/Http/Requests/UserFormRequest.php+++ b/api/app/Http/Requests/UserFormRequest.php@@ -24,7 +24,8 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequestpublic function __construct(Request $request){- $this->form = $request?->form ?? null;+ // Get form from route model binding instead of middleware+ $this->form = $request?->route('form') ?? null;}protected function prepareForValidation()diff --git a/api/app/Http/Requests/Workspace/CustomDomainRequest.php b/api/app/Http/Requests/Workspace/CustomDomainRequest.phpindex 3f6ea35d1..8bf243389 100644--- a/api/app/Http/Requests/Workspace/CustomDomainRequest.php+++ b/api/app/Http/Requests/Workspace/CustomDomainRequest.php@@ -14,9 +14,9 @@ class CustomDomainRequest extends FormRequestpublic array $customDomains = [];- public function __construct(Request $request, Workspace $workspace)+ public function __construct(Request $request){- $this->workspace = Workspace::findOrFail($request->workspaceId);+ $this->workspace = $request->route('workspace');}/**diff --git a/api/app/Http/Requests/Workspace/EmailSettingsRequest.php b/api/app/Http/Requests/Workspace/EmailSettingsRequest.phpindex ca0c2e610..72b18a212 100644--- a/api/app/Http/Requests/Workspace/EmailSettingsRequest.php+++ b/api/app/Http/Requests/Workspace/EmailSettingsRequest.php@@ -10,9 +10,9 @@ class EmailSettingsRequest extends FormRequest{public Workspace $workspace;- public function __construct(Request $request, Workspace $workspace)+ public function __construct(Request $request){- $this->workspace = Workspace::findOrFail($request->workspaceId);+ $this->workspace = $request->route('workspace');}/**diff --git a/api/app/Http/Requests/Zapier/CreateIntegrationRequest.php b/api/app/Http/Requests/Zapier/CreateIntegrationRequest.phpindex da70daf10..0717502e7 100644--- a/api/app/Http/Requests/Zapier/CreateIntegrationRequest.php+++ b/api/app/Http/Requests/Zapier/CreateIntegrationRequest.php@@ -24,6 +24,7 @@ class CreateIntegrationRequest extends FormRequestpublic function form(): Form{- return Form::findOrFail($this->input('form_id'));+ // Use firstOrFail with query optimization instead of findOrFail+ return Form::where('id', $this->input('form_id'))->firstOrFail();}}diff --git a/api/app/Http/Requests/Zapier/DeleteIntegrationRequest.php b/api/app/Http/Requests/Zapier/DeleteIntegrationRequest.phpindex 0510160a8..793cbf8ee 100644--- a/api/app/Http/Requests/Zapier/DeleteIntegrationRequest.php+++ b/api/app/Http/Requests/Zapier/DeleteIntegrationRequest.php@@ -24,6 +24,7 @@ class DeleteIntegrationRequest extends FormRequestpublic function form(): Form{- return Form::findOrFail($this->input('form_id'));+ // Use firstOrFail with query optimization instead of findOrFail+ return Form::where('id', $this->input('form_id'))->firstOrFail();}}diff --git a/api/app/Http/Resources/ExportJobStatusResource.php b/api/app/Http/Resources/ExportJobStatusResource.phpnew file mode 100644index 000000000..5502c50f1--- /dev/null+++ b/api/app/Http/Resources/ExportJobStatusResource.php@@ -0,0 +1,28 @@+<?php++namespace App\Http\Resources;++use Illuminate\Http\Request;+use Illuminate\Http\Resources\Json\JsonResource;++class ExportJobStatusResource extends JsonResource+{+ /**+ * Transform the resource into an array.+ */+ public function toArray(Request $request): array+ {+ return [+ 'job_id' => $this->resource['job_id'] ?? null,+ 'status' => $this->resource['status'],+ 'progress' => $this->resource['progress'],+ 'processed_submissions' => $this->resource['processed_submissions'] ?? null,+ 'total_submissions' => $this->resource['total_submissions'] ?? null,+ 'file_url' => $this->resource['file_url'] ?? null,+ 'error_message' => $this->resource['error_message'] ?? null,+ 'expires_at' => $this->resource['expires_at'] ?? null,+ 'created_at' => $this->resource['created_at'] ?? null,+ 'updated_at' => $this->resource['updated_at'] ?? null,+ ];+ }+}diff --git a/api/app/Http/Resources/FormResource.php b/api/app/Http/Resources/FormResource.phpindex 70d01010f..268de9cde 100644--- a/api/app/Http/Resources/FormResource.php+++ b/api/app/Http/Resources/FormResource.php@@ -5,6 +5,7 @@ namespace App\Http\Resources;use App\Http\Middleware\Form\ProtectedForm;use Illuminate\Http\Resources\Json\JsonResource;use Illuminate\Support\Facades\Auth;+use App\Models\User as UserModel;class FormResource extends JsonResource{@@ -42,13 +43,13 @@ class FormResource extends JsonResource'is_pro' => $this->workspaceIsPro(),'is_trialing' => $this->workspaceIsTrialing(),'workspace_id' => $this->workspace_id,- 'workspace' => new WorkspaceResource($this->getWorkspace()),+ 'workspace' => new WorkspaceResource($this->workspace),'is_closed' => $this->is_closed,'is_password_protected' => false,'has_password' => $this->has_password,'max_number_of_submissions_reached' => $this->max_number_of_submissions_reached,'form_pending_submission_key' => $this->form_pending_submission_key,- 'max_file_size' => $this->max_file_size / 1000000,+ 'max_file_size' => $this->workspace->max_file_size / 1000000,'auto_save' => $this->getAutoSave(),]);}@@ -86,32 +87,37 @@ class FormResource extends JsonResource];}- private function getWorkspace()- {- return $this->extra?->loadedWorkspace ?? $this->workspace;- }-private function workspaceIsPro(){- return $this->extra?->workspaceIsPro ?? $this->getWorkspace()->is_pro ?? $this->is_pro;+ return $this->workspace->is_pro ?? $this->is_pro;}private function workspaceIsTrialing(){- return $this->getWorkspace()->is_trialing;+ return $this->workspace->is_trialing;}private function userIsFormOwner(){- return $this->extra?->userIsOwner ??- (- Auth::check() && Auth::user()->ownsForm($this->resource)- );+ if (!Auth::check()) {+ return false;+ }++ /** @var UserModel|null $user */+ $user = Auth::user();++ // Use preloaded workspace users if available to avoid N+1 queries+ if ($this->relationLoaded('workspace') && $this->workspace->relationLoaded('users')) {+ return $this->workspace->users->contains('id', $user->id);+ }++ // Fallback to checking ownership+ return $user instanceof UserModel && $user->ownsForm($this->resource);}private function getCleanigns(){- return $this->extra?->cleanings ?? $this->cleanings;+ return $this->cleanings;}private function hasPaymentBlock()diff --git a/api/app/Jobs/Form/ExportFormSubmissionsJob.php b/api/app/Jobs/Form/ExportFormSubmissionsJob.phpnew file mode 100644index 000000000..80153f340--- /dev/null+++ b/api/app/Jobs/Form/ExportFormSubmissionsJob.php@@ -0,0 +1,138 @@+<?php++namespace App\Jobs\Form;++use App\Models\Forms\Form;+use App\Service\Forms\FormExportService;+use Illuminate\Bus\Queueable;+use Illuminate\Contracts\Queue\ShouldQueue;+use Illuminate\Foundation\Bus\Dispatchable;+use Illuminate\Queue\InteractsWithQueue;+use Illuminate\Queue\SerializesModels;+use Illuminate\Support\Facades\Cache;+use Illuminate\Support\Facades\Log;++class ExportFormSubmissionsJob implements ShouldQueue+{+ use Dispatchable;+ use InteractsWithQueue;+ use Queueable;+ use SerializesModels;++ public $timeout = 900; // 15 minutes+ public $tries = 1;++ public function __construct(+ public Form $form,+ public array $columns,+ public string $jobId,+ public int $userId+ ) {+ }++ public function handle(FormExportService $exportService): void+ {+ // Initialize job status in cache+ $this->updateJobStatus('processing', 0);++ // Get total submission count+ $totalSubmissions = $this->form->submissions()->count();++ if ($totalSubmissions === 0) {+ $this->updateJobStatus('failed', 0, 'No submissions to export');+ return;+ }++ // Process submissions in chunks+ $chunkSize = 500;+ $processedCount = 0;+ $allRows = [];++ $this->form->submissions()+ ->orderBy('created_at', 'desc')+ ->chunk($chunkSize, function ($submissions) use (&$processedCount, &$allRows, $totalSubmissions, $exportService) {+ foreach ($submissions as $submission) {+ $formattedRow = $exportService->formatSubmissionForExport(+ $this->form,+ $submission,+ $this->columns+ );+ $allRows[] = $formattedRow;+ $processedCount++;+ }++ // Update progress+ $progress = min(90, ($processedCount / $totalSubmissions) * 90); // Reserve 10% for file generation+ $this->updateJobStatus('processing', $progress, null, $processedCount, $totalSubmissions);+ });++ // Generate and upload file to S3+ $this->updateJobStatus('processing', 95, 'Generating export file...');++ $fileName = $this->form->slug . '-submissions-' . now()->format('Y-m-d-H-i-s') . '.csv';+ $fileUrl = $exportService->generateAndUploadCsvFile($allRows, $fileName);++ // Mark as completed+ $this->updateJobStatus('completed', 100, null, $totalSubmissions, $totalSubmissions, $fileUrl);++ Log::info("Export job {$this->jobId} completed successfully", [+ 'form_id' => $this->form->id,+ 'total_submissions' => $totalSubmissions,+ 'file_url' => $fileUrl+ ]);+ }++ public function failed(\Throwable $exception): void+ {+ $this->updateJobStatus('failed', 0, $exception->getMessage());++ Log::error("Export job {$this->jobId} failed in failed() method", [+ 'form_id' => $this->form->id,+ 'error' => $exception->getMessage()+ ]);+ }++ private function updateJobStatus(+ string $status,+ int $progress,+ ?string $errorMessage = null,+ ?int $processedSubmissions = null,+ ?int $totalSubmissions = null,+ ?string $fileUrl = null+ ): void {+ $exportService = app(FormExportService::class);+ $cacheKey = $exportService->getCacheKey($this->jobId);++ // Get existing data to preserve created_at+ $existingData = Cache::get($cacheKey, []);++ $data = [+ 'status' => $status,+ 'progress' => $progress,+ 'form_id' => $this->form->id,+ 'user_id' => $this->userId,+ 'created_at' => $existingData['created_at'] ?? now()->toISOString(),+ 'updated_at' => now()->toISOString(),+ ];++ if ($errorMessage) {+ $data['error_message'] = $errorMessage;+ }++ if ($processedSubmissions !== null) {+ $data['processed_submissions'] = $processedSubmissions;+ }++ if ($totalSubmissions !== null) {+ $data['total_submissions'] = $totalSubmissions;+ }++ if ($fileUrl) {+ $data['file_url'] = $fileUrl;+ $data['expires_at'] = now()->addDay()->toISOString(); // File expires in 24 hours+ }++ // Cache for 2 hours+ Cache::put($cacheKey, $data, now()->addHours(2));+ }+}diff --git a/api/app/Listeners/Forms/InvalidateFormSubmissionCache.php b/api/app/Listeners/Forms/InvalidateFormSubmissionCache.phpnew file mode 100644index 000000000..d0085a3a6--- /dev/null+++ b/api/app/Listeners/Forms/InvalidateFormSubmissionCache.php@@ -0,0 +1,25 @@+<?php++namespace App\Listeners\Forms;++use App\Events\Forms\FormSubmitted;++class InvalidateFormSubmissionCache+{+ /**+ * Create the event listener.+ */+ public function __construct()+ {+ //+ }++ /**+ * Handle the event.+ */+ public function handle(FormSubmitted $event): void+ {+ // Clear the form's submission count cache for real-time accuracy+ $event->form->forget('submissions_count');+ }+}diff --git a/api/app/Logging/SlackLogHandler.php b/api/app/Logging/SlackLogHandler.phpindex 3b5f3ed28..f31ba87f4 100644--- a/api/app/Logging/SlackLogHandler.php+++ b/api/app/Logging/SlackLogHandler.php@@ -49,7 +49,6 @@ class SlackLogHandler extends AbstractProcessingHandler]);} catch (Exception $e) {// Log the error without causing recursion- ray($e);error_log("Failed to send Slack message: " . $e->getMessage());}}diff --git a/api/app/Models/Forms/Form.php b/api/app/Models/Forms/Form.phpindex bd63ae049..b1b3c1e17 100644--- a/api/app/Models/Forms/Form.php+++ b/api/app/Models/Forms/Form.php@@ -134,6 +134,7 @@ class Form extends Model implements CachableAttributes'is_pro','views_count','max_file_size',+ 'submissions_count',];/**@@ -178,22 +179,69 @@ class Form extends Model implements CachableAttributespublic function getSubmissionsCountAttribute(){- return $this->submissions()->where('status', FormSubmission::STATUS_COMPLETED)->count();+ // If hydrated from withCount, use it directly (no cache needed)+ if (isset($this->attributes['submissions_count'])) {+ return $this->attributes['submissions_count'];+ }++ // Fallback to cached query for individual form access+ return $this->remember('submissions_count', 15 * 60, function (): int {+ return $this->submissions()->where('status', FormSubmission::STATUS_COMPLETED)->count();+ });}public function getViewsCountAttribute(){- return $this->remember('views_count', 15 * 60, function (): int {- if (config('database.default') === 'mysql') {- return (int) ($this->views()->count() +- $this->statistics()->sum(DB::raw("json_extract(data, '$.views')")));- }+ // If preloaded via scope, use the combined count+ if (isset($this->attributes['total_views_count'])) {+ return (int) $this->attributes['total_views_count'];+ }- return $this->views()->count() +- $this->statistics()->sum(DB::raw("cast(data->>'views' as integer)"));- });+ // Fallback to cached calculation for individual access+ return $this->remember('views_count', 15 * 60, fn () => $this->calculateTotalViews());+ }++ /**+ * Calculate total views from both views table and statistics table+ */+ private function calculateTotalViews(): int+ {+ $directViews = $this->views()->count();+ $statisticsViews = $this->getStatisticsViewsSum();+ return $directViews + $statisticsViews;+ }++ /**+ * Get views sum from statistics table (database agnostic)+ */+ private function getStatisticsViewsSum(): int+ {+ return (int) $this->statistics()->sum(+ config('database.default') === 'mysql'+ ? DB::raw("CAST(JSON_EXTRACT(data, '$.views') AS SIGNED)")+ : DB::raw("CAST(data->>'views' AS INTEGER)")+ );+ }++ /**+ * Scope to efficiently load total views count+ */+ public function scopeWithTotalViews($query)+ {+ $statisticsExpression = config('database.default') === 'mysql'+ ? 'SUM(CAST(JSON_EXTRACT(data, "$.views") AS SIGNED))'+ : 'SUM(CAST(data->>\'views\' AS INTEGER))';++ return $query->addSelect([+ 'total_views_count' => DB::raw(+ 'COALESCE((SELECT COUNT(*) FROM form_views WHERE form_views.form_id = forms.id), 0) + ' .+ 'COALESCE((SELECT ' . $statisticsExpression . ' FROM form_statistics WHERE form_statistics.form_id = forms.id), 0)'+ )+ ]);}++public function setSubmittedTextAttribute($value){// Strip out unwanted htmldiff --git a/api/app/Models/User.php b/api/app/Models/User.phpindex 74c348cf1..90815507f 100644--- a/api/app/Models/User.php+++ b/api/app/Models/User.php@@ -3,6 +3,8 @@namespace App\Models;use App\Models\Forms\Form;+use App\Models\Traits\CachableAttributes;+use App\Models\Traits\CachesAttributes;use App\Notifications\ResetPassword;use App\Notifications\VerifyEmail;use Illuminate\Database\Eloquent\Factories\HasFactory;@@ -13,12 +15,13 @@ use Laravel\Cashier\Billable;use Laravel\Sanctum\HasApiTokens;use Tymon\JWTAuth\Contracts\JWTSubject;-class User extends Authenticatable implements JWTSubject+class User extends Authenticatable implements JWTSubject, CachableAttributes{use Billable;use HasFactory;use Notifiable;use HasApiTokens;+ use CachesAttributes;public const ROLE_ADMIN = 'admin';public const ROLE_USER = 'user';@@ -82,13 +85,30 @@ class User extends Authenticatable implements JWTSubject'is_blocked'];+ protected $cachableAttributes = [+ 'has_forms',+ 'is_subscribed',+ 'is_pro',+ 'active_license',+ ];+public function ownsForm(Form $form){+ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('workspaces')) {+ return $this->workspaces->contains('id', $form->workspace_id);+ }+return $this->workspaces()->where('workspaces.id', $form->workspace_id)->exists();}public function ownsWorkspace(Workspace $workspace){+ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('workspaces')) {+ return $this->workspaces->contains('id', $workspace->id);+ }+return $this->workspaces()->where('workspaces.id', $workspace->id)->exists();}@@ -107,14 +127,30 @@ class User extends Authenticatable implements JWTSubjectpublic function getHasFormsAttribute(){- return $this->workspaces()->whereHas('forms')->exists();+ return $this->remember('has_forms', 10 * 60, function (): bool {+ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('workspaces')) {+ return $this->workspaces->some(function ($workspace) {+ // If workspace has forms relationship loaded, use it+ if ($workspace->relationLoaded('forms')) {+ return $workspace->forms->isNotEmpty();+ }+ // Otherwise fall back to database query for this workspace+ return $workspace->forms()->exists();+ });+ }++ return $this->workspaces()->whereHas('forms')->exists();+ });}public function getIsSubscribedAttribute(){- return $this->subscribed()- || in_array($this->email, config('opnform.extra_pro_users_emails'))- || !is_null($this->activeLicense());+ return $this->remember('is_subscribed', 5 * 60, function (): bool {+ return $this->subscribed()+ || in_array($this->email, config('opnform.extra_pro_users_emails'))+ || !is_null($this->activeLicense());+ });}public function getHasCustomerIdAttribute()@@ -139,8 +175,17 @@ class User extends Authenticatable implements JWTSubjectpublic function getIsProAttribute(){- return $this->workspaces()->get()->some(function ($workspace) {- return $workspace->is_pro;+ return $this->remember('is_pro', 5 * 60, function (): bool {+ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('workspaces')) {+ return $this->workspaces->some(function ($workspace) {+ return $workspace->is_pro;+ });+ }++ return $this->workspaces()->get()->some(function ($workspace) {+ return $workspace->is_pro;+ });});}@@ -247,7 +292,14 @@ class User extends Authenticatable implements JWTSubjectpublic function activeLicense(): ?License{- return $this->licenses()->active()->first();+ return $this->remember('active_license', 10 * 60, function (): ?License {+ // Use loaded relationship if available - UserController loads only active licenses+ if ($this->relationLoaded('licenses')) {+ return $this->licenses->first(); // Already filtered to active in eager load+ }++ return $this->licenses()->active()->first();+ });}/**@@ -296,6 +348,10 @@ class User extends Authenticatable implements JWTSubjectpublic function flushCache(){+ // Clear user's own cached attributes+ $this->flush();++ // Clear related workspace caches$this->workspaces()->with('forms')->get()->each(function (Workspace $workspace) {$workspace->flush();$workspace->forms->each(function (Form $form) {diff --git a/api/app/Models/Workspace.php b/api/app/Models/Workspace.phpindex c44166f59..7e9039db9 100644--- a/api/app/Models/Workspace.php+++ b/api/app/Models/Workspace.php@@ -45,6 +45,7 @@ class Workspace extends Model implements CachableAttributesprotected $cachableAttributes = ['is_pro',+ 'is_trialing','is_enterprise','is_risky','submissions_count',@@ -106,7 +107,11 @@ class Workspace extends Model implements CachableAttributesreturn $this->remember('is_pro', 15 * 60, function (): bool {// Make sure at least one owner is pro- foreach ($this->owners as $owner) {+ $owners = $this->relationLoaded('users')+ ? $this->users->where('pivot.role', 'admin')+ : $this->owners()->get();++ foreach ($owners as $owner) {if ($owner->is_subscribed) {return true;}@@ -123,8 +128,12 @@ class Workspace extends Model implements CachableAttributes}return $this->remember('is_trialing', 15 * 60, function (): bool {- // Make sure at least one owner is pro- foreach ($this->owners as $owner) {+ // Make sure at least one owner is trialing+ $owners = $this->relationLoaded('users')+ ? $this->users->where('pivot.role', 'admin')+ : $this->owners()->get();++ foreach ($owners as $owner) {if ($owner->onTrial()) {return true;}@@ -141,8 +150,12 @@ class Workspace extends Model implements CachableAttributes}return $this->remember('is_enterprise', 15 * 60, function (): bool {- // Make sure at least one owner is pro- foreach ($this->owners as $owner) {+ // Make sure at least one owner has enterprise subscription+ $owners = $this->relationLoaded('users')+ ? $this->users->where('pivot.role', 'admin')+ : $this->owners()->get();++ foreach ($owners as $owner) {if ($owner->has_enterprise_subscription) {return true;}@@ -156,7 +169,11 @@ class Workspace extends Model implements CachableAttributes{return $this->remember('is_risky', 15 * 60, function (): bool {// A workspace is risky if all of his users are risky- foreach ($this->owners as $owner) {+ $owners = $this->relationLoaded('users')+ ? $this->users->where('pivot.role', 'admin')+ : $this->owners()->get();++ foreach ($owners as $owner) {if (!$owner->is_risky) {return false;}@@ -170,7 +187,12 @@ class Workspace extends Model implements CachableAttributes{return $this->remember('submissions_count', 15 * 60, function (): int {$total = 0;- foreach ($this->forms as $form) {+ // Use loaded relationship if available to avoid queries+ $forms = $this->relationLoaded('forms')+ ? $this->forms+ : $this->forms()->get();++ foreach ($forms as $form) {$total += $form->submissions_count;}@@ -181,6 +203,10 @@ class Workspace extends Model implements CachableAttributespublic function getUsersCountAttribute(){return $this->remember('users_count', 15 * 60, function (): int {+ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('users')) {+ return $this->users->count();+ }return $this->users()->count();});}@@ -229,16 +255,35 @@ class Workspace extends Model implements CachableAttributespublic function isAdminUser(?User $user){- return $user ? $this->users()+ if (!$user) {+ return false;+ }++ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('users')) {+ return $this->users->where('id', $user->id)->first()?->pivot->role === User::ROLE_ADMIN;+ }++ return $this->users()->wherePivot('user_id', $user->id)->wherePivot('role', User::ROLE_ADMIN)- ->exists() : false;+ ->exists();}+public function isReadonlyUser(?User $user){- return $user ? $this->users()+ if (!$user) {+ return false;+ }++ // Use loaded relationship if available to avoid queries+ if ($this->relationLoaded('users')) {+ return $this->users->where('id', $user->id)->first()?->pivot->role === User::ROLE_READONLY;+ }++ return $this->users()->wherePivot('user_id', $user->id)->wherePivot('role', User::ROLE_READONLY)- ->exists() : false;+ ->exists();}}diff --git a/api/app/Policies/WorkspacePolicy.php b/api/app/Policies/WorkspacePolicy.phpindex fa64660c4..c345fb2ff 100644--- a/api/app/Policies/WorkspacePolicy.php+++ b/api/app/Policies/WorkspacePolicy.php@@ -52,7 +52,7 @@ class WorkspacePolicypublic function create(User $user){// Check if user already has a workspace- if (!$user->is_pro && $user->workspaces()->count() > 0) {+ if (!$user->is_subscribed && $user->workspaces()->count() > 0) {return Response::deny('You have reached the limit for free workspaces. Upgrade to Pro to create additional workspaces.');}diff --git a/api/app/Providers/AppServiceProvider.php b/api/app/Providers/AppServiceProvider.phpindex 3e92e179a..baf73c4e1 100644--- a/api/app/Providers/AppServiceProvider.php+++ b/api/app/Providers/AppServiceProvider.php@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Storage;use Illuminate\Support\Facades\URL;use Illuminate\Support\Facades\Validator;use Illuminate\Support\Facades\Event;+use Illuminate\Support\Facades\Route;use Illuminate\Support\ServiceProvider;use Laravel\Cashier\Cashier;use Laravel\Dusk\DuskServiceProvider;@@ -45,6 +46,25 @@ class AppServiceProvider extends ServiceProviderEvent::listen(function (\SocialiteProviders\Manager\SocialiteWasCalled $event) {$event->extendSocialite('stripe', \SocialiteProviders\Stripe\Provider::class);});++ // Route model bindings for performance optimization+ Route::bind('workspace', function ($value) {+ return \App\Models\Workspace::with([+ 'users' => fn ($q) => $q->withPivot('role')+ ])->findOrFail((int) $value);+ });++ Route::bind('form', function ($value) {+ // Support both numeric ID and slug resolution (compact, common part outside ternary)+ $query = \App\Models\Forms\Form::with(['workspace.users' => fn ($q) => $q->withPivot('role')]);+ return is_numeric($value)+ ? $query->findOrFail((int) $value)+ : $query->where('slug', $value)->firstOrFail();+ });++ Route::bind('user', function ($value) {+ return \App\Models\User::findOrFail((int) $value);+ });}/**diff --git a/api/app/Providers/EventServiceProvider.php b/api/app/Providers/EventServiceProvider.phpindex 01ed6f73d..a1623642e 100644--- a/api/app/Providers/EventServiceProvider.php+++ b/api/app/Providers/EventServiceProvider.php@@ -40,7 +40,8 @@ class EventServiceProvider extends ServiceProviderFormSpamCheckListener::class,],FormSubmitted::class => [- NotifyFormSubmission::class+ NotifyFormSubmission::class,+ \App\Listeners\Forms\InvalidateFormSubmissionCache::class,],FormSubmissionDeleting::class => [DeleteFormSubmissionFiles::class,diff --git a/api/app/Rules/CustomFieldValidationRule.php b/api/app/Rules/CustomFieldValidationRule.phpindex 9b08283b1..b27a7e0a5 100644--- a/api/app/Rules/CustomFieldValidationRule.php+++ b/api/app/Rules/CustomFieldValidationRule.php@@ -2,6 +2,7 @@namespace App\Rules;+use App\Models\Forms\Form;use App\Service\Forms\FormLogicConditionChecker;use Closure;use Illuminate\Contracts\Validation\ValidationRule;@@ -20,7 +21,7 @@ class CustomFieldValidationRule implements ValidationRule** @return void*/- public function __construct(public array $validation, public array $formData)+ public function __construct(public array $validation, public array $formData, public ?Form $form = null){}@@ -38,9 +39,20 @@ class CustomFieldValidationRule implements ValidationRulereturn true;}+ // Prepare form data with form context if form is provided+ $formDataWithContext = $this->formData;+ if ($this->form) {+ $formDataWithContext = array_merge($this->formData, [+ 'form' => [+ 'id' => $this->form->id,+ 'slug' => $this->form->slug,+ ]+ ]);+ }+return FormLogicConditionChecker::conditionsMet($logicConditions,- $this->formData+ $formDataWithContext);}diff --git a/api/app/Service/Forms/FormExportService.php b/api/app/Service/Forms/FormExportService.phpnew file mode 100644index 000000000..a9ee5a839--- /dev/null+++ b/api/app/Service/Forms/FormExportService.php@@ -0,0 +1,153 @@+<?php++namespace App\Service\Forms;++use App\Models\Forms\Form;+use App\Models\Forms\FormSubmission;+use Illuminate\Support\Facades\Storage;+use Illuminate\Support\Facades\Cache;+use Illuminate\Support\Str;+use Vinkla\Hashids\Facades\Hashids;++class FormExportService+{+ public const SYNC_EXPORT_THRESHOLD = 1000;+ public const CACHE_KEY_PREFIX = 'form_export_job';+ public const EXPORT_FILE_PATH = 'exports/temp/';++ /**+ * Determine if export should be processed synchronously or asynchronously+ */+ public function shouldExportAsync(Form $form): bool+ {+ return $form->submissions()->count() > self::SYNC_EXPORT_THRESHOLD;+ }++ /**+ * Format a single submission for export+ */+ public function formatSubmissionForExport(Form $form, FormSubmission $submission, array $displayColumns): array+ {+ $formatter = (new FormSubmissionFormatter($form, $submission->data))+ ->outputStringsOnly()+ ->setEmptyForNoValue()+ ->showRemovedFields()+ ->showHiddenFields()+ ->useSignedUrlForFiles();++ $formattedData = $formatter->getCleanKeyValue();+ $filteredData = ['id' => Hashids::encode($submission->id)];++ foreach ($displayColumns as $column => $value) {+ if ($value === true) {+ $key = collect($formattedData)->keys()->first(fn ($key) => str_contains($key, $column));+ if ($key) {+ $filteredData[$key] = $formattedData[$key];+ }+ }+ }++ if (isset($displayColumns['created_at']) && $displayColumns['created_at'] === true) {+ $filteredData['created_at'] = $submission->created_at->format('Y-m-d H:i');+ }++ return $filteredData;+ }++ /**+ * Generate CSV content from rows and upload to storage+ */+ public function generateAndUploadCsvFile(array $rows, string $fileName): string+ {+ if (empty($rows)) {+ throw new \Exception('No data to export');+ }++ // Generate CSV content+ $csvContent = $this->generateCsvContent($rows);++ // Upload to configured storage disk+ $filePath = self::EXPORT_FILE_PATH . $fileName;+ $disk = Storage::disk(config('filesystems.default'));++ $disk->put($filePath, $csvContent, [+ 'visibility' => 'private',+ 'Content-Type' => 'text/csv',+ 'Content-Disposition' => 'attachment; filename="' . $fileName . '"'+ ]);++ // Generate temporary URL for download (works for all storage types)+ return $disk->temporaryUrl($filePath, now()->addDay());+ }++ /**+ * Generate CSV content from array of rows+ */+ private function generateCsvContent(array $rows): string+ {+ if (empty($rows)) {+ return '';+ }++ $output = fopen('php://temp', 'r+');++ // Write header row (clean column names)+ $headers = $this->cleanColumnNames(array_keys($rows[0]));+ fputcsv($output, $headers);++ // Write data rows+ foreach ($rows as $row) {+ fputcsv($output, array_values($row));+ }++ rewind($output);+ $csvContent = stream_get_contents($output);+ fclose($output);++ return $csvContent;+ }++ /**+ * Clean column names by removing parenthetical content+ */+ private function cleanColumnNames(array $columnNames): array+ {+ return collect($columnNames)->map(function ($columnName) {+ return preg_replace('/\s\(.*\)/', '', $columnName);+ })->toArray();+ }++ /**+ * Initialize async export job and return job ID+ */+ public function initializeAsyncExport(Form $form, int $userId): string+ {+ $jobId = (string) Str::uuid();+ $cacheKey = $this->getCacheKey($jobId);++ // Initialize cache entry before dispatching job to prevent race condition+ Cache::put($cacheKey, [+ 'status' => 'queued',+ 'progress' => 0,+ 'form_id' => $form->id,+ 'user_id' => $userId,+ 'created_at' => now()->toISOString(),+ 'updated_at' => now()->toISOString(),+ 'processed_submissions' => null,+ 'total_submissions' => null,+ 'file_url' => null,+ 'error_message' => null,+ 'expires_at' => null,+ ], now()->addHours(2));++ return $jobId;+ }++ /**+ * Generate cache key for export job+ */+ public function getCacheKey(string $jobId): string+ {+ return self::CACHE_KEY_PREFIX . ':' . $jobId;+ }+}diff --git a/api/app/Service/Forms/FormLogicConditionChecker.php b/api/app/Service/Forms/FormLogicConditionChecker.phpindex 0603f0157..9af781c4e 100644--- a/api/app/Service/Forms/FormLogicConditionChecker.php+++ b/api/app/Service/Forms/FormLogicConditionChecker.php@@ -386,7 +386,6 @@ class FormLogicConditionCheckertry {return (bool) preg_match('/' . $propertyCondition['value'] . '/', $value);} catch (\Exception $e) {- ray('matches_regex_error', $e);return false;}case 'does_not_match_regex':diff --git a/api/config/filesystems.php b/api/config/filesystems.phpindex 0eb67df7b..3468cc16d 100644--- a/api/config/filesystems.php+++ b/api/config/filesystems.php@@ -48,6 +48,7 @@ return ['root' => storage_path('app'),'visibility' => env('LOCAL_FILESYSTEM_VISIBILITY', 'private'),'directory_visibility' => env('LOCAL_FILESYSTEM_VISIBILITY', 'private'),+ 'serve' => true,],'public' => [diff --git a/api/config/purify.php b/api/config/purify.phpindex 44b2efb1d..768f97d4a 100644--- a/api/config/purify.php+++ b/api/config/purify.php@@ -125,7 +125,7 @@ return [],// 'serializer' => [- // 'disk' => env('FILESYSTEM_DISK', 'local'),+ // 'disk' => env('FILESYSTEM_DRIVER', 'local'),// 'path' => 'purify',// 'cache' => \Stevebauman\Purify\Cache\FilesystemDefinitionCache::class,// ],diff --git a/api/routes/api.php b/api/routes/api.phpindex ac6e7c54d..06bbc8427 100644--- a/api/routes/api.php+++ b/api/routes/api.php@@ -24,7 +24,6 @@ use App\Http\Controllers\Auth\UserInviteController;use App\Http\Controllers\Forms\FormPaymentController;use App\Http\Controllers\WorkspaceController;use App\Http\Controllers\WorkspaceUserController;-use App\Http\Middleware\Form\ResolveFormMiddleware;use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;use Illuminate\Http\Request;use Illuminate\Support\Facades\Route;@@ -82,13 +81,13 @@ Route::group(['middleware' => 'auth.multi'], function () {Route::get('/providers', [OAuthProviderController::class, 'index'])->name('providers');Route::get('/forms', [FormController::class, 'indexAll'])->name('forms.index-all');- Route::get('/forms/{slug}', [FormController::class, 'show'])->name('forms.show');+ Route::get('/forms/{form}', [FormController::class, 'show'])->name('forms.show');Route::prefix('workspaces')->name('workspaces.')->group(function () {Route::get('/', [WorkspaceController::class, 'index'])->name('index');Route::post('/create', [WorkspaceController::class, 'create'])->name('create');- Route::prefix('/{workspaceId}')->group(function () {+ Route::prefix('/{workspace}')->group(function () {Route::get('/users',[WorkspaceUserController::class, 'listUsers']@@ -104,7 +103,7 @@ Route::group(['middleware' => 'auth.multi'], function () {)->name('users.add');Route::delete(- '/users/{userId}/remove',+ '/users/{user}/remove',[WorkspaceUserController::class, 'removeUser'])->name('users.remove');@@ -119,7 +118,7 @@ Route::group(['middleware' => 'auth.multi'], function () {)->name('invites.cancel');Route::put(- '/users/{userId}/update-role',+ '/users/{user}/update-role',[WorkspaceUserController::class, 'updateUserRole'])->name('users.update-role');@@ -139,23 +138,24 @@ Route::group(['middleware' => 'auth.multi'], function () {Route::delete('/', [WorkspaceController::class, 'delete'])->name('delete');Route::middleware('pro-form')->group(function () {- Route::get('form-stats/{formId}', [FormStatsController::class, 'getFormStats'])->name('form.stats');- Route::get('form-stats-details/{formId}', [FormStatsController::class, 'getFormStatsDetails'])->name('form.stats-details');+ Route::get('form-stats/{form}', [FormStatsController::class, 'getFormStats'])->name('form.stats');+ Route::get('form-stats-details/{form}', [FormStatsController::class, 'getFormStatsDetails'])->name('form.stats-details');});});});Route::prefix('forms')->name('forms.')->group(function () {Route::post('/', [FormController::class, 'store'])->name('store');- Route::post('/{id}/workspace/{workspace_id}', [FormController::class, 'updateWorkspace'])->name('workspace.update');- Route::put('/{id}', [FormController::class, 'update'])->name('update')->middleware([ResolveFormMiddleware::class]);- Route::delete('/{id}', [FormController::class, 'destroy'])->name('destroy');- Route::get('/{id}/mobile-editor-email', [FormController::class, 'mobileEditorEmail'])->name('mobile-editor-email');+ Route::post('/{form}/workspace/{workspace}', [FormController::class, 'updateWorkspace'])->name('workspace.update');+ Route::put('/{form}', [FormController::class, 'update'])->name('update');+ Route::delete('/{form}', [FormController::class, 'destroy'])->name('destroy');+ Route::get('/{form}/mobile-editor-email', [FormController::class, 'mobileEditorEmail'])->name('mobile-editor-email');- Route::prefix('/{id}/submissions')->name('submissions.')->group(function () {+ Route::prefix('/{form}/submissions')->name('submissions.')->group(function () {Route::get('/', [FormSubmissionController::class, 'submissions'])->name('index');- Route::put('/{submission_id}', [FormSubmissionController::class, 'update'])->name('update')->middleware([ResolveFormMiddleware::class]);+ Route::put('/{submission_id}', [FormSubmissionController::class, 'update'])->name('update');Route::post('/export', [FormSubmissionController::class, 'export'])->name('export');+ Route::get('/export/status/{jobId}', [FormSubmissionController::class, 'exportStatus'])->name('export.status');Route::get('/file/{filename}', [FormSubmissionController::class, 'submissionFile'])->middleware('signed')->withoutMiddleware(['auth.multi'])@@ -166,13 +166,13 @@ Route::group(['middleware' => 'auth.multi'], function () {// Form Admin toolRoute::put(- '/{id}/regenerate-link/{option}',+ '/{form}/regenerate-link/{option}',[FormController::class, 'regenerateLink'])->where('option', '(uuid|slug)')->name('regenerate-link');Route::post(- '/{id}/duplicate',+ '/{form}/duplicate',[FormController::class, 'duplicate'])->name('duplicate');@@ -182,7 +182,7 @@ Route::group(['middleware' => 'auth.multi'], function () {[FormController::class, 'uploadAsset'])->withoutMiddleware(['auth.multi'])->name('assets.upload');Route::get(- '/{id}/uploaded-file/{filename}',+ '/{form}/uploaded-file/{filename}',[FormController::class, 'viewFile'])->name('uploaded_file');@@ -196,23 +196,23 @@ Route::group(['middleware' => 'auth.multi'], function () {[FormZapierWebhookController::class, 'delete'])->name('integrations.zapier-hooks.delete');Route::get(- '/{id}/integrations',+ '/{form}/integrations',[FormIntegrationsController::class, 'index'])->name('integrations');Route::post(- '/{id}/integration',+ '/{form}/integration',[FormIntegrationsController::class, 'create'])->name('integration.create');Route::put(- '/{id}/integration/{integrationid}',+ '/{form}/integration/{integrationid}',[FormIntegrationsController::class, 'update'])->name('integration.update');Route::delete(- '/{id}/integration/{integrationid}',+ '/{form}/integration/{integrationid}',[FormIntegrationsController::class, 'destroy'])->name('integration.destroy');Route::get(- '/{id}/integration/{integrationid}/events',+ '/{form}/integration/{integrationid}/events',[FormIntegrationsEventController::class, 'index'])->name('integrations.events');});@@ -228,7 +228,7 @@ Route::group(['middleware' => 'auth.multi'], function () {[\App\Http\Controllers\Admin\AdminController::class, 'fetchUser']);Route::get(- 'impersonate/{userId}',+ 'impersonate/{user}',[\App\Http\Controllers\Admin\ImpersonationController::class, 'impersonate']);Route::patch(@@ -263,14 +263,14 @@ Route::group(['middleware' => 'auth.multi'], function () {);Route::group(['prefix' => 'billing'], function () {- Route::get('{userId}/email', [\App\Http\Controllers\Admin\BillingController::class, 'getEmail']);+ Route::get('{user}/email', [\App\Http\Controllers\Admin\BillingController::class, 'getEmail']);Route::patch('/email', [\App\Http\Controllers\Admin\BillingController::class, 'updateEmail']);- Route::get('{userId}/subscriptions', [\App\Http\Controllers\Admin\BillingController::class, 'getSubscriptions']);- Route::get('{userId}/payments', [\App\Http\Controllers\Admin\BillingController::class, 'getPayments']);+ Route::get('{user}/subscriptions', [\App\Http\Controllers\Admin\BillingController::class, 'getSubscriptions']);+ Route::get('{user}/payments', [\App\Http\Controllers\Admin\BillingController::class, 'getPayments']);});Route::group(['prefix' => 'forms'], function () {- Route::get('{userId}/deleted-forms', [\App\Http\Controllers\Admin\FormController::class, 'getDeletedForms']);+ Route::get('{user}/deleted-forms', [\App\Http\Controllers\Admin\FormController::class, 'getDeletedForms']);Route::patch('{slug}/restore', [\App\Http\Controllers\Admin\FormController::class, 'restoreDeletedForm']);});});@@ -306,21 +306,21 @@ Route::prefix('oauth')->name('oauth.')->group(function () {*/Route::prefix('forms')->name('forms.')->group(function () {Route::middleware('protected-form')->group(function () {- Route::get('{slug}/view', [PublicFormController::class, 'view'])->name('view');- Route::post('{slug}/answer', [PublicFormController::class, 'answer'])->name('answer')->middleware(HandlePrecognitiveRequests::class);- Route::get('{slug}/stripe-connect/get-account', [FormPaymentController::class, 'getAccount'])->name('stripe-connect.get-account')->middleware(HandlePrecognitiveRequests::class);- Route::post('{slug}/stripe-connect/payment-intent', [FormPaymentController::class, 'createIntent'])->name('stripe-connect.create-intent')->middleware(HandlePrecognitiveRequests::class);+ Route::get('{form}/view', [PublicFormController::class, 'view'])->name('view');+ Route::post('{form}/answer', [PublicFormController::class, 'answer'])->name('answer')->middleware(HandlePrecognitiveRequests::class);+ Route::get('{form}/stripe-connect/get-account', [FormPaymentController::class, 'getAccount'])->name('stripe-connect.get-account')->middleware(HandlePrecognitiveRequests::class);+ Route::post('{form}/stripe-connect/payment-intent', [FormPaymentController::class, 'createIntent'])->name('stripe-connect.create-intent')->middleware(HandlePrecognitiveRequests::class);// Form content endpoints (user lists, relation lists etc.)Route::get(- '{slug}/users',+ '{form}/users',[PublicFormController::class, 'listUsers'])->name('users.index');});// Get form and submit- Route::get('{slug}', [PublicFormController::class, 'show'])->name('show');- Route::get('{slug}/submissions/{submission_id}', [PublicFormController::class, 'fetchSubmission'])->name('fetchSubmission');+ Route::get('{form}', [PublicFormController::class, 'show'])->name('show');+ Route::get('{form}/submissions/{submission_id}', [PublicFormController::class, 'fetchSubmission'])->name('fetchSubmission');// File uploadsRoute::get('assets/{assetFileName}', [PublicFormController::class, 'showAsset'])->name('assets.show');diff --git a/api/tests/Feature/EnsureUserHasWorkspaceTest.php b/api/tests/Feature/EnsureUserHasWorkspaceTest.phpindex 2267be889..baf9253a3 100644--- a/api/tests/Feature/EnsureUserHasWorkspaceTest.php+++ b/api/tests/Feature/EnsureUserHasWorkspaceTest.php@@ -20,7 +20,7 @@ test('detaching user from last workspace creates a default one via controller',// Act: Admin detaches the user$this->actingAs($admin)- ->deleteJson(route('open.workspaces.users.remove', ['workspaceId' => $workspace->id, 'userId' => $userToDetach->id]))+ ->deleteJson(route('open.workspaces.users.remove', ['workspace' => $workspace, 'user' => $userToDetach]))->assertOk();// Assert: User now has 1 workspace, named 'My Workspace'@@ -55,7 +55,7 @@ test('detaching user from one workspace when they have others does not create de// Act: Admin detaches the user from workspace1$this->actingAs($admin)- ->deleteJson(route('open.workspaces.users.remove', ['workspaceId' => $workspace1->id, 'userId' => $userToDetach->id]))+ ->deleteJson(route('open.workspaces.users.remove', ['workspace' => $workspace1, 'user' => $userToDetach]))->assertOk();// Assert: User now has 1 workspace (workspace2), no default created@@ -77,7 +77,7 @@ test('user leaving last workspace creates a default one', function () {// Act: User leaves the workspace$this->actingAs($user)- ->postJson(route('open.workspaces.leave', ['workspaceId' => $workspace->id]))+ ->postJson(route('open.workspaces.leave', ['workspace' => $workspace]))->assertOk();// Assert: User now has 1 workspace, named 'My Workspace'@@ -109,7 +109,7 @@ test('user leaving one workspace when they have others does not create default o// Act: User leaves workspace1$this->actingAs($user)- ->postJson(route('open.workspaces.leave', ['workspaceId' => $workspace1->id]))+ ->postJson(route('open.workspaces.leave', ['workspace' => $workspace1]))->assertOk();// Assert: User now has 1 workspace (workspace2), no default createddiff --git a/api/tests/Feature/Forms/CustomSmtpTest.php b/api/tests/Feature/Forms/CustomSmtpTest.phpindex 9218e3c77..b6df4df13 100644--- a/api/tests/Feature/Forms/CustomSmtpTest.php+++ b/api/tests/Feature/Forms/CustomSmtpTest.php@@ -8,7 +8,7 @@ it('can not save custom SMTP settings if not pro user', function () {$user = $this->actingAsUser();$workspace = $this->createUserWorkspace($user);- $this->putJson(route('open.workspaces.save-email-settings', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-email-settings', $workspace), ['host' => 'custom.smtp.host','port' => '587','username' => 'custom_username',@@ -22,7 +22,7 @@ it('send email with custom SMTP settings', function () {$form = $this->createForm($user, $workspace);// Set custom SMTP settings- $this->putJson(route('open.workspaces.save-email-settings', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-email-settings', $workspace), ['host' => 'custom.smtp.host','port' => '587','username' => 'custom_username',diff --git a/api/tests/Feature/Forms/FormIntegrationEventTest.php b/api/tests/Feature/Forms/FormIntegrationEventTest.phpindex be1377a44..c85f49acb 100644--- a/api/tests/Feature/Forms/FormIntegrationEventTest.php+++ b/api/tests/Feature/Forms/FormIntegrationEventTest.php@@ -20,14 +20,14 @@ it('can fetch form integration events', function () {]];- $response = $this->postJson(route('open.forms.integration.create', $form->id), $data)+ $response = $this->postJson(route('open.forms.integration.create', $form), $data)->assertSuccessful()->assertJson(['type' => 'success','message' => 'Form Integration was created.']);- $this->getJson(route('open.forms.integrations.events', [$form->id, $response->json('form_integration.id')]))+ $this->getJson(route('open.forms.integrations.events', [$form, $response->json('form_integration.id')]))->assertSuccessful()->assertJsonCount(0);});diff --git a/api/tests/Feature/Forms/FormIntegrationTest.php b/api/tests/Feature/Forms/FormIntegrationTest.phpindex 34278822b..1a307e823 100644--- a/api/tests/Feature/Forms/FormIntegrationTest.php+++ b/api/tests/Feature/Forms/FormIntegrationTest.php@@ -20,25 +20,25 @@ it('can CRUD form integration', function () {]];- $response = $this->postJson(route('open.forms.integration.create', $form->id), $data)+ $response = $this->postJson(route('open.forms.integration.create', $form), $data)->assertSuccessful()->assertJson(['type' => 'success','message' => 'Form Integration was created.']);- $this->getJson(route('open.forms.integrations', $form->id))+ $this->getJson(route('open.forms.integrations', $form))->assertSuccessful()->assertJsonCount(1);- $this->putJson(route('open.forms.integration.update', [$form->id, $response->json('form_integration.id')]), $data)+ $this->putJson(route('open.forms.integration.update', [$form, $response->json('form_integration.id')]), $data)->assertSuccessful()->assertJson(['type' => 'success','message' => 'Form Integration was updated.']);- $this->deleteJson(route('open.forms.integration.destroy', [$form->id, $response->json('form_integration.id')]), $data)+ $this->deleteJson(route('open.forms.integration.destroy', [$form, $response->json('form_integration.id')]), $data)->assertSuccessful()->assertJson(['type' => 'success',@@ -93,7 +93,7 @@ it('can create form integration with checkbox logic', function () {]];- $this->postJson(route('open.forms.integration.create', $form->id), $data)+ $this->postJson(route('open.forms.integration.create', $form), $data)->assertSuccessful()->assertJson(['type' => 'success',diff --git a/api/tests/Feature/Forms/FormLogicTest.php b/api/tests/Feature/Forms/FormLogicTest.phpindex 6b96e959f..35b69a7cd 100644--- a/api/tests/Feature/Forms/FormLogicTest.php+++ b/api/tests/Feature/Forms/FormLogicTest.php@@ -169,8 +169,6 @@ it('preserves multi-select values during validation with logic conditions', func'multi_select_field' => ['Option 1', 'Option 2']];- ray($formData)->blue('Original form data');-$response = $this->postJson(route('forms.answer', $form->slug), $formData);// The validation should fail because text_field is required when Option 1 is selected@@ -183,7 +181,6 @@ it('preserves multi-select values during validation with logic conditions', func]);// Check that the multi-select values were preserved in the validation data- ray($response->json())->purple('Response data');expect($response->json('errors.multi_select_field'))->toBeNull();});@@ -248,12 +245,8 @@ it('correctly handles multi-select values with complex form logic', function ()'0ca51469-6bda-40f4-831c-084f066643d7' => '10km (Most popular)'];- ray($formData)->blue('Original form data');-$response = $this->postJson(route('forms.answer', $form->slug), $formData);- ray($response->json())->purple('Response data');-// Should be successful since all required fields are filled$response->assertSuccessful()->assertJson([@@ -324,12 +317,8 @@ it('preserves multi-select values when building validation rules', function () {'93c8ebe9-b1ba-42ce-841c-bf3b9be1ca4b' => ['Jerusalem Marathon (April 4)']];- ray($formData)->blue('Original form data');-$response = $this->postJson(route('forms.answer', $form->slug), $formData);- ray($response->json())->purple('Response data');-// Should be successful since Jerusalem Marathon doesn't require Additional Days$response->assertSuccessful();diff --git a/api/tests/Feature/Forms/FormStatTest.php b/api/tests/Feature/Forms/FormStatTest.phpindex abd9c4b88..4aadd0f31 100644--- a/api/tests/Feature/Forms/FormStatTest.php+++ b/api/tests/Feature/Forms/FormStatTest.php@@ -39,7 +39,7 @@ it('check formstat chart data', function () {}// Now check chart data- $this->getJson(route('open.workspaces.form.stats', [$workspace->id, $form->id]) . '?date_from=' . now()->subDays(29)->format('Y-m-d') . '&date_to=' . now()->format('Y-m-d'))+ $this->getJson(route('open.workspaces.form.stats', [$workspace, $form]) . '?date_from=' . now()->subDays(29)->format('Y-m-d') . '&date_to=' . now()->format('Y-m-d'))->assertSuccessful()->assertJson(function (\Illuminate\Testing\Fluent\AssertableJson $json) use ($views, $submissions) {return $json->whereType('views', 'array')@@ -97,7 +97,7 @@ it('checks form stats details', function () {[] // No metadata field at all]);- $this->getJson(route('open.workspaces.form.stats-details', [$workspace->id, $form->id]))+ $this->getJson(route('open.workspaces.form.stats-details', [$workspace, $form]))->assertSuccessful()->assertJson(function (\Illuminate\Testing\Fluent\AssertableJson $json) {return $json->has('views')diff --git a/api/tests/Feature/Forms/FormSubmissionExportTest.php b/api/tests/Feature/Forms/FormSubmissionExportTest.phpindex bfc4db8a1..46bfc1111 100644--- a/api/tests/Feature/Forms/FormSubmissionExportTest.php+++ b/api/tests/Feature/Forms/FormSubmissionExportTest.php@@ -36,7 +36,7 @@ it('can export form submissions with selected columns', function () {// Test export with selected columns$response = $this->postJson(route('open.forms.submissions.export', [- 'id' => $form->id,+ 'form' => $form,'columns' => ['name_field' => true,'email_field' => true,@@ -63,7 +63,7 @@ it('cannot export form submissions with invalid columns', function () {]);$response = $this->postJson(route('open.forms.submissions.export', [- 'id' => $form->id,+ 'form' => $form,'columns' => ['invalid_field' => true,'name_field' => true@@ -83,7 +83,7 @@ it('cannot export form submissions from another user form', function () {$this->actingAsProUser();$response = $this->postJson(route('open.forms.submissions.export', [- 'id' => $form->id,+ 'form' => $form,'columns' => []]));diff --git a/api/tests/Feature/PublicApiPolicyTest.php b/api/tests/Feature/PublicApiPolicyTest.phpindex 88458d41f..d0236476c 100644--- a/api/tests/Feature/PublicApiPolicyTest.php+++ b/api/tests/Feature/PublicApiPolicyTest.php@@ -65,7 +65,7 @@ describe('Public API Policy Tests', function () {// Act & AssertSanctum::actingAs($user, ['forms-read']);- $this->getJson(route('open.forms.submissions.index', ['id' => $form->id]))+ $this->getJson(route('open.forms.submissions.index', ['form' => $form]))->assertSuccessful();});@@ -79,7 +79,7 @@ describe('Public API Policy Tests', function () {// Act & AssertSanctum::actingAs($user, ['forms-read']);- $this->deleteJson(route('open.forms.submissions.destroy', ['id' => $form->id, 'submission_id' => $submission->id]))+ $this->deleteJson(route('open.forms.submissions.destroy', ['form' => $form, 'submission_id' => $submission->id]))->assertForbidden();});@@ -93,7 +93,7 @@ describe('Public API Policy Tests', function () {// Act & AssertSanctum::actingAs($user, ['forms-write']);- $this->deleteJson(route('open.forms.submissions.destroy', ['id' => $form->id, 'submission_id' => $submission->id]))+ $this->deleteJson(route('open.forms.submissions.destroy', ['form' => $form, 'submission_id' => $submission->id]))->assertSuccessful();});@@ -109,10 +109,10 @@ describe('Public API Policy Tests', function () {Sanctum::actingAs($userA, ['forms-read']);// Assert: Laravel will return a 401 when a policy check fails on a model binding.- $this->getJson(route('open.forms.show', ['slug' => $formB->slug]))+ $this->getJson(route('open.forms.show', ['form' => $formB]))->assertUnauthorized();- $this->getJson(route('open.forms.submissions.index', ['id' => $formB->id]))+ $this->getJson(route('open.forms.submissions.index', ['form' => $formB]))->assertUnauthorized();});});diff --git a/api/tests/Feature/Submissions/EditSubmissionTest.php b/api/tests/Feature/Submissions/EditSubmissionTest.phpindex cd578009c..99278a28c 100644--- a/api/tests/Feature/Submissions/EditSubmissionTest.php+++ b/api/tests/Feature/Submissions/EditSubmissionTest.php@@ -19,7 +19,7 @@ it('can update form submission', function () {'message' => 'Form submission saved.',]);$submission = $form->submissions()->first();- $updateResponse = $this->putJson(route('open.forms.submissions.update', ['id' => $form->id, 'submission_id' => $submission->id]), $updatedFormData)+ $updateResponse = $this->putJson(route('open.forms.submissions.update', ['form' => $form, 'submission_id' => $submission->id]), $updatedFormData)->assertSuccessful()->assertJson(['type' => 'success',@@ -52,6 +52,6 @@ it('cannot update form submission as non admin', function () {]);$submission = $form->submissions()->first();$this->actingAs($secondUser);- $updateResponse = $this->putJson(route('open.forms.submissions.update', ['id' => $form->id, 'submission_id' => $submission->id]), $updatedFormData)+ $updateResponse = $this->putJson(route('open.forms.submissions.update', ['form' => $form, 'submission_id' => $submission->id]), $updatedFormData)->assertStatus(403);});diff --git a/api/tests/Feature/Submissions/SubmissionTest.php b/api/tests/Feature/Submissions/SubmissionTest.phpindex 9c488b198..2cc3e6cd4 100644--- a/api/tests/Feature/Submissions/SubmissionTest.php+++ b/api/tests/Feature/Submissions/SubmissionTest.php@@ -12,7 +12,7 @@ it('can delete form submission', function () {'message' => 'Form submission saved.',]);$submission = $form->submissions()->first();- $this->deleteJson(route('open.forms.submissions.destroy', ['id' => $form->id, 'submission_id' => $submission->id]))+ $this->deleteJson(route('open.forms.submissions.destroy', ['form' => $form, 'submission_id' => $submission->id]))->assertSuccessful()->assertJson(['type' => 'success',@@ -35,7 +35,7 @@ it('can delete multiple form submissions', function () {$submissionIds = $form->submissions()->pluck('id')->random(2)->toArray();// Delete 2 submissions- $this->postJson(route('open.forms.submissions.destroy-multi', ['id' => $form->id]), ['submissionIds' => $submissionIds])+ $this->postJson(route('open.forms.submissions.destroy-multi', ['form' => $form]), ['submissionIds' => $submissionIds])->assertSuccessful()->assertJson(['type' => 'success',diff --git a/api/tests/Feature/UserManagementTest.php b/api/tests/Feature/UserManagementTest.phpindex 59b42d32c..b49eb3372 100644--- a/api/tests/Feature/UserManagementTest.php+++ b/api/tests/Feature/UserManagementTest.php@@ -19,7 +19,7 @@ beforeEach(function () {it('can register with invite token', function () {$email = '[email protected]';$inviteData = ['email' => $email, 'role' => 'user'];- $this->postJson(route('open.workspaces.users.add', $this->workspace->id), $inviteData)+ $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), $inviteData)->assertSuccessful();expect($this->workspace->invites()->count())->toBe(1);@@ -48,7 +48,7 @@ it('can register with invite token', function () {it('cannot register with expired invite token', function () {$email = '[email protected]';$inviteData = ['email' => $email, 'role' => 'user'];- $this->postJson(route('open.workspaces.users.add', $this->workspace->id), $inviteData)+ $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), $inviteData)->assertSuccessful();expect($this->workspace->invites()->count())->toBe(1);@@ -80,7 +80,7 @@ it('cannot register with expired invite token', function () {it('cannot re-register with accepted invite token', function () {$email = '[email protected]';$inviteData = ['email' => $email, 'role' => 'user'];- $this->postJson(route('open.workspaces.users.add', $this->workspace->id), $inviteData)+ $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), $inviteData)->assertSuccessful();expect($this->workspace->invites()->count())->toBe(1);@@ -130,7 +130,7 @@ it('cannot re-register with accepted invite token', function () {it('can cancel user invite', function () {$email = '[email protected]';$inviteData = ['email' => $email, 'role' => 'user'];- $response = $this->postJson(route('open.workspaces.users.add', $this->workspace->id), $inviteData)+ $response = $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), $inviteData)->assertSuccessful();expect($this->workspace->invites()->count())->toBe(1);@@ -138,7 +138,7 @@ it('can cancel user invite', function () {$token = $userInvite->token;// Cancel the invite- $this->deleteJson(route('open.workspaces.invites.cancel', ['workspaceId' => $this->workspace->id, 'inviteId' => $userInvite->id]))+ $this->deleteJson(route('open.workspaces.invites.cancel', ['workspace' => $this->workspace, 'inviteId' => $userInvite->id]))->assertSuccessful();$this->postJson('/logout')diff --git a/api/tests/Feature/WorkspaceTest.php b/api/tests/Feature/WorkspaceTest.phpindex 4ae20f097..27b54a045 100644--- a/api/tests/Feature/WorkspaceTest.php+++ b/api/tests/Feature/WorkspaceTest.php@@ -47,7 +47,7 @@ it('can create and delete Workspace', function () {foreach ($user->workspaces as $workspace) {$i++;if ($i !== 3) {- $this->deleteJson(route('open.workspaces.delete', $workspace->id))+ $this->deleteJson(route('open.workspaces.delete', $workspace))->assertSuccessful()->assertJson(['type' => 'success',@@ -55,7 +55,7 @@ it('can create and delete Workspace', function () {]);} else {// Last workspace can not delete- $this->deleteJson(route('open.workspaces.delete', $workspace->id))+ $this->deleteJson(route('open.workspaces.delete', $workspace))->assertStatus(403);}}@@ -77,7 +77,7 @@ it('can update workspace', function () {expect($user->workspaces()->count())->toBe(1);$workspace = $user->workspaces()->first();- $this->putJson(route('open.workspaces.update', $workspace->id), [+ $this->putJson(route('open.workspaces.update', $workspace), ['name' => 'Workspace Test Updated','icon' => '🔬',])@@ -92,7 +92,7 @@ it('can save custom domain for workspace', function () {$user = $this->actingAsProUser();$workspace = $this->createUserWorkspace($user);- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace), ['custom_domains' => ['example.com']])->assertSuccessful();@@ -106,7 +106,7 @@ it('can set custom domain to null', function () {$workspace = $this->createUserWorkspace($user);$workspace->update(['custom_domains' => ['example.com']]);- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace), ['custom_domains' => []])->assertSuccessful();@@ -119,7 +119,7 @@ it('validates custom domain format', function () {$user = $this->actingAsProUser();$workspace = $this->createUserWorkspace($user);- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace), ['custom_domains' => ['invalid-domain']])->assertStatus(422)@@ -127,7 +127,7 @@ it('validates custom domain format', function () {'message' => 'Invalid domain: invalid-domain',]);- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace), ['custom_domains' => ['https://example.com']])->assertStatus(422)@@ -142,13 +142,13 @@ it('prevents duplicate custom domains across workspaces', function () {$workspace2 = $this->createUserWorkspace($user);// Set domain for first workspace- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace1->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace1), ['custom_domains' => ['example.com']])->assertSuccessful();// Try to set same domain for second workspace- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace2->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace2), ['custom_domains' => ['example.com']])->assertStatus(422)@@ -163,7 +163,7 @@ it('allows same workspace to update its own custom domain', function () {$workspace->update(['custom_domains' => ['example.com']]);// Same workspace should be able to "update" to the same domain- $this->putJson(route('open.workspaces.save-custom-domains', [$workspace->id]), [+ $this->putJson(route('open.workspaces.save-custom-domains', $workspace), ['custom_domains' => ['example.com']])->assertSuccessful();diff --git a/api/tests/Feature/WorkspaceUserTest.php b/api/tests/Feature/WorkspaceUserTest.phpindex 93ff2fa76..15176de04 100644--- a/api/tests/Feature/WorkspaceUserTest.php+++ b/api/tests/Feature/WorkspaceUserTest.php@@ -13,17 +13,17 @@ beforeEach(function () {it('can list users in a workspace', function () {- $this->getJson(route('open.workspaces.users.index', ['workspaceId' => $this->workspace->id]))+ $this->getJson(route('open.workspaces.users.index', ['workspace' => $this->workspace]))->assertSuccessful()->assertJsonCount(1);});it('can add a user to a workspace', function () {$newUser = User::factory()->create(['email' => '[email protected]']);- $this->postJson(route('open.workspaces.users.add', ['workspaceId' => $this->workspace->id]), [- 'email' => $newUser->email,- 'role' => 'user',- ])+ $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), [+ 'email' => $newUser->email,+ 'role' => 'user',+ ])->assertSuccessful()->assertJson(['message' => 'User has been successfully added to workspace.'@@ -35,10 +35,10 @@ it('can add a user to a workspace', function () {it('can send an invitation email to a non-existing user', function () {Mail::fake();- $this->postJson(route('open.workspaces.users.add', ['workspaceId' => $this->workspace->id]), [- 'email' => '[email protected]',- 'role' => 'user',- ])+ $this->postJson(route('open.workspaces.users.add', ['workspace' => $this->workspace]), [+ 'email' => '[email protected]',+ 'role' => 'user',+ ])->assertSuccessful()->assertJson(['message' => 'Registration invitation email sent to user.'@@ -52,11 +52,11 @@ it('can update user role in a workspace', function () {$this->workspace->users()->attach($existingUser, ['role' => 'user']);$this->putJson(route('open.workspaces.users.update-role', [- 'workspaceId' => $this->workspace->id,- 'userId' => $existingUser->id- ]), [- 'role' => 'admin',- ])+ 'workspace' => $this->workspace,+ 'user' => $existingUser+ ]), [+ 'role' => 'admin',+ ])->assertSuccessful()->assertJson(['message' => 'User role changed successfully.'@@ -68,9 +68,9 @@ it('can remove a user from a workspace', function () {$this->workspace->users()->attach($existingUser);$this->deleteJson(route('open.workspaces.users.remove', [- 'workspaceId' => $this->workspace->id,- 'userId' => $existingUser->id- ]))+ 'workspace' => $this->workspace,+ 'user' => $existingUser+ ]))->assertSuccessful()->assertJson(['message' => 'User removed from workspace successfully.'@@ -80,7 +80,7 @@ it('can remove a user from a workspace', function () {});it('can leave a workspace', function () {- $this->postJson(route('open.workspaces.leave', ['workspaceId' => $this->workspace->id]))+ $this->postJson(route('open.workspaces.leave', ['workspace' => $this->workspace]))->assertSuccessful()->assertJson(['message' => 'You have left the workspace successfully.'diff --git a/api/tests/Feature/Zapier/IntegrationsTest.php b/api/tests/Feature/Zapier/IntegrationsTest.phpindex 4e2b6b02f..d81a94576 100644--- a/api/tests/Feature/Zapier/IntegrationsTest.php+++ b/api/tests/Feature/Zapier/IntegrationsTest.php@@ -44,6 +44,7 @@ test('cannot create an integration without a corresponding ability', function ()Sanctum::actingAs($user);post(route('zapier.webhooks.store'), [+'form_id' => $form->id,'hookUrl' => 'https://zapier.com/hook/test'])@@ -63,6 +64,7 @@ test('cannot create an integration for other users form', function () {Sanctum::actingAs($user);post(route('zapier.webhooks.store'), [+'form_id' => $form->id,'hookUrl' => 'https://zapier.com/hook/test'])@@ -92,7 +94,7 @@ test('delete an integration', function () {assertDatabaseCount('form_integrations', 1);- delete(route('zapier.webhooks.destroy', $integration), [+ delete(route('zapier.webhooks.destroy'), ['form_id' => $form->id,'hookUrl' => $hookUrl,])@@ -120,7 +122,7 @@ test('cannot delete an integration with an incorrect hook url', function () {]]);- delete(route('zapier.webhooks.destroy', $integration), [+ delete(route('zapier.webhooks.destroy'), ['form_id' => $form->id,'hookUrl' => 'https://google.com',])diff --git a/client/api/forms.js b/client/api/forms.jsindex 6bfbb6e3d..4d750c3f5 100644--- a/client/api/forms.js+++ b/client/api/forms.js@@ -29,6 +29,7 @@ export const formsApi = {delete: (formId, submissionId) => apiService.delete(`/open/forms/${formId}/submissions/${submissionId}`),deleteMulti: (formId, submissionIds) => apiService.post(`/open/forms/${formId}/submissions/multi`, { submissionIds }),export: (formId, data) => apiService.post(`/open/forms/${formId}/submissions/export`, data),+ exportStatus: (formId, jobId) => apiService.get(`/open/forms/${formId}/submissions/export/status/${jobId}`),answer: (slug, data, options) => apiService.post(`/forms/${slug}/answer`, data, options)},diff --git a/client/components/open/forms/FormExportModal.vue b/client/components/open/forms/FormExportModal.vuenew file mode 100644index 000000000..6ec251d88--- /dev/null+++ b/client/components/open/forms/FormExportModal.vue@@ -0,0 +1,381 @@+<template>+ <div>+ <!-- Export Button -->+ <UButton+ size="sm"+ color="neutral"+ variant="ghost"+ label="Export"+ :loading="isExporting"+ @click="startExport"+ />++ <!-- Export Progress Modal -->+ <UModal v-model:open="showModal">+ <template #content>+ <div class="p-6 space-y-4">+ <VTransition name="fade">+ <!-- Queued State -->+ <div v-if="exportStatus === 'queued'" key="queued" class="text-center space-y-4">+ <div class="w-16 h-16 mx-auto relative">+ <!-- Animated pulse ring -->+ <div class="absolute inset-0 bg-blue-100 rounded-full animate-ping opacity-75"></div>+ <div class="relative w-full h-full bg-blue-200 rounded-full flex items-center justify-center">+ <UIcon name="i-heroicons-clock" class="w-8 h-8 text-blue-600" />+ </div>+ </div>+ <div class="space-y-2">+ <p class="text-neutral-700 font-medium">Export queued</p>+ <p class="text-sm text-neutral-500">Waiting for processing to begin...</p>+ </div>+ </div>++ <!-- Progress Bar -->+ <div v-else-if="exportStatus === 'processing'" key="processing" class="text-center space-y-4">+ <div class="w-20 h-20 mx-auto relative">+ <!-- Spinning progress circle -->+ <svg class="w-full h-full transform -rotate-90" viewBox="0 0 64 64">+ <circle cx="32" cy="32" r="28" fill="none" stroke="#e5e7eb" stroke-width="4"></circle>+ <circle+ cx="32" cy="32" r="28" fill="none" stroke="#3b82f6" stroke-width="4"+ stroke-linecap="round"+ stroke-dasharray="175.93"+ :stroke-dashoffset="175.93 - (175.93 * smoothProgress / 100)"+ class="transition-all duration-500 ease-out"+ ></circle>+ </svg>+ <div class="absolute inset-0 flex items-center justify-center">+ <span class="text-lg font-bold text-blue-600">{{ Math.round(smoothProgress) }}%</span>+ </div>+ </div>+ <div class="space-y-2">+ <p class="text-neutral-700 font-semibold">Processing submissions</p>+ <p class="text-sm text-neutral-500">This may take a few moments...</p>+ </div>+ </div>++ <!-- Success State -->+ <div v-else-if="exportStatus === 'completed'" key="completed" class="text-center space-y-4">+ <div class="w-16 h-16 mx-auto bg-green-100 rounded-full flex items-center justify-center">+ <UIcon name="i-heroicons-check" class="w-8 h-8 text-green-600" />+ </div>+ <div class="space-y-2">+ <p class="text-green-600 font-semibold text-lg">Export completed!</p>+ <p class="text-sm text-neutral-600">Your download should start automatically</p>+ </div>+ </div>++ <!-- Error State -->+ <div v-else-if="exportStatus === 'failed'" key="failed" class="text-center space-y-4">+ <div class="w-16 h-16 mx-auto bg-red-100 rounded-full flex items-center justify-center">+ <UIcon name="i-heroicons-exclamation-triangle" class="w-8 h-8 text-red-600" />+ </div>+ <div class="space-y-3">+ <p class="text-red-600 font-semibold text-lg">Export failed</p>+ <p class="text-sm text-neutral-600">{{ exportError }}</p>+ <UButton color="red" @click="closeModal">Close</UButton>+ </div>+ </div>++ <!-- Loading State -->+ <div v-else key="loading" class="text-center space-y-4">+ <div class="w-16 h-16 mx-auto relative">+ <div class="absolute inset-0 bg-neutral-200 rounded-full animate-pulse"></div>+ <div class="relative w-full h-full bg-neutral-100 rounded-full flex items-center justify-center">+ <UIcon name="i-heroicons-arrow-down-tray" class="w-8 h-8 text-neutral-500 animate-bounce" />+ </div>+ </div>+ <div class="space-y-2">+ <p class="text-neutral-700 font-medium">Starting export</p>+ <p class="text-sm text-neutral-500">Please wait...</p>+ </div>+ </div>+ </VTransition>+ </div>+ </template>+ </UModal>+ </div>+</template>++<script setup>+import { formsApi } from '~/api'+import VTransition from '~/components/global/transitions/VTransition.vue'++const props = defineProps({+ form: {+ type: Object,+ required: true+ },+ columns: {+ type: Object,+ required: true+ }+})++// Internal state - no props needed+const showModal = ref(false)+const isExporting = ref(false)+const exportJobId = ref(null)+const exportProgress = ref(0)+const exportStatus = ref(null)+const exportError = ref(null)+const pollingInterval = ref(null)++// Continuous progress system+const learnedSpeed = ref(0) // Real speed learned from API calls (% per second)+const smoothProgress = ref(0)+const animationFrame = ref(null)+const lastApiCall = ref(null)+const progressStartTime = ref(null)++const startExport = () => {+ if (isExporting.value) return++ isExporting.value = true+ exportError.value = null++ // Reset progress tracking+ smoothProgress.value = 0+ learnedSpeed.value = 0+ lastApiCall.value = null+ progressStartTime.value = Date.now()++ formsApi.submissions.export(props.form.id, {+ columns: props.columns+ }).then(response => {+ // Check if this is an async export+ if (response.is_async) {+ // Start async export with polling+ exportJobId.value = response.job_id+ exportStatus.value = 'queued'+ exportProgress.value = 0+ showModal.value = true+ startPolling()+ } else {+ // Handle sync export (direct download)+ handleDirectDownload(response)+ isExporting.value = false+ }+ }).catch((error) => {+ console.error(error)+ exportError.value = error.response?.data?.message || 'Export failed'+ exportStatus.value = 'failed'+ showModal.value = true+ isExporting.value = false+ })+}++const handleDirectDownload = (data) => {+ // Convert string to Blob if needed+ let blob+ if (typeof data === 'string') {+ blob = new Blob([data], { type: 'text/csv;charset=utf-8;' })+ } else if (data instanceof Blob) {+ blob = data+ } else {+ throw new Error('Invalid export data format')+ }++ const filename = `${props.form.slug}-${Date.now()}-submissions.csv`+ const a = document.createElement("a")+ document.body.appendChild(a)+ a.style = "display: none"+ const url = window.URL.createObjectURL(blob)+ a.href = url+ a.download = filename+ a.click()+ window.URL.revokeObjectURL(url)+ document.body.removeChild(a)+}++const startPolling = () => {+ if (pollingInterval.value) {+ clearInterval(pollingInterval.value)+ }++ pollingInterval.value = setInterval(() => {+ checkExportStatus()+ }, 5000) // Poll every 5 seconds++ // Initial check+ checkExportStatus()+}++// Start smooth continuous progress when processing begins+watch(exportStatus, (newStatus) => {+ if (newStatus === 'processing') {+ startContinuousProgress()+ } else {+ stopProgressAnimation()+ }+})++const checkExportStatus = () => {+ if (!exportJobId.value) return++ formsApi.submissions.exportStatus(props.form.id, exportJobId.value)+ .then(response => {+ exportStatus.value = response.status+ const newProgress = response.progress || 0++ // Update our learned speed from real API data+ if (exportStatus.value === 'processing') {+ updateProgressWithApiData(newProgress)+ } else {+ exportProgress.value = newProgress+ smoothProgress.value = newProgress+ }++ if (response.status === 'completed') {+ stopPolling()+ stopProgressAnimation()+ isExporting.value = false+ smoothProgress.value = 100++ if (response.file_url) {+ // Download the file+ const a = document.createElement("a")+ document.body.appendChild(a)+ a.style = "display: none"+ a.href = response.file_url+ a.download = `${props.form.slug}-submissions.csv`+ a.click()+ document.body.removeChild(a)++ // Close modal after a short delay+ setTimeout(() => {+ closeModal()+ }, 1000)+ }+ } else if (response.status === 'failed') {+ stopPolling()+ stopProgressAnimation()+ isExporting.value = false+ exportError.value = response.error_message || 'Export failed'+ }+ })+ .catch(error => {+ console.error('Polling error:', error)+ stopPolling()+ stopProgressAnimation()+ isExporting.value = false+ exportError.value = 'Failed to check export status'+ })+}++const updateProgressWithApiData = (newProgress) => {+ const now = Date.now()+ const progressDiff = newProgress - exportProgress.value++ if (progressDiff > 0 && lastApiCall.value) {+ // Calculate actual time elapsed since last API call+ const timeElapsed = (now - lastApiCall.value) / 1000 // seconds++ // Calculate real progress speed (% per second)+ const realSpeed = progressDiff / timeElapsed++ // Update learned speed (use moving average for stability)+ if (learnedSpeed.value === 0) {+ learnedSpeed.value = realSpeed+ } else {+ // Weighted average: 70% new data, 30% previous+ learnedSpeed.value = (realSpeed * 0.7) + (learnedSpeed.value * 0.3)+ }++ // If our continuous progress is behind the real progress, catch up quickly+ if (smoothProgress.value < newProgress - 5) {+ smoothProgress.value = newProgress - 2 // Stay slightly behind real progress+ }++ exportProgress.value = newProgress+ }++ lastApiCall.value = now+}++// Truly continuous progress that never stops moving+const startContinuousProgress = () => {+ let lastFrameTime = Date.now()++ const animate = () => {+ if (exportStatus.value === 'processing' && smoothProgress.value < 95) {+ const now = Date.now()+ const deltaTime = (now - lastFrameTime) / 1000 // seconds since last frame+ lastFrameTime = now++ // Calculate current speed based on progress phase+ let currentSpeed = 0++ if (smoothProgress.value < 5) {+ // Phase 1: Initial slow progress (0-5%)+ currentSpeed = 0.2 // 0.2% per second - very slow but visible+ } else if (smoothProgress.value < 15 && learnedSpeed.value === 0) {+ // Phase 2: Still learning, slightly faster+ currentSpeed = 0.4 // 0.4% per second+ } else if (learnedSpeed.value > 0) {+ // Phase 3: Use learned speed (conservative)+ currentSpeed = learnedSpeed.value * 0.5 // 50% of real speed++ if (smoothProgress.value > 30) {+ // Phase 4: More confident, use 70% of learned speed+ currentSpeed = learnedSpeed.value * 0.7+ }++ if (smoothProgress.value > 85) {+ // Phase 5: Slow down near completion+ const slowdownFactor = Math.max(0.2, (95 - smoothProgress.value) / 10)+ currentSpeed *= slowdownFactor+ }+ } else {+ // Fallback: slow but steady progress+ currentSpeed = 0.3+ }++ // ALWAYS move forward (this is the key!)+ const increment = currentSpeed * deltaTime+ smoothProgress.value = Math.min(smoothProgress.value + increment, 95)++ animationFrame.value = requestAnimationFrame(animate)+ }+ }++ if (animationFrame.value) {+ cancelAnimationFrame(animationFrame.value)+ }+ animationFrame.value = requestAnimationFrame(animate)+}++const stopProgressAnimation = () => {+ if (animationFrame.value) {+ cancelAnimationFrame(animationFrame.value)+ animationFrame.value = null+ }+}++const stopPolling = () => {+ if (pollingInterval.value) {+ clearInterval(pollingInterval.value)+ pollingInterval.value = null+ }+}++const closeModal = () => {+ showModal.value = false+ exportJobId.value = null+ exportStatus.value = null+ exportProgress.value = 0+ smoothProgress.value = 0+ learnedSpeed.value = 0+ lastApiCall.value = null+ progressStartTime.value = null+ exportError.value = null+ stopPolling()+ stopProgressAnimation()+}++// Cleanup on unmount+onUnmounted(() => {+ stopPolling()+ stopProgressAnimation()+})+</script>\ No newline at end of filediff --git a/client/components/open/forms/components/FormStatusBadges.vue b/client/components/open/forms/components/FormStatusBadges.vueindex d4b15a53f..a5c4c8d2d 100644--- a/client/components/open/forms/components/FormStatusBadges.vue+++ b/client/components/open/forms/components/FormStatusBadges.vue@@ -73,10 +73,10 @@<UBadgecolor="neutral"variant="subtle"- icon="i-heroicons-chart-bar"+ icon="i-heroicons-lock-closed":size="size">- Submissions full+ Limit reached</UBadge></UTooltip></template>diff --git a/client/components/open/forms/components/FormSubmissions.vue b/client/components/open/forms/components/FormSubmissions.vueindex 1b1424e06..da456d8dc 100644--- a/client/components/open/forms/components/FormSubmissions.vue+++ b/client/components/open/forms/components/FormSubmissions.vue@@ -4,11 +4,15 @@<OpenTablev-if="form"ref="table"- :data="tableData"- :loading="isLoading"+ :data="submissions"+ :loading="isLoading || isFetching":form="form"+ :pagination="pagination"+ @search="handleSearch"+ @filter="handleFilter"+ @page-change="handlePageChange"@deleted="onDeleteRecord"- @updated="(submission)=>onUpdateRecord(submission)"+ @updated="onUpdateRecord"@multi-delete="onDeleteMultiRecord"/>@@ -39,88 +43,60 @@</template><script setup>+import { useQueryClient } from '@tanstack/vue-query'import OpenTable from '~/components/open/tables/OpenTable.vue'-import { formsApi } from '~/api/forms'+import { useFormSubmissions } from '~/composables/query/forms/useFormSubmissions'const props = defineProps({form: { type: Object, required: true },})-const recordStore = useRecordsStore()-const tableData = storeToRefs(recordStore).getAll-const route = useRoute()-const slug = route.params.slug--const fullyLoaded = ref(false)+const queryClient = useQueryClient()const table = ref(null)-const isLoading = computed(() => {- return recordStore.loading-})--onMounted(() => {- onFormChange()-})--watch(() => props.form?.id, () => {- onFormChange()-})+const { paginatedList } = useFormSubmissions()+const {+ submissions,+ pagination,+ isLoading,+ isFetching,+ setSearch,+ setStatus,+ setPage+} = paginatedList(computed(() => props.form?.id))-const onFormChange = () => {- if (props.form === null || props.form.slug !== slug) {- return- }- fullyLoaded.value = false- getSubmissionsData()+const handleSearch = (searchTerm) => {+ setSearch(searchTerm)}-const getSubmissionsData = () => {- if (fullyLoaded.value) {- return+const handleFilter = (filters) => {+ if (filters.status) {+ setStatus(filters.status)}-- recordStore.startLoading()- formsApi.submissions.list(props.form.id, { query: { page: 1 } }).then((firstResponse) => {- recordStore.save(firstResponse.data.map((record) => record.data))-- const lastPage = firstResponse.meta.last_page-- if (lastPage > 1) {- // Create an array of promises for remaining pages- const remainingPages = Array.from({ length: lastPage - 1 }, (_, i) => {- const page = i + 2 // Start from page 2- return formsApi.submissions.list(props.form.id, { query: { page } })- })-- // Fetch all remaining pages in parallel- return Promise.all(remainingPages)- }- return []- }).then(responses => {- // Save all responses data- responses.forEach(response => {- recordStore.save(response.data.map((record) => record.data))- })-- fullyLoaded.value = true- recordStore.stopLoading()- }).catch(() => {- recordStore.stopLoading()- })}+const handlePageChange = (page) => {+ setPage(page)+}-const onUpdateRecord = (submission) => {- recordStore.save(submission)+const onUpdateRecord = (_submission) => {+ // Invalidate to refetch current page+ queryClient.invalidateQueries({+ queryKey: ['forms', props.form.id, 'submissions', 'paginated']+ })}-const onDeleteRecord = (submission) => {- recordStore.remove(submission)+const onDeleteRecord = (_submission) => {+ // Invalidate to refetch current page+ queryClient.invalidateQueries({+ queryKey: ['forms', props.form.id, 'submissions', 'paginated']+ })}-const onDeleteMultiRecord = (submissionIds) => {- submissionIds.forEach(id => {- recordStore.remove(id)+const onDeleteMultiRecord = (_submissionIds) => {+ // Invalidate to refetch current page+ queryClient.invalidateQueries({+ queryKey: ['forms', props.form.id, 'submissions', 'paginated']})}</script>diff --git a/client/components/open/forms/components/form-components/FormEditorPreview.vue b/client/components/open/forms/components/form-components/FormEditorPreview.vueindex f9b811b7b..3bd07bd11 100644--- a/client/components/open/forms/components/form-components/FormEditorPreview.vue+++ b/client/components/open/forms/components/form-components/FormEditorPreview.vue@@ -90,13 +90,7 @@</div></div></transition>- <div v-if="recordLoading">- <p class="text-center p-4">- <loader class="h-6 w-6 text-blue-500 mx-auto" />- </p>- </div><open-complete-form- v-show="!recordLoading"ref="formPreview"class="w-full mx-auto py-5":class="{'max-w-lg': form && (form.width === 'centered'),'px-7': !isExpanded, 'px-3': isExpanded}"@@ -115,7 +109,6 @@import { computed, ref, watch, onMounted } from 'vue'import OpenCompleteForm from '../../OpenCompleteForm.vue'import {handleDarkMode, useDarkMode} from "~/lib/forms/public-page.js"-import { useRecordsStore } from '~/stores/records'import { useWorkingFormStore } from '~/stores/working_form'import { storeToRefs } from 'pinia'import { FormMode } from "~/lib/forms/FormModeStrategy.js"@@ -124,7 +117,6 @@ import TrackClick from '~/components/global/TrackClick.vue'const { hideChat, showChat } = useCrisp()-const recordsStore = useRecordsStore()const workingFormStore = useWorkingFormStore()const parent = ref(null)@@ -140,7 +132,6 @@ watch(isExpanded, (expanded) => {})const { content: form } = storeToRefs(workingFormStore)-const recordLoading = computed(() => recordsStore.loading)const darkMode = useDarkMode(parent)// Use PREVIEW mode when not expanded, TEST mode when expandeddiff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vueindex ea9c71f61..06a47943f 100644--- a/client/components/open/tables/OpenTable.vue+++ b/client/components/open/tables/OpenTable.vue@@ -3,7 +3,7 @@ref="root":class="['flex-1 divide-y divide-accented w-full flex flex-col',- { 'fixed inset-0 z-50 bg-white dark:bg-neutral-900 z-[70]': isExpanded,+ { 'fixed inset-0 bg-white dark:bg-neutral-900 z-[70]': isExpanded,'border-t mt-4': !isExpanded}]"@@ -15,14 +15,14 @@class="max-w-sm min-w-[12ch]"placeholder="Search..."icon="i-heroicons-magnifying-glass-solid"- v-model="search"+ v-model="searchInput"/><USelectMenusize="sm"variant="ghost"class="w-24"v-if="hasStatus"- v-model="selectedStatus"+ v-model="statusFilter"value-key="value":items="statusList":search-input="false"@@ -43,14 +43,11 @@@click="onDeleteMultiClick"/>- <UButton- size="sm"- color="neutral"- variant="ghost"- label="Export"- :loading="exportLoading"- @click="downloadAsCsv"+ <FormExportModal+ :form="form"+ :columns="columnVisibility"/>+<UButtonsize="sm"color="neutral"@@ -58,6 +55,28 @@:icon="isExpanded ? 'i-heroicons-arrows-pointing-in' : 'i-heroicons-arrows-pointing-out'"@click="toggleExpanded"/>++ <!-- Add pagination section -->+ <UPagination+ v-if="pagination && pagination.last_page > 1"+ v-model:page="pagination.current_page"+ :items-per-page="pagination.per_page"+ :total="pagination.total"+ size="sm"+ :sibling-count="0"+ :ui="{+ wrapper: 'w-auto',+ list: 'gap-0',+ ellipsis: 'hidden',+ first: 'hidden',+ last: 'hidden'+ }"+ @update:page="$emit('page-change', $event)"+ >+ <template #item="{ page, pageCount }">+ <span class="text-sm font-medium px-2">{{ page }} of {{ pageCount }}</span>+ </template>+ </UPagination></div><UTable@@ -139,13 +158,15 @@</div></template></UTable>++</div></template><script setup>-import { formsApi } from '~/api'import { useEventListener, refDebounced } from '@vueuse/core'import { useTableState } from '~/composables/components/tables/useTableState'+import FormExportModal from '~/components/open/forms/FormExportModal.vue'import OpenText from "./components/OpenText.vue"import OpenUrl from "./components/OpenUrl.vue"import OpenSelect from "./components/OpenSelect.vue"@@ -158,7 +179,7 @@ import OpenSubmissionStatus from "./components/OpenSubmissionStatus.vue"import RecordOperations from "../components/RecordOperations.vue"import TableHeader from "./components/TableHeader.vue"import TableColumnManager from "./components/TableColumnManager.vue"-import Fuse from "fuse.js"+import { formsApi } from "~/api/forms"const props = defineProps({data: {@@ -173,9 +194,13 @@ const props = defineProps({type: Object,default: () => null,},+ pagination: {+ type: Object,+ default: () => null,+ },})-const emit = defineEmits(["updated", "deleted", "multi-delete"])+const emit = defineEmits(["updated", "deleted", "multi-delete", "search", "filter", "page-change"])// Get workspace for table stateconst { current: workspace } = useCurrentWorkspace()@@ -217,17 +242,25 @@ const fieldComponents = {status: OpenSubmissionStatus,}-const exportLoading = ref(false)const table = ref(null)const root = ref(null)const topBar = ref(null)const isExpanded = ref(false)const maxHeight = ref('800px') // fallback default-const search = ref("")-const debouncedSearch = refDebounced(search, 300)-const selectedStatus = ref('all')+const searchInput = ref("")+const debouncedSearch = refDebounced(searchInput, 300)+const statusFilter = ref('all')const alert = useAlert()+// Watch and emit instead of filtering locally:+watch(debouncedSearch, (newSearch) => {+ emit('search', newSearch)+})++watch(statusFilter, (newStatus) => {+ emit('filter', { status: newStatus })+})+// Table row selectionconst rowSelection = ref({})const multiDeleteLoading = ref(false)@@ -272,29 +305,8 @@ const sortedData = computed(() => {return props.data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at))})-const filteredTableData = computed(() => {- let data = [...props.data]-- // Status filter (client-side)- if (hasStatus.value && selectedStatus.value !== 'all') {- data = data.filter(row => {- if (selectedStatus.value === 'completed') return row.status !== 'partial'- if (selectedStatus.value === 'partial') return row.status === 'partial'- return true- })- }-- // Search (client-side, fuzzy)- if (debouncedSearch.value && debouncedSearch.value.trim() !== "") {- const fuse = new Fuse(data, {- keys: allColumns.value.map(col => col.id).filter(id => id !== 'actions'),- threshold: 0.4,- })- return fuse.search(debouncedSearch.value).map(res => res.item)- } else {- return sortedData.value- }-})+// Replace with simple data pass-through:+const filteredTableData = computed(() => props.data || [])const hasStatus = computed(() => {return props.form?.is_pro && (props.form.enable_partial_submissions ?? false)@@ -366,41 +378,4 @@ onMounted(() => {})useEventListener(window, 'resize', computeMaxHeight)--// Download as CSV-const downloadAsCsv = () => {- if (exportLoading.value) {- return- }-- exportLoading.value = true- formsApi.submissions.export(props.form.id, {- columns: columnVisibility.value- }).then(data => {-- // Convert string to Blob if needed- let blob- if (typeof data === 'string') {- blob = new Blob([data], { type: 'text/csv;charset=utf-8;' })- } else if (data instanceof Blob) {- blob = data- } else {- throw new Error('Invalid export data format')- }-- const filename = `${props.form.slug}-${Date.now()}-submissions.csv`- const a = document.createElement("a")- document.body.appendChild(a)- a.style = "display: none"- const url = window.URL.createObjectURL(blob)- a.href = url- a.download = filename- a.click()- window.URL.revokeObjectURL(url)- }).catch((error) => {- console.error(error)- }).finally(() => {- exportLoading.value = false- })-}-</script>\ No newline at end of file+</script>\ No newline at end of filediff --git a/client/composables/query/forms/useFormSubmissions.js b/client/composables/query/forms/useFormSubmissions.jsindex 6b3deec42..bfd349b8c 100644--- a/client/composables/query/forms/useFormSubmissions.js+++ b/client/composables/query/forms/useFormSubmissions.js@@ -1,4 +1,4 @@-import { useQueryClient, useQuery, useMutation } from '@tanstack/vue-query'+import { useQueryClient, useQuery, useMutation, keepPreviousData } from '@tanstack/vue-query'import { formsApi } from '~/api/forms'export function useFormSubmissions() {@@ -33,6 +33,104 @@ export function useFormSubmissions() {})}+ const paginatedList = (formId, options = {}) => {+ const page = ref(1)+ const search = ref('')+ const status = ref('all')+ const perPage = ref(100)++ // Debounced search (500ms)+ const debouncedSearch = refDebounced(search, 500)++ // Query key changes trigger refetch+ const queryKey = computed(() => [+ 'forms',+ toValue(formId),+ 'submissions',+ 'paginated',+ page.value,+ debouncedSearch.value,+ status.value,+ perPage.value+ ])++ const query = useQuery({+ queryKey,+ queryFn: async () => {+ const params = {+ page: page.value,+ per_page: perPage.value+ }++ if (debouncedSearch.value) {+ params.search = debouncedSearch.value+ }++ if (status.value !== 'all') {+ params.status = status.value+ }++ return await formsApi.submissions.list(toValue(formId), { query: params })+ },+ placeholderData: keepPreviousData,+ staleTime: 30000, // 30 seconds+ enabled: computed(() => !!toValue(formId)),+ ...options+ })++ // Computed properties+ const submissions = computed(() =>+ query.data.value?.data?.map(record => record.data) || []+ )++ const pagination = computed(() => query.data.value?.meta || null)++ // Actions that reset to page 1+ const setSearch = (value) => {+ search.value = value+ page.value = 1+ }++ const setStatus = (value) => {+ status.value = value+ page.value = 1+ }++ const setPage = (value) => {+ page.value = value+ }++ // Reset when form changes+ watch(() => toValue(formId), () => {+ page.value = 1+ search.value = ''+ status.value = 'all'+ })++ return {+ // Data+ submissions,+ pagination,++ // States+ isLoading: query.isLoading,+ isFetching: query.isFetching,+ isError: query.isError,+ error: query.error,+ isPlaceholderData: query.isPlaceholderData,++ // Current values (readonly)+ page: readonly(page),+ search: readonly(search),+ status: readonly(status),++ // Actions+ setSearch,+ setStatus,+ setPage+ }+ }+const submissionDetail = (slug, submissionId, options = {}) => {return useQuery({queryKey: ['submissions', submissionId],@@ -115,6 +213,7 @@ export function useFormSubmissions() {return {submissions,paginatedSubmissions,+ paginatedList,submissionDetail,updateSubmission,deleteSubmission,diff --git a/client/pages/forms/[slug]/show/submissions.vue b/client/pages/forms/[slug]/show/submissions.vueindex d76a8cfee..8ebf52141 100644--- a/client/pages/forms/[slug]/show/submissions.vue+++ b/client/pages/forms/[slug]/show/submissions.vue@@ -18,7 +18,5 @@ useOpnSeoMeta({: "Form Submissions",})-onBeforeRouteLeave(() => {- useRecordsStore().resetState()-})+</script>diff --git a/client/stores/records.js b/client/stores/records.jsdeleted file mode 100644index 2d2ed7fce..000000000--- a/client/stores/records.js+++ /dev/null@@ -1,19 +0,0 @@-import { defineStore } from "pinia"-import { useContentStore } from "~/composables/stores/useContentStore"--/**- * Loads records from database- */-export const useRecordsStore = defineStore("records", () => {- const contentStore = useContentStore()-- const loadRecord = (request) => {- contentStore.resetState()- contentStore.startLoading()- return request.then((data) => {- contentStore.save(data)- contentStore.stopLoading()- })- }- return { ...contentStore, loadRecord }-})diff --git a/docker-compose.dev.yml b/docker-compose.dev.ymlindex 4e045bb21..96c8a52de 100644--- a/docker-compose.dev.yml+++ b/docker-compose.dev.yml@@ -30,7 +30,7 @@ services:SESSION_DRIVER: fileQUEUE_CONNECTION: sync# Storage settings- FILESYSTEM_DISK: local+ FILESYSTEM_DRIVER: localLOCAL_FILESYSTEM_VISIBILITY: public# Mail settings (development - uses log driver)MAIL_MAILER: log