diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 00:18:04 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-04-03 21:18:04 -0700 |
commit | 348374fba5db8415d37d5cd8b897048b1300f415 (patch) | |
tree | 8277c9be4b8032b488e2fe87ceee58a283569a3e /webapp/components/admin_console/manage_teams_modal | |
parent | 4c9019b9eb789152439ad6a56e93c7f0fb7832c5 (diff) | |
download | chat-348374fba5db8415d37d5cd8b897048b1300f415.tar.gz chat-348374fba5db8415d37d5cd8b897048b1300f415.tar.bz2 chat-348374fba5db8415d37d5cd8b897048b1300f415.zip |
PLT-6098 Added Manage Teams modal to System Console users list (#5914)
* Added Manage Teams modal to System Console users list
* Localized ManageTeamsModal
* Fixed borders between Manage Teams list items
* Updated appearance of ManageTeamsModal
* Fixed admin being redirected from system console when removing self from a team
* Sorted teams in ManageTeamsModal
* Updated Manage Teams styling
Diffstat (limited to 'webapp/components/admin_console/manage_teams_modal')
3 files changed, 414 insertions, 0 deletions
diff --git a/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx new file mode 100644 index 000000000..81e6460af --- /dev/null +++ b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx @@ -0,0 +1,137 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import React from 'react'; +import {Dropdown, MenuItem} from 'react-bootstrap'; +import {FormattedMessage} from 'react-intl'; + +import {updateTeamMemberRoles, removeUserFromTeam} from 'actions/team_actions.jsx'; + +import * as Utils from 'utils/utils.jsx'; + +export default class ManageTeamsDropdown extends React.Component { + static propTypes = { + user: React.PropTypes.object.isRequired, + teamMember: React.PropTypes.object.isRequired, + onError: React.PropTypes.func.isRequired, + onMemberChange: React.PropTypes.func.isRequired, + onMemberRemove: React.PropTypes.func.isRequired + }; + + constructor(props) { + super(props); + + this.toggleDropdown = this.toggleDropdown.bind(this); + + this.makeTeamAdmin = this.makeTeamAdmin.bind(this); + this.makeMember = this.makeMember.bind(this); + this.removeFromTeam = this.removeFromTeam.bind(this); + + this.handleMemberChange = this.handleMemberChange.bind(this); + this.handleMemberRemove = this.handleMemberRemove.bind(this); + + this.state = { + show: false + }; + } + + toggleDropdown() { + this.setState({ + show: !this.state.show + }); + } + + makeTeamAdmin() { + updateTeamMemberRoles( + this.props.teamMember.team_id, + this.props.user.id, + 'team_user team_admin', + this.handleMemberChange, + this.props.onError + ); + } + + makeMember() { + updateTeamMemberRoles( + this.props.teamMember.team_id, + this.props.user.id, + 'team_user', + this.handleMemberChange, + this.props.onError + ); + } + + removeFromTeam() { + removeUserFromTeam( + this.props.teamMember.team_id, + this.props.user.id, + this.handleMemberRemove, + this.props.onError + ); + } + + handleMemberChange() { + this.props.onMemberChange(this.props.teamMember.team_id); + } + + handleMemberRemove() { + this.props.onMemberRemove(this.props.teamMember.team_id); + } + + render() { + const isTeamAdmin = Utils.isAdmin(this.props.teamMember.roles); + + let title; + if (isTeamAdmin) { + title = Utils.localizeMessage('admin.user_item.teamAdmin', 'Team Admin'); + } else { + title = Utils.localizeMessage('admin.user_item.teamMember', 'Team Member'); + } + + let makeTeamAdmin = null; + if (!isTeamAdmin) { + makeTeamAdmin = ( + <MenuItem onSelect={this.makeTeamAdmin}> + <FormattedMessage + id='admin.user_item.makeTeamAdmin' + defaultMessage='Make Team Admin' + /> + </MenuItem> + ); + } + + let makeMember = null; + if (isTeamAdmin) { + makeMember = ( + <MenuItem onSelect={this.makeMember}> + <FormattedMessage + id='admin.user_item.makeMember' + defaultMessage='Make Member' + /> + </MenuItem> + ); + } + + return ( + <Dropdown + id={`manage-teams-${this.props.user.id}-${this.props.teamMember.team_id}`} + open={this.state.show} + onToggle={this.toggleDropdown} + > + <Dropdown.Toggle useAnchor={true}> + {title} + </Dropdown.Toggle> + <Dropdown.Menu> + {makeTeamAdmin} + {makeMember} + <MenuItem onSelect={this.removeFromTeam}> + <FormattedMessage + id='team_members_dropdown.leave_team' + defaultMessage='Remove from Team' + /> + </MenuItem> + </Dropdown.Menu> + </Dropdown> + ); + } +} diff --git a/webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx b/webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx new file mode 100644 index 000000000..e3eae6310 --- /dev/null +++ b/webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx @@ -0,0 +1,225 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import React from 'react'; +import {Modal} from 'react-bootstrap'; +import {FormattedMessage} from 'react-intl'; + +import * as TeamActions from 'actions/team_actions.jsx'; + +import Client from 'client/web_client.jsx'; + +import LoadingScreen from 'components/loading_screen.jsx'; + +import {sortTeamsByDisplayName} from 'utils/team_utils.jsx'; +import * as Utils from 'utils/utils.jsx'; + +import ManageTeamsDropdown from './manage_teams_dropdown.jsx'; +import RemoveFromTeamButton from './remove_from_team_button.jsx'; + +export default class ManageTeamsModal extends React.Component { + static propTypes = { + onModalDismissed: React.PropTypes.func.isRequired, + show: React.PropTypes.bool.isRequired, + user: React.PropTypes.object + }; + + constructor(props) { + super(props); + + this.loadTeamsAndTeamMembers = this.loadTeamsAndTeamMembers.bind(this); + + this.handleError = this.handleError.bind(this); + this.handleMemberChange = this.handleMemberChange.bind(this); + this.handleMemberRemove = this.handleMemberRemove.bind(this); + + this.renderContents = this.renderContents.bind(this); + + this.state = { + error: null, + teams: null, + teamMembers: null + }; + } + + componentDidMount() { + if (this.props.user) { + this.loadTeamsAndTeamMembers(); + } + } + + componentWillReceiveProps(nextProps) { + const userId = this.props.user ? this.props.user.id : ''; + const nextUserId = nextProps.user ? nextProps.user.id : ''; + + if (userId !== nextUserId) { + this.setState({ + teams: null, + teamMembers: null + }); + + if (nextProps.user) { + this.loadTeamsAndTeamMembers(nextProps.user); + } + } + } + + loadTeamsAndTeamMembers(user = this.props.user) { + TeamActions.getTeamsForUser(user.id, (teams) => { + this.setState({ + teams: teams.sort(sortTeamsByDisplayName) + }); + }); + + TeamActions.getTeamMembersForUser(user.id, (teamMembers) => { + this.setState({ + teamMembers + }); + }); + } + + handleError(error) { + this.setState({ + error + }); + } + + handleMemberChange() { + TeamActions.getTeamMembersForUser(this.props.user.id, (teamMembers) => { + this.setState({ + teamMembers + }); + }); + } + + handleMemberRemove(teamId) { + this.setState({ + teams: this.state.teams.filter((team) => team.id !== teamId), + teamMembers: this.state.teamMembers.filter((teamMember) => teamMember.team_id !== teamId) + }); + } + + renderContents() { + const {user} = this.props; + const {teams, teamMembers} = this.state; + + if (!user) { + return <LoadingScreen/>; + } + + const isSystemAdmin = Utils.isAdmin(user.roles); + + let name = Utils.getFullName(user); + if (name) { + name += ` (@${user.username})`; + } else { + name = `@${user.username}`; + } + + let teamList; + if (teams && teamMembers) { + teamList = teams.map((team) => { + const teamMember = teamMembers.find((member) => member.team_id === team.id); + if (!teamMember) { + return null; + } + + let action; + if (isSystemAdmin) { + action = ( + <RemoveFromTeamButton + user={user} + team={team} + onError={this.handleError} + onMemberRemove={this.handleMemberRemove} + /> + ); + } else { + action = ( + <ManageTeamsDropdown + user={user} + team={team} + teamMember={teamMember} + onError={this.handleError} + onMemberChange={this.handleMemberChange} + onMemberRemove={this.handleMemberRemove} + /> + ); + } + + return ( + <div + key={team.id} + className='manage-teams__team' + > + <div className='manage-teams__team-name'> + {team.display_name} + </div> + <div className='manage-teams__team-actions'> + {action} + </div> + </div> + ); + }); + } else { + teamList = <LoadingScreen/>; + } + + let systemAdminIndicator = null; + if (isSystemAdmin) { + systemAdminIndicator = ( + <div className='manage-teams__system-admin'> + <FormattedMessage + id='admin.user_item.sysAdmin' + defaultMessage='System Admin' + /> + </div> + ); + } + + return ( + <div> + <div className='manage-teams__user'> + <img + className='manage-teams__profile-picture' + src={Client.getProfilePictureUrl(user.id, user.last_picture_update)} + /> + <div className='manage-teams__info'> + <div className='manage-teams__name'> + {name} + </div> + <div className='manage-teams__email'> + {user.email} + </div> + </div> + {systemAdminIndicator} + </div> + <div className='manage-teams__teams'> + {teamList} + </div> + </div> + ); + } + + render() { + return ( + <Modal + show={this.props.show} + onHide={this.props.onModalDismissed} + dialogClassName='manage-teams' + > + <Modal.Header closeButton={true}> + <Modal.Title> + <FormattedMessage + id='admin.user_item.manageTeams' + defaultMessage='Manage Teams' + /> + </Modal.Title> + </Modal.Header> + <Modal.Body> + {this.renderContents()} + </Modal.Body> + </Modal> + ); + } +} diff --git a/webapp/components/admin_console/manage_teams_modal/remove_from_team_button.jsx b/webapp/components/admin_console/manage_teams_modal/remove_from_team_button.jsx new file mode 100644 index 000000000..d733135f4 --- /dev/null +++ b/webapp/components/admin_console/manage_teams_modal/remove_from_team_button.jsx @@ -0,0 +1,52 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import React from 'react'; +import {FormattedMessage} from 'react-intl'; + +import {removeUserFromTeam} from 'actions/team_actions.jsx'; + +export default class RemoveFromTeamButton extends React.PureComponent { + static propTypes = { + onError: React.PropTypes.func.isRequired, + onMemberRemove: React.PropTypes.func.isRequired, + team: React.PropTypes.object.isRequired, + user: React.PropTypes.object.isRequired + }; + + constructor(props) { + super(props); + + this.handleClick = this.handleClick.bind(this); + this.handleMemberRemove = this.handleMemberRemove.bind(this); + } + + handleClick(e) { + e.preventDefault(); + + removeUserFromTeam( + this.props.team.id, + this.props.user.id, + this.handleMemberRemove, + this.props.onError + ); + } + + handleMemberRemove() { + this.props.onMemberRemove(this.props.team.id); + } + + render() { + return ( + <button + className='btn btn-default' + onClick={this.handleClick} + > + <FormattedMessage + id='team_members_dropdown.leave_team' + defaultMessage='Remove from Team' + /> + </button> + ); + } +} |