Convering client to react-router.

web/react/components/admin_console/admin_controller.jsx

@@ -6,7 +6,6 @@ import AdminStore from '../../stores/admin_store.jsx';
 import TeamStore from '../../stores/team_store.jsx';
 import * as AsyncClient from '../../utils/async_client.jsx';
 import LoadingScreen from '../loading_screen.jsx';
-import * as Utils from '../../utils/utils.jsx';
 
 import EmailSettingsTab from './email_settings.jsx';
 import LogSettingsTab from './log_settings.jsx';
@@ -50,11 +49,6 @@ export default class AdminController extends React.Component {
             selected: props.tab || 'system_analytics',
             selectedTeam: props.teamId || null
         };
-
-        if (!props.tab) {
-            var tokenIndex = Utils.getUrlParameter('session_token_index');
-            history.replaceState(null, null, `/admin_console/${this.state.selected}?session_token_index=${tokenIndex}`);
-        }
     }
 
     componentDidMount() {
@@ -63,6 +57,9 @@ export default class AdminController extends React.Component {
 
         AdminStore.addAllTeamsChangeListener(this.onAllTeamsListenerChange);
         AsyncClient.getAllTeams();
+
+        $('[data-toggle="tooltip"]').tooltip();
+        $('[data-toggle="popover"]').popover();
     }
 
     componentWillUnmount() {
@@ -175,7 +172,7 @@ export default class AdminController extends React.Component {
         }
 
         return (
-            <div>
+            <div id='admin_controller'>
                 <div
                     className='sidebar--menu'
                     id='sidebar-menu'

web/react/components/admin_console/admin_navbar_dropdown.jsx

@@ -2,13 +2,14 @@
 // See License.txt for license information.
 
 import * as Utils from '../../utils/utils.jsx';
-import * as Client from '../../utils/client.jsx';
 import TeamStore from '../../stores/team_store.jsx';
 
 import Constants from '../../utils/constants.jsx';
 
 import {FormattedMessage} from 'mm-intl';
 
+import {Link} from 'react-router';
+
 function getStateFromStores() {
     return {currentTeam: TeamStore.getCurrent()};
 }
@@ -18,16 +19,9 @@ export default class AdminNavbarDropdown extends React.Component {
         super(props);
         this.blockToggle = false;
 
-        this.handleLogoutClick = this.handleLogoutClick.bind(this);
-
         this.state = getStateFromStores();
     }
 
-    handleLogoutClick(e) {
-        e.preventDefault();
-        Client.logout();
-    }
-
     componentDidMount() {
         $(ReactDOM.findDOMNode(this.refs.dropdown)).on('hide.bs.dropdown', () => {
             this.blockToggle = true;
@@ -78,15 +72,12 @@ export default class AdminNavbarDropdown extends React.Component {
                             </a>
                         </li>
                         <li>
-                            <a
-                                href='#'
-                                onClick={this.handleLogoutClick}
-                            >
+                            <Link to={Utils.getTeamURLFromAddressBar() + '/logout'}>
                                 <FormattedMessage
                                     id='admin.nav.logout'
                                     defaultMessage='Logout'
                                 />
-                            </a>
+                            </Link>
                         </li>
                         <li className='divider'></li>
                         <li>
@@ -116,4 +107,4 @@ export default class AdminNavbarDropdown extends React.Component {
             </ul>
         );
     }
-}
+}

web/react/components/admin_console/admin_sidebar.jsx

@@ -3,7 +3,6 @@
 
 import AdminSidebarHeader from './admin_sidebar_header.jsx';
 import SelectTeamModal from './select_team_modal.jsx';
-import * as Utils from '../../utils/utils.jsx';
 
 import {FormattedMessage} from 'mm-intl';
 
@@ -30,8 +29,6 @@ export default class AdminSidebar extends React.Component {
     handleClick(name, teamId, e) {
         e.preventDefault();
         this.props.selectTab(name, teamId);
-        var tokenIndex = Utils.getUrlParameter('session_token_index');
-        history.pushState({name, teamId}, null, `/admin_console/${name}/${teamId || ''}?session_token_index=${tokenIndex}`);
     }
 
     isSelected(name, teamId) {
@@ -73,7 +70,6 @@ export default class AdminSidebar extends React.Component {
     }
 
     teamSelectedModal(teamId) {
-        this.props.selectedTeams[teamId] = 'true';
         this.setState({showSelectModal: false});
         this.props.addSelectedTeam(teamId);
         this.forceUpdate();

web/react/components/admin_console/admin_sidebar_header.jsx

@@ -3,7 +3,6 @@
 
 import AdminNavbarDropdown from './admin_navbar_dropdown.jsx';
 import UserStore from '../../stores/user_store.jsx';
-import * as Utils from '../../utils/utils.jsx';
 
 import {FormattedMessage} from 'mm-intl';
 
@@ -39,7 +38,7 @@ export default class SidebarHeader extends React.Component {
             profilePicture = (
                 <img
                     className='user__picture'
-                    src={'/api/v1/users/' + me.id + '/image?time=' + me.update_at + '&' + Utils.getSessionIndex()}
+                    src={'/api/v1/users/' + me.id + '/image?time=' + me.update_at}
                 />
             );
         }
@@ -65,4 +64,4 @@ export default class SidebarHeader extends React.Component {
             </div>
         );
     }
-}
+}

web/react/components/admin_console/user_item.jsx

@@ -366,7 +366,7 @@ export default class UserItem extends React.Component {
                 <td className='row member-div padding--equal'>
                     <img
                         className='post-profile-img pull-left'
-                        src={`/api/v1/users/${user.id}/image?time=${user.update_at}&${Utils.getSessionIndex()}`}
+                        src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
                         height='36'
                         width='36'
                     />