Fxing some channel changing issues

11 files changed, 90 insertions, 45 deletions

diff --git a/webapp/action_creators/global_actions.jsx b/webapp/action_creators/global_actions.jsx
index 9c38d8955..fd447ec93 100644
--- a/webapp/action_creators/global_actions.jsx
+++ b/webapp/action_creators/global_actions.jsx
@@ -335,4 +335,3 @@ export function emitRemoteUserTypingEvent(channelId, userId, postParentId) {
         postParentId
     });
 }
-
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 482aabc01..16d9ea536 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -26,10 +26,10 @@ import * as Utils from 'utils/utils.jsx';
 import * as TextFormatting from 'utils/text_formatting.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
 import * as Client from 'utils/client.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 import Constants from 'utils/constants.jsx';
 
 import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
 
 const ActionTypes = Constants.ActionTypes;
 
@@ -106,7 +106,7 @@ export default class ChannelHeader extends React.Component {
                 });
 
                 const townsquare = ChannelStore.getByName('town-square');
-                GlobalActions.emitChannelClickEvent(townsquare);
+                browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + townsquare.name);
             },
             (err) => {
                 AsyncClient.dispatchError(err, 'handleLeave');
diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx
index 811bb8101..5ccf9c11e 100644
--- a/webapp/components/more_channels.jsx
+++ b/webapp/components/more_channels.jsx
@@ -9,9 +9,9 @@ import * as AsyncClient from 'utils/async_client.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import LoadingScreen from './loading_screen.jsx';
 import NewChannelFlow from './new_channel_flow.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 
 import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
 
 import loadingGif from 'images/load.gif';
 
@@ -65,7 +65,7 @@ export default class MoreChannels extends React.Component {
         client.joinChannel(channel.id,
             () => {
                 $(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
-                GlobalActions.emitChannelClickEvent(channel);
+                browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
                 this.setState({joiningChannel: -1});
             },
             (err) => {
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx
index 29d64517e..a83816c40 100644
--- a/webapp/components/more_direct_channels.jsx
+++ b/webapp/components/more_direct_channels.jsx
@@ -5,9 +5,9 @@ import {Modal} from 'react-bootstrap';
 import FilteredUserList from './filtered_user_list.jsx';
 import UserStore from 'stores/user_store.jsx';
 import * as Utils from 'utils/utils.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 
 import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
 import SpinnerButton from 'components/spinner_button.jsx';
 
 import React from 'react';
@@ -69,7 +69,7 @@ export default class MoreDirectChannels extends React.Component {
         Utils.openDirectChannelToUser(
             teammate,
             (channel) => {
-                GlobalActions.emitChannelClickEvent(channel);
+                browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
                 this.setState({loadingDMChannel: -1});
                 this.handleHide();
             },
diff --git a/webapp/components/new_channel_flow.jsx b/webapp/components/new_channel_flow.jsx
index 8c66ef3ce..82494dac0 100644
--- a/webapp/components/new_channel_flow.jsx
+++ b/webapp/components/new_channel_flow.jsx
@@ -4,25 +4,21 @@
 import * as Utils from 'utils/utils.jsx';
 import * as Client from 'utils/client.jsx';
 import UserStore from 'stores/user_store.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 
 import NewChannelModal from './new_channel_modal.jsx';
 import ChangeURLModal from './change_url_modal.jsx';
 
 import {intlShape, injectIntl, defineMessages} from 'react-intl';
+import {browserHistory} from 'react-router';
+
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from 'utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
 
 const SHOW_NEW_CHANNEL = 1;
 const SHOW_EDIT_URL = 2;
 const SHOW_EDIT_URL_THEN_COMPLETE = 3;
 const messages = defineMessages({
-    invalidName: {
-        id: 'channel_flow.invalidName',
-        defaultMessage: 'Invalid Channel Name'
-    },
-    alreadyExist: {
-        id: 'channel_flow.alreadyExist',
-        defaultMessage: 'A channel with that URL already exists'
-    },
     channel: {
         id: 'channel_flow.channel',
         defaultMessage: 'Channel'
@@ -87,37 +83,51 @@ class NewChannelFlow extends React.Component {
         }
     }
     doSubmit() {
-        var channel = {};
-
-        const {formatMessage} = this.props.intl;
-        channel.display_name = this.state.channelDisplayName;
-        if (!channel.display_name) {
-            this.setState({serverError: formatMessage(messages.invalidName)});
+        if (!this.state.channelDisplayName) {
+            this.setState({serverError: Utils.localizeMessage('channel_flow.invalidName', 'Invalid Channel Name')});
             return;
         }
 
-        channel.name = this.state.channelName;
-        if (channel.name.length < 2) {
+        if (this.state.channelName < 2) {
             this.setState({flowState: SHOW_EDIT_URL_THEN_COMPLETE});
             return;
         }
 
         const cu = UserStore.getCurrentUser();
-        channel.team_id = cu.team_id;
-        channel.purpose = this.state.channelPurpose;
-        channel.type = this.state.channelType;
-
-        Client.createChannel(channel,
+        const channel = {
+            team_id: cu.team_id,
+            name: this.state.channelName,
+            display_name: this.state.channelDisplayName,
+            purpose: this.state.channelPurpose,
+            type: this.state.channelType
+        };
+        Client.createChannel(
+            channel,
             (data) => {
-                this.props.onModalDismissed();
-                GlobalActions.emitChannelClickEvent(data);
+                Client.getChannel(
+                    data.id,
+                    (data2, textStatus, xhr) => {
+                        if (xhr.status === 304 || !data2) {
+                            return;
+                        }
+
+                        AppDispatcher.handleServerAction({
+                            type: ActionTypes.RECEIVED_CHANNEL,
+                            channel: data2.channel,
+                            member: data2.member
+                        });
+
+                        this.props.onModalDismissed();
+                        browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + data2.channel.name);
+                    }
+                );
             },
             (err) => {
                 if (err.id === 'model.channel.is_valid.2_or_more.app_error') {
                     this.setState({flowState: SHOW_EDIT_URL_THEN_COMPLETE});
                 }
                 if (err.id === 'store.sql_channel.update.exists.app_error') {
-                    this.setState({serverError: formatMessage(messages.alreadyExist)});
+                    this.setState({serverError: Utils.localizeMessage('channel_flow.alreadyExist', 'A channel with that URL already exists')});
                     return;
                 }
                 this.setState({serverError: err.message});
diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx
index 226a1889c..8c3c381af 100644
--- a/webapp/components/popover_list_members.jsx
+++ b/webapp/components/popover_list_members.jsx
@@ -6,10 +6,10 @@ import $ from 'jquery';
 import UserStore from 'stores/user_store.jsx';
 import {Popover, Overlay} from 'react-bootstrap';
 import * as Utils from 'utils/utils.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 import Constants from 'utils/constants.jsx';
 
 import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
 
 import React from 'react';
 
@@ -35,7 +35,7 @@ export default class PopoverListMembers extends React.Component {
         Utils.openDirectChannelToUser(
             teammate,
             (channel, channelAlreadyExisted) => {
-                GlobalActions.emitChannelClickEvent(channel);
+                browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
                 if (channelAlreadyExisted) {
                     this.closePopover();
                 }
diff --git a/webapp/components/removed_from_channel_modal.jsx b/webapp/components/removed_from_channel_modal.jsx
index 45018ac99..d037c089d 100644
--- a/webapp/components/removed_from_channel_modal.jsx
+++ b/webapp/components/removed_from_channel_modal.jsx
@@ -6,9 +6,10 @@ import ReactDOM from 'react-dom';
 import ChannelStore from 'stores/channel_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 
+import * as Utils from 'utils/utils.jsx';
 import {FormattedMessage} from 'react-intl';
+import {browserHistory} from 'react-router';
 
 import React from 'react';
 
@@ -33,7 +34,11 @@ export default class RemovedFromChannelModal extends React.Component {
         }
 
         var townSquare = ChannelStore.getByName('town-square');
-        setTimeout(() => GlobalActions.emitChannelClickEvent(townSquare), 1);
+        setTimeout(
+            () => {
+                browserHistory.push(Utils.getTeamURLNoOriginFromAddressBar() + '/channels/' + townSquare.name);
+            },
+        1);
 
         this.setState(newState);
     }
diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx
index ced3c2d2b..3e47847e7 100644
--- a/webapp/components/rename_channel_modal.jsx
+++ b/webapp/components/rename_channel_modal.jsx
@@ -4,7 +4,7 @@
 import ReactDOM from 'react-dom';
 import * as Utils from 'utils/utils.jsx';
 import * as Client from 'utils/client.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
+import * as AsyncClient from 'utils/async_client.jsx';
 import Constants from 'utils/constants.jsx';
 
 import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl';
@@ -165,7 +165,7 @@ export default class RenameChannelModal extends React.Component {
         Client.updateChannel(
             channel,
             () => {
-                GlobalActions.emitChannelClickEvent(channel);
+                AsyncClient.getChannel(channel.id);
 
                 this.handleHide();
             },
diff --git a/webapp/root.jsx b/webapp/root.jsx
index da5980c33..10cc63643 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -197,6 +197,12 @@ function doChannelChange(state) {
         channel = JSON.parse(state.location.query.fakechannel);
     } else {
         channel = ChannelStore.getByName(state.params.channel);
+        if (!channel) {
+            channel = ChannelStore.getMoreByName(state.params.channel);
+        }
+        if (!channel) {
+            console.error('Unable to get channel to change to.'); //eslint-disable-line no-console
+        }
     }
     GlobalActions.emitChannelClickEvent(channel);
 }
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx
index b2946e326..9437d5e44 100644
--- a/webapp/stores/channel_store.jsx
+++ b/webapp/stores/channel_store.jsx
@@ -95,7 +95,12 @@ class ChannelStoreClass extends EventEmitter {
         this.removeListener(LEAVE_EVENT, callback);
     }
     findFirstBy(field, value) {
-        var channels = this.getChannels();
+        return this.doFindFirst(field, value, this.getChannels());
+    }
+    findFirstMoreBy(field, value) {
+        return this.doFindFirst(field, value, this.getMoreChannels());
+    }
+    doFindFirst(field, value, channels) {
         for (var i = 0; i < channels.length; i++) {
             if (channels[i][field] === value) {
                 return channels[i];
@@ -113,6 +118,9 @@ class ChannelStoreClass extends EventEmitter {
     getByName(name) {
         return this.findFirstBy('name', name);
     }
+    getMoreByName(name) {
+        return this.findFirstMoreBy('name', name);
+    }
     getAll() {
         return this.getChannels();
     }
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 9b03ef32a..35c347f9f 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -3,7 +3,6 @@
 
 import $ from 'jquery';
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import LocalizationStore from 'stores/localization_store.jsx';
@@ -168,7 +167,7 @@ export function notifyMe(title, body, channel) {
                     notification.onclick = () => {
                         window.focus();
                         if (channel) {
-                            GlobalActions.emitChannelClickEvent(channel);
+                            browserHistory.push(getTeamURLNoOriginFromAddressBar() + '/channels/' + channel.name);
                         } else {
                             browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square');
                         }
@@ -1216,6 +1215,10 @@ export function getTeamURLFromAddressBar() {
     return window.location.origin + '/' + window.location.pathname.split('/')[1];
 }
 
+export function getTeamURLNoOriginFromAddressBar() {
+    return '/' + window.location.pathname.split('/')[1];
+}
+
 export function getShortenedTeamURL() {
     const teamURL = getTeamURLFromAddressBar();
     if (teamURL.length > 35) {
@@ -1261,10 +1264,24 @@ export function openDirectChannelToUser(user, successCb, errorCb) {
             channel,
             user.id,
             (data) => {
-                AsyncClient.getChannel(data.id);
-                if ($.isFunction(successCb)) {
-                    successCb(data, false);
-                }
+                Client.getChannel(
+                    data.id,
+                    (data2, textStatus, xhr) => {
+                        if (xhr.status === 304 || !data2) {
+                            return;
+                        }
+
+                        AppDispatcher.handleServerAction({
+                            type: ActionTypes.RECEIVED_CHANNEL,
+                            channel: data2.channel,
+                            member: data2.member
+                        });
+
+                        if ($.isFunction(successCb)) {
+                            successCb(data2.channel, false);
+                        }
+                    }
+                );
             },
             () => {
                 browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channelName);