Merge branch 'dev' into cf15

# Conflicts:
#	src/projects/actions/projectMember.js

Author: maxceem

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/components/TopBar/TopBarContainer.js

@@ -14,6 +14,7 @@ import {
   DOMAIN
 } from '../../config/constants'
 import ConnectLogoMono from '../../assets/icons/connect-logo-mono.svg'
+import { getAvatarResized } from '../../helpers/tcHelpers.js'
 require('./TopBarContainer.scss')
 
 
@@ -61,9 +62,9 @@ class TopBarContainer extends React.Component {
       )
     }
     const { user, toolbar, userRoles, isPowerUser } = this.props
-
     const userHandle  = _.get(user, 'handle')
-    const userImage = _.get(user, 'photoURL')
+    const bigPhotoURL = _.get(user, 'photoURL')
+    const userImage = getAvatarResized(bigPhotoURL, 40)
     const userFirstName = _.get(user, 'firstName')
     const userLastName = _.get(user, 'lastName')
     let userName = userFirstName

src/config/constants.js

@@ -347,6 +347,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'
@@ -530,6 +535,9 @@ export const PROJECT_MEMBER_INVITE_STATUS_REFUSED = 'refused'
 export const PROJECT_MEMBER_INVITE_STATUS_CANCELED = 'canceled'
 export const PROJECT_MEMBER_INVITE_STATUS_PENDING = 'pending'
 export const PROJECT_MEMBER_INVITE_STATUS_REQUESTED = 'requested'
+export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED = 'request_approved'
+export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED = 'request_rejected'
+
 
 // projects list view types
 export const PROJECTS_LIST_VIEW = {
@@ -786,7 +794,7 @@ export const EVENT_TYPE = {
     ASSIGNED_AS_OWNER: 'notifications.connect.project.member.assignedAsOwner',
     INVITE_REQUESTED: 'notifications.connect.project.member.invite.requested',
     INVITE_APPROVED: 'notifications.connect.project.member.invite.approved',
-    INVITE_REFUSED: 'notifications.connect.project.member.invite.refused',
+    INVITE_REFUSED: 'notifications.connect.project.member.invite.rejected',
   },
   PROJECT: {
     ACTIVE: 'notifications.connect.project.active',

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,
@@ -18,6 +18,7 @@ import {ADD_PROJECT_MEMBER, REMOVE_PROJECT_MEMBER, UPDATE_PROJECT_MEMBER,
   ACCEPT_OR_REFUSE_INVITE,
   PROJECT_ROLE_CUSTOMER,
   PROJECT_MEMBER_INVITE_STATUS_CANCELED,
+  RELOAD_PROJECT_MEMBERS,
   CLEAR_MEMBER_SUGGESTIONS
 } from '../../config/constants'
 
@@ -157,22 +158,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,17 @@ export const projectState = function (state=initialState, action) {
 
   case ACCEPT_OR_REFUSE_INVITE_SUCCESS: {
     return Object.assign({}, state, {
-      showUserInvited: false
+      showUserInvited: false,
+    })
+  }
+
+  case RELOAD_PROJECT_MEMBERS_SUCCESS: {
+    return Object.assign({}, state, {
+      project:{
+        ...state.project,
+        members: action.payload.members,
+        invites: action.payload.invites,
+      }
     })
   }
 

src/reducers/alerts.js

@@ -24,6 +24,8 @@ import {
   REMOVE_CUSTOMER_INVITE_FAILURE, REMOVE_CUSTOMER_INVITE_SUCCESS,
   // accepted or refused invite
   ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE,
+  PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, PROJECT_MEMBER_INVITE_STATUS_REFUSED,
+  PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED, PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED,
   // project feeds
   CREATE_PROJECT_FEED_FAILURE,
   CREATE_PROJECT_FEED_COMMENT_FAILURE,
@@ -159,7 +161,15 @@ export default function(state = {}, action) {
     return state
 
   case ACCEPT_OR_REFUSE_INVITE_SUCCESS:
-    Alert.success('You\'ve successfully joined the project.')
+    if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_ACCEPTED){
+      Alert.success('You\'ve successfully joined the project.')
+    } else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REFUSED){
+      Alert.success('You\'ve refused to join the project.')
+    } else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED){
+      Alert.success('You\'ve approved copilot invitation request.')
+    } else if (action.payload.status===PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED){
+      Alert.success('You\'ve rejected copilot invitation request.')
+    }
     return state
 
   case UPDATE_PROJECT_FAILURE:

src/routes/notifications/constants/notifications.js

@@ -236,7 +236,7 @@ export const NOTIFICATIONS = [
       toUserHandle: true,
       goTo: GOTO.PROJECT_DASHBOARD
     }, {
-      text: 'Your request to add invite the copilot was approved',
+      text: 'Your request to invite the copilot was approved',
       originator: true,
       goTo: GOTO.PROJECT_DASHBOARD
     }]
@@ -246,7 +246,7 @@ export const NOTIFICATIONS = [
     eventType: EVENT_TYPE.MEMBER.INVITE_REFUSED,
     type: NOTIFICATION_TYPE.MEMBER_ADDED,
     rules: [{
-      text: 'Your request to add invite the member was refused',
+      text: 'Your request to invite the copilot was refused',
       originator: true,
       goTo: GOTO.PROJECT_DASHBOARD
     }]