IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix sidebar status not updating (#6752)

Browse Source
This commit is contained in:
Joram Wilander
2017-06-29 09:37:57 -04:00
committed by Harrison Healey
parent 227586e09a
commit bef07fc53e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/components/sidebar.jsx
View File

@@ -45,7 +45,7 @@ const dispatch = store.dispatch;
const getState = store.getState;
import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
import {getUsers} from 'mattermost-redux/selectors/entities/users';
import {getUsers, getUserStatuses} from 'mattermost-redux/selectors/entities/users';
import {savePreferences} from 'mattermost-redux/actions/preferences';
export default class Sidebar extends React.Component {
@@ -108,10 +108,12 @@ export default class Sidebar extends React.Component {
const channels = ChannelStore.getAll();
const preferences = getMyPreferences(store.getState());
const profiles = getUsers(store.getState());
const statuses = getUserStatuses(store.getState());
let displayableChannels = {};
if (!Utils.areObjectsEqual(channels, this.oldChannels) ||
!Utils.areObjectsEqual(preferences, this.oldPreferences) ||
!Utils.areObjectsEqual(profiles, this.oldProfiles)) {
!Utils.areObjectsEqual(profiles, this.oldProfiles) ||
!Utils.areObjectsEqual(statuses, this.oldStatuses)) {
const channelsArray = channels.map((channel) => Object.assign({}, channel));
displayableChannels = ChannelUtils.buildDisplayableChannelList(channelsArray);
displayableChannels.favoriteChannels.sort(sortTeamsByDisplayName);
@@ -119,6 +121,7 @@ export default class Sidebar extends React.Component {
this.oldChannels = channels;
this.oldPreferences = preferences;
this.oldProfiles = profiles;
this.oldStatuses = statuses;
return {
activeId: currentChannelId,