Merge branch 'main' into 12fa6-right-to-left-mode

JhumanJ · Nov 20, 2024 · b194c50 · b194c50
2 parents acbae32 + fbf0831
commit b194c50
Show file tree

Hide file tree

Showing 5 changed files with 338 additions and 110 deletions.
diff --git a/api/app/Http/Controllers/Forms/PublicFormController.php b/api/app/Http/Controllers/Forms/PublicFormController.php
@@ -141,7 +141,14 @@ public function fetchSubmission(Request $request, string $slug, string $submissi
             ]);
         }
 
-        $submission = new FormSubmissionResource(FormSubmission::findOrFail($submissionId));
+        $submission = FormSubmission::find($submissionId);
+        if (!$submission) {
+            return $this->error([
+                'message' => 'Submission not found.',
+            ]);
+        }
+
+        $submission = new FormSubmissionResource($submission);
         $submission->publiclyAccessed();
 
         if ($submission->form_id != $form->id) {

diff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vue
@@ -418,6 +418,9 @@ export default {
       await this.recordsStore.loadRecord(
         opnFetch('/forms/' + this.form.slug + '/submissions/' + this.form.submission_id).then((data) => {
           return {submission_id: this.form.submission_id, id: this.form.submission_id, ...data.data}
+        }).catch((error) => {
+          useAlert().error(error?.data?.message || 'Something went wrong')
+          return null
         })
       )
       return this.recordsStore.getByKey(this.form.submission_id)

diff --git a/client/nuxt.config.ts b/client/nuxt.config.ts
@@ -15,7 +15,6 @@ export default defineNuxtConfig({
         '@nuxtjs/sitemap',
         '@nuxt/ui', 
         'nuxt-utm', 
-        '@nuxt/icon', 
         ...process.env.NUXT_PUBLIC_GTM_CODE ? ['@zadigetvoltaire/nuxt-gtm'] : [],
 ],
     build: {