fix: added validation for empty attachments (#7318)

* fix: added validation for empty attachments * fix: added storybookbasedir
opengovsg · May 8, 2024 · aa051b9 · aa051b9
1 parent 6e11d0a
commit aa051b9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
@@ -61,6 +61,7 @@ jobs:
           autoAcceptChanges: develop
           exitOnceUploaded: true
           onlyChanged: true
+          storybookBaseDir: frontend/.storybook
           # Skip running Chromatic on dependabot PRs
           skip: dependabot/**
           # Only run when the frontend directory has changes

diff --git a/frontend/src/components/Field/Attachment/Attachment.tsx b/frontend/src/components/Field/Attachment/Attachment.tsx
@@ -184,14 +184,18 @@ export const Attachment = forwardRef<AttachmentProps, 'div'>(
 
     const fileValidator = useCallback<NonNullable<DropzoneProps['validator']>>(
       (file) => {
-        if (
-          !IMAGE_UPLOAD_TYPES_TO_COMPRESS.includes(file.type) &&
-          maxSize &&
-          file.size > maxSize
-        ) {
-          return {
-            code: 'file-too-large',
-            message: `You have exceeded the limit, please upload a file below ${readableMaxSize}`,
+        if (!IMAGE_UPLOAD_TYPES_TO_COMPRESS.includes(file.type)) {
+          if (maxSize && file.size > maxSize) {
+            return {
+              code: 'file-too-large',
+              message: `You have exceeded the limit, please upload a file below ${readableMaxSize}`,
+            }
+          }
+          if (file.size === 0) {
+            return {
+              code: 'file-empty',
+              message: `You have uploaded an empty file, please upload a valid attachment`,
+            }
           }
         }
         return null

diff --git a/src/app/utils/field-validation/validators/attachmentValidator.ts b/src/app/utils/field-validation/validators/attachmentValidator.ts
@@ -44,6 +44,12 @@ const makeAttachmentSizeValidator: AttachmentValidatorConstructor =
   (attachmentField) => (response) => {
     const { attachmentSize } = attachmentField
     const byteSizeLimit = parseInt(attachmentSize) * MB
+
+    // Check if the attachment content is empty
+    if (response.content.byteLength === 0) {
+      return left(`AttachmentValidator:\t File is empty.`)
+    }
+
     return response.content.byteLength <= byteSizeLimit
       ? right(response)
       : left(`AttachmentValidator:\t File size more than limit`)