Fixing loading of team members for dm list (#4477)
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
07dbbfb957
Коммит
5fe2d78211
@@ -19,7 +19,6 @@ import * as AsyncClient from 'utils/async_client.jsx';
|
|||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
import * as ChannelUtils from 'utils/channel_utils.jsx';
|
import * as ChannelUtils from 'utils/channel_utils.jsx';
|
||||||
import * as ChannelActions from 'actions/channel_actions.jsx';
|
import * as ChannelActions from 'actions/channel_actions.jsx';
|
||||||
import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
|
|
||||||
|
|
||||||
import Constants from 'utils/constants.jsx';
|
import Constants from 'utils/constants.jsx';
|
||||||
|
|
||||||
@@ -125,9 +124,6 @@ export default class Sidebar extends React.Component {
|
|||||||
|
|
||||||
document.addEventListener('keydown', this.navigateChannelShortcut);
|
document.addEventListener('keydown', this.navigateChannelShortcut);
|
||||||
document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
|
document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
|
||||||
|
|
||||||
loadProfilesAndTeamMembersForDMSidebar();
|
|
||||||
AsyncClient.getMyChannelMembers();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
shouldComponentUpdate(nextProps, nextState) {
|
shouldComponentUpdate(nextProps, nextState) {
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ import ChannelStore from 'stores/channel_store.jsx';
|
|||||||
import emojiRoute from 'routes/route_emoji.jsx';
|
import emojiRoute from 'routes/route_emoji.jsx';
|
||||||
import integrationsRoute from 'routes/route_integrations.jsx';
|
import integrationsRoute from 'routes/route_integrations.jsx';
|
||||||
|
|
||||||
|
import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
|
||||||
|
|
||||||
function onChannelEnter(nextState, replace, callback) {
|
function onChannelEnter(nextState, replace, callback) {
|
||||||
doChannelChange(nextState, replace, callback);
|
doChannelChange(nextState, replace, callback);
|
||||||
}
|
}
|
||||||
@@ -68,6 +70,8 @@ function preNeedsTeam(nextState, replace, callback) {
|
|||||||
|
|
||||||
TeamStore.saveMyTeam(team);
|
TeamStore.saveMyTeam(team);
|
||||||
TeamStore.emitChange();
|
TeamStore.emitChange();
|
||||||
|
loadProfilesAndTeamMembersForDMSidebar();
|
||||||
|
AsyncClient.getMyChannelMembers();
|
||||||
|
|
||||||
var d1 = $.Deferred(); //eslint-disable-line new-cap
|
var d1 = $.Deferred(); //eslint-disable-line new-cap
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user