Merge pull request #1600 from hmhealey/plt1152

PLT-1152 Fix cross-contamination between invite member modals

6 files changed, 28 insertions, 68 deletions

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 08c4a48ea..d5a46721e 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -40,7 +40,6 @@ export default class ChannelHeader extends React.Component {
 
         const state = this.getStateFromStores();
         state.showEditChannelPurposeModal = false;
-        state.showInviteModal = false;
         state.showMembersModal = false;
         this.state = state;
     }
@@ -201,13 +200,13 @@ export default class ChannelHeader extends React.Component {
                         key='add_members'
                         role='presentation'
                     >
-                        <a
+                        <ToggleModalButton
                             role='menuitem'
-                            href='#'
-                            onClick={() => this.setState({showInviteModal: true})}
+                            dialogType={ChannelInviteModal}
+                            dialogProps={{channel}}
                         >
                             {'Add Members'}
-                        </a>
+                        </ToggleModalButton>
                     </li>
                 );
 
@@ -402,13 +401,10 @@ export default class ChannelHeader extends React.Component {
                     onModalDismissed={() => this.setState({showEditChannelPurposeModal: false})}
                     channel={channel}
                 />
-                <ChannelInviteModal
-                    show={this.state.showInviteModal}
-                    onModalDismissed={() => this.setState({showInviteModal: false})}
-                />
                 <ChannelMembersModal
                     show={this.state.showMembersModal}
                     onModalDismissed={() => this.setState({showMembersModal: false})}
+                    channel={channel}
                 />
             </div>
         );
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx
index 0518ccb86..56e2e53f9 100644
--- a/web/react/components/channel_invite_modal.jsx
+++ b/web/react/components/channel_invite_modal.jsx
@@ -53,15 +53,8 @@ export default class ChannelInviteModal extends React.Component {
             return a.username.localeCompare(b.username);
         });
 
-        var channelName = '';
-        if (ChannelStore.getCurrent()) {
-            channelName = ChannelStore.getCurrent().display_name;
-        }
-
         return {
             nonmembers,
-            memberIds,
-            channelName,
             loading
         };
     }
@@ -94,28 +87,14 @@ export default class ChannelInviteModal extends React.Component {
         }
     }
     handleInvite(userId) {
-        // Make sure the user isn't already a member of the channel
-        if (this.state.memberIds.indexOf(userId) > -1) {
-            return;
-        }
-
         var data = {};
         data.user_id = userId;
 
-        Client.addChannelMember(ChannelStore.getCurrentId(), data,
+        Client.addChannelMember(
+            this.props.channel.id,
+            data,
             () => {
-                var nonmembers = this.state.nonmembers;
-                var memberIds = this.state.memberIds;
-
-                for (var i = 0; i < nonmembers.length; i++) {
-                    if (userId === nonmembers[i].id) {
-                        nonmembers[i].invited = true;
-                        memberIds.push(userId);
-                        break;
-                    }
-                }
-
-                this.setState({inviteError: null, memberIds, nonmembers});
+                this.setState({inviteError: null});
                 AsyncClient.getChannelExtraInfo();
             },
             (err) => {
@@ -157,10 +136,10 @@ export default class ChannelInviteModal extends React.Component {
             <Modal
                 dialogClassName='more-modal'
                 show={this.props.show}
-                onHide={this.props.onModalDismissed}
+                onHide={this.props.onHide}
             >
                 <Modal.Header closeButton={true}>
-                    <Modal.Title>{'Add New Members to '}<span className='name'>{this.state.channelName}</span></Modal.Title>
+                    <Modal.Title>{'Add New Members to '}<span className='name'>{this.props.channel.display_nam}</span></Modal.Title>
                 </Modal.Header>
                 <Modal.Body
                     ref='modalBody'
@@ -173,7 +152,7 @@ export default class ChannelInviteModal extends React.Component {
                     <button
                         type='button'
                         className='btn btn-default'
-                        onClick={this.props.onModalDismissed}
+                        onClick={this.props.onHide}
                     >
                         {'Close'}
                     </button>
@@ -185,5 +164,6 @@ export default class ChannelInviteModal extends React.Component {
 
 ChannelInviteModal.propTypes = {
     show: React.PropTypes.bool.isRequired,
-    onModalDismissed: React.PropTypes.func.isRequired
+    onHide: React.PropTypes.func.isRequired,
+    channel: React.PropTypes.object.isRequired
 };
diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx
index f07fc166a..d1b9df988 100644
--- a/web/react/components/channel_members_modal.jsx
+++ b/web/react/components/channel_members_modal.jsx
@@ -69,16 +69,9 @@ export default class ChannelMembersModal extends React.Component {
         memberList.sort(compareByUsername);
         nonmemberList.sort(compareByUsername);
 
-        const channel = ChannelStore.getCurrent();
-        let channelName = '';
-        if (channel) {
-            channelName = channel.display_name;
-        }
-
         return {
             nonmemberList,
-            memberList,
-            channelName
+            memberList
         };
     }
     onShow() {
@@ -169,7 +162,7 @@ export default class ChannelMembersModal extends React.Component {
                     onHide={this.props.onModalDismissed}
                 >
                     <Modal.Header closeButton={true}>
-                        <Modal.Title><span className='name'>{this.state.channelName}</span>{' Members'}</Modal.Title>
+                        <Modal.Title><span className='name'>{this.props.channel.display_name}</span>{' Members'}</Modal.Title>
                         <a
                             className='btn btn-md btn-primary'
                             href='#'
@@ -205,7 +198,8 @@ export default class ChannelMembersModal extends React.Component {
                 </Modal>
                 <ChannelInviteModal
                     show={this.state.showInviteModal}
-                    onModalDismissed={() => this.setState({showInviteModal: false})}
+                    onHide={() => this.setState({showInviteModal: false})}
+                    channel={this.props.channel}
                 />
             </div>
         );
@@ -218,5 +212,6 @@ ChannelMembersModal.defaultProps = {
 
 ChannelMembersModal.propTypes = {
     show: React.PropTypes.bool.isRequired,
-    onModalDismissed: React.PropTypes.func.isRequired
+    onModalDismissed: React.PropTypes.func.isRequired,
+    channel: React.PropTypes.object.isRequired
 };
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index f5d5ab28b..f7f77f48a 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -31,9 +31,7 @@ export default class MemberListItem extends React.Component {
         var timestamp = UserStore.getCurrentUser().update_at;
 
         var invite;
-        if (member.invited && this.props.handleInvite) {
-            invite = <span className='member-role'>Added</span>;
-        } else if (this.props.handleInvite) {
+        if (this.props.handleInvite) {
             invite = (
                     <a
                         onClick={this.handleInvite}
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 6c3bfc7db..3bdc9efac 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -44,7 +44,6 @@ export default class Navbar extends React.Component {
         state.showEditChannelPurposeModal = false;
         state.showEditChannelHeaderModal = false;
         state.showMembersModal = false;
-        state.showInviteModal = false;
         this.state = state;
     }
     getStateFromStores() {
@@ -171,13 +170,13 @@ export default class Navbar extends React.Component {
             if (!isDirect && !ChannelStore.isDefault(channel)) {
                 addMembersOption = (
                     <li role='presentation'>
-                        <a
+                        <ToggleModalButton
                             role='menuitem'
-                            href='#'
-                            onClick={() => this.setState({showInviteModal: true})}
+                            dialogType={ChannelInviteModal}
+                            dialogProps={{channel}}
                         >
                             {'Add Members'}
-                        </a>
+                        </ToggleModalButton>
                     </li>
                 );
 
@@ -475,10 +474,7 @@ export default class Navbar extends React.Component {
                 <ChannelMembersModal
                     show={this.state.showMembersModal}
                     onModalDismissed={() => this.setState({showMembersModal: false})}
-                />
-                <ChannelInviteModal
-                    show={this.state.showInviteModal}
-                    onModalDismissed={() => this.setState({showInviteModal: false})}
+                    channel={{channel}}
                 />
             </div>
         );
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx
index 6d6694fec..631bd1872 100644
--- a/web/react/components/posts_view_container.jsx
+++ b/web/react/components/posts_view_container.jsx
@@ -3,7 +3,6 @@
 
 import PostsView from './posts_view.jsx';
 import LoadingScreen from './loading_screen.jsx';
-import ChannelInviteModal from './channel_invite_modal.jsx';
 
 import ChannelStore from '../stores/channel_store.jsx';
 import PostStore from '../stores/post_store.jsx';
@@ -13,7 +12,7 @@ import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
 import Constants from '../utils/constants.jsx';
 
-import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx';
+import {createChannelIntroMessage} from '../utils/channel_intro_messages.jsx';
 
 export default class PostsViewContainer extends React.Component {
     constructor() {
@@ -177,7 +176,7 @@ export default class PostsViewContainer extends React.Component {
                     loadMorePostsBottomClicked={() => {}}
                     showMoreMessagesTop={!this.state.atTop[this.state.currentChannelIndex]}
                     showMoreMessagesBottom={false}
-                    introText={channel ? createChannelIntroMessage(channel, () => this.setState({showInviteModal: true})) : null}
+                    introText={channel ? createChannelIntroMessage(channel) : null}
                     messageSeparatorTime={this.state.currentLastViewed}
                 />
             );
@@ -194,10 +193,6 @@ export default class PostsViewContainer extends React.Component {
         return (
             <div id='post-list'>
                 {postListCtls}
-                <ChannelInviteModal
-                    show={this.state.showInviteModal}
-                    onModalDismissed={() => this.setState({showInviteModal: false})}
-                />
             </div>
         );
     }