diff --git a/app/frontend/src/components/designer/FormViewerMultiUpload.vue b/app/frontend/src/components/designer/FormViewerMultiUpload.vue index 624d623d9..1a5580866 100644 --- 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 index fbe2258d2..1bebd4a15 100644 --- 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;