fixed issue with uploading attachments

bologer · Mar 28, 2020 · efa07d0 · efa07d0
1 parent 820292c
commit efa07d0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/reactjs/src/core/comment/CommentActions.ts b/reactjs/src/core/comment/CommentActions.ts
@@ -333,6 +333,7 @@ export function uploadAttachment(attachments, entropy) {
                 };
             },
             failure: {type: COMMENT_ATTACHMENT_UPLOAD_FAILURE, payload: {entropy}},
+            always: {type: COMMENT_ATTACHMENT_UPLOAD_INVALIDATE, payload: {entropy}},
         },
     });
 }

diff --git a/reactjs/src/core/comment/commentReducers.ts b/reactjs/src/core/comment/commentReducers.ts
@@ -157,7 +157,7 @@ export default function (state = DEFAULT_STATE, action) {
                 ...state,
                 attachmentUpload: {
                     ...state.attachmentUpload,
-                    [action.payload.entropy]: {isFetching: true}
+                    [action.payload.entropy]: {isFetching: true},
                 },
             };
         case COMMENT_ATTACHMENT_UPLOAD_SUCCESS:

diff --git a/reactjs/src/core/comment/form/SendCommentFormBody.tsx b/reactjs/src/core/comment/form/SendCommentFormBody.tsx
@@ -44,29 +44,29 @@ export default function SendCommentFormBody({
     const attachmentEntropy = comment && comment.id || 'default';
 
     useEffect(() => {
-        manageReducer({
-            reducer: attachmentUpload[attachmentEntropy],
-            onSuccess: (response) => {
-                if (response) {
-                    const files = response.files;
 
+        const attachmentReducer = attachmentUpload[attachmentEntropy] || undefined;
+
+        if (attachmentReducer && !attachmentReducer.isFetching) {
+            const {payload: response} = attachmentReducer;
+            if (response) {
+                const files = response.files || undefined;
+
+                if (files) {
                     if (!attachments || !attachments.length) {
                         handleAttachmentChange(files);
                     } else {
                         let newAttachments: [] = attachments;
-                        response.files.forEach(item => {
+                        files.forEach(item => {
                             newAttachments.push(item);
                         });
                         handleAttachmentChange(newAttachments);
                     }
-
-                    batch(() => {
-                        dispatch(invalidateAttachmentUpload(attachmentEntropy))
-                        dispatch(successSnackbar(settings.i18.file_uploaded));
-                    });
                 }
-            },
-        });
+
+                dispatch(successSnackbar(settings.i18.file_uploaded));
+            }
+        }
     }, [attachmentUpload[attachmentEntropy]]);
 
     /**