Skip to content

Commit 8a6d891

Browse files
committed
invite approve success messages
1 parent 5855300 commit 8a6d891

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

src/config/constants.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,9 @@ export const PROJECT_MEMBER_INVITE_STATUS_REFUSED = 'refused'
534534
export const PROJECT_MEMBER_INVITE_STATUS_CANCELED = 'canceled'
535535
export const PROJECT_MEMBER_INVITE_STATUS_PENDING = 'pending'
536536
export const PROJECT_MEMBER_INVITE_STATUS_REQUESTED = 'requested'
537+
export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED = 'request_approved'
538+
export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED = 'request_rejected'
539+
537540

538541
// projects list view types
539542
export const PROJECTS_LIST_VIEW = {

src/projects/reducers/project.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,16 @@ export const projectState = function (state=initialState, action) {
183183
case ACCEPT_OR_REFUSE_INVITE_SUCCESS: {
184184
return Object.assign({}, state, {
185185
showUserInvited: false,
186-
project: action.payload
187186
})
188187
}
189188

190189
case RELOAD_PROJECT_MEMBERS_SUCCESS: {
191190
return Object.assign({}, state, {
192-
project: action.payload
191+
project:{
192+
...state.project,
193+
members: action.payload.members,
194+
invites: action.payload.invites,
195+
}
193196
})
194197
}
195198

src/reducers/alerts.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import {
2424
REMOVE_CUSTOMER_INVITE_FAILURE, REMOVE_CUSTOMER_INVITE_SUCCESS,
2525
// accepted or refused invite
2626
ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE,
27+
PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, PROJECT_MEMBER_INVITE_STATUS_REFUSED,
28+
PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED, PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED,
2729
// project feeds
2830
CREATE_PROJECT_FEED_FAILURE,
2931
CREATE_PROJECT_FEED_COMMENT_FAILURE,
@@ -159,7 +161,15 @@ export default function(state = {}, action) {
159161
return state
160162

161163
case ACCEPT_OR_REFUSE_INVITE_SUCCESS:
162-
Alert.success('You\'ve successfully joined the project.')
164+
if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_ACCEPTED){
165+
Alert.success('You\'ve successfully joined the project.')
166+
} else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REFUSED){
167+
Alert.success('You\'ve refused to join the project.')
168+
} else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED){
169+
Alert.success('You\'ve approved copilot invitation request.')
170+
} else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED){
171+
Alert.success('You\'ve rejected copilot invitation request.')
172+
}
163173
return state
164174

165175
case UPDATE_PROJECT_FAILURE:

0 commit comments

Comments
 (0)