summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/manage_teams_modal
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-08-01 11:06:53 -0400
committerGitHub <noreply@github.com>2017-08-01 11:06:53 -0400
commit5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b (patch)
treefdd886332e75a9ae8138a31d3c34b240adb094b5 /webapp/components/admin_console/manage_teams_modal
parent4ef844298fdb0d6fb41eac760f8ac00cee82b3bc (diff)
downloadchat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.tar.gz
chat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.tar.bz2
chat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.zip
PLT-6987 User access token UI (#7007)
* Add user access token UI * Fix enter press and update mattermost-redux * Updating UI for access token stuff (#7066) * Revert segment key
Diffstat (limited to 'webapp/components/admin_console/manage_teams_modal')
-rw-r--r--webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx21
-rw-r--r--webapp/components/admin_console/manage_teams_modal/remove_from_team_button.jsx2
2 files changed, 7 insertions, 16 deletions
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
index a579ab03c..21f9d762d 100644
--- a/webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx
+++ b/webapp/components/admin_console/manage_teams_modal/manage_teams_modal.jsx
@@ -1,11 +1,10 @@
-import PropTypes from 'prop-types';
-
// Copyright (c) 2017-present 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 PropTypes from 'prop-types';
import * as TeamActions from 'actions/team_actions.jsx';
@@ -29,14 +28,6 @@ export default class ManageTeamsModal extends React.Component {
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,
@@ -66,7 +57,7 @@ export default class ManageTeamsModal extends React.Component {
}
}
- loadTeamsAndTeamMembers(user = this.props.user) {
+ loadTeamsAndTeamMembers = (user = this.props.user) => {
TeamActions.getTeamsForUser(user.id, (teams) => {
this.setState({
teams: teams.sort(sortTeamsByDisplayName)
@@ -80,13 +71,13 @@ export default class ManageTeamsModal extends React.Component {
});
}
- handleError(error) {
+ handleError = (error) => {
this.setState({
error
});
}
- handleMemberChange() {
+ handleMemberChange = () => {
TeamActions.getTeamMembersForUser(this.props.user.id, (teamMembers) => {
this.setState({
teamMembers
@@ -94,14 +85,14 @@ export default class ManageTeamsModal extends React.Component {
});
}
- handleMemberRemove(teamId) {
+ handleMemberRemove = (teamId) => {
this.setState({
teams: this.state.teams.filter((team) => team.id !== teamId),
teamMembers: this.state.teamMembers.filter((teamMember) => teamMember.team_id !== teamId)
});
}
- renderContents() {
+ renderContents = () => {
const {user} = this.props;
const {teams, teamMembers} = this.state;
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
index 28e9fde8f..69579d46f 100644
--- 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
@@ -41,7 +41,7 @@ export default class RemoveFromTeamButton extends React.PureComponent {
render() {
return (
<button
- className='btn btn-default'
+ className='btn btn-danger'
onClick={this.handleClick}
>
<FormattedMessage