fix: use logger in postFile, refactor postFile

graasp · Aug 31, 2020 · d9145b6 · d9145b6
1 parent d308f36
commit d9145b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/public/app/listeners/postFile.js b/public/app/listeners/postFile.js
@@ -28,7 +28,7 @@ const postFile = mainWindow => (event, payload = {}) => {
     // send back the resource
     mainWindow.webContents.send(POST_FILE_CHANNEL, newPayload);
   } catch (e) {
-    console.error(e);
+    logger.error(e);
     mainWindow.webContents.send(POST_FILE_CHANNEL, ERROR_GENERAL);
   }
 };

diff --git a/src/actions/file.js b/src/actions/file.js
@@ -7,7 +7,7 @@ import { ERROR_POSTING_FILE_MESSAGE } from '../config/messages';
 export const postFile = async (
   { userId, appInstanceId, spaceId, subSpaceId, format, data, type } = {},
   callback
-) => () => {
+) => {
   try {
     window.ipcRenderer.send(POST_FILE_CHANNEL, {
       userId,
@@ -36,6 +36,10 @@ export const postFile = async (
       }
     });
   } catch (err) {
-    console.error(err);
+    callback({
+      appInstanceId,
+      type: POST_FILE_FAILED,
+      payload: ERROR_POSTING_FILE_MESSAGE,
+    });
   }
 };
diff --git a/src/components/phase/PhaseApp.js b/src/components/phase/PhaseApp.js
@@ -54,7 +54,6 @@ class PhaseApp extends Component {
     folder: PropTypes.string.isRequired,
     dispatchGetAppInstance: PropTypes.func.isRequired,
     dispatchPostAction: PropTypes.func.isRequired,
-    dispatchPostFile: PropTypes.func.isRequired,
     id: PropTypes.string.isRequired,
     phaseId: PropTypes.string.isRequired,
     spaceId: PropTypes.string.isRequired,
@@ -119,7 +118,6 @@ class PhaseApp extends Component {
     try {
       const {
         dispatchGetAppInstance,
-        dispatchPostFile,
         appInstance,
         dispatchPostAction,
         user,
@@ -166,7 +164,7 @@ class PhaseApp extends Component {
           }
           case POST_FILE: {
             if (isSpaceSaved) {
-              return dispatchPostFile(payload, this.postMessage);
+              return postFile(payload, this.postMessage);
             }
             break;
           }
@@ -341,7 +339,6 @@ const mapStateToProps = ({ authentication, Space }) => ({
 const mapDispatchToProps = {
   dispatchGetAppInstance: getAppInstance,
   dispatchPostAction: postAction,
-  dispatchPostFile: postFile,
 };
 
 const ConnectedComponent = connect(