PLT-2057 User as a first class object (#2648)

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams

1 files changed, 1 insertions, 31 deletions

diff --git a/webapp/components/claim/claim.jsx b/webapp/components/claim/claim.jsx
index 5cfb04af3..0197e1677 100644
--- a/webapp/components/claim/claim.jsx
+++ b/webapp/components/claim/claim.jsx
@@ -1,8 +1,6 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import TeamStore from 'stores/team_store.jsx';
-
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 import {Link} from 'react-router';
@@ -13,40 +11,15 @@ export default class Claim extends React.Component {
     constructor(props) {
         super(props);
 
-        this.onTeamChange = this.onTeamChange.bind(this);
-        this.updateStateFromStores = this.updateStateFromStores.bind(this);
-
         this.state = {};
     }
     componentWillMount() {
         this.setState({
             email: this.props.location.query.email,
             newType: this.props.location.query.new_type,
-            oldType: this.props.location.query.old_type,
-            teamName: this.props.params.team,
-            teamDisplayName: ''
-        });
-        this.updateStateFromStores();
-    }
-    componentDidMount() {
-        TeamStore.addChangeListener(this.onTeamChange);
-    }
-    componentWillUnmount() {
-        TeamStore.removeChangeListener(this.onTeamChange);
-    }
-    updateStateFromStores() {
-        const team = TeamStore.getByName(this.state.teamName);
-        let displayName = '';
-        if (team) {
-            displayName = team.display_name;
-        }
-        this.setState({
-            teamDisplayName: displayName
+            oldType: this.props.location.query.old_type
         });
     }
-    onTeamChange() {
-        this.updateStateFromStores();
-    }
     render() {
         return (
             <div>
@@ -66,8 +39,6 @@ export default class Claim extends React.Component {
                         />
                         <div id='claim'>
                             {React.cloneElement(this.props.children, {
-                                teamName: this.state.teamName,
-                                teamDisplayName: this.state.teamDisplayName,
                                 currentType: this.state.oldType,
                                 newType: this.state.newType,
                                 email: this.state.email
@@ -83,7 +54,6 @@ export default class Claim extends React.Component {
 Claim.defaultProps = {
 };
 Claim.propTypes = {
-    params: React.PropTypes.object.isRequired,
     location: React.PropTypes.object.isRequired,
     children: React.PropTypes.node
 };