Fix DMs not being removed until re-render (#6305)

Этот коммит содержится в:
Joram Wilander
2017-05-03 11:54:47 -04:00
коммит произвёл Corey Hulen
родитель aa65478445
Коммит 6a6c5365d3
2 изменённых файлов: 7 добавлений и 1 удалений

Просмотреть файл

@@ -42,6 +42,7 @@ export default class MoreDirectChannels extends React.Component {
this.handleExit = this.handleExit.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.handleDelete = this.handleDelete.bind(this);
this.handlePageChange = this.handlePageChange.bind(this);
this.onChange = this.onChange.bind(this);
this.search = this.search.bind(this);
this.addValue = this.addValue.bind(this);

Просмотреть файл

@@ -40,6 +40,9 @@ import {browserHistory, Link} from 'react-router/es6';
import favicon from 'images/favicon/favicon-16x16.png';
import redFavicon from 'images/favicon/redfavicon-16x16.png';
import store from 'stores/redux_store.jsx';
import * as Selectors from 'mattermost-redux/selectors/entities/preferences';
export default class Sidebar extends React.Component {
constructor(props) {
super(props);
@@ -117,12 +120,14 @@ export default class Sidebar extends React.Component {
const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999);
const channels = ChannelStore.getAll();
const preferences = Selectors.getMyPreferences(store.getState());
let displayableChannels = {};
if (channels !== this.oldChannels) {
if (channels !== this.oldChannels || preferences !== this.oldPreferences) {
const channelsArray = channels.map((channel) => Object.assign({}, channel));
displayableChannels = ChannelUtils.buildDisplayableChannelList(channelsArray);
}
this.oldChannels = channels;
this.oldPreferences = preferences;
return {
activeId: currentChannelId,