@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
33import { withRouter } from 'react-router'
44import _ from 'lodash'
55import {
6- ROLE_CONNECT_COPILOT , ROLE_CONNECT_MANAGER ,
6+ ROLE_CONNECT_COPILOT , ROLE_CONNECT_MANAGER , ROLE_ADMINISTRATOR ,
77 PROJECT_ROLE_COPILOT , PROJECT_ROLE_MANAGER , PROJECT_ROLE_CUSTOMER , AUTOCOMPLETE_TRIGGER_LENGTH
88} from '../../../config/constants'
99import TeamManagement from '../../../components/TeamManagement/TeamManagement'
@@ -221,13 +221,14 @@ class TeamManagementContainer extends Component {
221221}
222222
223223const mapStateToProps = ( { loadUser, members } ) => {
224+ const powerUserRoles = [ ROLE_CONNECT_COPILOT , ROLE_CONNECT_MANAGER , ROLE_ADMINISTRATOR ]
225+ const managerRoles = [ ROLE_ADMINISTRATOR , ROLE_CONNECT_MANAGER ]
224226 return {
225227 currentUser : {
226228 userId : parseInt ( loadUser . user . id ) ,
227229 isCopilot : _ . indexOf ( loadUser . user . roles , ROLE_CONNECT_COPILOT ) > - 1 ,
228- isManager : _ . indexOf ( loadUser . user . roles , ROLE_CONNECT_MANAGER ) > - 1 ,
229- isCustomer : _ . indexOf ( loadUser . user . roles , ROLE_CONNECT_MANAGER ) === - 1
230- && _ . indexOf ( loadUser . user . roles , ROLE_CONNECT_COPILOT ) === - 1
230+ isManager : loadUser . user . roles . some ( ( role ) => managerRoles . indexOf ( role ) !== - 1 ) ,
231+ isCustomer : ! loadUser . user . roles . some ( ( role ) => powerUserRoles . indexOf ( role ) !== - 1 )
231232 } ,
232233 allMembers : _ . values ( members . members )
233234 }
0 commit comments