Beautiful Open-Source Form Builder
ESC-884 = Enhance ViewSubmissionModal functionality and improve submission moda… (#1145)
Chirag Chhatralab56a23794c1b
diff --git a/client/components/open/components/EditSubmissionModal.vue b/client/components/open/components/EditSubmissionModal.vueindex 50484702a..77eff69c1 100644--- a/client/components/open/components/EditSubmissionModal.vue+++ b/client/components/open/components/EditSubmissionModal.vue@@ -91,7 +91,7 @@ watch(() => props.show, (newShow) => {})})}-})+}, { immediate: true })// Use form submissions composable for updateconst { updateSubmission } = useFormSubmissions()diff --git a/client/components/open/components/RecordOperations.vue b/client/components/open/components/RecordOperations.vueindex a6f30f8c6..83f166d90 100644--- a/client/components/open/components/RecordOperations.vue+++ b/client/components/open/components/RecordOperations.vue@@ -1,33 +1,45 @@<template><div class="flex gap-1">+ <TrackClick+ name="edit_record_click"+ :properties="{ form_id: form.id, submission_id: submissionId }"+ >+ <UButton+ size="xs"+ color="neutral"+ variant="outline"+ icon="heroicons:pencil-square"+ @click="emit('edit', submissionId)"+ />+ </TrackClick>+ <UButton+ v-if="hasPdfTemplates"+ size="xs"+ color="neutral"+ variant="outline"+ icon="i-heroicons-arrow-down-tray-20-solid"+ aria-label="Download PDF"+ @click="emit('download-pdf', submissionId)"+ /><TrackClickname="view_record_click"- :properties="{}"+ :properties="{ form_id: form.id, submission_id: submissionId }"><UButtonsize="xs"color="neutral"variant="outline"icon="heroicons:arrows-pointing-out"- @click="showViewSubmissionModal = true"+ @click="emit('view', submissionId)"/></TrackClick></div>-- <ViewSubmissionModal- :show="showViewSubmissionModal"- :form="form"- :data="data"- :submission-id="submissionId"- @close="showViewSubmissionModal = false"- /></template><script setup>-import ViewSubmissionModal from "./ViewSubmissionModal.vue"import TrackClick from "~/components/global/TrackClick.vue"-const props = defineProps({+defineProps({form: {type: Object,required: true,@@ -36,24 +48,11 @@ const props = defineProps({type: Number,required: true,},- data: {- type: Array,- default: () => [],+ hasPdfTemplates: {+ type: Boolean,+ default: false,},})-const route = useRoute()-const showViewSubmissionModal = ref(false)--// 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 emit = defineEmits(['edit', 'download-pdf', 'view'])</script>diff --git a/client/components/open/components/ViewSubmissionModal.vue b/client/components/open/components/ViewSubmissionModal.vueindex 2d2fe18d9..0bf556366 100644--- a/client/components/open/components/ViewSubmissionModal.vue+++ b/client/components/open/components/ViewSubmissionModal.vue@@ -4,13 +4,39 @@:ui="{ content: 'sm:max-w-4xl', body: 'p-0!' }"><template #header>- <div class="flex items-center justify-between w-full">- <h2 class="font-semibold">+ <div class="flex flex-col gap-3 w-full min-w-0 sm:flex-row sm:items-center sm:justify-between sm:gap-2">+ <h2 class="font-semibold shrink-0">View Submission</h2>- <div class="flex items-center gap-2">- <div class="relative z-20">+ <div class="flex flex-wrap items-center gap-2 justify-between sm:justify-end min-w-0">+ <div class="flex items-center gap-1 relative z-20 shrink-0">+ <TrackClick+ name="edit_record_click"+ :properties="{ form_id: form.id, submission_id: submissionId }"+ >+ <UButton+ color="neutral"+ variant="outline"+ size="sm"+ icon="heroicons:pencil-square"+ aria-label="Edit"+ @click="showEditSubmissionModal = true"+ >+ <span class="hidden sm:inline">Edit</span>+ </UButton>+ </TrackClick>+ <UButton+ v-if="hasPdfTemplates"+ color="neutral"+ variant="outline"+ size="sm"+ icon="i-heroicons-arrow-down-tray-20-solid"+ aria-label="Download PDF"+ @click="downloadPdf"+ >+ <span class="hidden sm:inline">Download PDF</span>+ </UButton><UDropdownMenu:items="getMenuItems":content="{ side: 'bottom', align: 'end' }"@@ -18,19 +44,21 @@><UButtoncolor="neutral"- variant="ghost"+ variant="outline"icon="i-heroicons-ellipsis-horizontal"- size="md"+ size="sm"+ aria-label="More actions"/></UDropdownMenu>- </div>-+ </div>+<UPaginationv-model:page="currentPage":items-per-page="1":total="totalSubmissions"size="sm":sibling-count="0"+ class="shrink-0":ui="{wrapper: 'w-auto',list: 'gap-0',@@ -40,7 +68,7 @@}"><template #item="{ page, pageCount }">- <span class="text-sm font-medium px-2">{{ page }} of {{ pageCount }}</span>+ <span class="text-sm font-medium px-2 whitespace-nowrap">{{ page }} of {{ pageCount }}</span></template></UPagination></div>@@ -84,7 +112,7 @@:show="showEditSubmissionModal":form="form":submission="submission"- @close="showEditSubmissionModal = false"+ @close="onEditSubmissionModalClose"/></template>@@ -109,7 +137,11 @@ const props = defineProps({default: () => [],},show: { type: Boolean, required: true },- form: { type: Object, required: true }+ form: { type: Object, required: true },+ hasPdfTemplates: {+ type: Boolean,+ default: false,+ },})const emit = defineEmits(["close", "restored"])@@ -132,26 +164,12 @@ const getMenuItems = computed(() => {icon: 'i-heroicons-clipboard-document-check-20-solid',onClick: copyLink},- {- label: 'Download PDF',- icon: 'i-heroicons-arrow-down-tray-20-solid',- onClick: downloadPdf- },- ],- [{label: 'Submission History',icon: 'i-heroicons-clock',onClick: () => {showSubmissionHistoryModal.value = true}- },- {- label: 'Edit',- icon: 'i-heroicons-pencil-square-20-solid',- onClick: () => {- showEditSubmissionModal.value = true- }}],[@@ -181,10 +199,16 @@ const isModalOpen = computed({const showEditSubmissionModal = ref(false)const showSubmissionHistoryModal = ref(false)-const currentPage = ref(props.data.findIndex(s => s.id === props.submissionId) + 1)+const currentPage = ref(1)const totalSubmissions = ref(props.data.length)const submission = computed(() => props.data[currentPage.value - 1])+const syncCurrentPage = () => {+ const index = props.data.findIndex(s => Number(s.id) === Number(props.submissionId))+ currentPage.value = index >= 0 ? index + 1 : 1+ totalSubmissions.value = props.data.length+}+// Set up form manager with proper modelet formManager = nullconst setupFormManager = () => {@@ -199,6 +223,8 @@ const setupFormManager = () => {formManager = setupFormManager()const formManagerInit = () => {+ if (!submission.value) return+formManager.initialize({skipPendingSubmission: true,skipUrlParams: true,@@ -209,6 +235,25 @@ const formManagerInit = () => {watch(() => props.show, (newShow) => {if (newShow) {+ syncCurrentPage()+ nextTick(() => {+ formManagerInit()+ })+ }+}, { immediate: true })++watch(() => props.submissionId, () => {+ if (props.show) {+ syncCurrentPage()+ nextTick(() => {+ formManagerInit()+ })+ }+})++watch(() => props.data, () => {+ if (props.show) {+ syncCurrentPage()nextTick(() => {formManagerInit()})@@ -278,4 +323,9 @@ const deleteRecord = () => {alert.error(error.data?.message || "Something went wrong!")})}++const onEditSubmissionModalClose = () => {+ showEditSubmissionModal.value = false+ formManagerInit()+}</script>diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vueindex 6914363a3..1b1d13f95 100644--- a/client/components/open/tables/OpenTable.vue+++ b/client/components/open/tables/OpenTable.vue@@ -166,13 +166,39 @@<RecordOperations:form="form":submission-id="row.original.id"- :data="sortedData"+ :has-pdf-templates="hasPdfTemplates"+ @edit="onEditSubmission"+ @download-pdf="onDownloadPdf"+ @view="onViewSubmission"/></div></template></UTable>-+ <ViewSubmissionModal+ v-if="viewSubmissionId"+ :show="showViewSubmissionModal"+ :form="form"+ :data="viewModalSubmissions"+ :submission-id="viewSubmissionId"+ :has-pdf-templates="hasPdfTemplates"+ @close="onViewSubmissionModalClose"+ @restored="emit('refresh')"+ />++ <EditSubmissionModal+ :show="showEditSubmissionModal"+ :form="form"+ :submission="editSubmission"+ @close="onEditSubmissionModalClose"+ />++ <DownloadPdf+ v-if="hasPdfTemplates"+ ref="downloadPdfRef"+ :form="form"+ :submission-id="activeDownloadSubmissionId"+ /></div></template>@@ -190,10 +216,15 @@ import OpenFile from "./components/OpenFile.vue"import OpenCheckbox from "./components/OpenCheckbox.vue"import OpenPayment from "./components/OpenPayment.vue"import OpenSubmissionStatus from "./components/OpenSubmissionStatus.vue"+import DownloadPdf from "../components/DownloadPdf.vue"+import EditSubmissionModal from "../components/EditSubmissionModal.vue"import RecordOperations from "../components/RecordOperations.vue"+import ViewSubmissionModal from "../components/ViewSubmissionModal.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"+import { usePdfTemplates } from '~/composables/query/forms/usePdfTemplates'const props = defineProps({data: {@@ -216,6 +247,8 @@ const props = defineProps({const emit = defineEmits(["search", "filter", "page-change", "refresh"])+const route = useRoute()+// Get workspace for table stateconst { current: workspace } = useCurrentWorkspace()@@ -266,6 +299,18 @@ const searchInput = ref("")const debouncedSearch = refDebounced(searchInput, 300)const statusFilter = ref('all')const alert = useAlert()+const showViewSubmissionModal = ref(false)+const viewSubmissionId = ref(null)+const viewModalExtraSubmission = ref(null)+const pendingViewFromUrl = ref(false)+const showEditSubmissionModal = ref(false)+const editSubmissionId = ref(null)+const downloadPdfRef = ref(null)+const activeDownloadSubmissionId = ref(0)++const { list: listPdfTemplates } = usePdfTemplates()+const { data: pdfTemplatesData } = listPdfTemplates(() => props.form?.id)+const hasPdfTemplates = computed(() => (pdfTemplatesData.value?.data?.length ?? 0) > 0)// Use form submissions composable for multi-deleteconst { deleteMultiSubmissions } = useFormSubmissions()@@ -320,6 +365,87 @@ const sortedData = computed(() => {return props.data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at))})+const editSubmission = computed(() => sortedData.value.find(s => s.id === editSubmissionId.value))++const viewModalSubmissions = computed(() => {+ if (!viewModalExtraSubmission.value) {+ return sortedData.value+ }++ const extraId = viewModalExtraSubmission.value.id+ const rest = sortedData.value.filter(s => s.id !== extraId)+ return [viewModalExtraSubmission.value, ...rest]+})++const onViewSubmission = (submissionId) => {+ viewModalExtraSubmission.value = null+ viewSubmissionId.value = submissionId+ showViewSubmissionModal.value = true+}++const onViewSubmissionModalClose = () => {+ showViewSubmissionModal.value = false+ viewSubmissionId.value = null+ viewModalExtraSubmission.value = null+}++const openViewFromUrl = () => {+ const urlViewId = route.query.view+ if (!urlViewId || showViewSubmissionModal.value || !props.form?.id) return++ const submissionId = parseInt(urlViewId)+ if (!submissionId || Number.isNaN(submissionId)) return++ const inCurrentPage = sortedData.value.some(s => Number(s.id) === submissionId)+ if (inCurrentPage) {+ viewModalExtraSubmission.value = null+ viewSubmissionId.value = submissionId+ showViewSubmissionModal.value = true+ return+ }++ if (props.loading || pendingViewFromUrl.value) return++ pendingViewFromUrl.value = true+ formsApi.submissions.fetch(props.form.id, submissionId)+ .then((record) => {+ if (!record?.data) return+ viewModalExtraSubmission.value = record.data+ viewSubmissionId.value = submissionId+ showViewSubmissionModal.value = true+ })+ .catch(() => {})+ .finally(() => {+ pendingViewFromUrl.value = false+ })+}++const onEditSubmission = (submissionId) => {+ editSubmissionId.value = submissionId+ showEditSubmissionModal.value = true+}++const onEditSubmissionModalClose = () => {+ showEditSubmissionModal.value = false+ editSubmissionId.value = null+}++const onDownloadPdf = (submissionId) => {+ const submission = sortedData.value.find(s => s.id === submissionId)+ if (!submission?.submission_id) {+ alert.error("Something went wrong!")+ return+ }+ activeDownloadSubmissionId.value = submission.submission_id+ nextTick(() => {+ if (downloadPdfRef.value) {+ downloadPdfRef.value.handleDownload()+ } else {+ alert.error("Something went wrong!")+ }+ })+}+// Replace with simple data pass-through:const filteredTableData = computed(() => props.data || [])@@ -393,5 +519,13 @@ onMounted(() => {computeMaxHeight()})+watch(+ () => [route.query.view, props.loading, props.data.length],+ () => {+ openViewFromUrl()+ },+ { immediate: true }+)+useEventListener(window, 'resize', computeMaxHeight)</script>\ No newline at end of file