From d67a2e1f0cdc62a89c39bb3a16adc4a6a4d05eeb Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 31 Oct 2016 09:11:23 -0400 Subject: Fix new DMs not showing up in the sidebar (#4374) --- webapp/actions/global_actions.jsx | 8 ++++---- webapp/utils/channel_utils.jsx | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 123c1c392..a2c7c341d 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -360,14 +360,14 @@ export function emitClearSuggestions(suggestionId) { } export function emitPreferenceChangedEvent(preference) { - if (preference.category === Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW) { - loadProfilesAndTeamMembersForDMSidebar(); - } - AppDispatcher.handleServerAction({ type: Constants.ActionTypes.RECEIVED_PREFERENCE, preference }); + + if (preference.category === Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW) { + loadProfilesAndTeamMembersForDMSidebar(); + } } export function emitRemovePost(post) { diff --git a/webapp/utils/channel_utils.jsx b/webapp/utils/channel_utils.jsx index 119021fce..113d86ea8 100644 --- a/webapp/utils/channel_utils.jsx +++ b/webapp/utils/channel_utils.jsx @@ -35,7 +35,7 @@ export function buildDisplayableChannelList(persistentChannels) { publicChannels: notFavoriteChannels.filter(isOpenChannel), privateChannels: notFavoriteChannels.filter(isPrivateChannel), directChannels: directChannels.filter(isConnectedToTeamMember), - directNonTeamChannels: directChannels.filter(not(isConnectedToTeamMember)) + directNonTeamChannels: directChannels.filter(isNotConnectedToTeamMember) }; } @@ -119,6 +119,10 @@ function isTeamMember(userId) { return TeamStore.hasActiveMemberInTeam(TeamStore.getCurrentId(), userId); } +function isNotConnectedToTeamMember(channel) { + return TeamStore.hasMemberNotInTeam(TeamStore.getCurrentId(), channel.teammate_id); +} + function not(f) { return (...args) => !f(...args); } -- cgit v1.2.3-1-g7c22