Merge branch 'dev' into feature/copilotWorkflow

Author: gondzo

src/components/TeamManagement/TeamManagement.jsx

@@ -68,7 +68,7 @@ class TeamManagement extends React.Component {
     const topcoderTeamManageAction = currentUser.isAdmin || (currentMember && currentUser.isManager)
     const topcoderTeamViewAction = !topcoderTeamManageAction
     const canJoinAsCopilot = !currentMember && currentUser.isCopilot
-    const canJoinAsManager = !currentMember && currentUser.isManager
+    const canJoinAsManager = !currentMember && (currentUser.isManager || currentUser.isAccountManager)
     const canShowInvite = currentMember && (currentUser.isCustomer || currentMember.isCopilot || currentMember.isManager)
 
     const sortedMembers = members
@@ -162,16 +162,19 @@ class TeamManagement extends React.Component {
           const onClickJoinConfirm = (role) => {
             onJoinConfirm(role)
           }
+          let role = 'Manager'
+          if (currentUser.isCopilot) role = 'Copilot'
+          if (currentUser.isAccountManager) role = 'Account Manager'
           return (
             <Dialog
               disabled={processingMembers}
               onCancel={onClickCancel}
               onConfirm={onClickJoinConfirm}
-              title={`Join project as ${currentUser.isCopilot ? 'Copilot' : 'Manager'}`}
+              title={`Join project as ${role}`}
               content={JOIN_MESSAGE}
               buttonText="Join project"
               buttonColor="blue"
-              showRoleSelector
+              showRoleSelector={currentUser.isManager}
             />
           )
         })())}

src/config/constants.js

@@ -556,6 +556,7 @@ export const EVENT_ROUTE_CHANGE = 'event.route_change'
 export const ROLE_TOPCODER_USER = 'Topcoder User'
 export const ROLE_CONNECT_COPILOT = 'Connect Copilot'
 export const ROLE_CONNECT_MANAGER = 'Connect Manager'
+export const ROLE_CONNECT_ACCOUNT_MANAGER = 'Connect Account Manager'
 export const ROLE_CONNECT_ADMIN = 'Connect Admin'
 export const ROLE_ADMINISTRATOR = 'administrator'
 export const ROLE_CONNECT_COPILOT_MANAGER = 'Connect Copilot Manager'

src/projects/detail/containers/TeamManagementContainer.jsx

@@ -12,6 +12,7 @@ import {
   ROLE_CONNECT_COPILOT,
   ROLE_CONNECT_COPILOT_MANAGER,
   ROLE_CONNECT_MANAGER,
+  ROLE_CONNECT_ACCOUNT_MANAGER,
   PROJECT_ROLE_ACCOUNT_MANAGER
 } from '../../../config/constants'
 import TeamManagement from '../../../components/TeamManagement/TeamManagement'
@@ -72,7 +73,10 @@ class TeamManagementContainer extends Component {
 
   onJoinConfirm(role) {
     const { currentUser, projectId, addProjectMember } = this.props
-    role = role || (currentUser.isCopilot ? PROJECT_ROLE_COPILOT : PROJECT_ROLE_MANAGER)
+    let defaultRole = PROJECT_ROLE_MANAGER
+    if (currentUser.isCopilot) defaultRole = PROJECT_ROLE_COPILOT
+    if (currentUser.isAccountManager) defaultRole = PROJECT_ROLE_ACCOUNT_MANAGER
+    role = role || defaultRole
     addProjectMember(
       projectId,
       {userId: currentUser.userId, role}
@@ -218,6 +222,7 @@ const mapStateToProps = ({loadUser, members, projectState}) => {
       isManager: loadUser.user.roles.some((role) => managerRoles.indexOf(role) !== -1),
       isCustomer: !loadUser.user.roles.some((role) => powerUserRoles.indexOf(role) !== -1),
       isCopilotManager: _.indexOf(loadUser.user.roles, ROLE_CONNECT_COPILOT_MANAGER) > -1,
+      isAccountManager: _.indexOf(loadUser.user.roles, ROLE_CONNECT_ACCOUNT_MANAGER) > -1,
     },
     allMembers: _.values(members.members),
     processingInvites: projectState.processingInvites,

src/projects/list/components/Projects/Projects.jsx

@@ -15,7 +15,7 @@ import _ from 'lodash'
 import querystring from 'query-string'
 import { updateProject } from '../../../actions/project'
 import { getNewProjectLink } from '../../../../helpers/projectHelper'
-import { ROLE_CONNECT_MANAGER, ROLE_CONNECT_COPILOT, ROLE_ADMINISTRATOR,
+import { ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER, ROLE_CONNECT_COPILOT, ROLE_ADMINISTRATOR,
   ROLE_CONNECT_ADMIN, PROJECT_STATUS, PROJECT_STATUS_CANCELLED, PROJECT_STATUS_ACTIVE,
   PROJECT_LIST_DEFAULT_CRITERIA, PROJECTS_LIST_VIEW, PROJECTS_LIST_PER_PAGE } from '../../../../config/constants'
 
@@ -262,7 +262,7 @@ class Projects extends Component {
 
 const mapStateToProps = ({ projectSearch, members, loadUser, projectState, templates, notifications }) => {
   let isPowerUser = false
-  const roles = [ROLE_CONNECT_COPILOT, ROLE_CONNECT_MANAGER, ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN]
+  const roles = [ROLE_CONNECT_COPILOT, ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER, ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN]
   if (loadUser.user) {
     isPowerUser = loadUser.user.roles.some((role) => roles.indexOf(role) !== -1)
   }

src/routes/notifications/constants/notifications.js

@@ -6,7 +6,7 @@
  */
 import {
   NOTIFICATION_TYPE,
-  ROLE_CONNECT_COPILOT, ROLE_CONNECT_MANAGER, ROLE_ADMINISTRATOR, ROLE_CONNECT_COPILOT_MANAGER,
+  ROLE_CONNECT_COPILOT, ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER, ROLE_CONNECT_COPILOT_MANAGER, ROLE_ADMINISTRATOR,
   PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER, PROJECT_ROLE_OWNER, PROJECT_ROLE_MEMBER,
   EVENT_TYPE,
 } from '../../../config/constants'
@@ -34,6 +34,11 @@ export const NOTIFICATIONS = [
       text: 'Your Project was created successfully',
       projectRoles: [PROJECT_ROLE_OWNER],
       goTo: GOTO.PROJECT_DASHBOARD
+    },
+    {
+      text: 'New project is created',
+      topcoderRoles: [ROLE_CONNECT_ACCOUNT_MANAGER],
+      goTo: GOTO.PROJECT_DASHBOARD
     }]
   },
 
@@ -60,7 +65,7 @@ export const NOTIFICATIONS = [
       goTo: GOTO.PROJECT_DASHBOARD
     }, {
       text: 'Project is available for review',
-      topcoderRoles: [ROLE_CONNECT_MANAGER, ROLE_ADMINISTRATOR],
+      topcoderRoles: [ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER, ROLE_ADMINISTRATOR],
       goTo: GOTO.PROJECT_SPECIFICATION
     }]
   },