1 files changed, 34 insertions, 1 deletions

diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index edded5aab..e6c4f637c 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -18,6 +18,7 @@ export default class UserItem extends React.Component {
         super(props);
 
         this.handleMakeMember = this.handleMakeMember.bind(this);
+        this.handleRemoveFromTeam = this.handleRemoveFromTeam.bind(this);
         this.handleMakeActive = this.handleMakeActive.bind(this);
         this.handleMakeNotActive = this.handleMakeNotActive.bind(this);
         this.handleMakeAdmin = this.handleMakeAdmin.bind(this);
@@ -56,6 +57,19 @@ export default class UserItem extends React.Component {
         }
     }
 
+    handleRemoveFromTeam() {
+        Client.removeUserFromTeam(
+                this.props.team.id,
+                this.props.user.id,
+                () => {
+                    this.props.refreshProfiles();
+                },
+                (err) => {
+                    this.setState({serverError: err.message});
+                }
+            );
+    }
+
     handleMakeActive(e) {
         e.preventDefault();
         Client.updateActive(this.props.user.id, true,
@@ -222,6 +236,7 @@ export default class UserItem extends React.Component {
             );
         }
 
+        const me = UserStore.getCurrentUser();
         const email = user.email;
         let showMakeMember = teamMember.roles === 'admin' || user.roles === 'system_admin';
         let showMakeAdmin = teamMember.roles === '' && user.roles !== 'system_admin';
@@ -299,6 +314,24 @@ export default class UserItem extends React.Component {
             );
         }
 
+        let removeFromTeam = null;
+        if (this.props.user.id !== me.id) {
+            removeFromTeam = (
+                <li role='presentation'>
+                    <a
+                        role='menuitem'
+                        href='#'
+                        onClick={this.handleRemoveFromTeam}
+                    >
+                        <FormattedMessage
+                            id='team_members_dropdown.leave_team'
+                            defaultMessage='Remove From Team'
+                        />
+                    </a>
+                </li>
+            );
+        }
+
         let makeActive = null;
         if (showMakeActive) {
             makeActive = (
@@ -428,7 +461,6 @@ export default class UserItem extends React.Component {
             passwordReset = null;
         }
 
-        const me = UserStore.getCurrentUser();
         let makeDemoteModal = null;
         if (this.props.user.id === me.id) {
             const title = (
@@ -511,6 +543,7 @@ export default class UserItem extends React.Component {
                             className='dropdown-menu member-menu'
                             role='menu'
                         >
+                            {removeFromTeam}
                             {makeAdmin}
                             {makeMember}
                             {makeActive}