Merge pull request #3344 from appirio-tech/feature/new-roles

vikasrohit · web-flow · commit e49e361d84aa · 2019-10-01T11:17:12.000+05:30
New user roles
diff --git a/src/actions/loadUser.js b/src/actions/loadUser.js
@@ -9,7 +9,11 @@ import {
   ROLE_CONNECT_COPILOT,
   ROLE_TOPCODER_USER,
   ROLE_CONNECT_MANAGER,
-  ROLE_CONNECT_ADMIN
+  ROLE_CONNECT_ADMIN,
+  ROLE_ACCOUNT_EXECUTIVE,
+  ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+  ROLE_PROGRAM_MANAGER,
+  ROLE_PRESALES, ROLE_PROJECT_MANAGER, ROLE_SOLUTION_ARCHITECT
 } from '../config/constants'
 import { getFreshToken, configureConnector, decodeToken } from 'tc-accounts'
 import { getUserProfile } from '../api/users'
@@ -55,7 +59,19 @@ export function loadUserSuccess(dispatch, token) {
       currentUser = _.assign(currentUser, profile)
       // determine user role
       let userRole
-      if (_.indexOf(currentUser.roles, ROLE_ADMINISTRATOR) > -1) {
+      if (_.indexOf(currentUser.roles, ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE) > -1) {
+        userRole = ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE
+      } else if (_.indexOf(currentUser.roles, ROLE_PRESALES) > -1) {
+        userRole = ROLE_PRESALES
+      } else if (_.indexOf(currentUser.roles, ROLE_ACCOUNT_EXECUTIVE) > -1) {
+        userRole = ROLE_ACCOUNT_EXECUTIVE
+      } else if (_.indexOf(currentUser.roles, ROLE_PROGRAM_MANAGER) > -1) {
+        userRole = ROLE_PROGRAM_MANAGER
+      } else if (_.indexOf(currentUser.roles, ROLE_PROJECT_MANAGER) > -1) {
+        userRole = ROLE_PROJECT_MANAGER
+      } else if (_.indexOf(currentUser.roles, ROLE_SOLUTION_ARCHITECT) > -1) {
+        userRole = ROLE_SOLUTION_ARCHITECT
+      } else if (_.indexOf(currentUser.roles, ROLE_ADMINISTRATOR) > -1) {
         userRole = ROLE_ADMINISTRATOR
       } else if (_.indexOf(currentUser.roles, ROLE_CONNECT_ADMIN) > -1) {
         userRole = ROLE_CONNECT_ADMIN
diff --git a/src/components/TeamManagement/Dialog.js b/src/components/TeamManagement/Dialog.js
@@ -21,6 +21,18 @@ class Dialog extends React.Component {
     }, {
       title: 'Account Manager',
       value: 'account_manager',
+    }, {
+      title: 'Account Executive',
+      value: 'account_executive',
+    }, {
+      title: 'Program Manager',
+      value: 'program_manager',
+    }, {
+      title: 'Solution Architect',
+      value: 'solution_architect',
+    }, {
+      title: 'Project Manager',
+      value: 'project_manager',
     }]
 
     this.handleRoles = this.handleRoles.bind(this)
diff --git a/src/components/TeamManagement/TeamManagement.scss b/src/components/TeamManagement/TeamManagement.scss
@@ -144,6 +144,7 @@
         }
 
         .project-member-layout {
+          flex-wrap: wrap;
           min-height: 60px;
           padding: $base-unit*2 $base-unit*4;
           display: flex;
@@ -247,20 +248,29 @@
           }
 
           .member-role-container {
-            margin-left: $base-unit*3;
+            margin-left: $base-unit*12;
+            width: 100%;
             display: flex;
             padding: 1px;
             border-radius: 5px;
             border: 1px solid $tc-gray-40;
             background: white;
             min-width: 300px;
 
+            .Tooltip {
+              align-items: center;
+              display: flex;
+            }
+
             .member-role {
+              align-items: center;
+              display: flex;
               padding: $base-unit $base-unit*2;
               @include roboto;
               color: $tc-gray-70;
               font-size: $tc-label-xs;
               cursor: pointer;
+              text-align: center;
             }
 
             .member-role.active {
@@ -473,4 +483,4 @@
 
 .title-text {
   letter-spacing: 0.8px
-}
+}
diff --git a/src/components/TeamManagement/TopcoderManagementDialog.js b/src/components/TeamManagement/TopcoderManagementDialog.js
@@ -44,6 +44,18 @@ class TopcoderManagementDialog extends React.Component {
     }, {
       title: 'Account Manager',
       value: 'account_manager',
+    }, {
+      title: 'Account Executive',
+      value: 'account_executive',
+    }, {
+      title: 'Program Manager',
+      value: 'program_manager',
+    }, {
+      title: 'Solution Architect',
+      value: 'solution_architect',
+    }, {
+      title: 'Project Manager',
+      value: 'project_manager',
     }]
   }
 
@@ -208,7 +220,7 @@ class TopcoderManagementDialog extends React.Component {
                         </div>
                       )
                     }
-                    const types = ['Observer', 'Copilot', 'Manager', 'Account Manager']
+                    const types = ['Observer', 'Copilot', 'Manager', 'Account Manager', 'Account Executive', 'Program Manager', 'Solution Architect', 'Project Manager']
                     const currentType = role
                     const onClick = (type) => {
                       this.onUserRoleChange(member.userId, member.id, type)
diff --git a/src/components/TopBar/TopBarContainer.js b/src/components/TopBar/TopBarContainer.js
@@ -11,7 +11,12 @@ import {
   ROLE_ADMINISTRATOR,
   ROLE_CONNECT_ADMIN,
   ROLE_CONNECT_ACCOUNT_MANAGER,
-  DOMAIN
+  DOMAIN,
+  ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+  ROLE_PRESALES,
+  ROLE_ACCOUNT_EXECUTIVE,
+  ROLE_PROJECT_MANAGER,
+  ROLE_PROGRAM_MANAGER, ROLE_SOLUTION_ARCHITECT
 } from '../../config/constants'
 import ConnectLogoMono from '../../assets/icons/connect-logo-mono.svg'
 import { getAvatarResized, getFullNameWithFallback } from '../../helpers/tcHelpers.js'
@@ -161,7 +166,20 @@ class TopBarContainer extends React.Component {
 
 const mapStateToProps = ({ loadUser }) => {
   let isPowerUser = false
-  const roles = [ROLE_CONNECT_COPILOT, ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER, ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN]
+  const roles = [
+    ROLE_CONNECT_COPILOT,
+    ROLE_CONNECT_MANAGER,
+    ROLE_CONNECT_ACCOUNT_MANAGER,
+    ROLE_ADMINISTRATOR,
+    ROLE_CONNECT_ADMIN,
+    
+    ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+    ROLE_PRESALES,
+    ROLE_ACCOUNT_EXECUTIVE,
+    ROLE_PROJECT_MANAGER,
+    ROLE_PROGRAM_MANAGER,
+    ROLE_SOLUTION_ARCHITECT,
+  ]
   if (loadUser.user) {
     isPowerUser = loadUser.user.roles.some((role) => roles.indexOf(role) !== -1)
   }
diff --git a/src/config/constants.js b/src/config/constants.js
@@ -626,7 +626,10 @@ export const PROJECT_ROLE_ACCOUNT_MANAGER = 'account_manager'
 export const PROJECT_ROLE_CUSTOMER = 'customer'
 export const PROJECT_ROLE_OWNER = 'owner'
 export const PROJECT_ROLE_MEMBER = 'member' // this is need for notifications
-
+export const PROJECT_ROLE_ACCOUNT_EXECUTIVE = 'account_executive'
+export const PROJECT_ROLE_PROGRAM_MANAGER = 'program_manager'
+export const PROJECT_ROLE_SOLUTION_ARCHITECT = 'solution_architect'
+export const PROJECT_ROLE_PROJECT_MANAGER = 'project_manager'
 /*
  * Events
  */
@@ -642,6 +645,12 @@ 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'
+export const ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE = 'Business Development Representative'
+export const ROLE_PRESALES = 'Presales'
+export const ROLE_ACCOUNT_EXECUTIVE = 'Account Executive'
+export const ROLE_PROGRAM_MANAGER = 'Program Manager'
+export const ROLE_SOLUTION_ARCHITECT = 'Solution Architect'
+export const ROLE_PROJECT_MANAGER = 'Project Manager'
 
 // to be able to start the Connect App we should pass at least the dummy value for `FILE_PICKER_API_KEY`
 // but if we want to test file uploading we should provide the real value in `FILE_PICKER_API_KEY` env variable
diff --git a/src/config/permissions.js b/src/config/permissions.js
@@ -6,31 +6,98 @@ import {
   ROLE_ADMINISTRATOR,
   ROLE_CONNECT_ADMIN,
   ROLE_CONNECT_MANAGER,
-  ROLE_CONNECT_ACCOUNT_MANAGER
+  ROLE_CONNECT_ACCOUNT_MANAGER,
+  ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+  ROLE_PRESALES,
+  ROLE_ACCOUNT_EXECUTIVE,
+  ROLE_PROGRAM_MANAGER,
+  ROLE_SOLUTION_ARCHITECT,
+  ROLE_PROJECT_MANAGER,
+  PROJECT_ROLE_ACCOUNT_EXECUTIVE,
+  PROJECT_ROLE_PROJECT_MANAGER,
+  PROJECT_ROLE_PROGRAM_MANAGER,
+  PROJECT_ROLE_SOLUTION_ARCHITECT
 } from './constants'
 
 export default {
   EDIT_PROJECT_PLAN: {
-    projectRoles: [PROJECT_ROLE_MANAGER, PROJECT_ROLE_COPILOT, ROLE_CONNECT_ADMIN],
+    projectRoles: [
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT,
+      PROJECT_ROLE_COPILOT,
+      ROLE_CONNECT_ADMIN
+    ],
     topcoderRoles: [ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN],
   },
   INVITE_TOPCODER_MEMBER: {
-    projectRoles: [PROJECT_ROLE_MANAGER, PROJECT_ROLE_ACCOUNT_MANAGER, ROLE_CONNECT_ADMIN],
-    topcoderRoles: [ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN, ROLE_CONNECT_MANAGER, ROLE_CONNECT_ACCOUNT_MANAGER],
+    projectRoles: [
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_ACCOUNT_MANAGER,
+      PROJECT_ROLE_ACCOUNT_EXECUTIVE,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT,
+      ROLE_CONNECT_ADMIN
+    ],
+    topcoderRoles: [
+      ROLE_ADMINISTRATOR,
+      ROLE_CONNECT_ADMIN,
+      ROLE_CONNECT_MANAGER,
+      ROLE_CONNECT_ACCOUNT_MANAGER,
+      ROLE_BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+      ROLE_PRESALES,
+      ROLE_ACCOUNT_EXECUTIVE,
+      ROLE_PROGRAM_MANAGER,
+      ROLE_SOLUTION_ARCHITECT,
+      ROLE_PROJECT_MANAGER,
+    ],
   },
   ACCESS_PRIVATE_POST: {
-    topcoderRoles: [PROJECT_ROLE_COPILOT, ROLE_CONNECT_MANAGER, ROLE_CONNECT_ADMIN, ROLE_ADMINISTRATOR]
+    topcoderRoles: [
+      PROJECT_ROLE_COPILOT,
+      ROLE_CONNECT_MANAGER,
+      ROLE_CONNECT_ADMIN,
+      ROLE_ADMINISTRATOR,
+      ROLE_PROGRAM_MANAGER,
+      ROLE_SOLUTION_ARCHITECT,
+      ROLE_PROJECT_MANAGER,
+    ]
   },
   ACCESS_BUDGET_REPORT: {
-    projectRoles: [PROJECT_ROLE_CUSTOMER, PROJECT_ROLE_MANAGER, PROJECT_ROLE_ACCOUNT_MANAGER],
+    projectRoles: [
+      PROJECT_ROLE_CUSTOMER,
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_ACCOUNT_MANAGER,
+      PROJECT_ROLE_ACCOUNT_EXECUTIVE,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT
+    ],
     topcoderRoles: [ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN],
   },
   ACCESS_BUDGET_SPENT_REPORT: {
-    projectRoles: [PROJECT_ROLE_MANAGER, PROJECT_ROLE_ACCOUNT_MANAGER],
+    projectRoles: [
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_ACCOUNT_MANAGER,
+      PROJECT_ROLE_ACCOUNT_EXECUTIVE,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT
+    ],
     topcoderRoles: [ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN],
   },
   ACCESS_INVOICE_REPORT: {
-    projectRoles: [PROJECT_ROLE_CUSTOMER, PROJECT_ROLE_MANAGER, PROJECT_ROLE_ACCOUNT_MANAGER],
+    projectRoles: [
+      PROJECT_ROLE_CUSTOMER,
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_ACCOUNT_MANAGER,
+      PROJECT_ROLE_ACCOUNT_EXECUTIVE,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT
+    ],
     topcoderRoles: [ROLE_ADMINISTRATOR, ROLE_CONNECT_ADMIN],
   }
 }
diff --git a/src/projects/components/projectsCard/ProjectCardBody.jsx b/src/projects/components/projectsCard/ProjectCardBody.jsx
@@ -5,7 +5,13 @@ import { Link } from 'react-router-dom'
 import ProjectProgress from '../../../components/ProjectProgress/ProjectProgress'
 import ProjectStatus from '../../../components/ProjectStatus/ProjectStatus'
 import editableProjectStatus from '../../../components/ProjectStatus/editableProjectStatus'
-import { PROJECT_STATUS_ACTIVE, PROJECT_STATUS_COMPLETED, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER } from '../../../config/constants'
+import {
+  PROJECT_STATUS_ACTIVE,
+  PROJECT_STATUS_COMPLETED,
+  PROJECT_ROLE_COPILOT,
+  PROJECT_ROLE_MANAGER,
+  PROJECT_ROLE_PROGRAM_MANAGER, PROJECT_ROLE_SOLUTION_ARCHITECT, PROJECT_ROLE_PROJECT_MANAGER
+} from '../../../config/constants'
 import './ProjectCardBody.scss'
 import _ from 'lodash'
 
@@ -17,7 +23,13 @@ function ProjectCardBody({ project, projectCanBeActive, duration, currentMemberR
 
   const canEdit = canEditStatus && (
     project.status !== PROJECT_STATUS_COMPLETED && (isSuperUser || (currentMemberRole
-    && (_.indexOf([PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER], currentMemberRole) > -1)))
+    && (_.indexOf([
+      PROJECT_ROLE_COPILOT,
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT,
+    ], currentMemberRole) > -1)))
   )
 
   const progress = _.get(process, 'percent', 0)
diff --git a/src/projects/detail/containers/ProjectInfoContainer.js b/src/projects/detail/containers/ProjectInfoContainer.js
@@ -10,9 +10,21 @@ import { loadDashboardFeeds, loadProjectMessages } from '../../actions/projectTo
 import { loadTopic } from '../../../actions/topics'
 import { loadProjectPlan } from '../../actions/projectPlan'
 import { setDuration, getProjectNavLinks } from '../../../helpers/projectHelper'
-import { PROJECT_ROLE_OWNER, PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER,
-  DIRECT_PROJECT_URL, SALESFORCE_PROJECT_LEAD_LINK, PROJECT_STATUS_CANCELLED,  PROJECT_STATUS_ACTIVE,
-  PROJECT_STATUS_COMPLETED, PHASE_STATUS_REVIEWED, PHASE_STATUS_ACTIVE } from '../../../config/constants'
+import {
+  PROJECT_ROLE_OWNER,
+  PROJECT_ROLE_COPILOT,
+  PROJECT_ROLE_MANAGER,
+  DIRECT_PROJECT_URL,
+  SALESFORCE_PROJECT_LEAD_LINK,
+  PROJECT_STATUS_CANCELLED,
+  PROJECT_STATUS_ACTIVE,
+  PROJECT_STATUS_COMPLETED,
+  PHASE_STATUS_REVIEWED,
+  PHASE_STATUS_ACTIVE,
+  PROJECT_ROLE_PROJECT_MANAGER,
+  PROJECT_ROLE_PROGRAM_MANAGER,
+  PROJECT_ROLE_SOLUTION_ARCHITECT,
+} from '../../../config/constants'
 import PERMISSIONS from '../../../config/permissions'
 import { checkPermission } from '../../../helpers/permissions'
 import Panel from '../../../components/Panel/Panel'
@@ -424,7 +436,13 @@ class ProjectInfoContainer extends React.Component {
       productsTimelines, isProjectProcessing, notifications } = this.props
     let directLinks = null
     // check if direct links need to be added
-    const isMemberOrCopilot = _.indexOf([PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER], currentMemberRole) > -1
+    const isMemberOrCopilot = _.indexOf([
+      PROJECT_ROLE_COPILOT,
+      PROJECT_ROLE_MANAGER,
+      PROJECT_ROLE_PROJECT_MANAGER,
+      PROJECT_ROLE_PROGRAM_MANAGER,
+      PROJECT_ROLE_SOLUTION_ARCHITECT
+    ], currentMemberRole) > -1
     if (isMemberOrCopilot || isSuperUser) {
       directLinks = []
       if (project.directProjectId) {
@@ -461,7 +479,13 @@ class ProjectInfoContainer extends React.Component {
 
     const canEdit = (
       project.status !== PROJECT_STATUS_COMPLETED && (isSuperUser || (currentMemberRole
-      && (_.indexOf([PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER], currentMemberRole) > -1)))
+      && (_.indexOf([
+        PROJECT_ROLE_COPILOT,
+        PROJECT_ROLE_MANAGER,
+        PROJECT_ROLE_PROJECT_MANAGER,
+        PROJECT_ROLE_PROGRAM_MANAGER,
+        PROJECT_ROLE_SOLUTION_ARCHITECT
+      ], currentMemberRole) > -1)))
     )
 
     const progress = _.get(process, 'percent', 0)
diff --git a/src/projects/detail/containers/ScopeAndSpecificationContainer.jsx b/src/projects/detail/containers/ScopeAndSpecificationContainer.jsx
diff --git a/src/projects/detail/containers/TeamManagementContainer.jsx b/src/projects/detail/containers/TeamManagementContainer.jsx
diff --git a/src/routes/notifications/constants/notifications.js b/src/routes/notifications/constants/notifications.js
