Skip to content

feat: remote "project role" selection #4128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxceem merged 1 commit into from
Sep 17, 2020
Merged

feat: remote "project role" selection #4128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/TeamManagement/TeamManagement.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ class TeamManagement extends React.Component {
isMember={!!currentMember}
onCancel={onClickCancel}
removeMember={removeMember}
addUsers={onTopcoderInviteSend}
sendInvite={onTopcoderInviteSend}
approveOrDecline={onAcceptOrRefuse}
projectTeamInvites={projectTeamInvites}
topcoderTeamInvites={topcoderTeamInvites}
Expand Down
8 changes: 0 additions & 8 deletions src/components/TeamManagement/TeamManagement.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,19 +414,11 @@
height: 200px;
}

.topcoder-dialog {
width: 750px;
}

@media screen and (max-width: $screen-md - 1px) {
.dialog-body {
margin: 0 !important;
}

.topcoder-dialog {
width: unset;
}

.project-dialog {
width: unset;
}
Expand Down
119 changes: 4 additions & 115 deletions src/components/TeamManagement/TopcoderManagementDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import _ from 'lodash'
import React from 'react'
import PT from 'prop-types'
import cn from 'classnames'
import moment from 'moment'
import Modal from 'react-modal'
import XMarkIcon from '../../assets/icons/icon-x-mark.svg'
import Avatar from 'appirio-tech-react-components/components/Avatar/Avatar'
import { getAvatarResized, getFullNameWithFallback } from '../../helpers/tcHelpers'
import SelectDropdown from '../SelectDropdown/SelectDropdown'
import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'
import AutocompleteInputContainer from './AutocompleteInputContainer'
import {
PROJECT_MEMBER_INVITE_STATUS_REQUESTED, PROJECT_MEMBER_INVITE_STATUS_PENDING,
Expand All @@ -23,58 +20,14 @@ class TopcoderManagementDialog extends React.Component {
constructor(props) {
super(props)
this.state = {
userRole: 'manager',
managerType: {},
showAlreadyMemberError: false,
errorMessage: null,
processingInviteRequestIds: [], // ids of invites for which request is being processed
}

this.onUserRoleChange = this.onUserRoleChange.bind(this)
this.handleRoles = this.handleRoles.bind(this)
this.addUsers = this.addUsers.bind(this)
this.onChange = this.onChange.bind(this)
this.showIndividualErrors = this.showIndividualErrors.bind(this)

this.roles = [{
title: 'Manager',
value: 'manager',
}, {
title: 'Observer',
value: 'observer',
}, {
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',
}]
}

onUserRoleChange(memberId, id, type) {
const managerType = Object.assign({}, this.state.managerType)
managerType[memberId] = type
this.props.changeRole(id, {role: this.roles.find((role) => role.title === type).value})
this.setState({managerType})
}

handleRoles(option) {
this.setState({
userRole: option.value
})
}

addUsers() {
this.props.addUsers(this.state.userRole )
}

onChange(selectedMembers) {
Expand Down Expand Up @@ -142,7 +95,7 @@ class TopcoderManagementDialog extends React.Component {
render() {
const {
members, currentUser, isMember, removeMember, onCancel, removeInvite, approveOrDecline, topcoderTeamInvites = [],
selectedMembers, processingInvites, updatingMemberIds
selectedMembers, processingInvites,
} = this.props
const { processingInviteRequestIds } = this.state
const showRemove = hasPermission(PERMISSIONS.MANAGE_TOPCODER_TEAM)
Expand All @@ -159,7 +112,7 @@ class TopcoderManagementDialog extends React.Component {
contentLabel=""
>

<div className="project-dialog topcoder-dialog">
<div className="project-dialog">
<div className="dialog-title">
Topcoder team
<span onClick={onCancel}><XMarkIcon /></span>
Expand All @@ -175,8 +128,6 @@ class TopcoderManagementDialog extends React.Component {
removeMember(member)
}
const userFullName = getFullNameWithFallback(member)
const role = _.get(_.find(this.roles, r => r.value === member.role), 'title')
const isMemberProcessing = _.includes(updatingMemberIds, member.id)
return (
<div
key={i}
Expand All @@ -203,59 +154,6 @@ class TopcoderManagementDialog extends React.Component {
Leave
</div>
}
{(() => {
if (!isMember || (!currentUser.isAdmin && !currentUser.isManager)) {
return (
<div className="member-type-wrapper">
<div className="member-type">
{role}
</div>
</div>
)
}
let types = ['Manager', 'Account Manager', 'Account Executive', 'Program Manager', 'Solution Architect', 'Project Manager']
const currentType = role
types = currentType === 'Observer'? ['Observer', ...types] : [...types]
const onClick = (type) => {
this.onUserRoleChange(member.userId, member.id, type)
}
return (
<div className={`member-role-container ${isMemberProcessing ? 'is-processing' : ''}`}>
{
isMemberProcessing ? <LoadingIndicator isSmall /> :
types.map((type) => {
const isCopilotDisabled =
type === 'Copilot' &&
type !== currentType &&
!(currentUser.isCopilotManager || currentUser.isAdmin)

return (
isCopilotDisabled ? (
<Tooltip theme="light" key={type}>
<div className="tooltip-target">
<div className="member-role disabled">
{type}
</div>
</div>
<div className="tooltip-body">
{'Only Connect Copilot Managers can change member role to copilots.'}
</div>
</Tooltip>
) : (
<div
key={type}
onClick={() => onClick(type)}
className={cn('member-role', { active: type === currentType })}
>
{type}
</div>
)
)
})
}
</div>
)
})()}
</div>
)
}))}
Expand Down Expand Up @@ -358,23 +256,14 @@ class TopcoderManagementDialog extends React.Component {
{ this.state.showAlreadyMemberError && <div className="error-message">
Project Member(s) can\'t be invited again. Please remove them from list.
</div> }
<Formsy.Form>
<SelectDropdown
name="role"
value={this.state.userRole}
theme="role-drop-down default"
options={this.roles.filter(role => role.title !== 'Observer')}
onSelect={this.handleRoles}
/>
</Formsy.Form>
{ this.state.errorMessage && <div className="error-message">
{this.state.errorMessage}
</div> }
<button
className="tc-btn tc-btn-primary tc-btn-md"
type="submit"
disabled={processingInvites || this.state.showAlreadyMemberError || selectedMembers.length === 0}
onClick={this.addUsers}
onClick={this.props.sendInvite}
>
Invite users
</button>
Expand Down Expand Up @@ -404,7 +293,7 @@ TopcoderManagementDialog.propTypes = {
changeRole: PT.func.isRequired,
projectTeamInvites: PT.arrayOf(PT.object),
topcoderTeamInvites: PT.arrayOf(PT.object),
addUsers: PT.func.isRequired,
sendInvite: PT.func.isRequired,
approveOrDecline: PT.func.isRequired,
removeInvite: PT.func.isRequired,
onSelectedMembersUpdate: PT.func.isRequired,
Expand Down
4 changes: 2 additions & 2 deletions src/projects/detail/containers/TeamManagementContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ class TeamManagementContainer extends Component {
this.props.deleteTopcoderMemberInvite(this.props.projectId, invite)
}

onTopcoderInviteSend(role) {
onTopcoderInviteSend() {
const {handles, emails } = this.getEmailsAndHandles()
this.props.inviteTopcoderMembers(this.props.projectId, {role, handles, emails})
this.props.inviteTopcoderMembers(this.props.projectId, {role: 'manager', handles, emails})
}

onProjectInviteDelete(invite) {
Expand Down