remove attachment field checks and validation

opengovsg · May 14, 2021 · e04d38c · e04d38c
1 parent abee913
commit e04d38c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/src/app/models/field/attachmentField.ts b/src/app/models/field/attachmentField.ts
@@ -1,11 +1,6 @@
 import { Document, Schema } from 'mongoose'
 
-import {
-  AttachmentSize,
-  IAttachmentField,
-  IFormSchema,
-  ResponseMode,
-} from '../../../types'
+import { AttachmentSize, IAttachmentField, IFormSchema } from '../../../types'
 
 // Manual override since mongoose types don't have generics yet.
 interface IAttachmentFieldSchema extends IAttachmentField, Document {
@@ -24,22 +19,6 @@ const createAttachmentFieldSchema = () => {
     },
   })
 
-  // Prevent attachments from being saved on a webhooked form.
-  AttachmentFieldSchema.pre<IAttachmentFieldSchema>(
-    'validate',
-    function (next) {
-      const { webhook, responseMode } = this.parent()
-
-      if (responseMode === ResponseMode.Encrypt && webhook?.url) {
-        return next(
-          Error('Attachments are not allowed when a form has a webhook url'),
-        )
-      }
-
-      return next()
-    },
-  )
-
   return AttachmentFieldSchema
 }
 

diff --git a/src/public/modules/forms/admin/directives/edit-form.client.directive.js b/src/public/modules/forms/admin/directives/edit-form.client.directive.js
@@ -341,9 +341,8 @@ function editFormController(
 
   $scope.isStorageForm = $scope.myform.responseMode === responseModeEnum.ENCRYPT
 
-  // Disable attachment fields when we have webhooks
-  $scope.isDisabledField = function (fieldType) {
-    return fieldType.name === 'attachment' && $scope.myform.webhook.url !== ''
+  $scope.isDisabledField = function () {
+    return false
   }
 
   /**