Skip to content

Commit fb8f030

Browse files
committed
issue-1083
1 parent 6754b03 commit fb8f030

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

src/actions/challenges.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,10 @@ export function createChallenge (challengeDetails) {
245245
type: CREATE_CHALLENGE_SUCCESS,
246246
challengeDetails: challenge
247247
})
248-
}).catch(() => {
248+
}).catch((e) => {
249249
dispatch({
250-
type: CREATE_CHALLENGE_FAILURE
250+
type: CREATE_CHALLENGE_FAILURE,
251+
error: e
251252
})
252253
})
253254
}

src/components/ChallengeEditor/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,6 +1160,7 @@ class ChallengeEditor extends Component {
11601160
token,
11611161
removeAttachment,
11621162
failedToLoad,
1163+
errorMessage,
11631164
projectDetail,
11641165
attachments
11651166
} = this.props
@@ -1180,7 +1181,7 @@ class ChallengeEditor extends Component {
11801181
if (failedToLoad) {
11811182
return (
11821183
<div className={styles.wrapper}>
1183-
<div className={styles.title}>There was an error loading the challenge</div>
1184+
<div className={styles.title}>{errorMessage || 'There was an error loading the challenge'}</div>
11841185
<br />
11851186
<div className={styles.container}>
11861187
<div className={styles.formContainer}>
@@ -1557,6 +1558,7 @@ ChallengeEditor.propTypes = {
15571558
attachments: PropTypes.arrayOf(PropTypes.shape()),
15581559
token: PropTypes.string.isRequired,
15591560
failedToLoad: PropTypes.bool,
1561+
errorMessage: PropTypes.string,
15601562
history: PropTypes.any.isRequired,
15611563
assignedMemberDetails: PropTypes.shape(),
15621564
updateChallengeDetails: PropTypes.func.isRequired,

src/containers/ChallengeEditor/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ class ChallengeEditor extends Component {
245245
token,
246246
removeAttachment,
247247
failedToLoad,
248+
errorMessage,
248249
projectDetail,
249250
updateChallengeDetails,
250251
partiallyUpdateChallengeDetails,
@@ -325,6 +326,7 @@ class ChallengeEditor extends Component {
325326
token={token}
326327
removeAttachment={removeAttachment}
327328
failedToLoad={failedToLoad}
329+
errorMessage={errorMessage}
328330
projectDetail={projectDetail}
329331
assignedMemberDetails={assignedMemberDetails}
330332
updateChallengeDetails={updateChallengeDetails}
@@ -422,6 +424,7 @@ ChallengeEditor.propTypes = {
422424
loggedInUser: PropTypes.object,
423425
removeAttachment: PropTypes.func,
424426
failedToLoad: PropTypes.bool,
427+
errorMessage: PropTypes.string,
425428
updateChallengeDetails: PropTypes.func.isRequired,
426429
partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
427430
createChallenge: PropTypes.func.isRequired,
@@ -431,7 +434,7 @@ ChallengeEditor.propTypes = {
431434
// members: PropTypes.arrayOf(PropTypes.shape())
432435
}
433436

434-
const mapStateToProps = ({ projects, challenges: { challengeDetails, challengeResources, metadata, isLoading, attachments, failedToLoad }, auth: { token, user }, members: { members } }) => ({
437+
const mapStateToProps = ({ projects, challenges: { challengeDetails, challengeResources, metadata, isLoading, attachments, failedToLoad, errorMessage }, auth: { token, user }, members: { members } }) => ({
435438
challengeDetails,
436439
hasProjectAccess: projects.hasProjectAccess,
437440
projectDetail: projects.projectDetail,
@@ -442,7 +445,8 @@ const mapStateToProps = ({ projects, challenges: { challengeDetails, challengeRe
442445
attachments,
443446
token,
444447
loggedInUser: user,
445-
failedToLoad
448+
failedToLoad,
449+
errorMessage
446450
// members
447451
})
448452

src/reducers/challenges.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default function (state = initialState, action) {
9393
return { ...state, isLoading: false }
9494
case LOAD_CHALLENGE_DETAILS_FAILURE:
9595
case CREATE_CHALLENGE_FAILURE:
96-
return { ...state, isLoading: false, attachments: [], challenge: null, failedToLoad: true }
96+
return { ...state, isLoading: false, attachments: [], challenge: null, failedToLoad: true, errorMessage: _.get(action, 'error.response.data.message', '') }
9797
case LOAD_CHALLENGE_DETAILS_SUCCESS: {
9898
return {
9999
...state,

0 commit comments

Comments
 (0)