Beautiful Open-Source Form Builder
View Submission Modal (#832)
Chirag Chhatrala0274bef864a5
diff --git a/client/components/open/components/EditSubmissionModal.vue b/client/components/open/components/EditSubmissionModal.vueindex 0500c5253..4858a6289 100644--- a/client/components/open/components/EditSubmissionModal.vue+++ b/client/components/open/components/EditSubmissionModal.vue@@ -1,6 +1,7 @@<template><UModalv-model:open="isModalOpen"+ :ui="{ content: 'sm:max-w-2xl' }"title="Edit Submission"><template #body>@@ -12,7 +13,7 @@><template #submit-btn="{ isProcessing }"><UButton- class="mt-4"+ class="mt-2":loading="loading || isProcessing"@click.prevent="updateForm"label="Update Submission"diff --git a/client/components/open/components/RecordOperations.vue b/client/components/open/components/RecordOperations.vueindex 05dc22661..1307566da 100644--- a/client/components/open/components/RecordOperations.vue+++ b/client/components/open/components/RecordOperations.vue@@ -1,5 +1,17 @@<template><div class="flex gap-1">+ <TrackClick+ name="view_record_click"+ :properties="{}"+ >+ <UButton+ size="xs"+ color="neutral"+ variant="outline"+ icon="heroicons:eye"+ @click="showViewSubmissionModal = true"+ />+ </TrackClick><TrackClickname="edit_record_click":properties="{}"@@ -33,10 +45,19 @@@close="showEditSubmissionModal = false"@updated="(submission) => $emit('updated', submission)"/>++ <ViewSubmissionModal+ :show="showViewSubmissionModal"+ :form="form"+ :data="data"+ :submission-id="submissionId"+ @close="showViewSubmissionModal = false"+ /></template><script setup>import EditSubmissionModal from "./EditSubmissionModal.vue"+import ViewSubmissionModal from "./ViewSubmissionModal.vue"import TrackClick from "~/components/global/TrackClick.vue"import { formsApi } from "~/api/forms"@@ -45,26 +66,44 @@ const props = defineProps({type: Object,required: true,},- submission: {- type: Object,- default: () => {},+ submissionId: {+ type: Number,+ required: true,+ },+ data: {+ type: Array,+ default: () => [],},})const emit = defineEmits(["updated", "deleted"])const alert = useAlert()+const route = useRoute()const showEditSubmissionModal = ref(false)+const showViewSubmissionModal = ref(false)++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)+onMounted(() => {+ const urlViewId = route.query.view+ if (urlViewId && parseInt(urlViewId) === props.submissionId) {+ nextTick(() => {+ showViewSubmissionModal.value = true+ })+ }+})const onDeleteClick = () => {alert.confirm("Do you really want to delete this record?", deleteRecord)}const deleteRecord = () => {- formsApi.submissions.delete(props.form.id, props.submission.id)+ formsApi.submissions.delete(props.form.id, submission.value.id).then((data) => {if (data.type === "success") {- emit("deleted", props.submission)+ emit("deleted", submission.value)alert.success(data.message)} else {alert.error("Something went wrong!")diff --git a/client/components/open/components/ViewSubmissionModal.vue b/client/components/open/components/ViewSubmissionModal.vuenew file mode 100644index 000000000..1edfa3b36--- /dev/null+++ b/client/components/open/components/ViewSubmissionModal.vue@@ -0,0 +1,145 @@+<template>+ <UModal+ v-model:open="isModalOpen"+ :ui="{ content: 'sm:max-w-2xl' }"+ >+ <template #header>+ <div class="flex items-center justify-between w-full">+ <h2 class="font-semibold">+ View Submission+ </h2>+ <UPagination+ v-model:page="currentPage"+ :items-per-page="1"+ :total="totalSubmissions"+ size="sm"+ :sibling-count="0"+ :ui="{+ wrapper: 'w-auto',+ list: 'gap-0',+ ellipsis: 'hidden',+ first: 'hidden',+ last: 'hidden'+ }"+ >+ <template #item="{ page, pageCount }">+ <span class="text-sm font-medium px-2">{{ page }} of {{ pageCount }}</span>+ </template>+ </UPagination>+ </div>+ </template>++ <template #body>+ <OpenForm+ v-if="form"+ :form-manager="formManager"+ :theme="theme"+ @submit="isModalOpen = false"+ >+ <template #submit-btn="{ loading }">+ <UButton+ class="mt-2"+ color="neutral"+ variant="outline"+ @click.prevent="isModalOpen = false"+ label="Close"+ />+ </template>+ </OpenForm>+ </template>+ </UModal>+</template>++<script setup>+import OpenForm from "../forms/OpenForm.vue"+import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"+import { FormMode } from "~/lib/forms/FormModeStrategy.js"+import { useFormManager } from '~/lib/forms/composables/useFormManager'++const props = defineProps({+ submissionId: {+ type: Number,+ required: true,+ },+ data: {+ type: Array,+ default: () => [],+ },+ show: { type: Boolean, required: true },+ form: { type: Object, required: true },+ theme: {+ type: Object, default: () => {+ const theme = inject("theme", null)+ if (theme) {+ return theme.value+ }+ return CachedDefaultTheme.getInstance()+ }+ }+})++const emit = defineEmits(["close"])+const route = useRoute()+const router = useRouter()++// Modal state+const isModalOpen = computed({+ get() {+ return props.show+ },+ set(value) {+ if (!value) {+ emit("close")+ updateUrlWithSubmission(null)+ }+ }+})++const currentPage = ref(props.data.findIndex(s => s.id === props.submissionId) + 1)+const totalSubmissions = ref(props.data.length)+const submission = computed(() => props.data[currentPage.value - 1])++// Set up form manager with proper mode+let formManager = null+const setupFormManager = () => {+ if (!props.form) return null++ formManager = useFormManager(props.form, FormMode.READ_ONLY)++ return formManager+}++// Initialize form manager+formManager = setupFormManager()++const formManagerInit = () => {+ formManager.initialize({+ skipPendingSubmission: true,+ skipUrlParams: true,+ defaultData: submission.value+ })+ updateUrlWithSubmission(submission.value.id)+}++watch(() => props.show, (newShow) => {+ if (newShow) {+ nextTick(() => {+ formManagerInit()+ })+ }+})++watch(currentPage, () => {+ formManagerInit()+})++const updateUrlWithSubmission = (submissionId) => {+ const query = { ...route.query }+ if(submissionId) {+ query.view = submissionId+ } else {+ delete query.view+ }+ router.replace({ query })+}+</script>\ No newline at end of filediff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vueindex 2fb9762df..7e2121fa0 100644--- a/client/components/open/forms/OpenForm.vue+++ b/client/components/open/forms/OpenForm.vue@@ -56,7 +56,7 @@native-type="button":form="form"class="mt-2 px-8 mx-1"- @click="handlePreviousClick"+ @click.stop="handlePreviousClick">{{ previousFieldsPageBreak.previous_btn_text || $t('forms.buttons.previous') }}</open-form-button>diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vueindex aa7bdaa4a..1ed057b84 100644--- a/client/components/open/forms/OpenFormField.vue+++ b/client/components/open/forms/OpenFormField.vue@@ -190,6 +190,7 @@ const dataForm = computed(() => props.formManager?.form || {})const darkMode = computed(() => props.formManager?.darkMode?.value || false)const showHidden = computed(() => props.formManager?.strategy?.value?.display?.showHiddenFields || false)const enableDisabledFields = computed(() => props.formManager?.strategy?.value?.display?.enableDisabledFields || false)+const isReadOnlyMode = computed(() => props.formManager?.strategy?.value?.display?.disableFields || false)// Setup stores and reactive stateconst workingFormStore = useWorkingFormStore()@@ -256,6 +257,7 @@ const isFieldRequired = computed(() =>)const isFieldDisabled = computed(() => {+ if (isReadOnlyMode.value) return trueif (enableDisabledFields.value) return falsereturn (new FormLogicPropertyResolver(props.field, dataForm.value)).isDisabled()})diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vueindex 888700fa6..ea9c71f61 100644--- a/client/components/open/tables/OpenTable.vue+++ b/client/components/open/tables/OpenTable.vue@@ -131,7 +131,8 @@<div class="flex justify-center" :style="{ width: `var(--col-actions-size, auto)` }"><RecordOperations:form="form"- :submission="row.original"+ :submission-id="row.original.id"+ :data="sortedData"@deleted="(submission) => $emit('deleted', submission)"@updated="(submission) => $emit('updated', submission)"/>@@ -266,6 +267,11 @@ const statusList = [{ label: 'In Progress', value: 'partial' }]+// Default sort by created_at desc+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]@@ -286,8 +292,7 @@ const filteredTableData = computed(() => {})return fuse.search(debouncedSearch.value).map(res => res.item)} else {- // Default sort by created_at desc- return data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at))+ return sortedData.value}})diff --git a/client/lib/forms/FormModeStrategy.js b/client/lib/forms/FormModeStrategy.jsindex 6ff38ee49..bc955268b 100644--- a/client/lib/forms/FormModeStrategy.js+++ b/client/lib/forms/FormModeStrategy.js@@ -7,7 +7,8 @@ export const FormMode = {PREFILL: 'prefill', // URL prefill preview with no validationEDIT: 'edit', // Editing an existing submissionTEST: 'test', // Test mode with validation but no actual submission- TEMPLATE: 'template' // Template mode with no validation+ TEMPLATE: 'template', // Template mode with no validation+ READ_ONLY: 'read_only' // Read only mode}/**@@ -33,7 +34,8 @@ export function createFormModeStrategy(mode) {enableDisabledFields: false,showFormCleanings: true,showFontLink: false,- showBranding: true+ showBranding: true,+ disableFields: false},// Admin behaviors@@ -107,6 +109,15 @@ export function createFormModeStrategy(mode) {strategy.submission.enablePartialSubmissions = falsestrategy.display.showBranding = falsebreak++ case FormMode.READ_ONLY:+ // Read only mode - no validation, no submission, fields are disabled+ strategy.validation.validateOnNextPage = false+ strategy.validation.validateOnSubmit = false+ strategy.validation.performActualSubmission = false+ strategy.display.disableFields = true+ strategy.submission.enablePartialSubmissions = false+ break}