Merge pull request #1684 from hmhealey/plt1184

PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made

3 files changed, 43 insertions, 20 deletions

diff --git a/web/react/components/edit_channel_header_modal.jsx b/web/react/components/edit_channel_header_modal.jsx
index 209e30fcc..e4817f6e4 100644
--- a/web/react/components/edit_channel_header_modal.jsx
+++ b/web/react/components/edit_channel_header_modal.jsx
@@ -1,8 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import * as Client from '../utils/client.jsx';
-import * as AsyncClient from '../utils/async_client.jsx';
+import Constants from '../utils/constants.jsx';
 import * as Utils from '../utils/utils.jsx';
 
 const Modal = ReactBootstrap.Modal;
@@ -11,12 +12,14 @@ export default class EditChannelHeaderModal extends React.Component {
     constructor(props) {
         super(props);
 
-        this.handleEdit = this.handleEdit.bind(this);
+        this.handleChange = this.handleChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this);
 
         this.onShow = this.onShow.bind(this);
         this.onHide = this.onHide.bind(this);
 
         this.state = {
+            header: props.channel.header,
             serverError: ''
         };
     }
@@ -27,27 +30,38 @@ export default class EditChannelHeaderModal extends React.Component {
         }
     }
 
+    componentWillReceiveProps(nextProps) {
+        if (this.props.channel.header !== nextProps.channel.header) {
+            this.setState({
+                header: nextProps.channel.header
+            });
+        }
+    }
+
     componentDidUpdate(prevProps) {
         if (this.props.show && !prevProps.show) {
             this.onShow();
         }
     }
 
-    handleEdit() {
-        var data = {};
-        data.channel_id = this.props.channel.id;
-
-        if (data.channel_id.length !== 26) {
-            return;
-        }
-
-        data.channel_header = ReactDOM.findDOMNode(this.refs.textarea).value;
+    handleChange(e) {
+        this.setState({
+            header: e.target.value
+        });
+    }
 
-        Client.updateChannelHeader(data,
-            () => {
+    handleSubmit() {
+        Client.updateChannelHeader(
+            this.props.channel.id,
+            this.state.header,
+            (channel) => {
                 this.setState({serverError: ''});
-                AsyncClient.getChannel(this.props.channel.id);
                 this.onHide();
+
+                AppDispatcher.handleServerAction({
+                    type: Constants.ActionTypes.RECIEVED_CHANNEL,
+                    channel
+                });
             },
             (err) => {
                 if (err.message === 'Invalid channel_header parameter') {
@@ -66,7 +80,8 @@ export default class EditChannelHeaderModal extends React.Component {
 
     onHide() {
         this.setState({
-            serverError: ''
+            serverError: '',
+            header: this.props.channel.header
         });
 
         this.props.onHide();
@@ -94,7 +109,8 @@ export default class EditChannelHeaderModal extends React.Component {
                         rows='6'
                         id='edit_header'
                         maxLength='1024'
-                        defaultValue={this.props.channel.header}
+                        value={this.state.header}
+                        onChange={this.handleChange}
                     />
                     {serverError}
                 </Modal.Body>
@@ -102,14 +118,14 @@ export default class EditChannelHeaderModal extends React.Component {
                     <button
                         type='button'
                         className='btn btn-default'
-                        onClick={this.props.onHide}
+                        onClick={this.onHide}
                     >
                         {'Cancel'}
                     </button>
                     <button
                         type='button'
                         className='btn btn-primary'
-                        onClick={this.handleEdit}
+                        onClick={this.handleSubmit}
                     >
                         {'Save'}
                     </button>
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index 0bfde77b4..afc960fcf 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -317,7 +317,9 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
 
     case ActionTypes.RECIEVED_CHANNEL:
         ChannelStore.pStoreChannel(action.channel);
-        ChannelStore.pStoreChannelMember(action.member);
+        if (action.member) {
+            ChannelStore.pStoreChannelMember(action.member);
+        }
         currentId = ChannelStore.getCurrentId();
         if (currentId) {
             ChannelStore.resetCounts(currentId);
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 09e962161..5d02a8c88 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -590,7 +590,12 @@ export function updateChannel(channel, success, error) {
     track('api', 'api_channels_update');
 }
 
-export function updateChannelHeader(data, success, error) {
+export function updateChannelHeader(channelId, header, success, error) {
+    const data = {
+        channel_id: channelId,
+        channel_header: header
+    };
+
     $.ajax({
         url: '/api/v1/channels/update_header',
         dataType: 'json',