When user is removed, a modal appears, which on closing redirects the

user to town square.

4 files changed, 59 insertions, 2 deletions

diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx
new file mode 100644
index 000000000..3a5a58d5e
--- /dev/null
+++ b/web/react/components/removed_from_channel_modal.jsx
@@ -0,0 +1,45 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var ChannelStore = require('../stores/channel_store.jsx');
+var UserStore = require('../stores/user_store.jsx');
+var utils = require('../utils/utils.jsx');
+
+module.exports = React.createClass({
+    handleClose: function() {
+      var townSquare = ChannelStore.getByName("town-square");
+      utils.switchChannel(townSquare);
+    },
+    componentDidMount: function() {
+      $(this.getDOMNode()).on('hidden.bs.modal',this.handleClose);
+    },
+    componentWillUnmount: function() {
+      $(this.getDOMNode()).off('hidden.bs.modal',this.handleClose);
+    },
+    render: function() {
+        currentUser = UserStore.getCurrentUser();
+
+        if (currentUser != null) {
+            return (
+                <div className="modal fade" ref="modal" id="removed_from_channel" tabIndex="-1" role="dialog" aria-hidden="true">
+                   <div className="modal-dialog">
+                      <div className="modal-content">
+                        <div className="modal-header">
+                          <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                          <h4 className="modal-title" />
+                        </div>
+                        <div className="modal-body">
+                            <p />
+                        </div>
+                        <div className="modal-footer">
+                          <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button>
+                        </div>
+                      </div>
+                   </div>
+                </div>
+            );
+        } else {
+            return <div/>;
+        }
+    }
+});
\ No newline at end of file
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index ed75e51cf..a29c6a903 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -201,8 +201,13 @@ module.exports = React.createClass({
             if(msg.user_id === UserStore.getCurrentId()) {
                 AsyncClient.getChannels(true);
 
-                if(msg.props.channel_id === ChannelStore.getCurrentId()) {
-                    window.location.reload();
+                if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) {
+                    var channelName = ChannelStore.getCurrent().display_name;
+                    var curUser = UserStore.getProfile(msg.props.remover).username;
+                    $('#removed_from_channel').find('.modal-title').text("Removed from " + channelName);
+                    $('#removed_from_channel').find('.modal-body').children().text(curUser + " removed you from " + channelName);
+
+                    $('#removed_from_channel').modal('show');
                 }
             }
         }
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index cc78df120..90d90b29f 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var MentionList = require('../components/mention_list.jsx');
 var ChannelInfoModal = require('../components/channel_info_modal.jsx');
 var AccessHistoryModal = require('../components/access_history_modal.jsx');
 var ActivityLogModal = require('../components/activity_log_modal.jsx');
+var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx')
 
 
 var Constants = require('../utils/constants.jsx');
@@ -217,4 +218,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
         document.getElementById('activity_log_modal')
     );
 
+    React.render(
+        <RemovedFromChannelModal />,
+        document.getElementById('removed_from_channel_modal')
+    );
+
 };
diff --git a/web/templates/channel.html b/web/templates/channel.html
index 8e856032d..6325069ee 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -47,6 +47,7 @@
   <div id="channel_info_modal"></div>
   <div id="access_history_modal"></div>
   <div id="activity_log_modal"></div>
+  <div id="removed_from_channel_modal"></div>
 <script>
 window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
 </script>