Skip to content

Commit e9c57a3

Browse files
authored
Merge pull request #1090 from yoution/issue-1083
issue-1083
2 parents ccdabb4 + 3778b58 commit e9c57a3

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
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/ChallengeEditor.module.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
span {
2929
color: $tc-red;
3030
}
31+
3132
}
3233

3334
.textRequired {
@@ -232,10 +233,13 @@
232233
}
233234

234235
.error {
235-
text-align: right;
236236
padding-right: 40px;
237237
padding-bottom: 20px;
238-
color: $tc-red
238+
color: $tc-red;
239+
240+
.errorMessage {
241+
font-size: 25px;
242+
}
239243
}
240244

241245
.actionButtons {
@@ -332,6 +336,7 @@
332336
line-height: 36px;
333337
margin-bottom: 30px;
334338
margin-top: 0;
339+
335340
}
336341

337342
span {

src/components/ChallengeEditor/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,7 @@ class ChallengeEditor extends Component {
11651165
token,
11661166
removeAttachment,
11671167
failedToLoad,
1168+
errorMessage,
11681169
projectDetail,
11691170
attachments
11701171
} = this.props
@@ -1192,6 +1193,7 @@ class ChallengeEditor extends Component {
11921193
<div className={styles.group}>
11931194
<div className={styles.row}>
11941195
<div className={styles.error}>
1196+
{errorMessage && <div className={styles.errorMessage}>{`Error : ${errorMessage}`}</div>}
11951197
Please try again later and if the issue persists contact us at&nbsp;
11961198
<a href='mailto:support@topcoder.com'>support@topcoder.com</a>
11971199
&nbsp;to resolve the issue as soon as possible.
@@ -1562,6 +1564,7 @@ ChallengeEditor.propTypes = {
15621564
attachments: PropTypes.arrayOf(PropTypes.shape()),
15631565
token: PropTypes.string.isRequired,
15641566
failedToLoad: PropTypes.bool,
1567+
errorMessage: PropTypes.string,
15651568
history: PropTypes.any.isRequired,
15661569
assignedMemberDetails: PropTypes.shape(),
15671570
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)