mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Changed direct channels in the sidebar to be displayed based on user preferences

Просмотр исходного кода
Этот коммит содержится в:
hmhealey
2015-10-02 09:50:34 -04:00
родитель a087403e9f
Коммит 7d03c24b44
5 изменённых файлов: 308 добавлений и 37 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

166
web/react/components/sidebar.jsx
Просмотреть файл

@@ -1,19 +1,20 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
var ChannelStore = require('../stores/channel_store.jsx');
var Client = require('../utils/client.jsx');
var AsyncClient = require('../utils/async_client.jsx');
var SocketStore = require('../stores/socket_store.jsx');
var UserStore = require('../stores/user_store.jsx');
var TeamStore = require('../stores/team_store.jsx');
var BrowserStore = require('../stores/browser_store.jsx');
var Utils = require('../utils/utils.jsx');
var SidebarHeader = require('./sidebar_header.jsx');
var SearchBox = require('./search_bar.jsx');
var Constants = require('../utils/constants.jsx');
var NewChannelFlow = require('./new_channel_flow.jsx');
var UnreadChannelIndicator = require('./unread_channel_indicator.jsx');
const AsyncClient = require('../utils/async_client.jsx');
const BrowserStore = require('../stores/browser_store.jsx');
const ChannelStore = require('../stores/channel_store.jsx');
const Client = require('../utils/client.jsx');
const Constants = require('../utils/constants.jsx');
const PreferenceStore = require('../stores/preference_store.jsx');
const NewChannelFlow = require('./new_channel_flow.jsx');
const SearchBox = require('./search_bar.jsx');
const SidebarHeader = require('./sidebar_header.jsx');
const SocketStore = require('../stores/socket_store.jsx');
const TeamStore = require('../stores/team_store.jsx');
const UnreadChannelIndicator = require('./unread_channel_indicator.jsx');
const UserStore = require('../stores/user_store.jsx');
const Utils = require('../utils/utils.jsx');
export default class Sidebar extends React.Component {
constructor(props) {
@@ -23,6 +24,9 @@ export default class Sidebar extends React.Component {
this.firstUnreadChannel = null;
this.lastUnreadChannel = null;
this.getStateFromStores = this.getStateFromStores.bind(this);
//this.getDirectChannelsFromStores = this.getDirectChannelsFromStores.bind(this);
this.onChange = this.onChange.bind(this);
this.onScroll = this.onScroll.bind(this);
this.onResize = this.onResize.bind(this);
@@ -36,7 +40,7 @@ export default class Sidebar extends React.Component {
this.state = state;
}
getStateFromStores() {
var members = ChannelStore.getAllMembers();
const members = ChannelStore.getAllMembers();
var teamMemberMap = UserStore.getActiveOnlyProfiles();
var currentId = ChannelStore.getCurrentId();
@@ -48,11 +52,13 @@ export default class Sidebar extends React.Component {
teammates.push(teamMemberMap[id]);
}
const preferences = PreferenceStore.getPreferences('direct_channels', 'show_hide');
// Create lists of all read and unread direct channels
var showDirectChannels = [];
var readDirectChannels = [];
var visibleDirectChannels = [];
var hiddenDirectChannels = [];
for (var i = 0; i < teammates.length; i++) {
var teammate = teammates[i];
const teammate = teammates[i];
if (teammate.id === UserStore.getCurrentId()) {
continue;
@@ -65,7 +71,7 @@ export default class Sidebar extends React.Component {
channelName = teammate.id + '__' + UserStore.getCurrentId();
}
var channel = ChannelStore.getByName(channelName);
let channel = ChannelStore.getByName(channelName);
if (channel == null) {
var tempChannel = {};
@@ -84,21 +90,44 @@ export default class Sidebar extends React.Component {
channel.status = UserStore.getStatus(teammate.id);
var channelMember = members[channel.id];
/*var channelMember = members[channel.id];
var msgCount = channel.total_msg_count - channelMember.msg_count;
if (msgCount > 0) {
showDirectChannels.push(channel);
visibleDirectChannels.push(channel);
} else if (currentId === channel.id) {
showDirectChannels.push(channel);
visibleDirectChannels.push(channel);
} else {
readDirectChannels.push(channel);
}
hiddenDirectChannels.push(channel);
}*/
} else {
channel = {};
channel.fake = true;
channel.name = channelName;
channel.display_name = teammate.username;
channel.teammate_username = teammate.username;
channel.status = UserStore.getStatus(teammate.id);
channel.last_post_at = 0;
channel.total_msg_count = 0;
channel.type = 'D';
}
if (preferences.some((preference) => (preference.alt_id === teammate.id && preference.value !== 'false'))) {
visibleDirectChannels.push(channel);
} else {
hiddenDirectChannels.push(channel);
}
}
// If we don't have MAX_DMS unread channels, sort the read list by last_post_at
if (showDirectChannels.length < Constants.MAX_DMS) {
readDirectChannels.sort(function sortByLastPost(a, b) {
function sortByDisplayName(a, b) {
return a.display_name.localeCompare(b.display_name);
}
visibleDirectChannels.sort(sortByDisplayName);
hiddenDirectChannels.sort(sortByDisplayName);
/*// If we don't have MAX_DMS unread channels, sort the read list by last_post_at
if (visibleDirectChannels.length < Constants.MAX_DMS) {
hiddenDirectChannels.sort(function sortByLastPost(a, b) {
// sort by last_post_at first
if (a.last_post_at > b.last_post_at) {
return -1;
@@ -118,13 +147,13 @@ export default class Sidebar extends React.Component {
});
var index = 0;
while (showDirectChannels.length < Constants.MAX_DMS && index < readDirectChannels.length) {
showDirectChannels.push(readDirectChannels[index]);
while (visibleDirectChannels.length < Constants.MAX_DMS && index < hiddenDirectChannels.length) {
visibleDirectChannels.push(hiddenDirectChannels[index]);
index++;
}
readDirectChannels = readDirectChannels.slice(index);
hiddenDirectChannels = hiddenDirectChannels.slice(index);
showDirectChannels.sort(function directSort(a, b) {
visibleDirectChannels.sort(function directSort(a, b) {
if (a.display_name < b.display_name) {
return -1;
}
@@ -133,22 +162,84 @@ export default class Sidebar extends React.Component {
}
return 0;
});
}
}*/
return {
activeId: currentId,
channels: ChannelStore.getAll(),
members: members,
showDirectChannels: showDirectChannels,
hideDirectChannels: readDirectChannels
visibleDirectChannels: visibleDirectChannels,
hiddenDirectChannels: hiddenDirectChannels
};
}
/*getDirectChannelsFromStores() {
const id = UserStore.getCurrentId();
const channels = [];
const preferences = PreferenceStore.getPreferences('direct_channels', 'show_hide');
for (const preference of preferences) {
if (preference.value !== 'true') {
continue;
}
const otherId = preference.alt_id;
if (otherId === id) {
continue;
}
const teammate = UserStore.getProfile(otherId);
if (!teammate) {
continue;
}
let channelName = '';
if (otherId > id) {
channelName = `${id}__${otherId}`;
} else {
channelName = `${otherId}__${id}`;
}
const channel = ChannelStore.getByName(channelName);
if (channel != null) {
channel.display_name = teammate.username;
channel.teammate_username = teammate.username;
channel.status = UserStore.getStatus(otherId);
channels.push(channel);
} else {
const tempChannel = {};
tempChannel.fake = true;
tempChannel.name = channelName;
tempChannel.display_name = teammate.username;
tempChannel.teammate_username = teammate.username;
tempChannel.status = UserStore.getStatus(teammate.id);
tempChannel.last_post_at = 0;
tempChannel.total_msg_count = 0;
tempChannel.type = 'D';
channels.push(tempChannel);
}
}
channels.sort((a, b) => a.display_name.localeCompare(b));
return channels;
}*/
componentDidMount() {
ChannelStore.addChangeListener(this.onChange);
UserStore.addChangeListener(this.onChange);
UserStore.addStatusesChangeListener(this.onChange);
TeamStore.addChangeListener(this.onChange);
SocketStore.addChangeListener(this.onSocketChange);
PreferenceStore.addChangeListener(this.onChange);
AsyncClient.getDirectChannels();
$('.nav-pills__container').perfectScrollbar();
this.updateTitle();
@@ -178,6 +269,7 @@ export default class Sidebar extends React.Component {
UserStore.removeStatusesChangeListener(this.onChange);
TeamStore.removeChangeListener(this.onChange);
SocketStore.removeChangeListener(this.onSocketChange);
PreferenceStore.removeChangeListener(this.onChange);
}
onChange() {
var newState = this.getStateFromStores();
@@ -464,7 +556,7 @@ export default class Sidebar extends React.Component {
const privateChannels = this.state.channels.filter((channel) => channel.type === 'P');
const privateChannelItems = privateChannels.map(this.createChannelElement);
const directMessageItems = this.state.showDirectChannels.map(this.createChannelElement);
const directMessageItems = this.state.visibleDirectChannels.map(this.createChannelElement);
// update the favicon to show if there are any notifications
var link = document.createElement('link');
@@ -484,7 +576,7 @@ export default class Sidebar extends React.Component {
head.appendChild(link);
var directMessageMore = null;
if (this.state.hideDirectChannels.length > 0) {
if (this.state.hiddenDirectChannels.length > 0) {
directMessageMore = (
<li>
<a
@@ -492,9 +584,9 @@ export default class Sidebar extends React.Component {
data-toggle='modal'
className='nav-more'
data-target='#more_direct_channels'
data-channels={JSON.stringify(this.state.hideDirectChannels)}
data-channels={JSON.stringify(this.state.hiddenDirectChannels)}
>
{'More (' + this.state.hideDirectChannels.length + ')'}
{'More (' + this.state.hiddenDirectChannels.length + ')'}
</a>
</li>
);