diff options
author | enahum <nahumhbl@gmail.com> | 2016-12-19 10:05:46 -0300 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-19 08:05:46 -0500 |
commit | 999d1553e1ce45adf58f6082b160bc1147dc592b (patch) | |
tree | 369a9b7f46dd44d136a79a050469429169433cec /webapp/components/notify_counts.jsx | |
parent | 3ce2ce9dc882ed962dc3ce7550bdb07963f376b6 (diff) | |
download | chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.gz chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.bz2 chat-999d1553e1ce45adf58f6082b160bc1147dc592b.zip |
PLT-4167 Team Sidebar (#4569)
* PLT-4167 Team Sidebar
* Address feedback from PM
* change route from my_members to members
* bug fixes
* Updating styles for teams sidebar (#4681)
* Added PM changes
* Fix corner cases
* Addressing feedback
* use two different endpoints
* Bug fixes
* Rename model and client functions, using preferences to store last team and channel viewed
* Fix mobile notification count and closing the team sidebar
* unit test, fixed bad merge and retrieve from cached when available
* bug fixes
* use id for last channel in preferences, query optimization
* Updating multi team css (#4830)
Diffstat (limited to 'webapp/components/notify_counts.jsx')
-rw-r--r-- | webapp/components/notify_counts.jsx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx index 6ccbd228b..d49925780 100644 --- a/webapp/components/notify_counts.jsx +++ b/webapp/components/notify_counts.jsx @@ -3,14 +3,22 @@ import * as utils from 'utils/utils.jsx'; import ChannelStore from 'stores/channel_store.jsx'; +import TeamStore from 'stores/team_store.jsx'; function getCountsStateFromStores() { - var count = 0; - var channels = ChannelStore.getAll(); - var members = ChannelStore.getMyMembers(); + let count = 0; + const teamMembers = TeamStore.getMyTeamMembers(); + const channels = ChannelStore.getAll(); + const members = ChannelStore.getMyMembers(); + + teamMembers.forEach((member) => { + if (member.team_id !== TeamStore.getCurrentId()) { + count += ((member.msg_count || 0) + (member.mention_count || 0)); + } + }); channels.forEach((channel) => { - var channelMember = members[channel.id]; + const channelMember = members[channel.id]; if (channelMember == null) { return; } @@ -41,10 +49,12 @@ export default class NotifyCounts extends React.Component { componentDidMount() { this.mounted = true; ChannelStore.addChangeListener(this.onListenerChange); + TeamStore.addChangeListener(this.onListenerChange); } componentWillUnmount() { this.mounted = false; ChannelStore.removeChangeListener(this.onListenerChange); + TeamStore.removeChangeListener(this.onListenerChange); } onListenerChange() { if (this.mounted) { |