From b476f679b5de1ce8498ad407da9412c9b6e72323 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 23 Aug 2017 10:47:05 +0530 Subject: [PATCH 1/3] =?UTF-8?q?Github=20issue#1134,=20Update=20copyright?= =?UTF-8?q?=20year=20on=20spec=20footer=20=E2=80=94=20Done=20copy=20change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FooterV2/FooterV2.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FooterV2/FooterV2.jsx b/src/components/FooterV2/FooterV2.jsx index e95689627..d49a50dae 100644 --- a/src/components/FooterV2/FooterV2.jsx +++ b/src/components/FooterV2/FooterV2.jsx @@ -12,7 +12,7 @@ const FooterV2 = () => (
  • Terms
  • - Topcoder © { moment().format('YYYY') }. + © Topcoder { moment().format('YYYY') }
    ) From 6d4ecea3c9597330192a6ca2dec10dc8b10f54a5 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 23 Aug 2017 12:43:10 +0530 Subject: [PATCH 2/3] =?UTF-8?q?Github=20issue#1133,=20Chatbot:=20"Save=20c?= =?UTF-8?q?hanges"=20button=20is=20enabled,=20but=20not=20working=20when?= =?UTF-8?q?=20validation=20is=20triggered=20=E2=80=94=20Fixed=20toaster=20?= =?UTF-8?q?message=20to=20show=20correct=20state=20of=20the=20project=20be?= =?UTF-8?q?ing=20updated.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/reducers/alerts.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js index 32a33e77d..176afa64f 100644 --- a/src/reducers/alerts.js +++ b/src/reducers/alerts.js @@ -6,6 +6,7 @@ import { CREATE_PROJECT_SUCCESS, CREATE_PROJECT_FAILURE, UPDATE_PROJECT_SUCCESS, UPDATE_PROJECT_FAILURE, DELETE_PROJECT_SUCCESS, DELETE_PROJECT_FAILURE, + LOAD_PROJECT_SUCCESS, // Attachments ADD_PROJECT_ATTACHMENT_SUCCESS, ADD_PROJECT_ATTACHMENT_FAILURE, UPDATE_PROJECT_ATTACHMENT_SUCCESS, UPDATE_PROJECT_ATTACHMENT_FAILURE, @@ -20,7 +21,9 @@ import { SAVE_PROJECT_FEED_FAILURE, SAVE_PROJECT_FEED_COMMENT_FAILURE, DELETE_PROJECT_FEED_FAILURE, - DELETE_PROJECT_FEED_COMMENT_FAILURE + DELETE_PROJECT_FEED_COMMENT_FAILURE, + // Project status + PROJECT_STATUS_IN_REVIEW } from '../config/constants' /* eslint-enable no-unused-vars */ @@ -36,13 +39,21 @@ export default function(state = {}, action) { Alert.success('Project deleted.') return state + case LOAD_PROJECT_SUCCESS: + return Object.assign({}, state, { + project: action.payload + }) case UPDATE_PROJECT_SUCCESS: - if (action.payload.status === 'in_review') { + const prevStatus = _.get(state, 'project.status', '') + if (action.payload.status === PROJECT_STATUS_IN_REVIEW + && prevStatus && prevStatus !== PROJECT_STATUS_IN_REVIEW) { Alert.success('Project submitted.') } else { Alert.success('Project updated.') } - return state + return Object.assign({}, state, { + project: action.payload + }) case REMOVE_PROJECT_MEMBER_SUCCESS: // show notification message if user leaving a project if (action.meta.isUserLeaving) { From d2e3893bdd9e2aeaa831efa57c5c195c9f32cc90 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 23 Aug 2017 13:04:15 +0530 Subject: [PATCH 3/3] fixed lint error --- src/reducers/alerts.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js index 176afa64f..c022c2382 100644 --- a/src/reducers/alerts.js +++ b/src/reducers/alerts.js @@ -43,7 +43,8 @@ export default function(state = {}, action) { return Object.assign({}, state, { project: action.payload }) - case UPDATE_PROJECT_SUCCESS: + + case UPDATE_PROJECT_SUCCESS: { const prevStatus = _.get(state, 'project.status', '') if (action.payload.status === PROJECT_STATUS_IN_REVIEW && prevStatus && prevStatus !== PROJECT_STATUS_IN_REVIEW) { @@ -54,6 +55,8 @@ export default function(state = {}, action) { return Object.assign({}, state, { project: action.payload }) + } + case REMOVE_PROJECT_MEMBER_SUCCESS: // show notification message if user leaving a project if (action.meta.isUserLeaving) {