Merge branch 'dev' into cloudfrontavatar

Author: gautam1168

src/api/projects.js

@@ -56,6 +56,7 @@ export function getProjectById(projectId) {
       _.forEach(res.attachments, a => {
         a.downloadUrl = `/projects/${projectId}/attachments/${a.id}`
       })
+      if (!res.invites) res.invites = []
       return res
     })
 }

src/config/constants.js

@@ -346,6 +346,11 @@ export const ACCEPT_OR_REFUSE_INVITE_PENDING = 'ACCEPT_OR_REFUSE_INVITE_PENDING'
 export const ACCEPT_OR_REFUSE_INVITE_FAILURE = 'ACCEPT_OR_REFUSE_INVITE_FAILURE'
 export const ACCEPT_OR_REFUSE_INVITE_SUCCESS = 'ACCEPT_OR_REFUSE_INVITE_SUCCESS'
 
+export const RELOAD_PROJECT_MEMBERS       = 'RELOAD_PROJECT_MEMBERS'
+export const RELOAD_PROJECT_MEMBERS_PENDING       = 'RELOAD_PROJECT_MEMBERS_PENDING'
+export const RELOAD_PROJECT_MEMBERS_FAILURE       = 'RELOAD_PROJECT_MEMBERS_FAILURE'
+export const RELOAD_PROJECT_MEMBERS_SUCCESS       = 'RELOAD_PROJECT_MEMBERS_SUCCESS'
+
 export const ADD_PROJECT_MEMBERS         = 'ADD_PROJECT_MEMBERS'
 export const ADD_PROJECT_MEMBERS_PENDING = 'ADD_PROJECT_MEMBERS_PENDING'
 export const ADD_PROJECT_MEMBERS_SUCCESS = 'ADD_PROJECT_MEMBERS_SUCCESS'

src/projects/actions/projectMember.js

@@ -6,7 +6,7 @@ import { addProjectMember as addMember,
 import { createProjectMemberInvite as createProjectMemberInvite,
   updateProjectMemberInvite as updateProjectMemberInvite
 } from '../../api/projectMemberInvites'
-import { loadProjectDashboard } from './projectDashboard'
+import { getProjectById } from '../../api/projects'
 import { loadMembers, loadMembersByHandle } from '../../actions/members'
 
 import {ADD_PROJECT_MEMBER, REMOVE_PROJECT_MEMBER, UPDATE_PROJECT_MEMBER,
@@ -17,7 +17,8 @@ import {ADD_PROJECT_MEMBER, REMOVE_PROJECT_MEMBER, UPDATE_PROJECT_MEMBER,
   INVITE_CUSTOMER,
   ACCEPT_OR_REFUSE_INVITE,
   PROJECT_ROLE_CUSTOMER,
-  PROJECT_MEMBER_INVITE_STATUS_CANCELED
+  PROJECT_MEMBER_INVITE_STATUS_CANCELED,
+  RELOAD_PROJECT_MEMBERS
 } from '../../config/constants'
 
 
@@ -141,22 +142,20 @@ export function inviteProjectMembers(projectId, emailIds, handles) {
   }
 }
 
-
-function acceptOrRefuseInviteWithData(dispatch, projectId, item) {
-  return new Promise((resolve, reject) => {
-    return updateProjectMemberInvite(projectId, item)
-      .then(() => {
-        return dispatch(loadProjectDashboard(projectId))
-      })
-      .catch(err => reject(err))
-  })
-}
-
 export function acceptOrRefuseInvite(projectId, item) {
   return (dispatch) => {
     return dispatch({
       type: ACCEPT_OR_REFUSE_INVITE,
-      payload: acceptOrRefuseInviteWithData(dispatch, projectId, item)
+      payload: updateProjectMemberInvite(projectId, item)
+    })
+  }
+}
+
+export function reloadProjectMembers(projectId) {
+  return (dispatch) => {
+    return dispatch({
+      type: RELOAD_PROJECT_MEMBERS,
+      payload: getProjectById(projectId)
     })
   }
 }

src/projects/detail/containers/TeamManagementContainer.jsx

@@ -18,6 +18,7 @@ import {
 import TeamManagement from '../../../components/TeamManagement/TeamManagement'
 import {
   acceptOrRefuseInvite,
+  reloadProjectMembers,
   addProjectMember,
   deleteProjectInvite,
   deleteTopcoderMemberInvite,
@@ -103,6 +104,7 @@ class TeamManagementContainer extends Component {
 
   onAcceptOrRefuse(invite) {
     this.props.acceptOrRefuseInvite(this.props.projectId, invite)
+      .then(() => this.props.reloadProjectMembers(this.props.projectId))
   }
 
   changeRole(memberId, item) {
@@ -243,6 +245,7 @@ const mapDispatchToProps = {
   inviteTopcoderMembers,
   deleteTopcoderMemberInvite,
   acceptOrRefuseInvite,
+  reloadProjectMembers,
 }
 
 TeamManagementContainer.propTypes = {

src/projects/reducers/project.js

@@ -19,7 +19,7 @@ import {
   INVITE_TOPCODER_MEMBER_SUCCESS, REMOVE_TOPCODER_MEMBER_INVITE_SUCCESS, INVITE_TOPCODER_MEMBER_PENDING, REMOVE_CUSTOMER_INVITE_PENDING,
   REMOVE_TOPCODER_MEMBER_INVITE_PENDING, REMOVE_TOPCODER_MEMBER_INVITE_FAILURE, REMOVE_CUSTOMER_INVITE_FAILURE,
   INVITE_CUSTOMER_FAILURE, INVITE_TOPCODER_MEMBER_FAILURE, INVITE_CUSTOMER_PENDING,
-  ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING,
+  ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING, RELOAD_PROJECT_MEMBERS_SUCCESS,
   UPLOAD_PROJECT_ATTACHMENT_FILES, DISCARD_PROJECT_ATTACHMENT, CHANGE_ATTACHMENT_PERMISSION
 } from '../../config/constants'
 import _ from 'lodash'
@@ -182,7 +182,14 @@ export const projectState = function (state=initialState, action) {
 
   case ACCEPT_OR_REFUSE_INVITE_SUCCESS: {
     return Object.assign({}, state, {
-      showUserInvited: false
+      showUserInvited: false,
+      project: action.payload
+    })
+  }
+
+  case RELOAD_PROJECT_MEMBERS_SUCCESS: {
+    return Object.assign({}, state, {
+      project: action.payload
     })
   }