Fixed issue with channel name in url and added loading icon to replace 'Join' button for slow connections

web/react/components/more_channels.jsx

@@ -24,6 +24,7 @@ export default class MoreChannels extends React.Component {
 
         var initState = getStateFromStores();
         initState.channelType = '';
+        initState.joiningChannel = -1;
         this.state = initState;
     }
     componentDidMount() {
@@ -47,14 +48,17 @@ export default class MoreChannels extends React.Component {
             this.setState(newState);
         }
     }
-    handleJoin(id) {
+    handleJoin(channel, channelIndex) {
-        client.joinChannel(id,
+        this.setState({joiningChannel: channelIndex});
-            function joinSuccess(data) {
+        client.joinChannel(channel.id,
+            function joinSuccess() {
                 $(this.refs.modal.getDOMNode()).modal('hide');
-                asyncClient.getChannel(id);
+                asyncClient.getChannel(channel.id);
-                utils.switchChannel(data);
+                utils.switchChannel(channel);
+                this.setState({joiningChannel: -1});
             }.bind(this),
             function joinFail(err) {
+                this.setState({joiningChannel: -1});
                 this.state.serverError = err.message;
                 this.setState(this.state);
             }.bind(this)
@@ -79,7 +83,20 @@ export default class MoreChannels extends React.Component {
                     moreChannels = (
                         <table className='more-channel-table table'>
                             <tbody>
-                                {channels.map(function cMap(channel) {
+                                {channels.map(function cMap(channel, index) {
+                                    var joinButton;
+                                    if (self.state.joiningChannel === index) {
+                                        joinButton = (<img
+                                                        className='join-channel-loading-gif'
+                                                        src='/static/images/load.gif'
+                                                    />);
+                                    } else {
+                                        joinButton = (<button
+                                                        onClick={self.handleJoin.bind(self, channel, index)}
+                                                        className='btn btn-primary'>Join
+                                                    </button>);
+                                    }
+
                                     return (
                                         <tr key={channel.id}>
                                             <td>
@@ -87,10 +104,7 @@ export default class MoreChannels extends React.Component {
                                                 <p className='more-channel-description'>{channel.description}</p>
                                             </td>
                                             <td className='td--action'>
-                                                <button
+                                                {joinButton}
-                                                    onClick={self.handleJoin.bind(self, channel.id)}
-                                                    className='btn btn-primary'>Join
-                                                </button>
                                             </td>
                                         </tr>
                                     );

web/sass-files/sass/partials/_sidebar--left.scss

@@ -124,7 +124,15 @@
 }
 
 .channel-loading-gif {
-    height:15px;
+    height: 15px;
-    width:15px;
+    width: 15px;
-    margin-top:2px;
+    margin-top: 2px;
+}
+
+.join-channel-loading-gif {
+    margin-top: 5px;
+    margin-left: 10px;
+    height: 25px;
+    width: 25px;
+
 }