Added condition to check if form object exist or not

bcgov · Aug 31, 2023 · 1778f38 · 1778f38
1 parent b50150e
commit 1778f38
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/app/frontend/src/components/designer/FormViewerMultiUpload.vue b/app/frontend/src/components/designer/FormViewerMultiUpload.vue
@@ -309,21 +309,21 @@ export default {
         jsonPayload.forEach(function (submission) {
           delete submission.submit;
           delete submission.lateEntry;
-
-          const propsToRemove = new Set([
-            'confirmationId',
-            'formName',
-            'version',
-            'createdAt',
-            'fullName',
-            'username',
-            'email',
-            'status',
-            'assignee',
-            'assigneeEmail',
-          ]);
-
-          propsToRemove.forEach((key) => delete submission.form[key]);
+          if (Object.prototype.hasOwnProperty.call(submission, 'form')) {
+            const propsToRemove = [
+              'confirmationId',
+              'formName',
+              'version',
+              'createdAt',
+              'fullName',
+              'username',
+              'email',
+              'status',
+              'assignee',
+              'assigneeEmail',
+            ];
+            propsToRemove.forEach((key) => delete submission.form[key]);
+          }
         });
       }
       return jsonPayload;

diff --git a/app/src/forms/form/service.js b/app/src/forms/form/service.js
@@ -796,10 +796,11 @@ const service = {
       jsonPayload.forEach(function (submission) {
         delete submission.submit;
         delete submission.lateEntry;
+        if (Object.prototype.hasOwnProperty.call(submission, 'form')) {
+          const propsToRemove = ['confirmationId', 'formName', 'version', 'createdAt', 'fullName', 'username', 'email', 'status', 'assignee', 'assigneeEmail'];
 
-        const propsToRemove = new Set(['confirmationId', 'formName', 'version', 'createdAt', 'fullName', 'username', 'email', 'status', 'assignee', 'assigneeEmail']);
-
-        propsToRemove.forEach((key) => delete submission.form[key]);
+          propsToRemove.forEach((key) => delete submission.form[key]);
+        }
       });
     }
     return jsonPayload;