Fix DMs not being removed until re-render (#6305)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
aa65478445
Коммит
6a6c5365d3
@@ -42,6 +42,7 @@ export default class MoreDirectChannels extends React.Component {
|
|||||||
this.handleExit = this.handleExit.bind(this);
|
this.handleExit = this.handleExit.bind(this);
|
||||||
this.handleSubmit = this.handleSubmit.bind(this);
|
this.handleSubmit = this.handleSubmit.bind(this);
|
||||||
this.handleDelete = this.handleDelete.bind(this);
|
this.handleDelete = this.handleDelete.bind(this);
|
||||||
|
this.handlePageChange = this.handlePageChange.bind(this);
|
||||||
this.onChange = this.onChange.bind(this);
|
this.onChange = this.onChange.bind(this);
|
||||||
this.search = this.search.bind(this);
|
this.search = this.search.bind(this);
|
||||||
this.addValue = this.addValue.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 favicon from 'images/favicon/favicon-16x16.png';
|
||||||
import redFavicon from 'images/favicon/redfavicon-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 {
|
export default class Sidebar extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(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 tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999);
|
||||||
|
|
||||||
const channels = ChannelStore.getAll();
|
const channels = ChannelStore.getAll();
|
||||||
|
const preferences = Selectors.getMyPreferences(store.getState());
|
||||||
let displayableChannels = {};
|
let displayableChannels = {};
|
||||||
if (channels !== this.oldChannels) {
|
if (channels !== this.oldChannels || preferences !== this.oldPreferences) {
|
||||||
const channelsArray = channels.map((channel) => Object.assign({}, channel));
|
const channelsArray = channels.map((channel) => Object.assign({}, channel));
|
||||||
displayableChannels = ChannelUtils.buildDisplayableChannelList(channelsArray);
|
displayableChannels = ChannelUtils.buildDisplayableChannelList(channelsArray);
|
||||||
}
|
}
|
||||||
this.oldChannels = channels;
|
this.oldChannels = channels;
|
||||||
|
this.oldPreferences = preferences;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
activeId: currentChannelId,
|
activeId: currentChannelId,
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user