diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2016-01-07 10:25:56 -0500 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2016-01-07 10:25:56 -0500 |
commit | 357063044b2dc4a89a7d30601c16805880514997 (patch) | |
tree | 3d49a395b0187a3c94bcfccd9ddf22147e98caa5 /web/react/components | |
parent | 0e7a149982f73919badd9d366d06fa699925c89f (diff) | |
download | chat-357063044b2dc4a89a7d30601c16805880514997.tar.gz chat-357063044b2dc4a89a7d30601c16805880514997.tar.bz2 chat-357063044b2dc4a89a7d30601c16805880514997.zip |
Made ChannelInviteModal pull all channel members before rendering
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/channel_invite_modal.jsx | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx index 7dac39942..8b7485e5f 100644 --- a/web/react/components/channel_invite_modal.jsx +++ b/web/react/components/channel_invite_modal.jsx @@ -20,9 +20,14 @@ export default class ChannelInviteModal extends React.Component { this.onListenerChange = this.onListenerChange.bind(this); this.handleInvite = this.handleInvite.bind(this); - this.state = this.getStateFromStores(); + // the state gets populated when the modal is shown + this.state = {}; } shouldComponentUpdate(nextProps, nextState) { + if (!this.props.show && !nextProps.show) { + return false; + } + if (!Utils.areObjectsEqual(this.props, nextProps)) { return true; } @@ -34,13 +39,25 @@ export default class ChannelInviteModal extends React.Component { return false; } getStateFromStores() { - function getId(user) { - return user.id; + const users = UserStore.getActiveOnlyProfiles(); + + if ($.isEmptyObject(users)) { + return { + loading: true + }; + } + + // make sure we have all members of this channel before rendering + const extraInfo = ChannelStore.getCurrentExtraInfo(); + if (extraInfo.member_count !== extraInfo.members.length) { + AsyncClient.getChannelExtraInfo(this.props.channel.id, -1); + + return { + loading: true + }; } - var users = UserStore.getActiveOnlyProfiles(); - var memberIds = ChannelStore.getCurrentExtraInfo().members.map(getId); - var loading = $.isEmptyObject(users); + const memberIds = extraInfo.members.map((user) => user.id); var nonmembers = []; for (var id in users) { @@ -55,7 +72,7 @@ export default class ChannelInviteModal extends React.Component { return { nonmembers, - loading + loading: false }; } onShow() { |