From e57f4b7382e74ad3f8f677cd3ba5b1700482102c Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 21 Apr 2021 15:26:38 -0700
Subject: [PATCH] Resolved Document upload size limit & email attachments

---
 .../documents-upload/documents-upload.component.jsx       | 1 -
 .../documents-upload/documents-upload.utility.js          | 2 +-
 .../components/email-overlay/email-overlay.component.jsx  | 8 +++++---
 .../components/email-overlay/email-overlay.container.jsx  | 2 +-
 .../jobs-document-gallery.reassign.component.jsx          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/src/components/documents-upload/documents-upload.component.jsx b/client/src/components/documents-upload/documents-upload.component.jsx
index 65d0315ab..d5c139ce9 100644
--- a/client/src/components/documents-upload/documents-upload.component.jsx
+++ b/client/src/components/documents-upload/documents-upload.component.jsx
@@ -55,7 +55,6 @@ export function DocumentsUploadComponent({
       multiple={true}
       fileList={fileList}
       onChange={(f) => {
-        console.log(`f`, f);
         if (f.event && f.event.percent === 100) handleDone(f.file.uid);
         setFileList(f.fileList);
       }}
diff --git a/client/src/components/documents-upload/documents-upload.utility.js b/client/src/components/documents-upload/documents-upload.utility.js
index 69622fe0d..5386a105b 100644
--- a/client/src/components/documents-upload/documents-upload.utility.js
+++ b/client/src/components/documents-upload/documents-upload.utility.js
@@ -134,7 +134,7 @@ export const uploadToCloudinary = async (
           type: fileType,
           extension: extension,
           bodyshopid: bodyshop.id,
-          size: file.size || cloudinaryUploadResponse.data.bytes,
+          size: cloudinaryUploadResponse.data.bytes || file.size,
         },
       ],
     },
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index bfe2b5d48..67b902469 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -58,15 +58,17 @@ export default function EmailOverlayComponent({ form }) {
           valuePropName="fileList"
           getValueFromEvent={(e) => {
             console.log("Upload event:", e);
-
             if (Array.isArray(e)) {
               return e;
             }
-
             return e && e.fileList;
           }}
         >
-          <Upload.Dragger multiple listType="picture-card">
+          <Upload.Dragger
+            beforeUpload={Upload.LIST_IGNORE}
+            multiple
+            listType="picture-card"
+          >
             <>
               <p className="ant-upload-drag-icon">
                 <UploadOutlined />
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index 48bb33ce6..d58ff0769 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -60,7 +60,7 @@ export function EmailOverlayContainer({
       const t = {
         ContentType: f.type,
         Filename: f.name,
-        Base64Content: (await toBase64(f)).split(",")[1],
+        Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
       };
       attachments.push(t);
     });
diff --git a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
index d56c733c9..ac867cf45 100644
--- a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
@@ -65,7 +65,7 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
       });
     }
   };
-  console.log("selectedImages :>> ", selectedImages);
+
   const handleFinish = async ({ jobid }) => {
     setLoading(true);