Skip to content

Beautiful Open-Source Form Builder

Admin edit submission (#886)

Chirag Chhatraladc337a937c04
diff --git a/api/app/Http/Controllers/Forms/FormSubmissionController.php b/api/app/Http/Controllers/Forms/FormSubmissionController.php
index 95035dc9d..f0b00da77 100644
--- a/api/app/Http/Controllers/Forms/FormSubmissionController.php
+++ b/api/app/Http/Controllers/Forms/FormSubmissionController.php
@@ -71,14 +71,16 @@ class FormSubmissionController extends Controller
public function update(AnswerFormRequest $request, Form $form, $submission_id)
{
- $this->authorize('update', $form);
+ $submission = $form->submissions()->where('id', $submission_id)->firstOrFail();
+ $submission->setRelation('form', $form);
+ $this->authorize('update', $submission);
$submissionData = $request->validated();
- $submissionData['submission_id'] = $submission_id;
- $job = new StoreFormSubmissionJob($form, $submissionData);
- $job->handle();
+ $submissionData['submission_id'] = $submission->id;
+ (new StoreFormSubmissionJob($form, $submissionData))->handle();
- $data = new FormSubmissionResource(FormSubmission::with('form')->findOrFail($submission_id));
+ $submission = $submission->fresh()->setRelation('form', $form);
+ $data = new FormSubmissionResource($submission);
return $this->success([
'message' => 'Record successfully updated.',
diff --git a/api/app/Http/Controllers/Forms/PublicFormController.php b/api/app/Http/Controllers/Forms/PublicFormController.php
index 1e0e6f230..55f309bb1 100644
--- a/api/app/Http/Controllers/Forms/PublicFormController.php
+++ b/api/app/Http/Controllers/Forms/PublicFormController.php
@@ -8,7 +8,6 @@ use App\Models\Forms\Form;
use App\Http\Resources\FormResource;
use App\Http\Resources\FormSubmissionResource;
use App\Jobs\Form\StoreFormSubmissionJob;
-use App\Models\Forms\FormSubmission;
use App\Service\Forms\Analytics\UserAgentHelper;
use App\Service\Forms\FormSubmissionProcessor;
use App\Service\Forms\FormCleaner;
@@ -152,6 +151,9 @@ class PublicFormController extends Controller
public function answer(AnswerFormRequest $request, Form $form, FormSubmissionProcessor $formSubmissionProcessor)
{
+ // Check if user can answer this form
+ $this->authorize('answer', $form);
+
$isFirstSubmission = ($form->submissions_count === 0);
// Handle partial submissions
@@ -237,22 +239,17 @@ class PublicFormController extends Controller
]);
}
- $submission = FormSubmission::find($submissionId);
+ $submission = $form->submissions()->find($submissionId);
if (!$submission) {
return $this->error([
'message' => 'Submission not found.',
]);
}
- $submission = new FormSubmissionResource($submission);
- $submission->publiclyAccessed();
-
- if ($submission->form_id != $form->id) {
- return $this->error([
- 'message' => 'Not allowed.',
- ], 403);
- }
+ $submission->setRelation('form', $form);
+ $resource = new FormSubmissionResource($submission);
+ $resource->publiclyAccessed();
- return $this->success($submission->toArray($request));
+ return $this->success($resource->toArray($request));
}
}
diff --git a/api/app/Http/Requests/AnswerFormRequest.php b/api/app/Http/Requests/AnswerFormRequest.php
index 6c5adf70c..2e629f0b8 100644
--- a/api/app/Http/Requests/AnswerFormRequest.php
+++ b/api/app/Http/Requests/AnswerFormRequest.php
@@ -38,15 +38,6 @@ class AnswerFormRequest extends FormRequest
min($fieldProps['max_file_size'] * 1000000, $this->maxFileSize) : $this->maxFileSize;
}
- /**
- * Validate form before use it
- *
- * @return bool
- */
- public function authorize()
- {
- return !$this->form->is_closed && !$this->form->max_number_of_submissions_reached && $this->form->visibility === 'public';
- }
/**
* Get the validation rules that apply to the form.
diff --git a/api/app/Policies/FormPolicy.php b/api/app/Policies/FormPolicy.php
index 5aabf2bc6..ffa8595ec 100644
--- a/api/app/Policies/FormPolicy.php
+++ b/api/app/Policies/FormPolicy.php
@@ -113,4 +113,19 @@ class FormPolicy
{
return $this->canPerformWriteOperation($user, $form);
}
+
+ /**
+ * Determine whether a user can answer/submit to the form.
+ * This method checks if the form is open for public submissions.
+ *
+ * @param \App\Models\User|null $user
+ * @param \App\Models\Forms\Form $form
+ * @return bool
+ */
+ public function answer(?User $user, Form $form)
+ {
+ return !$form->is_closed
+ && !$form->max_number_of_submissions_reached
+ && $form->visibility === 'public';
+ }
}
diff --git a/api/app/Policies/FormSubmissionPolicy.php b/api/app/Policies/FormSubmissionPolicy.php
new file mode 100644
index 000000000..bcdc046b3
--- /dev/null
+++ b/api/app/Policies/FormSubmissionPolicy.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Forms\FormSubmission;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class FormSubmissionPolicy
+{
+ use HandlesAuthorization;
+
+ /**
+ * Determine whether the user can update the form submission.
+ */
+ public function update(User $user, FormSubmission $submission)
+ {
+ $form = $submission->form;
+
+ $ownsAndWritable = $user->ownsForm($form) && !$form->workspace->isReadonlyUser($user);
+
+ if ($token = $user->currentAccessToken()) {
+ return $token->can('forms-write') && $ownsAndWritable;
+ }
+
+ return $ownsAndWritable;
+ }
+}
diff --git a/api/app/Providers/AuthServiceProvider.php b/api/app/Providers/AuthServiceProvider.php
index 5636979c6..974e95449 100644
--- a/api/app/Providers/AuthServiceProvider.php
+++ b/api/app/Providers/AuthServiceProvider.php
@@ -3,11 +3,13 @@
namespace App\Providers;
use App\Models\Forms\Form;
+use App\Models\Forms\FormSubmission;
use App\Models\Integration\FormZapierWebhook;
use App\Models\OAuthProvider;
use App\Models\Template;
use App\Models\Workspace;
use App\Policies\FormPolicy;
+use App\Policies\FormSubmissionPolicy;
use App\Policies\Integration\FormZapierWebhookPolicy;
use App\Policies\OAuthProviderPolicy;
use App\Policies\PersonalAccessTokenPolicy;
@@ -25,6 +27,7 @@ class AuthServiceProvider extends ServiceProvider
*/
protected $policies = [
Form::class => FormPolicy::class,
+ FormSubmission::class => FormSubmissionPolicy::class,
Workspace::class => WorkspacePolicy::class,
FormZapierWebhook::class => FormZapierWebhookPolicy::class,
Template::class => TemplatePolicy::class,
diff --git a/api/tests/Feature/FormSubmissionUpdateAuthorizationTest.php b/api/tests/Feature/FormSubmissionUpdateAuthorizationTest.php
new file mode 100644
index 000000000..5a363a94f
--- /dev/null
+++ b/api/tests/Feature/FormSubmissionUpdateAuthorizationTest.php
@@ -0,0 +1,112 @@
+<?php
+
+use App\Models\Forms\FormSubmission;
+use Laravel\Sanctum\Sanctum;
+
+it('allows owner to update a submission', function () {
+ $user = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace);
+
+ $submission = new FormSubmission([
+ 'data' => [],
+ 'completion_time' => null,
+ 'status' => FormSubmission::STATUS_COMPLETED,
+ ]);
+ $submission->form_id = $form->id;
+ $submission->save();
+
+ $this->putJson(route('open.forms.submissions.update', [
+ 'form' => $form->id,
+ 'submission_id' => $submission->id,
+ ]), [
+ // No field values required as defaults are non-required
+ ])->assertOk();
+});
+
+it('forbids readonly member from updating a submission', function () {
+ $owner = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($owner);
+ $form = $this->createForm($owner, $workspace);
+
+ $submission = new FormSubmission([
+ 'data' => [],
+ 'completion_time' => null,
+ 'status' => FormSubmission::STATUS_COMPLETED,
+ ]);
+ $submission->form_id = $form->id;
+ $submission->save();
+
+ $readonly = $this->createUser();
+ $workspace->users()->attach($readonly, ['role' => 'readonly']);
+
+ $this->actingAsGuest();
+ $this->actingAsUser($readonly);
+
+ $this->putJson(route('open.forms.submissions.update', [
+ 'form' => $form->id,
+ 'submission_id' => $submission->id,
+ ]), [])->assertForbidden();
+});
+
+it('forbids token without forms-write from updating a submission', function () {
+ $user = $this->createProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace);
+
+ $submission = new FormSubmission([
+ 'data' => [],
+ 'completion_time' => null,
+ 'status' => FormSubmission::STATUS_COMPLETED,
+ ]);
+ $submission->form_id = $form->id;
+ $submission->save();
+
+ Sanctum::actingAs($user, ['forms-read']);
+
+ $this->putJson(route('open.forms.submissions.update', [
+ 'form' => $form->id,
+ 'submission_id' => $submission->id,
+ ]), [])->assertForbidden();
+});
+
+it('allows token with forms-write to update a submission', function () {
+ $user = $this->createProUser();
+ $workspace = $this->createUserWorkspace($user);
+ $form = $this->createForm($user, $workspace);
+
+ $submission = new FormSubmission([
+ 'data' => [],
+ 'completion_time' => null,
+ 'status' => FormSubmission::STATUS_COMPLETED,
+ ]);
+ $submission->form_id = $form->id;
+ $submission->save();
+
+ Sanctum::actingAs($user, ['forms-write']);
+
+ $this->putJson(route('open.forms.submissions.update', [
+ 'form' => $form->id,
+ 'submission_id' => $submission->id,
+ ]), [])->assertOk();
+});
+
+it('404s when trying to update a submission that does not belong to the form', function () {
+ $user = $this->actingAsUser();
+ $workspace = $this->createUserWorkspace($user);
+ $formA = $this->createForm($user, $workspace);
+ $formB = $this->createForm($user, $workspace);
+
+ $submission = new FormSubmission([
+ 'data' => [],
+ 'completion_time' => null,
+ 'status' => FormSubmission::STATUS_COMPLETED,
+ ]);
+ $submission->form_id = $formA->id;
+ $submission->save();
+
+ $this->putJson(route('open.forms.submissions.update', [
+ 'form' => $formB->id,
+ 'submission_id' => $submission->id,
+ ]), [])->assertNotFound();
+});
diff --git a/client/components/open/components/EditSubmissionModal.vue b/client/components/open/components/EditSubmissionModal.vue
index 6c9457e31..3112e6b5f 100644
--- a/client/components/open/components/EditSubmissionModal.vue
+++ b/client/components/open/components/EditSubmissionModal.vue
@@ -28,7 +28,7 @@
<template #submit-btn="{ isProcessing }">
<UButton
class="mt-2"
- :loading="loading || isProcessing"
+ :loading="updateSubmissionMutation.isPending.value || isProcessing"
@click.prevent="updateForm"
label="Update Submission"
/>
@@ -39,10 +39,10 @@
</template>
<script setup>
-import { ref, defineProps, defineEmits, computed } from "vue"
import OpenForm from "../forms/OpenForm.vue"
import { FormMode } from "~/lib/forms/FormModeStrategy.js"
import { useFormManager } from '~/lib/forms/composables/useFormManager'
+import { useFormSubmissions } from "~/composables/query/forms/useFormSubmissions"
const props = defineProps({
show: { type: Boolean, required: true },
@@ -87,25 +87,27 @@ watch(() => props.show, (newShow) => {
}
})
-const loading = ref(false)
+// Use form submissions composable for update
+const { updateSubmission } = useFormSubmissions()
+const updateSubmissionMutation = updateSubmission()
+
+const emit = defineEmits(["close"])
+const alert = useAlert()
-const emit = defineEmits(["close", "updated"])
const updateForm = () => {
- loading.value = true
- formManager.form.put("/open/forms/" + props.form.id + "/submissions/" + props.submission.id)
- .then((res) => {
- useAlert().success(res.message)
- loading.value = false
- emit("close")
- emit("updated", res.data.data)
- })
- .catch((error) => {
- console.error(error)
- if (error?.data) {
- useAlert().formValidationError(error.data)
- }
- loading.value = false
- })
+ updateSubmissionMutation.mutateAsync({
+ formId: props.form.id,
+ submissionId: props.submission.id,
+ data: formManager.form.data()
+ }).then((res) => {
+ alert.success(res.message)
+ emit("close")
+ }).catch((error) => {
+ console.error(error)
+ if (error?.data) {
+ alert.formValidationError(error.data)
+ }
+ })
}
const copySuccess = ref(false)
diff --git a/client/components/open/components/RecordOperations.vue b/client/components/open/components/RecordOperations.vue
index 1307566da..2fbe2ef6c 100644
--- a/client/components/open/components/RecordOperations.vue
+++ b/client/components/open/components/RecordOperations.vue
@@ -43,7 +43,6 @@
:form="form"
:submission="submission"
@close="showEditSubmissionModal = false"
- @updated="(submission) => $emit('updated', submission)"
/>
<ViewSubmissionModal
@@ -59,7 +58,7 @@
import EditSubmissionModal from "./EditSubmissionModal.vue"
import ViewSubmissionModal from "./ViewSubmissionModal.vue"
import TrackClick from "~/components/global/TrackClick.vue"
-import { formsApi } from "~/api/forms"
+import { useFormSubmissions } from "~/composables/query/forms/useFormSubmissions"
const props = defineProps({
form: {
@@ -76,13 +75,15 @@ const props = defineProps({
},
})
-const emit = defineEmits(["updated", "deleted"])
-
const alert = useAlert()
const route = useRoute()
const showEditSubmissionModal = ref(false)
const showViewSubmissionModal = ref(false)
+// Use form submissions composable for cache management
+const { deleteSubmission } = useFormSubmissions()
+const deleteSubmissionMutation = deleteSubmission()
+
const submission = computed(() => props.data.find(s => s.id === props.submissionId))
// Auto-open view modal if URL view param matches THIS component's submission ID (only on mount)
@@ -100,17 +101,17 @@ const onDeleteClick = () => {
}
const deleteRecord = () => {
- formsApi.submissions.delete(props.form.id, submission.value.id)
- .then((data) => {
- if (data.type === "success") {
- emit("deleted", submission.value)
- alert.success(data.message)
- } else {
- alert.error("Something went wrong!")
- }
- })
- .catch((error) => {
- alert.error(error.data.message)
- })
+ deleteSubmissionMutation.mutateAsync({
+ formId: props.form.id,
+ submissionId: submission.value.id
+ }).then((data) => {
+ if (data.type === "success") {
+ alert.success(data.message)
+ } else {
+ alert.error("Something went wrong!")
+ }
+ }).catch((error) => {
+ alert.error(error.data?.message || "Something went wrong!")
+ })
}
</script>
diff --git a/client/components/open/forms/components/FormSubmissions.vue b/client/components/open/forms/components/FormSubmissions.vue
index ccd73cb67..76d24f328 100644
--- a/client/components/open/forms/components/FormSubmissions.vue
+++ b/client/components/open/forms/components/FormSubmissions.vue
@@ -11,9 +11,6 @@
@search="handleSearch"
@filter="handleFilter"
@page-change="handlePageChange"
- @deleted="onDeleteRecord"
- @updated="onUpdateRecord"
- @multi-delete="onDeleteMultiRecord"
/>
<!-- Submissions Table Skeleton -->
@@ -43,7 +40,6 @@
</template>
<script setup>
-import { useQueryClient } from '@tanstack/vue-query'
import OpenTable from '~/components/open/tables/OpenTable.vue'
import { useFormSubmissions } from '~/composables/query/forms/useFormSubmissions'
@@ -51,7 +47,6 @@ const props = defineProps({
form: { type: Object, required: true },
})
-const queryClient = useQueryClient()
const table = ref(null)
// Replace all the recordStore logic with this:
@@ -81,24 +76,4 @@ const handlePageChange = (page) => {
setPage(page)
}
-const onUpdateRecord = (_submission) => {
- // Invalidate to refetch current page
- queryClient.invalidateQueries({
- queryKey: ['forms', props.form.id, 'submissions', 'paginated']
- })
-}
-
-const onDeleteRecord = (_submission) => {
- // Invalidate to refetch current page
- queryClient.invalidateQueries({
- queryKey: ['forms', props.form.id, 'submissions', 'paginated']
- })
-}
-
-const onDeleteMultiRecord = (_submissionIds) => {
- // Invalidate to refetch current page
- queryClient.invalidateQueries({
- queryKey: ['forms', props.form.id, 'submissions', 'paginated']
- })
-}
</script>
diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vue
index 06a47943f..ee97b626e 100644
--- a/client/components/open/tables/OpenTable.vue
+++ b/client/components/open/tables/OpenTable.vue
@@ -39,7 +39,7 @@
color="error"
variant="outline"
:label="`Delete (${selectedIds.length})`"
- :loading="multiDeleteLoading"
+ :loading="deleteMultiSubmissionsMutation.isPending.value"
@click="onDeleteMultiClick"
/>
@@ -152,8 +152,6 @@
:form="form"
:submission-id="row.original.id"
:data="sortedData"
- @deleted="(submission) => $emit('deleted', submission)"
- @updated="(submission) => $emit('updated', submission)"
/>
</div>
</template>
@@ -179,7 +177,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 { formsApi } from "~/api/forms"
+import { useFormSubmissions } from "~/composables/query/forms/useFormSubmissions"
const props = defineProps({
data: {
@@ -200,7 +198,7 @@ const props = defineProps({
},
})
-const emit = defineEmits(["updated", "deleted", "multi-delete", "search", "filter", "page-change"])
+const emit = defineEmits(["search", "filter", "page-change"])
// Get workspace for table state
const { current: workspace } = useCurrentWorkspace()
@@ -252,6 +250,10 @@ const debouncedSearch = refDebounced(searchInput, 300)
const statusFilter = ref('all')
const alert = useAlert()
+// Use form submissions composable for multi-delete
+const { deleteMultiSubmissions } = useFormSubmissions()
+const deleteMultiSubmissionsMutation = deleteMultiSubmissions()
+
// Watch and emit instead of filtering locally:
watch(debouncedSearch, (newSearch) => {
emit('search', newSearch)
@@ -263,7 +265,6 @@ watch(statusFilter, (newStatus) => {
// Table row selection
const rowSelection = ref({})
-const multiDeleteLoading = ref(false)
const selectedIds = computed(() => {
return table.value?.tableApi?.getFilteredSelectedRowModel()?.rows.map(row => row.original.id) || []
})
@@ -274,23 +275,20 @@ const onDeleteMultiClick = () => {
alert.confirm(`Do you really want to delete selected ${selectedIds.value.length} record${selectedIds.value.length > 1 ? 's' : ''}?`, deleteMultiRecord)
}
const deleteMultiRecord = () => {
- multiDeleteLoading.value = true
- formsApi.submissions.deleteMulti(props.form.id, selectedIds.value)
- .then((data) => {
- multiDeleteLoading.value = false
- clearSelection()
- if (data.type === "success") {
- emit('multi-delete', selectedIds.value)
- alert.success(data.message)
- } else {
- alert.error("Something went wrong!")
- }
- })
- .catch((error) => {
- multiDeleteLoading.value = false
- clearSelection()
- alert.error(error.data.message)
- })
+ deleteMultiSubmissionsMutation.mutateAsync({
+ formId: props.form.id,
+ submissionIds: selectedIds.value
+ }).then((data) => {
+ clearSelection()
+ if (data.type === "success") {
+ alert.success(data.message)
+ } else {
+ alert.error("Something went wrong!")
+ }
+ }).catch((error) => {
+ clearSelection()
+ alert.error(error.data?.message || "Something went wrong!")
+ })
}
diff --git a/client/composables/query/forms/useFormSubmissions.js b/client/composables/query/forms/useFormSubmissions.js
index bfd349b8c..1dcead16c 100644
--- a/client/composables/query/forms/useFormSubmissions.js
+++ b/client/composables/query/forms/useFormSubmissions.js
@@ -144,27 +144,22 @@ export function useFormSubmissions() {
return useMutation({
mutationFn: ({ formId, submissionId, data }) => formsApi.submissions.update(formId, submissionId, data),
onSuccess: (updatedSubmission, { formId, submissionId }) => {
- // Update submission cache
- queryClient.setQueryData(['submissions', submissionId], updatedSubmission)
-
- // Update in submissions list
- queryClient.setQueryData(['forms', formId, 'submissions'], (old) => {
- if (!old) return old
- if (Array.isArray(old)) {
- return old.map(submission =>
- submission.id === submissionId ? { ...submission, ...updatedSubmission } : submission
- )
- }
- if (old.data) {
+ // Update in paginated submissions cache (main cache used by UI)
+ queryClient.setQueriesData(
+ { queryKey: ['forms', formId, 'submissions', 'paginated'] },
+ (oldData) => {
+ if (!oldData?.data) return oldData
+
return {
- ...old,
- data: old.data.map(submission =>
- submission.id === submissionId ? { ...submission, ...updatedSubmission } : submission
+ ...oldData,
+ data: oldData.data.map(record =>
+ record.data.id === submissionId
+ ? { ...record, data: { ...record.data, ...updatedSubmission.data?.data } }
+ : record
)
}
}
- return old
- })
+ )
},
...options
})
@@ -174,30 +169,48 @@ export function useFormSubmissions() {
return useMutation({
mutationFn: ({ formId, submissionId }) => formsApi.submissions.delete(formId, submissionId),
onSuccess: (_, { formId, submissionId }) => {
- // Remove from submission cache
- queryClient.removeQueries({ queryKey: ['submissions', submissionId] })
-
- // Remove from submissions list
- queryClient.setQueryData(['forms', formId, 'submissions'], (old) => {
- if (!old) return old
- if (Array.isArray(old)) {
- return old.filter(submission => submission.id !== submissionId)
+ // Remove from paginated submissions cache (main cache used by UI)
+ queryClient.setQueriesData(
+ { queryKey: ['forms', formId, 'submissions', 'paginated'] },
+ (oldData) => {
+ if (!oldData?.data) return oldData
+
+ return {
+ ...oldData,
+ data: oldData.data.filter(record =>
+ record.data.id !== submissionId
+ )
+ }
}
- if (old.data) {
+ )
+ },
+ ...options
+ })
+ }
+
+ const deleteMultiSubmissions = (options = {}) => {
+ return useMutation({
+ mutationFn: ({ formId, submissionIds }) => formsApi.submissions.deleteMulti(formId, submissionIds),
+ onSuccess: (_, { formId, submissionIds }) => {
+ // Remove multiple submissions from paginated submissions cache
+ queryClient.setQueriesData(
+ { queryKey: ['forms', formId, 'submissions', 'paginated'] },
+ (oldData) => {
+ if (!oldData?.data) return oldData
+
return {
- ...old,
- data: old.data.filter(submission => submission.id !== submissionId)
+ ...oldData,
+ data: oldData.data.filter(record =>
+ !submissionIds.includes(record.data.id)
+ )
}
}
- return old
- })
-
- // Invalidate stats
- queryClient.invalidateQueries(['forms', formId, 'stats'])
+ )
},
...options
})
}
+
const exportSubmissions = (options = {}) => {
return useMutation({
@@ -217,6 +230,7 @@ export function useFormSubmissions() {
submissionDetail,
updateSubmission,
deleteSubmission,
+ deleteMultiSubmissions,
exportSubmissions,
invalidateSubmissions,
}