Merge pull request #1410 from hmhealey/plt906

PLT-906 Added ChannelExtra.MemberCount field

2 files changed, 7 insertions, 3 deletions

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 895dc5fe4..dcc3bf87d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -39,11 +39,14 @@ export default class ChannelHeader extends React.Component {
         this.state = state;
     }
     getStateFromStores() {
+        const extraInfo = ChannelStore.getCurrentExtraInfo();
+
         return {
             channel: ChannelStore.getCurrent(),
             memberChannel: ChannelStore.getCurrentMember(),
             memberTeam: UserStore.getCurrentUser(),
-            users: ChannelStore.getCurrentExtraInfo().members,
+            users: extraInfo.members,
+            userCount: extraInfo.member_count,
             searchVisible: SearchStore.getSearchResults() !== null
         };
     }
@@ -373,6 +376,7 @@ export default class ChannelHeader extends React.Component {
                             <th>
                                 <PopoverListMembers
                                     members={this.state.users}
+                                    memberCount={this.state.userCount}
                                     channelId={channel.id}
                                 />
                             </th>
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx
index f3c0fa0b4..bd6b6d3bd 100644
--- a/web/react/components/popover_list_members.jsx
+++ b/web/react/components/popover_list_members.jsx
@@ -69,7 +69,6 @@ export default class PopoverListMembers extends React.Component {
 
     render() {
         let popoverHtml = [];
-        let count = 0;
         let countText = '-';
         const members = this.props.members;
         const teamMembers = UserStore.getProfilesUsernameMap();
@@ -147,10 +146,10 @@ export default class PopoverListMembers extends React.Component {
                             </div>
                         </div>
                     );
-                    count++;
                 }
             });
 
+            const count = this.props.memberCount;
             if (count > 20) {
                 countText = '20+';
             } else if (count > 0) {
@@ -195,5 +194,6 @@ export default class PopoverListMembers extends React.Component {
 
 PopoverListMembers.propTypes = {
     members: React.PropTypes.array.isRequired,
+    memberCount: React.PropTypes.number.isRequired,
     channelId: React.PropTypes.string.isRequired
 };