diff --git a/components/Paper/PaperUploadInfo.js b/components/Paper/PaperUploadInfo.js index 07f0312e37..31b644bd50 100644 --- a/components/Paper/PaperUploadInfo.js +++ b/components/Paper/PaperUploadInfo.js @@ -372,7 +372,6 @@ class PaperUploadInfo extends React.Component { }; handleHubSelection = (id, value) => { - debugger; let form = JSON.parse(JSON.stringify(this.state.form)); let error = { ...this.state.error }; value = value || []; @@ -644,7 +643,7 @@ class PaperUploadInfo extends React.Component { )}
- + /> */} )} -
-
- - - + {editMode && ( +
+
+ + + +
-
+ )} - - - + {editMode && ( + + + + )}
@@ -949,9 +952,11 @@ class PaperUploadInfo extends React.Component { let paperId = this.props.paper.postedPaper && this.props.paper.postedPaper.id; - request === "POST" - ? await this.props.paperActions.postPaper(body) - : await this.props.paperActions.patchPaper(paperId, body); + let resp = + request === "POST" + ? await this.props.paperActions.postPaper(body) + : await this.props.paperActions.patchPaper(paperId, body); + if (this.props.paper.success) { this.props.messageActions.setMessage( `Paper successfully ${request === "POST" ? "uploaded" : "updated"}` @@ -964,46 +969,14 @@ class PaperUploadInfo extends React.Component { this.props.authActions.getUser(); this.navigateToSummary(); } else { - paperActions.patchPaper(paperId, body).then((resp) => { - if (paper.success) { - messageActions.setMessage( - `Paper successfully ${ - request === "POST" ? "uploaded" : "updated" - }` - ); - authActions.setUploadingPaper(true); - messageActions.showMessage({ show: true }); - let firstTime = !this.props.auth.user.has_seen_first_coin_modal; - authActions.checkUserFirstTime(firstTime); - - // What is this getuser doing here? - authActions.getUser(); - this.navigateToSummary(); - } else { - messageActions.setMessage("Hmm something went wrong"); - messageActions.showMessage({ show: true, error: true }); - setTimeout(() => messageActions.showMessage({ show: false }), 400); - } - }); + messageActions.setMessage( + resp.payload.errorBody.error + ? resp.payload.errorBody.error + : "Hmm something went wrong" + ); + messageActions.showMessage({ show: true, error: true }); + setTimeout(() => messageActions.showMessage({ show: false }), 2000); } - } else if (this.state.editMode) { - paperActions.patchPaper(this.props.paperId, body).then((resp) => { - if (resp.payload.success) { - messageActions.setMessage(`Paper successfully updated`); - messageActions.showMessage({ show: true }); - authActions.getUser(); - setTimeout(() => { - this.navigateToSummary(); - setTimeout(() => { - messageActions.showMessage({ show: false }); - }, 400); - }, 800); - } else { - messageActions.setMessage("Hmm something went wrong"); - messageActions.showMessage({ show: true, error: true }); - setTimeout(() => messageActions.showMessage({ show: false }), 400); - } - }); } }; @@ -1064,9 +1037,9 @@ class PaperUploadInfo extends React.Component { isOpen={modals.openAddAuthorModal} addNewUser={this.addNewUser} /> -
+ {/*
-
+
*/}
{ @@ -1078,9 +1051,9 @@ class PaperUploadInfo extends React.Component { autoComplete={"off"} >
-
+ {/*
-
+
*/} {this.renderContent()}
{this.renderButtons()} @@ -1099,6 +1072,7 @@ const styles = StyleSheet.create({ alignItems: "center", scrollBehavior: "smooth", position: "relative", + minHeight: "100vh", }, text: { fontFamily: "Roboto", @@ -1137,17 +1111,19 @@ const styles = StyleSheet.create({ width: "100%", }, pageContent: { - minHeight: 500, position: "relative", backgroundColor: "#FFF", - boxShadow: "0 1px 8px rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);", + border: "1px solid #ddd", + borderRadius: 4, + // boxShadow: "0 1px 8px rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);", padding: "30px 60px", - marginTop: 10, - borderTop: "4px solid #dedee5", + marginTop: 40, + // borderTop: "4px solid #dedee5", "@media only screen and (max-width: 935px)": { minWidth: "unset", width: 600, padding: 40, + marginTop: 16, }, "@media only screen and (max-width: 665px)": { width: "calc(100% - 16px)", diff --git a/redux/paper/actions.js b/redux/paper/actions.js index c5bbcf549f..d90f9763d5 100644 --- a/redux/paper/actions.js +++ b/redux/paper/actions.js @@ -19,7 +19,7 @@ export function setPostPaperPending(request = "POST") { payload: { donePosting: false }, }; } -export function setPostPaperFailure(request = "POST") { +export function setPostPaperFailure(request = "POST", errorBody) { let type = function(request) { switch (request) { case "PATCH": @@ -35,7 +35,7 @@ export function setPostPaperFailure(request = "POST") { return { type: type(request), - payload: { donePosting: true, success: false }, + payload: { donePosting: true, success: false, errorBody }, }; } export function setPostPaperSuccess(postedPaper, request = "POST") { diff --git a/redux/paper/index.js b/redux/paper/index.js index 33dcf1a75a..8341f3a2c0 100644 --- a/redux/paper/index.js +++ b/redux/paper/index.js @@ -174,7 +174,11 @@ export const PaperActions = { API.POST_FILE_CONFIG(shims.paperPost(body)) ).catch(utils.handleCatch); - let action = actions.setPostPaperFailure(); + let errorBody = null; + if (response.status === 400) { + errorBody = await response.json(); + } + let action = actions.setPostPaperFailure("POST", errorBody); if (response.ok) { const body = await response.json(); const paper = shims.paper(body);