@@ -123,19 +116,27 @@ export default class PopoverListMembers extends React.Component {
);
}
});
+
+ popoverHtml.push(
+
+ );
}
- let count = this.props.memberCount;
+ const count = this.props.memberCount;
let countText = '-';
-
- // fall back to checking the length of the member list if the count isn't set
- if (!count && members) {
- count = members.length;
- }
-
- if (count > Constants.MAX_CHANNEL_POPOVER_COUNT) {
- countText = Constants.MAX_CHANNEL_POPOVER_COUNT + '+';
- } else if (count > 0) {
+ if (count > 0) {
countText = count.toString();
}
@@ -151,7 +152,10 @@ export default class PopoverListMembers extends React.Component {
id='member_popover'
className='member-popover__trigger'
ref='member_popover_target'
- onClick={(e) => this.setState({popoverTarget: e.target, showPopover: !this.state.showPopover})}
+ onClick={(e) => {
+ this.setState({popoverTarget: e.target, showPopover: !this.state.showPopover});
+ AsyncClient.getProfilesInChannel(this.props.channel.id, 0);
+ }}
>
{countText}
diff --git a/webapp/components/post_view/components/pending_post_options.jsx b/webapp/components/post_view/components/pending_post_options.jsx
index 711ea832c7..44f4794ef4 100644
--- a/webapp/components/post_view/components/pending_post_options.jsx
+++ b/webapp/components/post_view/components/pending_post_options.jsx
@@ -4,11 +4,10 @@
import PostStore from 'stores/post_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
+import {loadPosts} from 'actions/post_actions.jsx';
+
import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
-
import Client from 'client/web_client.jsx';
-import * as AsyncClient from 'utils/async_client.jsx';
-
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
@@ -29,13 +28,13 @@ export default class PendingPostOptions extends React.Component {
var post = this.props.post;
Client.createPost(post,
(data) => {
- AsyncClient.getPosts(post.channel_id);
+ loadPosts(post.channel_id);
var channel = ChannelStore.get(post.channel_id);
- var member = ChannelStore.getMember(post.channel_id);
+ var member = ChannelStore.getMyMember(post.channel_id);
member.msg_count = channel.total_msg_count;
member.last_viewed_at = (new Date()).getTime();
- ChannelStore.setChannelMember(member);
+ ChannelStore.storeMyChannelMember(member);
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_POST,
diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx
index d686b28e5a..46ce0ed670 100644
--- a/webapp/components/post_view/components/post_list.jsx
+++ b/webapp/components/post_view/components/post_list.jsx
@@ -66,6 +66,16 @@ export default class PostList extends React.Component {
}
}
+ componentWillReceiveProps(nextProps) {
+ // TODO: Clean-up intro text creation
+ if (this.props.channel && this.props.channel.type === Constants.DM_CHANNEL) {
+ const teammateId = Utils.getUserIdFromChannelName(this.props.channel);
+ if (!this.props.profiles[teammateId] && nextProps.profiles[teammateId]) {
+ this.introText = createChannelIntroMessage(this.props.channel, this.state.fullWidthIntro);
+ }
+ }
+ }
+
handleKeyDown(e) {
if (e.which === Constants.KeyCodes.ESCAPE && $('.popover.in,.modal.in').length === 0) {
e.preventDefault();
diff --git a/webapp/components/post_view/post_focus_view_controller.jsx b/webapp/components/post_view/post_focus_view_controller.jsx
index 4e21cb29f6..8edec69704 100644
--- a/webapp/components/post_view/post_focus_view_controller.jsx
+++ b/webapp/components/post_view/post_focus_view_controller.jsx
@@ -35,10 +35,7 @@ export default class PostFocusView extends React.Component {
const focusedPostId = PostStore.getFocusedPostId();
const channel = ChannelStore.getCurrent();
- let profiles = UserStore.getProfiles();
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
+ const profiles = UserStore.getProfiles();
const joinLeaveEnabled = PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'join_leave', true);
@@ -115,12 +112,7 @@ export default class PostFocusView extends React.Component {
}
onUserChange() {
- const channel = ChannelStore.getCurrent();
- let profiles = UserStore.getProfiles();
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
- this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(profiles))});
+ this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(UserStore.getProfiles()))});
}
onStatusChange() {
diff --git a/webapp/components/post_view/post_view_controller.jsx b/webapp/components/post_view/post_view_controller.jsx
index 12fd5cd635..57b488b54e 100644
--- a/webapp/components/post_view/post_view_controller.jsx
+++ b/webapp/components/post_view/post_view_controller.jsx
@@ -34,13 +34,10 @@ export default class PostViewController extends React.Component {
this.onBusy = this.onBusy.bind(this);
const channel = props.channel;
- let profiles = UserStore.getProfiles();
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
+ const profiles = UserStore.getProfiles();
let lastViewed = Number.MAX_VALUE;
- const member = ChannelStore.getMember(channel.id);
+ const member = ChannelStore.getMyMember(channel.id);
if (member != null) {
lastViewed = member.last_viewed_at;
}
@@ -107,12 +104,7 @@ export default class PostViewController extends React.Component {
}
onUserChange() {
- const channel = this.state.channel;
- let profiles = UserStore.getProfiles();
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
- this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(profiles))});
+ this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(UserStore.getProfiles()))});
}
onPostsChange() {
@@ -165,15 +157,12 @@ export default class PostViewController extends React.Component {
const channel = nextProps.channel;
let lastViewed = Number.MAX_VALUE;
- const member = ChannelStore.getMember(channel.id);
+ const member = ChannelStore.getMyMember(channel.id);
if (member != null) {
lastViewed = member.last_viewed_at;
}
- let profiles = UserStore.getProfiles();
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
+ const profiles = UserStore.getProfiles();
const joinLeaveEnabled = PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'join_leave', true);
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 7d643bd388..27446c85a5 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -61,6 +61,10 @@ export default class RhsRootPost extends React.Component {
return true;
}
+ if (!Utils.areObjectsEqual(nextProps.user, this.props.user)) {
+ return true;
+ }
+
if (!Utils.areObjectsEqual(nextProps.currentUser, this.props.currentUser)) {
return true;
}
@@ -85,7 +89,7 @@ export default class RhsRootPost extends React.Component {
var isOwner = this.props.currentUser.id === post.user_id;
var isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser();
const isSystemMessage = post.type && post.type.startsWith(Constants.SYSTEM_MESSAGE_PREFIX);
- var timestamp = UserStore.getProfile(post.user_id).update_at;
+ var timestamp = user.update_at;
var channel = ChannelStore.get(post.channel_id);
const flagIcon = Constants.FLAG_ICON_SVG;
diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx
index 7d0de85900..11c79d7228 100644
--- a/webapp/components/rhs_thread.jsx
+++ b/webapp/components/rhs_thread.jsx
@@ -8,7 +8,6 @@ import RootPost from './rhs_root_post.jsx';
import Comment from './rhs_comment.jsx';
import FileUploadOverlay from './file_upload_overlay.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
import PostStore from 'stores/post_store.jsx';
import UserStore from 'stores/user_store.jsx';
import PreferenceStore from 'stores/preference_store.jsx';
@@ -238,12 +237,7 @@ export default class RhsThread extends React.Component {
render() {
const postsArray = this.state.postsArray;
const selected = this.state.selected;
- const channel = ChannelStore.get(this.state.selected.channel_id);
-
- let profiles = this.state.profiles || {};
- if (channel && channel.type === Constants.DM_CHANNEL) {
- profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
- }
+ const profiles = this.state.profiles || {};
if (postsArray == null || selected == null) {
return (
diff --git a/webapp/components/searchable_user_list.jsx b/webapp/components/searchable_user_list.jsx
new file mode 100644
index 0000000000..8d4f74ab38
--- /dev/null
+++ b/webapp/components/searchable_user_list.jsx
@@ -0,0 +1,226 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import UserList from 'components/user_list.jsx';
+
+import * as Utils from 'utils/utils.jsx';
+import Constants from 'utils/constants.jsx';
+const KeyCodes = Constants.KeyCodes;
+
+import $ from 'jquery';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import {FormattedMessage} from 'react-intl';
+
+const NEXT_BUTTON_TIMEOUT = 500;
+
+export default class SearchableUserList extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.nextPage = this.nextPage.bind(this);
+ this.previousPage = this.previousPage.bind(this);
+ this.doSearch = this.doSearch.bind(this);
+ this.onSearchBoxKeyPress = this.onSearchBoxKeyPress.bind(this);
+ this.onSearchBoxChange = this.onSearchBoxChange.bind(this);
+
+ this.nextTimeoutId = 0;
+
+ this.state = {
+ page: 0,
+ search: false,
+ nextDisabled: false
+ };
+ }
+
+ componentDidUpdate(prevProps, prevState) {
+ if (this.state.page !== prevState.page) {
+ $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0);
+ }
+ }
+
+ componentWillUnmount() {
+ clearTimeout(this.nextTimeoutId);
+ }
+
+ nextPage(e) {
+ e.preventDefault();
+ this.setState({page: this.state.page + 1, nextDisabled: true});
+ this.nextTimeoutId = setTimeout(() => this.setState({nextDisabled: false}), NEXT_BUTTON_TIMEOUT);
+ this.props.nextPage(this.state.page + 1);
+ }
+
+ previousPage(e) {
+ e.preventDefault();
+ this.setState({page: this.state.page - 1});
+ }
+
+ doSearch() {
+ const term = this.refs.filter.value;
+ this.props.search(term);
+ if (term === '') {
+ this.setState({page: 0, search: false});
+ } else {
+ this.setState({search: true});
+ }
+ }
+
+ onSearchBoxKeyPress(e) {
+ if (e.charCode === KeyCodes.ENTER) {
+ e.preventDefault();
+ this.doSearch();
+ }
+ }
+
+ onSearchBoxChange(e) {
+ if (e.target.value === '') {
+ this.props.search(''); // clear search
+ this.setState({page: 0, search: false});
+ }
+ }
+
+ render() {
+ let nextButton;
+ let previousButton;
+ let usersToDisplay;
+ let count;
+
+ if (this.props.users == null) {
+ usersToDisplay = this.props.users;
+ } else if (this.state.search || this.props.users == null) {
+ usersToDisplay = this.props.users;
+
+ if (this.props.total) {
+ count = (
+
+ );
+ }
+ } else {
+ const pageStart = this.state.page * this.props.usersPerPage;
+ const pageEnd = pageStart + this.props.usersPerPage;
+ usersToDisplay = this.props.users.slice(pageStart, pageEnd);
+
+ if (usersToDisplay.length >= this.props.usersPerPage) {
+ nextButton = (
+
+ );
+ }
+
+ if (this.state.page > 0) {
+ previousButton = (
+
+ );
+ }
+
+ if (this.props.total) {
+ const startCount = this.state.page * this.props.usersPerPage;
+ const endCount = startCount + usersToDisplay.length;
+
+ count = (
+
+ );
+ }
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+ {count}
+
+
+
+
+
+
+ {previousButton}
+ {nextButton}
+
+
+ );
+ }
+}
+
+SearchableUserList.defaultProps = {
+ users: [],
+ usersPerPage: 50, //eslint-disable-line no-magic-numbers
+ extraInfo: {},
+ actions: [],
+ actionProps: {},
+ actionUserProps: {},
+ showTeamToggle: false
+};
+
+SearchableUserList.propTypes = {
+ users: React.PropTypes.arrayOf(React.PropTypes.object),
+ usersPerPage: React.PropTypes.number,
+ total: React.PropTypes.number,
+ extraInfo: React.PropTypes.object,
+ nextPage: React.PropTypes.func.isRequired,
+ search: React.PropTypes.func.isRequired,
+ actions: React.PropTypes.arrayOf(React.PropTypes.func),
+ actionProps: React.PropTypes.object,
+ actionUserProps: React.PropTypes.object,
+ style: React.PropTypes.object
+};
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index 5f8d9f4639..283299b37c 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -46,7 +46,7 @@ export default class SelectTeam extends React.Component {
getStateFromStores(loaded) {
return {
teams: TeamStore.getAll(),
- teamMembers: TeamStore.getTeamMembers(),
+ teamMembers: TeamStore.getMyTeamMembers(),
teamListings: TeamStore.getTeamListings(),
loaded
};
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index dc52ebb917..c8a7e1eb95 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -19,6 +19,7 @@ import LocalizationStore from 'stores/localization_store.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as Utils from 'utils/utils.jsx';
import * as ChannelActions from 'actions/channel_actions.jsx';
+import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
import Constants from 'utils/constants.jsx';
@@ -93,7 +94,7 @@ export default class Sidebar extends React.Component {
}
getStateFromStores() {
- const members = ChannelStore.getAllMembers();
+ const members = ChannelStore.getMyMembers();
const currentChannelId = ChannelStore.getCurrentId();
const currentUserId = UserStore.getCurrentId();
@@ -133,9 +134,9 @@ export default class Sidebar extends React.Component {
directChannel.teammate_id = teammateId;
directChannel.status = UserStore.getStatus(teammateId) || 'offline';
- if (UserStore.hasTeamProfile(teammateId) && TeamStore.hasActiveMemberForTeam(teammateId)) {
+ if (TeamStore.hasActiveMemberInTeam(TeamStore.getCurrentId(), teammateId)) {
directChannels.push(directChannel);
- } else {
+ } else if (TeamStore.hasMemberNotInTeam(TeamStore.getCurrentId(), teammateId)) {
directNonTeamChannels.push(directChannel);
}
}
@@ -164,6 +165,7 @@ export default class Sidebar extends React.Component {
componentDidMount() {
ChannelStore.addChangeListener(this.onChange);
UserStore.addChangeListener(this.onChange);
+ UserStore.addInTeamChangeListener(this.onChange);
UserStore.addStatusesChangeListener(this.onChange);
TeamStore.addChangeListener(this.onChange);
PreferenceStore.addChangeListener(this.onChange);
@@ -173,6 +175,8 @@ export default class Sidebar extends React.Component {
document.addEventListener('keydown', this.navigateChannelShortcut);
document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
+
+ loadProfilesAndTeamMembersForDMSidebar();
}
shouldComponentUpdate(nextProps, nextState) {
@@ -205,6 +209,7 @@ export default class Sidebar extends React.Component {
componentWillUnmount() {
ChannelStore.removeChangeListener(this.onChange);
UserStore.removeChangeListener(this.onChange);
+ UserStore.removeInTeamChangeListener(this.onChange);
UserStore.removeStatusesChangeListener(this.onChange);
TeamStore.removeChangeListener(this.onChange);
PreferenceStore.removeChangeListener(this.onChange);
diff --git a/webapp/components/sidebar_header_dropdown.jsx b/webapp/components/sidebar_header_dropdown.jsx
index dccac64b32..76ed6271a1 100644
--- a/webapp/components/sidebar_header_dropdown.jsx
+++ b/webapp/components/sidebar_header_dropdown.jsx
@@ -54,7 +54,7 @@ export default class SidebarHeaderDropdown extends React.Component {
this.state = {
teams: TeamStore.getAll(),
- teamMembers: TeamStore.getTeamMembers(),
+ teamMembers: TeamStore.getMyTeamMembers(),
showDropdown: false
};
}
@@ -118,7 +118,7 @@ export default class SidebarHeaderDropdown extends React.Component {
onTeamChange() {
this.setState({
teams: TeamStore.getAll(),
- teamMembers: TeamStore.getTeamMembers()
+ teamMembers: TeamStore.getMyTeamMembers()
});
}
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index 9998e63577..d4f441f981 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -1,19 +1,19 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import React from 'react';
-
-import SuggestionStore from 'stores/suggestion_store.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
-import UserStore from 'stores/user_store.jsx';
-import * as Utils from 'utils/utils.jsx';
-import Client from 'client/web_client.jsx';
-import Constants from 'utils/constants.jsx';
-
-import {FormattedMessage} from 'react-intl';
import Suggestion from './suggestion.jsx';
-const MaxUserSuggestions = 40;
+import ChannelStore from 'stores/channel_store.jsx';
+
+import {autocompleteUsersInChannel} from 'actions/user_actions.jsx';
+
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import * as Utils from 'utils/utils.jsx';
+import Client from 'client/web_client.jsx';
+import {Constants, ActionTypes} from 'utils/constants.jsx';
+
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
class AtMentionSuggestion extends Suggestion {
render() {
@@ -99,92 +99,66 @@ class AtMentionSuggestion extends Suggestion {
}
}
-function filterUsersByPrefix(users, prefix, limit, type) {
- const filtered = [];
-
- for (const id of Object.keys(users)) {
- if (filtered.length >= limit) {
- break;
- }
-
- const user = users[id];
-
- if (user.delete_at > 0) {
- continue;
- }
-
- if (user.username.startsWith(prefix) ||
- (user.first_name && user.first_name.toLowerCase().startsWith(prefix)) ||
- (user.last_name && user.last_name.toLowerCase().startsWith(prefix)) ||
- (user.nickname && user.nickname.toLowerCase().startsWith(prefix))) {
- // create a new object here since we're mutating it by adding the type field
- filtered.push(Object.assign({}, user, {type}));
- }
- }
-
- return filtered;
-}
-
export default class AtMentionProvider {
constructor(channelId) {
this.channelId = channelId;
+ this.timeoutId = '';
+ }
+
+ componentWillUnmount() {
+ clearTimeout(this.timeoutId);
}
handlePretextChanged(suggestionId, pretext) {
+ clearTimeout(this.timeoutId);
+
const captured = (/@([a-z0-9\-\._]*)$/i).exec(pretext.toLowerCase());
if (captured) {
const prefix = captured[1];
- // Group users into members and nonmembers of the channel.
- const users = UserStore.getActiveOnlyProfiles(true);
- const channelMembers = {};
- const channelNonmembers = users;
- if (this.channelId != null) {
- const extraInfo = ChannelStore.getExtraInfo(this.channelId);
- for (let i = 0; i < extraInfo.members.length; i++) {
- const id = extraInfo.members[i].id;
- if (users[id]) {
- channelMembers[id] = users[id];
- Reflect.deleteProperty(channelNonmembers, id);
+ function autocomplete() {
+ autocompleteUsersInChannel(
+ prefix,
+ this.channelId,
+ (data) => {
+ const members = data.in_channel;
+ for (const id of Object.keys(members)) {
+ members[id].type = Constants.MENTION_MEMBERS;
+ }
+
+ const nonmembers = data.out_of_channel;
+ for (const id of Object.keys(nonmembers)) {
+ nonmembers[id].type = Constants.MENTION_NONMEMBERS;
+ }
+
+ let specialMentions = [];
+ if (!pretext.startsWith('/msg')) {
+ specialMentions = ['here', 'channel', 'all'].filter((item) => {
+ return item.startsWith(prefix);
+ }).map((name) => {
+ return {username: name, type: Constants.MENTION_SPECIAL};
+ });
+ }
+
+ const users = members.concat(specialMentions).concat(nonmembers);
+ const mentions = users.map((user) => '@' + user.username);
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.SUGGESTION_RECEIVED_SUGGESTIONS,
+ id: suggestionId,
+ matchedPretext: captured[0],
+ terms: mentions,
+ items: users,
+ component: AtMentionSuggestion
+ });
}
- }
+ );
}
- // Filter users by prefix.
- const filteredMembers = filterUsersByPrefix(
- channelMembers, prefix, MaxUserSuggestions, Constants.MENTION_MEMBERS);
- const filteredNonmembers = filterUsersByPrefix(
- channelNonmembers, prefix, MaxUserSuggestions - filteredMembers.length, Constants.MENTION_NONMEMBERS);
- let filteredSpecialMentions = [];
- if (!pretext.startsWith('/msg')) {
- filteredSpecialMentions = ['here', 'channel', 'all'].filter((item) => {
- return item.startsWith(prefix);
- }).map((name) => {
- return {username: name, type: Constants.MENTION_SPECIAL};
- });
- }
-
- // Sort users by username.
- [filteredMembers, filteredNonmembers].forEach((items) => {
- items.sort((a, b) => {
- const aPrefix = a.username.startsWith(prefix);
- const bPrefix = b.username.startsWith(prefix);
-
- if (aPrefix === bPrefix) {
- return a.username.localeCompare(b.username);
- } else if (aPrefix) {
- return -1;
- }
-
- return 1;
- });
- });
-
- const filtered = filteredMembers.concat(filteredSpecialMentions).concat(filteredNonmembers);
-
- const mentions = filtered.map((user) => '@' + user.username);
-
- SuggestionStore.addSuggestions(suggestionId, mentions, filtered, AtMentionSuggestion, captured[0]);
+ this.timeoutId = setTimeout(
+ autocomplete.bind(this),
+ Constants.AUTOCOMPLETE_TIMEOUT
+ );
}
}
}
diff --git a/webapp/components/suggestion/search_user_provider.jsx b/webapp/components/suggestion/search_user_provider.jsx
index b5466cf39f..baf91cd94b 100644
--- a/webapp/components/suggestion/search_user_provider.jsx
+++ b/webapp/components/suggestion/search_user_provider.jsx
@@ -1,14 +1,17 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import React from 'react';
-
-import Client from 'client/web_client.jsx';
-import SuggestionStore from 'stores/suggestion_store.jsx';
-import UserStore from 'stores/user_store.jsx';
-
import Suggestion from './suggestion.jsx';
+import {autocompleteUsersInTeam} from 'actions/user_actions.jsx';
+
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import Client from 'client/web_client.jsx';
+import * as Utils from 'utils/utils.jsx';
+import {Constants, ActionTypes} from 'utils/constants.jsx';
+
+import React from 'react';
+
class SearchUserSuggestion extends Suggestion {
render() {
const {item, isSelection} = this.props;
@@ -18,6 +21,17 @@ class SearchUserSuggestion extends Suggestion {
className += ' selected';
}
+ const username = item.username;
+ let description = '';
+
+ if ((item.first_name || item.last_name) && item.nickname) {
+ description = `- ${Utils.getFullName(item)} (${item.nickname})`;
+ } else if (item.nickname) {
+ description = `- (${item.nickname})`;
+ } else if (item.first_name || item.last_name) {
+ description = `- ${Utils.getFullName(item)}`;
+ }
+
return (
{item.username}
+
+
+
+ {username}
+
+
+ {' '}
+ {description}
+
+
);
}
}
export default class SearchUserProvider {
+ constructor() {
+ this.timeoutId = '';
+ }
+
+ componentWillUnmount() {
+ clearTimeout(this.timeoutId);
+ }
+
handlePretextChanged(suggestionId, pretext) {
+ clearTimeout(this.timeoutId);
+
const captured = (/\bfrom:\s*(\S*)$/i).exec(pretext.toLowerCase());
if (captured) {
const usernamePrefix = captured[1];
- const users = UserStore.getProfiles();
- let filtered = [];
+ function autocomplete() {
+ autocompleteUsersInTeam(
+ usernamePrefix,
+ (data) => {
+ const users = data.in_team;
+ const mentions = users.map((user) => user.username);
- for (const id of Object.keys(users)) {
- const user = users[id];
-
- if (user.username.startsWith(usernamePrefix)) {
- filtered.push(user);
- }
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.SUGGESTION_RECEIVED_SUGGESTIONS,
+ id: suggestionId,
+ matchedPretext: usernamePrefix,
+ terms: mentions,
+ items: users,
+ component: SearchUserSuggestion
+ });
+ }
+ );
}
- filtered = filtered.sort((a, b) => a.username.localeCompare(b.username));
-
- const usernames = filtered.map((user) => user.username);
-
- SuggestionStore.addSuggestions(suggestionId, usernames, filtered, SearchUserSuggestion, usernamePrefix);
+ this.timeoutId = setTimeout(
+ autocomplete.bind(this),
+ Constants.AUTOCOMPLETE_TIMEOUT
+ );
}
}
}
diff --git a/webapp/components/suggestion/suggestion_list.jsx b/webapp/components/suggestion/suggestion_list.jsx
index 7d8059e1ef..65311a5828 100644
--- a/webapp/components/suggestion/suggestion_list.jsx
+++ b/webapp/components/suggestion/suggestion_list.jsx
@@ -163,4 +163,4 @@ SuggestionList.propTypes = {
SuggestionList.defaultProps = {
renderDividers: false
-};
\ No newline at end of file
+};
diff --git a/webapp/components/suggestion/switch_channel_provider.jsx b/webapp/components/suggestion/switch_channel_provider.jsx
index 70e95b9b13..94622b5360 100644
--- a/webapp/components/suggestion/switch_channel_provider.jsx
+++ b/webapp/components/suggestion/switch_channel_provider.jsx
@@ -4,7 +4,6 @@
import React from 'react';
import ChannelStore from 'stores/channel_store.jsx';
-import UserStore from 'stores/user_store.jsx';
import SuggestionStore from 'stores/suggestion_store.jsx';
import Suggestion from './suggestion.jsx';
import Constants from 'utils/constants.jsx';
@@ -58,7 +57,10 @@ export default class SwitchChannelProvider {
const channel = allChannels[id];
if (channel.display_name.toLowerCase().startsWith(channelPrefix.toLowerCase())) {
channels.push(channel);
- } else if (channel.type === Constants.DM_CHANNEL && Utils.getDirectTeammate(channel.id).username.startsWith(channelPrefix.toLowerCase())) {
+ }
+
+ // TODO: Fix with auto-complete refactor
+ /*else if (channel.type === Constants.DM_CHANNEL && Utils.getDirectTeammate(channel.id).username.startsWith(channelPrefix.toLowerCase())) {
// New channel to not modify existing channel
const otherUser = Utils.getDirectTeammate(channel.id);
const newChannel = {
@@ -68,7 +70,7 @@ export default class SwitchChannelProvider {
status: UserStore.getStatus(otherUser.id) || 'offline'
};
channels.push(newChannel);
- }
+ }*/
}
channels.sort((a, b) => {
diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
index d459d0b02b..3b6bc87f3a 100644
--- a/webapp/components/team_members_dropdown.jsx
+++ b/webapp/components/team_members_dropdown.jsx
@@ -1,17 +1,20 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
+import ConfirmModal from './confirm_modal.jsx';
+
+import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
+
+import {removeUserFromTeam} from 'actions/team_actions.jsx';
+
import Client from 'client/web_client.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as Utils from 'utils/utils.jsx';
-import ConfirmModal from './confirm_modal.jsx';
-import TeamStore from 'stores/team_store.jsx';
-
-import {FormattedMessage} from 'react-intl';
import React from 'react';
+import {FormattedMessage} from 'react-intl';
import {browserHistory} from 'react-router/es6';
export default class TeamMembersDropdown extends React.Component {
@@ -44,8 +47,8 @@ export default class TeamMembersDropdown extends React.Component {
this.props.user.id,
'team_user',
() => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
+ AsyncClient.getTeamMember(this.props.teamMember.team_id);
+ AsyncClient.getUser(this.props.user.id);
},
(err) => {
this.setState({serverError: err.message});
@@ -54,24 +57,23 @@ export default class TeamMembersDropdown extends React.Component {
}
}
handleRemoveFromTeam() {
- Client.removeUserFromTeam(
- '',
- this.props.user.id,
- () => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
- },
- (err) => {
- this.setState({serverError: err.message});
- }
- );
+ removeUserFromTeam(
+ this.props.teamMember.team_id,
+ this.props.user.id,
+ () => {
+ AsyncClient.getTeamStats(this.props.teamMember.team_id);
+ },
+ (err) => {
+ this.setState({serverError: err.message});
+ }
+ );
}
handleMakeActive() {
Client.updateActive(this.props.user.id, true,
() => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
- AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
+ AsyncClient.getUser(this.props.user.id);
+ AsyncClient.getChannelStats(ChannelStore.getCurrentId());
+ AsyncClient.getTeamStats(this.props.teamMember.team_id);
},
(err) => {
this.setState({serverError: err.message});
@@ -81,9 +83,9 @@ export default class TeamMembersDropdown extends React.Component {
handleMakeNotActive() {
Client.updateActive(this.props.user.id, false,
() => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
- AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
+ AsyncClient.getUser(this.props.user.id);
+ AsyncClient.getChannelStats(ChannelStore.getCurrentId());
+ AsyncClient.getTeamStats(this.props.teamMember.team_id);
},
(err) => {
this.setState({serverError: err.message});
@@ -100,8 +102,8 @@ export default class TeamMembersDropdown extends React.Component {
this.props.user.id,
'team_user team_admin',
() => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
+ AsyncClient.getTeamMember(this.props.teamMember.team_id, this.props.user.id);
+ AsyncClient.getUser(this.props.user.id);
},
(err) => {
this.setState({serverError: err.message});
@@ -133,8 +135,8 @@ export default class TeamMembersDropdown extends React.Component {
this.props.user.id,
this.state.newRole,
() => {
- AsyncClient.getTeamMembers(TeamStore.getCurrentId());
- AsyncClient.getProfiles();
+ AsyncClient.getTeamMember(this.props.teamMember.team_id, this.props.user.id);
+ AsyncClient.getUser(this.props.user.id);
const teamUrl = TeamStore.getCurrentTeamUrl();
if (teamUrl) {
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index fa2ffec1ee..44468a67a3 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -109,7 +109,7 @@ export default class Textbox extends React.Component {
}
componentWillReceiveProps(nextProps) {
- if (nextProps.channelId !== this.channelId) {
+ if (nextProps.channelId !== this.props.channelId) {
// Update channel id for AtMentionProvider.
const providers = this.suggestionProviders;
for (let i = 0; i < providers.length; i++) {
diff --git a/webapp/components/user_list.jsx b/webapp/components/user_list.jsx
index 626cb3cf52..d34404c898 100644
--- a/webapp/components/user_list.jsx
+++ b/webapp/components/user_list.jsx
@@ -1,32 +1,29 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import {FormattedMessage} from 'react-intl';
import UserListRow from './user_list_row.jsx';
+import LoadingScreen from 'components/loading_screen.jsx';
import React from 'react';
+import {FormattedMessage} from 'react-intl';
export default class UserList extends React.Component {
render() {
const users = this.props.users;
let content;
- if (users.length > 0) {
+ if (users == null) {
+ return
;
+ } else if (users.length > 0) {
content = users.map((user) => {
- var teamMember;
- for (var index in this.props.teamMembers) {
- if (this.props.teamMembers[index].user_id === user.id) {
- teamMember = this.props.teamMembers[index];
- }
- }
-
return (
);
});
@@ -56,14 +53,15 @@ export default class UserList extends React.Component {
UserList.defaultProps = {
users: [],
- teamMembers: [],
+ extraInfo: {},
actions: [],
actionProps: {}
};
UserList.propTypes = {
users: React.PropTypes.arrayOf(React.PropTypes.object),
- teamMembers: React.PropTypes.arrayOf(React.PropTypes.object),
+ extraInfo: React.PropTypes.object,
actions: React.PropTypes.arrayOf(React.PropTypes.func),
- actionProps: React.PropTypes.object
+ actionProps: React.PropTypes.object,
+ actionUserProps: React.PropTypes.object
};
diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx
index 9f80d4caa5..ff381a30be 100644
--- a/webapp/components/user_list_row.jsx
+++ b/webapp/components/user_list_row.jsx
@@ -11,8 +11,9 @@ import * as Utils from 'utils/utils.jsx';
import Client from 'client/web_client.jsx';
import React from 'react';
+import {FormattedHTMLMessage} from 'react-intl';
-export default function UserListRow({user, teamMember, actions, actionProps}) {
+export default function UserListRow({user, extraInfo, actions, actionProps, actionUserProps}) {
const nameFormat = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', '');
let name = user.username;
@@ -29,15 +30,29 @@ export default function UserListRow({user, teamMember, actions, actionProps}) {
);
});
}
+ // QUICK HACK, NEEDS A PROP FOR TOGGLING STATUS
+ let email = user.email;
+ let emailStyle = 'more-modal__description';
let status;
- if (user.status) {
+ if (extraInfo && extraInfo.length > 0) {
+ email = (
+
+ );
+ emailStyle = '';
+ } else if (user.status) {
status = user.status;
} else {
status = UserStore.getStatus(user.id);
@@ -60,9 +75,10 @@ export default function UserListRow({user, teamMember, actions, actionProps}) {
{name}
-
- {user.email}
+
+ {email}
+ {extraInfo}
Sign-in Method: Email",
- "admin.user_item.authServiceNotEmail": ", Sign-in Method: {service}",
+ "admin.user_item.authServiceEmail": "Sign-in Method: Email",
+ "admin.user_item.authServiceNotEmail": "Sign-in Method: {service}",
"admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
"admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role",
"admin.user_item.confirmDemotion": "Confirm Demotion",
@@ -822,8 +822,8 @@
"admin.user_item.makeSysAdmin": "Make System Admin",
"admin.user_item.makeTeamAdmin": "Make Team Admin",
"admin.user_item.member": "Member",
- "admin.user_item.mfaNo": ", MFA: No",
- "admin.user_item.mfaYes": ", MFA: Yes",
+ "admin.user_item.mfaNo": "MFA: No",
+ "admin.user_item.mfaYes": "MFA: Yes",
"admin.user_item.resetMfa": "Remove MFA",
"admin.user_item.resetPwd": "Reset Password",
"admin.user_item.switchToEmail": "Switch to Email/Password",
@@ -881,6 +881,9 @@
"analytics.system.totalSessions": "Total Sessions",
"analytics.system.totalTeams": "Total Teams",
"analytics.system.totalUsers": "Total Users",
+ "analytics.system.totalWebsockets" : "Websocket Conns",
+ "analytics.system.totalMasterDbConnections": "Master DB Conns",
+ "analytics.system.totalReadDbConnections": "Replica DB Conns",
"analytics.team.activeUsers": "Active Users With Posts",
"analytics.team.newlyCreated": "Newly Created Users",
"analytics.team.privateGroups": "Private Groups",
@@ -1192,13 +1195,14 @@
"file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.",
"file_upload.pasted": "Image Pasted at ",
"filtered_channels_list.count": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}}",
- "filtered_channels_list.countTotal": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}} of {total} Total",
+ "filtered_channels_list.countTotal": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}} of {total} total",
"filtered_channels_list.search": "Search channels",
"filtered_user_list.any_team": "All Users",
"filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}",
- "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total",
+ "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
+ "filtered_user_list.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
"filtered_user_list.member": "Member",
- "filtered_user_list.search": "Search members",
+ "filtered_user_list.search": "Press enter to search",
"filtered_user_list.show": "Filter:",
"filtered_user_list.team_only": "Members of this Team",
"find_team.email": "Email",
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 1b4e48a51a..e63be5a5e9 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -58,7 +58,6 @@ function preNeedsTeam(nextState, replace, callback) {
// for the current url.
const teamName = nextState.params.team;
var team = TeamStore.getByName(teamName);
- const oldTeamId = TeamStore.getCurrentId();
if (!team) {
browserHistory.push('/');
@@ -70,15 +69,7 @@ function preNeedsTeam(nextState, replace, callback) {
TeamStore.saveMyTeam(team);
TeamStore.emitChange();
- // If the old team id is null then we will already have the direct
- // profiles from initial load
- if (oldTeamId != null) {
- AsyncClient.getDirectProfiles();
- }
-
var d1 = $.Deferred(); //eslint-disable-line new-cap
- var d2 = $.Deferred(); //eslint-disable-line new-cap
- var d3 = $.Deferred(); //eslint-disable-line new-cap
Client.getChannels(
(data) => {
@@ -96,38 +87,7 @@ function preNeedsTeam(nextState, replace, callback) {
}
);
- Client.getProfiles(
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_PROFILES,
- profiles: data
- });
-
- d2.resolve();
- },
- (err) => {
- AsyncClient.dispatchError(err, 'getProfiles');
- d2.resolve();
- }
- );
-
- Client.getTeamMembers(
- TeamStore.getCurrentId(),
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_MEMBERS_FOR_TEAM,
- team_members: data
- });
-
- d3.resolve();
- },
- (err) => {
- AsyncClient.dispatchError(err, 'getTeamMembers');
- d3.resolve();
- }
- );
-
- $.when(d1, d2, d3).done(() => {
+ $.when(d1).done(() => {
callback();
});
}
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 00fd838f0e..53c52fdf1a 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -236,7 +236,7 @@
&.more-channel__modal {
.modal-body {
overflow-x: hidden;
- padding: 10px 0 20px;
+ padding: 10px 0 15px;
}
.channel-count {
@@ -457,12 +457,12 @@
.modal-body {
overflow-x: hidden;
- padding: 10px 0 20px;
+ padding: 10px 0 15px;
}
.filter-row {
@include clearfix;
- margin: 10px 0;
+ margin: 5px 0 10px;
}
.member-count {
@@ -602,9 +602,16 @@
}
}
+.member-select__container {
+ position: absolute;
+ right: 15px;
+ top: 15px;
+}
+
.filtered-user-list {
display: flex;
flex-direction: column;
+ width: 100%;
.filter-row {
flex-grow: 0;
@@ -615,4 +622,20 @@
flex-grow: 1;
flex-shrink: 1;
}
+
+ .filter-controls {
+ @include clearfix;
+ flex-grow: 0;
+ flex-shrink: 0;
+ padding: 1em 1.5em 0;
+
+ .filter-control__next {
+ float: right;
+ }
+ }
+
+ .filter-button {
+ margin-left: 0;
+ padding-left: 0;
+ }
}
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 9a0190ebd5..a3e7ab5f5c 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -96,7 +96,13 @@
}
.member-select__container {
+ margin-bottom: 10px;
margin-top: 10px;
+ overflow: hidden;
+ position: relative;
+ right: 10px;
+ top: 0;
+ width: 100%;
}
.user-popover {
@@ -844,6 +850,10 @@
@include translate3d(0, 0, 0);
}
+ .nav-pills__container {
+ height: 100%;
+ }
+
> div {
padding-bottom: 70px;
}
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index cbed38a8b6..83c68dc6b8 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -239,6 +239,19 @@
}
}
+ .more-modal__list {
+ .filtered-user-list {
+ .filter-controls {
+ padding-bottom: 1em;
+ }
+ }
+
+ .filter-row {
+ margin: 10px 0;
+ overflow: hidden;
+ }
+ }
+
.member-list-holder {
background: $white;
margin-bottom: 4em;
@@ -451,4 +464,3 @@
overflow: hidden;
text-overflow: ellipsis;
}
-
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx
index 1870ad15b9..4d3042be7e 100644
--- a/webapp/stores/channel_store.jsx
+++ b/webapp/stores/channel_store.jsx
@@ -12,7 +12,7 @@ const NotificationPrefs = Constants.NotificationPrefs;
const CHANGE_EVENT = 'change';
const LEAVE_EVENT = 'leave';
const MORE_CHANGE_EVENT = 'change';
-const EXTRA_INFO_EVENT = 'extra_info';
+const STATS_EVENT = 'stats';
const LAST_VIEVED_EVENT = 'last_viewed';
class ChannelStoreClass extends EventEmitter {
@@ -21,41 +21,13 @@ class ChannelStoreClass extends EventEmitter {
this.setMaxListeners(15);
- this.emitChange = this.emitChange.bind(this);
- this.addChangeListener = this.addChangeListener.bind(this);
- this.removeChangeListener = this.removeChangeListener.bind(this);
- this.emitMoreChange = this.emitMoreChange.bind(this);
- this.addMoreChangeListener = this.addMoreChangeListener.bind(this);
- this.removeMoreChangeListener = this.removeMoreChangeListener.bind(this);
- this.emitExtraInfoChange = this.emitExtraInfoChange.bind(this);
- this.addExtraInfoChangeListener = this.addExtraInfoChangeListener.bind(this);
- this.removeExtraInfoChangeListener = this.removeExtraInfoChangeListener.bind(this);
- this.emitLeave = this.emitLeave.bind(this);
- this.addLeaveListener = this.addLeaveListener.bind(this);
- this.removeLeaveListener = this.removeLeaveListener.bind(this);
- this.emitLastViewed = this.emitLastViewed.bind(this);
- this.addLastViewedListener = this.addLastViewedListener.bind(this);
- this.removeLastViewedListener = this.removeLastViewedListener.bind(this);
- this.findFirstBy = this.findFirstBy.bind(this);
- this.get = this.get.bind(this);
- this.getMember = this.getMember.bind(this);
- this.getByName = this.getByName.bind(this);
- this.getByDisplayName = this.getByDisplayName.bind(this);
- this.setPostMode = this.setPostMode.bind(this);
- this.getPostMode = this.getPostMode.bind(this);
- this.setUnreadCount = this.setUnreadCount.bind(this);
- this.setUnreadCounts = this.setUnreadCounts.bind(this);
- this.getUnreadCount = this.getUnreadCount.bind(this);
- this.getUnreadCounts = this.getUnreadCounts.bind(this);
- this.getChannelNamesMap = this.getChannelNamesMap.bind(this);
-
this.currentId = null;
this.postMode = this.POST_MODE_CHANNEL;
this.channels = [];
- this.channelMembers = {};
+ this.myChannelMembers = {};
this.moreChannels = {};
this.moreChannels.loading = true;
- this.extraInfos = {};
+ this.stats = {};
this.unreadCounts = {};
}
@@ -91,16 +63,16 @@ class ChannelStoreClass extends EventEmitter {
this.removeListener(MORE_CHANGE_EVENT, callback);
}
- emitExtraInfoChange() {
- this.emit(EXTRA_INFO_EVENT);
+ emitStatsChange() {
+ this.emit(STATS_EVENT);
}
- addExtraInfoChangeListener(callback) {
- this.on(EXTRA_INFO_EVENT, callback);
+ addStatsChangeListener(callback) {
+ this.on(STATS_EVENT, callback);
}
- removeExtraInfoChangeListener(callback) {
- this.removeListener(EXTRA_INFO_EVENT, callback);
+ removeStatsChangeListener(callback) {
+ this.removeListener(STATS_EVENT, callback);
}
emitLeave(id) {
this.emit(LEAVE_EVENT, id);
@@ -148,8 +120,8 @@ class ChannelStoreClass extends EventEmitter {
return this.findFirstBy('id', id);
}
- getMember(id) {
- return this.getAllMembers()[id];
+ getMyMember(id) {
+ return this.getMyMembers()[id];
}
getByName(name) {
@@ -168,10 +140,6 @@ class ChannelStoreClass extends EventEmitter {
return this.getChannels();
}
- getAllMembers() {
- return this.getChannelMembers();
- }
-
getMoreAll() {
return this.getMoreChannels();
}
@@ -181,7 +149,7 @@ class ChannelStoreClass extends EventEmitter {
}
resetCounts(id) {
- const cm = this.channelMembers;
+ const cm = this.myChannelMembers;
for (var cmid in cm) {
if (cm[cmid].channel_id === id) {
var c = this.get(id);
@@ -213,41 +181,34 @@ class ChannelStoreClass extends EventEmitter {
var currentId = this.getCurrentId();
if (currentId) {
- return this.getAllMembers()[currentId];
+ return this.getMyMembers()[currentId];
}
return null;
}
- setChannelMember(member) {
- var members = this.getChannelMembers();
- members[member.channel_id] = member;
- this.storeChannelMembers(members);
- this.emitChange();
+ getCurrentStats() {
+ return this.getStats(this.getCurrentId());
}
- getCurrentExtraInfo() {
- return this.getExtraInfo(this.getCurrentId());
- }
-
- getExtraInfo(channelId) {
- var extra = null;
+ getStats(channelId) {
+ let stats;
if (channelId) {
- extra = this.getExtraInfos()[channelId];
+ stats = this.stats[channelId];
}
- if (extra) {
+ if (stats) {
// create a defensive copy
- extra = JSON.parse(JSON.stringify(extra));
+ stats = Object.assign({}, stats);
} else {
- extra = {members: []};
+ stats = {member_count: 0};
}
- return extra;
+ return stats;
}
- pStoreChannel(channel) {
+ storeChannel(channel) {
var channels = this.getChannels();
var found;
@@ -279,18 +240,18 @@ class ChannelStoreClass extends EventEmitter {
return this.channels;
}
- pStoreChannelMember(channelMember) {
- var members = this.getChannelMembers();
+ storeMyChannelMember(channelMember) {
+ const members = Object.assign({}, this.getMyMembers());
members[channelMember.channel_id] = channelMember;
- this.storeChannelMembers(members);
+ this.storeMyChannelMembers(members);
}
- storeChannelMembers(channelMembers) {
- this.channelMembers = channelMembers;
+ storeMyChannelMembers(channelMembers) {
+ this.myChannelMembers = channelMembers;
}
- getChannelMembers() {
- return this.channelMembers;
+ getMyMembers() {
+ return this.myChannelMembers;
}
storeMoreChannels(channels) {
@@ -301,12 +262,8 @@ class ChannelStoreClass extends EventEmitter {
return this.moreChannels;
}
- storeExtraInfos(extraInfos) {
- this.extraInfos = extraInfos;
- }
-
- getExtraInfos() {
- return this.extraInfos;
+ storeStats(stats) {
+ this.stats = stats;
}
isDefault(channel) {
@@ -323,7 +280,7 @@ class ChannelStoreClass extends EventEmitter {
setUnreadCount(id) {
const ch = this.get(id);
- const chMember = this.getMember(id);
+ const chMember = this.getMyMember(id);
const chMentionCount = chMember.mention_count;
let chUnreadCount = ch.total_msg_count - chMember.msg_count;
@@ -351,7 +308,7 @@ class ChannelStoreClass extends EventEmitter {
}
leaveChannel(id) {
- Reflect.deleteProperty(this.channelMembers, id);
+ Reflect.deleteProperty(this.myChannelMembers, id);
const element = this.channels.indexOf(id);
if (element > -1) {
this.channels.splice(element, 1);
@@ -405,7 +362,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
case ActionTypes.RECEIVED_CHANNELS:
ChannelStore.storeChannels(action.channels);
- ChannelStore.storeChannelMembers(action.members);
+ ChannelStore.storeMyChannelMembers(action.members);
currentId = ChannelStore.getCurrentId();
if (currentId && window.isActive) {
ChannelStore.resetCounts(currentId);
@@ -415,9 +372,9 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
break;
case ActionTypes.RECEIVED_CHANNEL:
- ChannelStore.pStoreChannel(action.channel);
+ ChannelStore.storeChannel(action.channel);
if (action.member) {
- ChannelStore.pStoreChannelMember(action.member);
+ ChannelStore.storeMyChannelMember(action.member);
}
currentId = ChannelStore.getCurrentId();
if (currentId && window.isActive) {
@@ -432,11 +389,11 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
ChannelStore.emitMoreChange();
break;
- case ActionTypes.RECEIVED_CHANNEL_EXTRA_INFO:
- var extraInfos = ChannelStore.getExtraInfos();
- extraInfos[action.extra_info.id] = action.extra_info;
- ChannelStore.storeExtraInfos(extraInfos);
- ChannelStore.emitExtraInfoChange();
+ case ActionTypes.RECEIVED_CHANNEL_STATS:
+ var stats = Object.assign({}, ChannelStore.getStats());
+ stats[action.stats.channel_id] = action.stats;
+ ChannelStore.storeStats(stats);
+ ChannelStore.emitStatsChange();
break;
case ActionTypes.LEAVE_CHANNEL:
diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx
index 02826d586e..dc707b50e7 100644
--- a/webapp/stores/notification_store.jsx
+++ b/webapp/stores/notification_store.jsx
@@ -44,7 +44,7 @@ class NotificationStoreClass extends EventEmitter {
const channel = ChannelStore.get(post.channel_id);
const user = UserStore.getCurrentUser();
- const member = ChannelStore.getMember(post.channel_id);
+ const member = ChannelStore.getMyMember(post.channel_id);
let notifyLevel = member && member.notify_props ? member.notify_props.desktop : 'default';
if (notifyLevel === 'default') {
diff --git a/webapp/stores/post_store.jsx b/webapp/stores/post_store.jsx
index 2d0d7a6748..cdd3f58603 100644
--- a/webapp/stores/post_store.jsx
+++ b/webapp/stores/post_store.jsx
@@ -178,15 +178,15 @@ class PostStoreClass extends EventEmitter {
}
// Returns true if posts need to be fetched
- requestVisibilityIncrease(id, ammount) {
+ requestVisibilityIncrease(id, amount) {
const endVisible = this.postsInfo[id].endVisible;
const postList = this.postsInfo[id].postList;
if (this.getVisibilityAtTop(id)) {
return false;
}
- this.postsInfo[id].endVisible += ammount;
+ this.postsInfo[id].endVisible += amount;
this.emitChange();
- return endVisible + ammount > postList.order.length;
+ return endVisible + amount > postList.order.length;
}
getFocusedPostId() {
diff --git a/webapp/stores/suggestion_store.jsx b/webapp/stores/suggestion_store.jsx
index c59c26a669..c528f73603 100644
--- a/webapp/stores/suggestion_store.jsx
+++ b/webapp/stores/suggestion_store.jsx
@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
import Constants from 'utils/constants.jsx';
import EventEmitter from 'events';
@@ -222,7 +222,9 @@ class SuggestionStore extends EventEmitter {
switch (type) {
case ActionTypes.SUGGESTION_PRETEXT_CHANGED:
- this.clearSuggestions(id);
+ if (other.pretext === '') {
+ this.clearSuggestions(id);
+ }
this.setPretext(id, other.pretext);
this.emitPretextChanged(id, other.pretext);
@@ -231,6 +233,8 @@ class SuggestionStore extends EventEmitter {
this.emitSuggestionsChanged(id);
break;
case ActionTypes.SUGGESTION_RECEIVED_SUGGESTIONS:
+ this.clearSuggestions(id);
+
// ensure the matched pretext hasn't changed so that we don't receive suggestions for outdated pretext
this.addSuggestions(id, other.terms, other.items, other.component, other.matchedPretext);
diff --git a/webapp/stores/team_store.jsx b/webapp/stores/team_store.jsx
index c71cc685b6..3a4ae73b94 100644
--- a/webapp/stores/team_store.jsx
+++ b/webapp/stores/team_store.jsx
@@ -9,6 +9,7 @@ import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
const CHANGE_EVENT = 'change';
+const STATS_EVENT = 'stats';
var Utils;
@@ -20,8 +21,10 @@ class TeamStoreClass extends EventEmitter {
clear() {
this.teams = {};
- this.team_members = [];
- this.members_for_team = [];
+ this.my_team_members = [];
+ this.members_in_team = {};
+ this.members_not_in_team = {};
+ this.stats = {};
this.teamListings = {};
this.currentTeamId = '';
}
@@ -38,6 +41,18 @@ class TeamStoreClass extends EventEmitter {
this.removeListener(CHANGE_EVENT, callback);
}
+ emitStatsChange() {
+ this.emit(STATS_EVENT);
+ }
+
+ addStatsChangeListener(callback) {
+ this.on(STATS_EVENT, callback);
+ }
+
+ removeStatsChangeListener(callback) {
+ this.removeListener(STATS_EVENT, callback);
+ }
+
get(id) {
var c = this.getAll();
return c[id];
@@ -114,6 +129,27 @@ class TeamStoreClass extends EventEmitter {
return origin + '/' + team.name;
}
+ getCurrentStats() {
+ return this.getStats(this.getCurrentId());
+ }
+
+ getStats(teamId) {
+ let stats;
+
+ if (teamId) {
+ stats = this.stats[teamId];
+ }
+
+ if (stats) {
+ // create a defensive copy
+ stats = Object.assign({}, stats);
+ } else {
+ stats = {member_count: 0};
+ }
+
+ return stats;
+ }
+
saveTeam(team) {
this.teams[team.id] = team;
}
@@ -127,44 +163,62 @@ class TeamStoreClass extends EventEmitter {
this.currentTeamId = team.id;
}
- saveTeamMembers(members) {
- this.team_members = members;
+ saveStats(teamId, stats) {
+ this.stats[teamId] = stats;
}
- appendTeamMember(member) {
- this.team_members.push(member);
+ saveMyTeamMembers(members) {
+ this.my_team_members = members;
}
- removeTeamMember(teamId) {
- for (var index in this.team_members) {
- if (this.team_members.hasOwnProperty(index)) {
- if (this.team_members[index].team_id === teamId) {
- this.team_members.splice(index, 1);
+ appendMyTeamMember(member) {
+ this.my_team_members.push(member);
+ }
+
+ removeMyTeamMember(teamId) {
+ for (var index in this.my_team_members) {
+ if (this.my_team_members.hasOwnProperty(index)) {
+ if (this.my_team_members[index].team_id === teamId) {
+ Reflect.deleteProperty(this.my_team_members, index);
}
}
}
}
- getTeamMembers() {
- return this.team_members;
+ getMyTeamMembers() {
+ return this.my_team_members;
}
- saveMembersForTeam(members) {
- this.members_for_team = members;
+ saveMembersInTeam(teamId = this.getCurrentId(), members) {
+ const oldMembers = this.members_in_team[teamId] || {};
+ this.members_in_team[teamId] = Object.assign({}, oldMembers, members);
}
- getMembersForTeam() {
- return this.members_for_team;
+ saveMembersNotInTeam(teamId = this.getCurrentId(), nonmembers) {
+ this.members_not_in_team[teamId] = nonmembers;
}
- hasActiveMemberForTeam(userId) {
- for (var index in this.members_for_team) {
- if (this.members_for_team.hasOwnProperty(index)) {
- if (this.members_for_team[index].user_id === userId &&
- this.members_for_team[index].team_id === this.currentTeamId) {
- return this.members_for_team[index].delete_at === 0;
- }
- }
+ removeMemberInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_in_team[teamId]) {
+ Reflect.deleteProperty(this.members_in_team[teamId], userId);
+ }
+ }
+
+ getMembersInTeam(teamId = this.getCurrentId()) {
+ return this.members_in_team[teamId] || {};
+ }
+
+ hasActiveMemberInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_in_team[teamId] && this.members_in_team[teamId][userId]) {
+ return true;
+ }
+
+ return false;
+ }
+
+ hasMemberNotInTeam(teamId = this.getCurrentId(), userId) {
+ if (this.members_not_in_team[teamId] && this.members_not_in_team[teamId][userId]) {
+ return true;
}
return false;
@@ -187,7 +241,7 @@ class TeamStoreClass extends EventEmitter {
Utils = require('utils/utils.jsx'); //eslint-disable-line global-require
}
- var teamMembers = this.getTeamMembers();
+ var teamMembers = this.getMyTeamMembers();
const teamMember = teamMembers.find((m) => m.user_id === userId && m.team_id === teamId);
if (teamMember) {
@@ -210,25 +264,32 @@ TeamStore.dispatchToken = AppDispatcher.register((payload) => {
break;
case ActionTypes.CREATED_TEAM:
TeamStore.saveTeam(action.team);
- TeamStore.appendTeamMember(action.member);
+ TeamStore.appendMyTeamMember(action.member);
TeamStore.emitChange();
break;
case ActionTypes.RECEIVED_ALL_TEAMS:
TeamStore.saveTeams(action.teams);
TeamStore.emitChange();
break;
- case ActionTypes.RECEIVED_TEAM_MEMBERS:
- TeamStore.saveTeamMembers(action.team_members);
+ case ActionTypes.RECEIVED_MY_TEAM_MEMBERS:
+ TeamStore.saveMyTeamMembers(action.team_members);
TeamStore.emitChange();
break;
case ActionTypes.RECEIVED_ALL_TEAM_LISTINGS:
TeamStore.saveTeamListings(action.teams);
TeamStore.emitChange();
break;
- case ActionTypes.RECEIVED_MEMBERS_FOR_TEAM:
- TeamStore.saveMembersForTeam(action.team_members);
+ case ActionTypes.RECEIVED_MEMBERS_IN_TEAM:
+ TeamStore.saveMembersInTeam(action.team_id, action.team_members);
+ if (action.non_team_members) {
+ TeamStore.saveMembersNotInTeam(action.team_id, action.non_team_members);
+ }
TeamStore.emitChange();
break;
+ case ActionTypes.RECEIVED_TEAM_STATS:
+ TeamStore.saveStats(action.team_id, action.stats);
+ TeamStore.emitStatsChange();
+ break;
default:
}
});
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index 859f385c0e..d93848670c 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -6,12 +6,16 @@ import EventEmitter from 'events';
import * as GlobalActions from 'actions/global_actions.jsx';
import LocalizationStore from './localization_store.jsx';
+import ChannelStore from 'stores/channel_store.jsx';
+import TeamStore from 'stores/team_store.jsx';
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
const UserStatuses = Constants.UserStatuses;
-const CHANGE_EVENT_DM_LIST = 'change_dm_list';
+const CHANGE_EVENT_NOT_IN_CHANNEL = 'change_not_in_channel';
+const CHANGE_EVENT_IN_CHANNEL = 'change_in_channel';
+const CHANGE_EVENT_IN_TEAM = 'change_in_team';
const CHANGE_EVENT = 'change';
const CHANGE_EVENT_SESSIONS = 'change_sessions';
const CHANGE_EVENT_AUDITS = 'change_audits';
@@ -26,9 +30,26 @@ class UserStoreClass extends EventEmitter {
}
clear() {
- this.profiles_for_dm_list = {};
+ // All the profiles, regardless of where they came from
this.profiles = {};
- this.direct_profiles = {};
+ this.paging_offset = 0;
+ this.paging_count = 0;
+
+ // Lists of sorted IDs for users in a team
+ this.profiles_in_team = {};
+ this.in_team_offset = 0;
+ this.in_team_count = 0;
+
+ // Lists of sorted IDs for users in a channel
+ this.profiles_in_channel = {};
+ this.in_channel_offset = {};
+ this.in_channel_count = {};
+
+ // Lists of sorted IDs for users not in a channel
+ this.profiles_not_in_channel = {};
+ this.not_in_channel_offset = {};
+ this.not_in_channel_count = {};
+
this.statuses = {};
this.sessions = {};
this.audits = {};
@@ -48,16 +69,40 @@ class UserStoreClass extends EventEmitter {
this.removeListener(CHANGE_EVENT, callback);
}
- emitDmListChange() {
- this.emit(CHANGE_EVENT_DM_LIST);
+ emitInTeamChange() {
+ this.emit(CHANGE_EVENT_IN_TEAM);
}
- addDmListChangeListener(callback) {
- this.on(CHANGE_EVENT_DM_LIST, callback);
+ addInTeamChangeListener(callback) {
+ this.on(CHANGE_EVENT_IN_TEAM, callback);
}
- removeDmListChangeListener(callback) {
- this.removeListener(CHANGE_EVENT_DM_LIST, callback);
+ removeInTeamChangeListener(callback) {
+ this.removeListener(CHANGE_EVENT_IN_TEAM, callback);
+ }
+
+ emitInChannelChange() {
+ this.emit(CHANGE_EVENT_IN_CHANNEL);
+ }
+
+ addInChannelChangeListener(callback) {
+ this.on(CHANGE_EVENT_IN_CHANNEL, callback);
+ }
+
+ removeInChannelChangeListener(callback) {
+ this.removeListener(CHANGE_EVENT_IN_CHANNEL, callback);
+ }
+
+ emitNotInChannelChange() {
+ this.emit(CHANGE_EVENT_NOT_IN_CHANNEL);
+ }
+
+ addNotInChannelChangeListener(callback) {
+ this.on(CHANGE_EVENT_NOT_IN_CHANNEL, callback);
+ }
+
+ removeNotInChannelChangeListener(callback) {
+ this.removeListener(CHANGE_EVENT_NOT_IN_CHANNEL, callback);
}
emitSessionsChange() {
@@ -96,6 +141,8 @@ class UserStoreClass extends EventEmitter {
this.removeListener(CHANGE_EVENT_STATUSES, callback);
}
+ // General
+
getCurrentUser() {
return this.getProfiles()[this.currentUserId];
}
@@ -119,29 +166,30 @@ class UserStoreClass extends EventEmitter {
return null;
}
- hasProfile(userId) {
- return this.getProfile(userId) != null;
+ // System-Wide Profiles
+
+ saveProfiles(profiles) {
+ const currentId = this.getCurrentId();
+ if (profiles[currentId]) {
+ Reflect.deleteProperty(profiles, currentId);
+ }
+ this.profiles = Object.assign({}, this.profiles, profiles);
}
- hasTeamProfile(userId) {
- return this.getProfiles()[userId];
- }
-
- hasDirectProfile(userId) {
- return this.getDirectProfiles()[userId];
+ getProfiles() {
+ return this.profiles;
}
getProfile(userId) {
- if (userId === this.getCurrentId()) {
- return this.getCurrentUser();
+ if (this.profiles[userId]) {
+ return Object.assign({}, this.profiles[userId]);
}
- const user = this.getProfiles()[userId];
- if (user) {
- return user;
- }
+ return null;
+ }
- return this.getDirectProfiles()[userId];
+ hasProfile(userId) {
+ return this.getProfile(userId) != null;
}
getProfileByUsername(username) {
@@ -162,22 +210,6 @@ class UserStoreClass extends EventEmitter {
return profileUsernameMap;
}
- getDirectProfiles() {
- return this.direct_profiles;
- }
-
- saveDirectProfile(profile) {
- this.direct_profiles[profile.id] = profile;
- }
-
- saveDirectProfiles(profiles) {
- this.direct_profiles = profiles;
- }
-
- getProfiles() {
- return this.profiles;
- }
-
getActiveOnlyProfiles(skipCurrent) {
const active = {};
const profiles = this.getProfiles();
@@ -195,14 +227,54 @@ class UserStoreClass extends EventEmitter {
getActiveOnlyProfileList() {
const profileMap = this.getActiveOnlyProfiles();
const profiles = [];
- const currentId = this.getCurrentId();
for (const id in profileMap) {
- if (profileMap.hasOwnProperty(id) && id !== currentId) {
+ if (profileMap.hasOwnProperty(id)) {
profiles.push(profileMap[id]);
}
}
+ profiles.sort((a, b) => {
+ if (a.username < b.username) {
+ return -1;
+ }
+ if (a.username > b.username) {
+ return 1;
+ }
+ return 0;
+ });
+
+ return profiles;
+ }
+
+ getProfileList(skipCurrent) {
+ const profiles = [];
+ const currentId = this.getCurrentId();
+
+ for (const id in this.profiles) {
+ if (this.profiles.hasOwnProperty(id)) {
+ var profile = this.profiles[id];
+
+ if (skipCurrent && id === currentId) {
+ continue;
+ }
+
+ if (profile.delete_at === 0) {
+ profiles.push(profile);
+ }
+ }
+ }
+
+ profiles.sort((a, b) => {
+ if (a.username < b.username) {
+ return -1;
+ }
+ if (a.username > b.username) {
+ return 1;
+ }
+ return 0;
+ });
+
return profiles;
}
@@ -210,44 +282,194 @@ class UserStoreClass extends EventEmitter {
this.profiles[profile.id] = profile;
}
- saveProfiles(profiles) {
- const currentId = this.getCurrentId();
- const currentUser = this.profiles[currentId];
- if (currentUser) {
- if (currentId in this.profiles) {
- Reflect.deleteProperty(this.profiles, currentId);
- }
+ // Team-Wide Profiles
- this.profiles = profiles;
- this.profiles[currentId] = currentUser;
- } else {
- this.profiles = profiles;
+ saveProfilesInTeam(teamId, profiles) {
+ const oldProfileList = this.profiles_in_team[teamId] || [];
+ const oldProfileMap = {};
+ for (let i = 0; i < oldProfileList.length; i++) {
+ oldProfileMap[oldProfileList[i]] = this.getProfile(oldProfileList[i]);
}
+
+ const newProfileMap = Object.assign({}, oldProfileMap, profiles);
+ const newProfileList = Object.keys(newProfileMap);
+
+ newProfileList.sort((a, b) => {
+ const aProfile = newProfileMap[a];
+ const bProfile = newProfileMap[b];
+
+ if (aProfile.username < bProfile.username) {
+ return -1;
+ }
+ if (aProfile.username > bProfile.username) {
+ return 1;
+ }
+ return 0;
+ });
+
+ this.profiles_in_team[teamId] = newProfileList;
+ this.saveProfiles(profiles);
}
- getProfilesForDmList() {
- const currentId = this.getCurrentId();
+ getProfileListInTeam(teamId = TeamStore.getCurrentId(), skipCurrent) {
+ const userIds = this.profiles_in_team[teamId] || [];
const profiles = [];
+ const currentId = this.getCurrentId();
- for (const id in this.profiles_for_dm_list) {
- if (this.profiles_for_dm_list.hasOwnProperty(id) && id !== currentId) {
- var profile = this.profiles_for_dm_list[id];
+ for (let i = 0; i < userIds.length; i++) {
+ const profile = this.getProfile(userIds[i]);
- if (profile.delete_at === 0) {
- profiles.push(profile);
- }
+ if (skipCurrent && profile.id === currentId) {
+ continue;
+ }
+
+ if (profile) {
+ profiles.push(profile);
}
}
- profiles.sort((a, b) => a.username.localeCompare(b.username));
-
return profiles;
}
- saveProfilesForDmList(profiles) {
- this.profiles_for_dm_list = profiles;
+ // Channel-Wide Profiles
+
+ saveProfilesInChannel(channelId = ChannelStore.getCurrentId(), profiles) {
+ const oldProfileList = this.profiles_in_channel[channelId] || [];
+ const oldProfileMap = {};
+ for (let i = 0; i < oldProfileList.length; i++) {
+ oldProfileMap[oldProfileList[i]] = this.getProfile(oldProfileList[i]);
+ }
+
+ const newProfileMap = Object.assign({}, oldProfileMap, profiles);
+ const newProfileList = Object.keys(newProfileMap);
+
+ newProfileList.sort((a, b) => {
+ const aProfile = newProfileMap[a];
+ const bProfile = newProfileMap[b];
+
+ if (aProfile.username < bProfile.username) {
+ return -1;
+ }
+ if (aProfile.username > bProfile.username) {
+ return 1;
+ }
+ return 0;
+ });
+
+ this.profiles_in_channel[channelId] = newProfileList;
+ this.saveProfiles(profiles);
}
+ saveProfileInChannel(channelId = ChannelStore.getCurrentId(), profile) {
+ const profileMap = {};
+ profileMap[profile.id] = profile;
+ this.saveProfilesInChannel(channelId, profileMap);
+ }
+
+ saveUserIdInChannel(channelId = ChannelStore.getCurrentId(), userId) {
+ const profile = this.getProfile(userId);
+
+ // Must have profile or we can't sort the list
+ if (!profile) {
+ return false;
+ }
+
+ this.saveProfileInChannel(channelId, profile);
+
+ return true;
+ }
+
+ removeProfileInChannel(channelId, userId) {
+ const userIds = this.profiles_in_channel[channelId];
+ if (!userIds) {
+ return;
+ }
+
+ const index = userIds.indexOf(userId);
+ if (index === -1) {
+ return;
+ }
+
+ userIds.splice(index, 1);
+ }
+
+ getProfileListInChannel(channelId = ChannelStore.getCurrentId()) {
+ const userIds = this.profiles_in_channel[channelId] || [];
+ const profiles = [];
+
+ for (let i = 0; i < userIds.length; i++) {
+ const profile = this.getProfile(userIds[i]);
+ if (profile) {
+ profiles.push(profile);
+ }
+ }
+
+ return profiles;
+ }
+
+ saveProfilesNotInChannel(channelId = ChannelStore.getCurrentId(), profiles) {
+ const oldProfileList = this.profiles_not_in_channel[channelId] || [];
+ const oldProfileMap = {};
+ for (let i = 0; i < oldProfileList.length; i++) {
+ oldProfileMap[oldProfileList[i]] = this.getProfile(oldProfileList[i]);
+ }
+
+ const newProfileMap = Object.assign({}, oldProfileMap, profiles);
+ const newProfileList = Object.keys(newProfileMap);
+
+ newProfileList.sort((a, b) => {
+ const aProfile = newProfileMap[a];
+ const bProfile = newProfileMap[b];
+
+ if (aProfile.username < bProfile.username) {
+ return -1;
+ }
+ if (aProfile.username > bProfile.username) {
+ return 1;
+ }
+ return 0;
+ });
+
+ this.profiles_not_in_channel[channelId] = newProfileList;
+ this.saveProfiles(profiles);
+ }
+
+ saveProfileNotInChannel(channelId = ChannelStore.getCurrentId(), profile) {
+ const profileMap = {};
+ profileMap[profile.id] = profile;
+ this.saveProfilesNotInChannel(channelId, profileMap);
+ }
+
+ removeProfileNotInChannel(channelId, userId) {
+ const userIds = this.profiles_not_in_channel[channelId];
+ if (!userIds) {
+ return;
+ }
+
+ const index = userIds.indexOf(userId);
+ if (index === -1) {
+ return;
+ }
+
+ userIds.splice(index, 1);
+ }
+
+ getProfileListNotInChannel(channelId = ChannelStore.getCurrentId()) {
+ const userIds = this.profiles_not_in_channel[channelId] || [];
+ const profiles = [];
+
+ for (let i = 0; i < userIds.length; i++) {
+ const profile = this.getProfile(userIds[i]);
+ if (profile) {
+ profiles.push(profile);
+ }
+ }
+
+ return profiles;
+ }
+
+ // Other
+
setSessions(sessions) {
this.sessions = sessions;
}
@@ -331,6 +553,58 @@ class UserStoreClass extends EventEmitter {
return false;
}
+
+ setPage(offset, count) {
+ this.paging_offset = offset + count;
+ this.paging_count = this.paging_count + count;
+ }
+
+ getPagingOffset() {
+ return this.paging_offset;
+ }
+
+ getPagingCount() {
+ return this.paging_count;
+ }
+
+ setInTeamPage(offset, count) {
+ this.in_team_offset = offset + count;
+ this.in_team_count = this.in_team_count + count;
+ }
+
+ getInTeamPagingOffset() {
+ return this.in_team_offset;
+ }
+
+ getInTeamPagingCount() {
+ return this.in_team_count;
+ }
+
+ setInChannelPage(channelId, offset, count) {
+ this.in_channel_offset[channelId] = offset + count;
+ this.in_channel_count[channelId] = this.dm_paging_count + count;
+ }
+
+ getInChannelPagingOffset(channelId) {
+ return this.in_channel_offset[channelId] | 0;
+ }
+
+ getInChannelPagingCount(channelId) {
+ return this.in_channel_count[channelId] | 0;
+ }
+
+ setNotInChannelPage(channelId, offset, count) {
+ this.not_in_channel_offset[channelId] = offset + count;
+ this.not_in_channel_count[channelId] = this.dm_paging_count + count;
+ }
+
+ getNotInChannelPagingOffset(channelId) {
+ return this.not_in_channel_offset[channelId] | 0;
+ }
+
+ getNotInChannelPagingCount(channelId) {
+ return this.not_in_channel_count[channelId] | 0;
+ }
}
var UserStore = new UserStoreClass();
@@ -340,16 +614,36 @@ UserStore.dispatchToken = AppDispatcher.register((payload) => {
var action = payload.action;
switch (action.type) {
- case ActionTypes.RECEIVED_PROFILES_FOR_DM_LIST:
- UserStore.saveProfilesForDmList(action.profiles);
- UserStore.emitDmListChange();
- break;
case ActionTypes.RECEIVED_PROFILES:
UserStore.saveProfiles(action.profiles);
+ if (action.offset != null && action.count != null) {
+ UserStore.setPage(action.offset, action.count);
+ }
UserStore.emitChange();
break;
- case ActionTypes.RECEIVED_DIRECT_PROFILES:
- UserStore.saveDirectProfiles(action.profiles);
+ case ActionTypes.RECEIVED_PROFILES_IN_TEAM:
+ UserStore.saveProfilesInTeam(action.team_id, action.profiles);
+ if (action.offset != null && action.count != null) {
+ UserStore.setInTeamPage(action.offset, action.count);
+ }
+ UserStore.emitInTeamChange();
+ break;
+ case ActionTypes.RECEIVED_PROFILES_IN_CHANNEL:
+ UserStore.saveProfilesInChannel(action.channel_id, action.profiles);
+ if (action.offset != null && action.count != null) {
+ UserStore.setInChannelPage(action.offset, action.count);
+ }
+ UserStore.emitInChannelChange();
+ break;
+ case ActionTypes.RECEIVED_PROFILES_NOT_IN_CHANNEL:
+ UserStore.saveProfilesNotInChannel(action.channel_id, action.profiles);
+ if (action.offset != null && action.count != null) {
+ UserStore.setNotInChannelPage(action.offset, action.count);
+ }
+ UserStore.emitNotInChannelChange();
+ break;
+ case ActionTypes.RECEIVED_PROFILE:
+ UserStore.saveProfile(action.profile);
UserStore.emitChange();
break;
case ActionTypes.RECEIVED_ME:
diff --git a/webapp/tests/client_channel.test.jsx b/webapp/tests/client_channel.test.jsx
index ccfcb32a47..92145f6e16 100644
--- a/webapp/tests/client_channel.test.jsx
+++ b/webapp/tests/client_channel.test.jsx
@@ -285,11 +285,10 @@ describe('Client.Channels', function() {
});
});
- it('getChannelExtraInfo', function(done) {
+ it('getChannelStats', function(done) {
TestHelper.initBasic(() => {
- TestHelper.basicClient().getChannelExtraInfo(
+ TestHelper.basicClient().getChannelStats(
TestHelper.basicChannel().id,
- 5,
function(data) {
assert.equal(data.member_count, 1);
done();
@@ -301,6 +300,23 @@ describe('Client.Channels', function() {
});
});
+ it('getChannelMember', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getChannelMember(
+ TestHelper.basicChannel().id,
+ TestHelper.basicUser().id,
+ function(data) {
+ assert.equal(data.channel_id, TestHelper.basicChannel().id);
+ assert.equal(data.user_id, TestHelper.basicUser().id);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
/* TODO FIX THIS TEST
it('addChannelMember', function(done) {
TestHelper.initBasic(() => {
diff --git a/webapp/tests/client_team.test.jsx b/webapp/tests/client_team.test.jsx
index 157a2f4a5a..6423079865 100644
--- a/webapp/tests/client_team.test.jsx
+++ b/webapp/tests/client_team.test.jsx
@@ -130,10 +130,12 @@ describe('Client.Team', function() {
});
});
- it('GetTeamMembers', function(done) {
+ it('getTeamMembers', function(done) {
TestHelper.initBasic(() => {
TestHelper.basicClient().getTeamMembers(
TestHelper.basicTeam().id,
+ 0,
+ 100,
function(data) {
assert.equal(data.length > 0, true);
done();
@@ -145,6 +147,55 @@ describe('Client.Team', function() {
});
});
+ it('getTeamMember', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getTeamMember(
+ TestHelper.basicTeam().id,
+ TestHelper.basicUser().id,
+ function(data) {
+ assert.equal(data.user_id, TestHelper.basicUser().id);
+ assert.equal(data.team_id, TestHelper.basicTeam().id);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getTeamStats', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getTeamStats(
+ TestHelper.basicTeam().id,
+ function(data) {
+ assert.equal(data.member_count > 0, true);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getTeamMembersByIds', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getTeamMembersByIds(
+ TestHelper.basicTeam().id,
+ [TestHelper.basicUser().id],
+ function(data) {
+ assert.equal(data[0].user_id, TestHelper.basicUser().id);
+ assert.equal(data[0].team_id, TestHelper.basicTeam().id);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
it('inviteMembers', function(done) {
TestHelper.initBasic(() => {
var data = {};
diff --git a/webapp/tests/client_user.test.jsx b/webapp/tests/client_user.test.jsx
index 48a0150d40..8c6f0f9700 100644
--- a/webapp/tests/client_user.test.jsx
+++ b/webapp/tests/client_user.test.jsx
@@ -444,52 +444,11 @@ describe('Client.User', function() {
});
});
- it('getDirectProfiles', function(done) {
- TestHelper.initBasic(() => {
- TestHelper.basicClient().getDirectProfiles(
- function(data) {
- assert.equal(Object.keys(data).length === 0, true);
- done();
- },
- function(err) {
- done(new Error(err.getDirectProfiles));
- }
- );
- });
- });
-
it('getProfiles', function(done) {
TestHelper.initBasic(() => {
TestHelper.basicClient().getProfiles(
- function(data) {
- assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
- done();
- },
- function(err) {
- done(new Error(err.message));
- }
- );
- });
- });
-
- it('getProfilesForTeam', function(done) {
- TestHelper.initBasic(() => {
- TestHelper.basicClient().getProfilesForTeam(
- TestHelper.basicTeam().id,
- function(data) {
- assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
- done();
- },
- function(err) {
- done(new Error(err.message));
- }
- );
- });
- });
-
- it('getProfilesForDirectMessageList', function(done) {
- TestHelper.initBasic(() => {
- TestHelper.basicClient().getProfilesForDirectMessageList(
+ 0,
+ 100,
function(data) {
assert.equal(Object.keys(data).length > 0, true);
done();
@@ -501,16 +460,129 @@ describe('Client.User', function() {
});
});
- /* TODO: FIX THIS TEST
- it('getStatuses', function(done) {
+ it('getProfilesInTeam', function(done) {
TestHelper.initBasic(() => {
- var ids = [];
- ids.push(TestHelper.basicUser().id);
-
- TestHelper.basicClient().getStatuses(
- ids,
+ TestHelper.basicClient().getProfilesInTeam(
+ TestHelper.basicTeam().id,
+ 0,
+ 100,
function(data) {
- assert.equal(data[TestHelper.basicUser().id], 'online');
+ assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getProfilesByIds', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getProfilesByIds(
+ [TestHelper.basicUser().id],
+ function(data) {
+ assert.equal(data[TestHelper.basicUser().id].id, TestHelper.basicUser().id);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getProfilesInChannel', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getProfilesInChannel(
+ TestHelper.basicChannel().id,
+ 0,
+ 100,
+ function(data) {
+ assert.equal(Object.keys(data).length > 0, true);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getProfilesNotInChannel', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().getProfilesNotInChannel(
+ TestHelper.basicChannel().id,
+ 0,
+ 100,
+ function(data) {
+ assert.equal(Object.keys(data).length > 0, false);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('searchUsers', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().searchUsers(
+ 'uid',
+ TestHelper.basicTeam().id,
+ {},
+ function(data) {
+ assert.equal(data.length > 0, true);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('autocompleteUsersInChannel', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().autocompleteUsersInChannel(
+ 'uid',
+ TestHelper.basicChannel().id,
+ function(data) {
+ assert.equal(data != null, true);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('autocompleteUsersInTeam', function(done) {
+ TestHelper.initBasic(() => {
+ TestHelper.basicClient().autocompleteUsersInTeam(
+ 'uid',
+ function(data) {
+ assert.equal(data != null, true);
+ done();
+ },
+ function(err) {
+ done(new Error(err.message));
+ }
+ );
+ });
+ });
+
+ it('getStatusesByIds', function(done) {
+ TestHelper.initBasic(() => {
+ var ids = [];
+ ids.push(TestHelper.basicUser().id);
+
+ TestHelper.basicClient().getStatusesByIds(
+ ids,
+ function(data) {
+ assert.equal(data[TestHelper.basicUser().id] != null, true);
done();
},
function(err) {
@@ -519,7 +591,6 @@ describe('Client.User', function() {
);
});
});
- */
it('setActiveChannel', function(done) {
TestHelper.initBasic(() => {
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 30bc474f8a..24d5409294 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -1,19 +1,21 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import $ from 'jquery';
-import Client from 'client/web_client.jsx';
-import * as GlobalActions from 'actions/global_actions.jsx';
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
import BrowserStore from 'stores/browser_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
-import PostStore from 'stores/post_store.jsx';
import UserStore from 'stores/user_store.jsx';
-import * as utils from './utils.jsx';
-import * as UserAgent from './user_agent.jsx';
+import TeamStore from 'stores/team_store.jsx';
import ErrorStore from 'stores/error_store.jsx';
-import Constants from './constants.jsx';
+import * as GlobalActions from 'actions/global_actions.jsx';
+import {loadStatusesForProfilesMap} from 'actions/status_actions.jsx';
+
+import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
+import Client from 'client/web_client.jsx';
+import * as utils from 'utils/utils.jsx';
+import * as UserAgent from 'utils/user_agent.jsx';
+
+import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
const StatTypes = Constants.StatTypes;
@@ -215,94 +217,89 @@ export function getMoreChannels(force) {
}
}
-export function getChannelExtraInfo(id, memberLimit) {
- let channelId;
- if (id) {
- channelId = id;
- } else {
- channelId = ChannelStore.getCurrentId();
- }
-
- if (channelId != null) {
- if (isCallInProgress('getChannelExtraInfo_' + channelId)) {
- return;
- }
-
- callTracker['getChannelExtraInfo_' + channelId] = utils.getTimestamp();
-
- Client.getChannelExtraInfo(
- channelId,
- memberLimit,
- (data) => {
- callTracker['getChannelExtraInfo_' + channelId] = 0;
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CHANNEL_EXTRA_INFO,
- extra_info: data
- });
- },
- (err) => {
- callTracker['getChannelExtraInfo_' + channelId] = 0;
- dispatchError(err, 'getChannelExtraInfo');
- }
- );
- }
-}
-
-export function getTeamMembers(teamId) {
- if (isCallInProgress('getTeamMembers')) {
+export function getChannelStats(channelId = ChannelStore.getCurrentId()) {
+ if (isCallInProgress('getChannelStats' + channelId)) {
return;
}
- callTracker.getTeamMembers = utils.getTimestamp();
- Client.getTeamMembers(
- teamId,
+ callTracker['getChannelStats' + channelId] = utils.getTimestamp();
+
+ Client.getChannelStats(
+ channelId,
(data) => {
- callTracker.getTeamMembers = 0;
+ callTracker['getChannelStats' + channelId] = 0;
AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_MEMBERS_FOR_TEAM,
- team_members: data
+ type: ActionTypes.RECEIVED_CHANNEL_STATS,
+ stats: data
});
},
(err) => {
- callTracker.getTeamMembers = 0;
- dispatchError(err, 'getTeamMembers');
+ callTracker['getChannelStats' + channelId] = 0;
+ dispatchError(err, 'getChannelStats');
}
);
}
-export function getProfilesForDirectMessageList() {
- if (isCallInProgress('getProfilesForDirectMessageList')) {
+export function getChannelMember(channelId, userId) {
+ if (isCallInProgress(`getChannelMember${channelId}${userId}`)) {
return;
}
- callTracker.getProfilesForDirectMessageList = utils.getTimestamp();
- Client.getProfilesForDirectMessageList(
+ callTracker[`getChannelMember${channelId}${userId}`] = utils.getTimestamp();
+
+ Client.getChannelMember(
+ channelId,
+ userId,
(data) => {
- callTracker.getProfilesForDirectMessageList = 0;
+ callTracker[`getChannelMember${channelId}${userId}`] = 0;
AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_PROFILES_FOR_DM_LIST,
- profiles: data
+ type: ActionTypes.RECEIVED_CHANNEL_MEMBER,
+ member: data
});
},
(err) => {
- callTracker.getProfilesForDirectMessageList = 0;
- dispatchError(err, 'getProfilesForDirectMessageList');
+ callTracker[`getChannelMember${channelId}${userId}`] = 0;
+ dispatchError(err, 'getChannelMember');
}
);
}
-export function getProfiles() {
- if (isCallInProgress('getProfiles')) {
+export function getUser(userId) {
+ if (isCallInProgress(`getUser${userId}`)) {
return;
}
- callTracker.getProfiles = utils.getTimestamp();
+ callTracker[`getUser${userId}`] = utils.getTimestamp();
+ Client.getUser(
+ userId,
+ (data) => {
+ callTracker[`getUser${userId}`] = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_PROFILE,
+ profile: data
+ });
+ },
+ (err) => {
+ callTracker[`getUser${userId}`] = 0;
+ dispatchError(err, 'getUser');
+ }
+ );
+}
+
+export function getProfiles(offset = UserStore.getPagingOffset(), limit = Constants.PROFILE_CHUNK_SIZE) {
+ if (isCallInProgress(`getProfiles${offset}${limit}`)) {
+ return;
+ }
+
+ callTracker[`getProfiles${offset}${limit}`] = utils.getTimestamp();
Client.getProfiles(
+ offset,
+ limit,
(data) => {
- callTracker.getProfiles = 0;
+ callTracker[`getProfiles${offset}${limit}`] = 0;
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_PROFILES,
@@ -310,30 +307,123 @@ export function getProfiles() {
});
},
(err) => {
- callTracker.getProfiles = 0;
+ callTracker[`getProfiles${offset}${limit}`] = 0;
dispatchError(err, 'getProfiles');
}
);
}
-export function getDirectProfiles() {
- if (isCallInProgress('getDirectProfiles')) {
+export function getProfilesInTeam(teamId = TeamStore.getCurrentId(), offset = UserStore.getInTeamPagingOffset(), limit = Constants.PROFILE_CHUNK_SIZE) {
+ if (isCallInProgress(`getProfilesInTeam${offset}${limit}`)) {
return;
}
- callTracker.getDirectProfiles = utils.getTimestamp();
- Client.getDirectProfiles(
+ callTracker[`getProfilesInTeam${offset}${limit}`] = utils.getTimestamp();
+ Client.getProfilesInTeam(
+ teamId,
+ offset,
+ limit,
(data) => {
- callTracker.getDirectProfiles = 0;
+ callTracker[`getProfilesInTeam${offset}${limit}`] = 0;
AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_DIRECT_PROFILES,
+ type: ActionTypes.RECEIVED_PROFILES_IN_TEAM,
+ profiles: data,
+ team_id: teamId,
+ offset,
+ count: Object.keys(data).length
+ });
+ },
+ (err) => {
+ callTracker[`getProfilesInTeam${offset}${limit}`] = 0;
+ dispatchError(err, 'getProfilesInTeam');
+ }
+ );
+}
+
+export function getProfilesInChannel(channelId = ChannelStore.getCurrentId(), offset = UserStore.getInChannelPagingOffset(), limit = Constants.PROFILE_CHUNK_SIZE) {
+ if (isCallInProgress(`getProfilesInChannel${offset}${limit}`)) {
+ return;
+ }
+
+ callTracker[`getProfilesInChannel${offset}${limit}`] = utils.getTimestamp();
+ Client.getProfilesInChannel(
+ channelId,
+ offset,
+ limit,
+ (data) => {
+ callTracker[`getProfilesInChannel${offset}${limit}`] = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_PROFILES_IN_CHANNEL,
+ channel_id: channelId,
+ profiles: data,
+ offset,
+ count: Object.keys(data).length
+ });
+
+ loadStatusesForProfilesMap(data);
+ },
+ (err) => {
+ callTracker[`getProfilesInChannel${offset}${limit}`] = 0;
+ dispatchError(err, 'getProfilesInChannel');
+ }
+ );
+}
+
+export function getProfilesNotInChannel(channelId = ChannelStore.getCurrentId(), offset = UserStore.getNotInChannelPagingOffset(), limit = Constants.PROFILE_CHUNK_SIZE) {
+ if (isCallInProgress(`getProfilesNotInChannel${offset}${limit}`)) {
+ return;
+ }
+
+ callTracker[`getProfilesNotInChannel${offset}${limit}`] = utils.getTimestamp();
+ Client.getProfilesNotInChannel(
+ channelId,
+ offset,
+ limit,
+ (data) => {
+ callTracker[`getProfilesNotInChannel${offset}${limit}`] = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_PROFILES_NOT_IN_CHANNEL,
+ channel_id: channelId,
+ profiles: data,
+ offset,
+ count: Object.keys(data).length
+ });
+
+ loadStatusesForProfilesMap(data);
+ },
+ (err) => {
+ callTracker[`getProfilesNotInChannel${offset}${limit}`] = 0;
+ dispatchError(err, 'getProfilesNotInChannel');
+ }
+ );
+}
+
+export function getProfilesByIds(userIds) {
+ if (isCallInProgress('getProfilesByIds')) {
+ return;
+ }
+
+ if (!userIds || userIds.length === 0) {
+ return;
+ }
+
+ callTracker.getProfilesByIds = utils.getTimestamp();
+ Client.getProfilesByIds(
+ userIds,
+ (data) => {
+ callTracker.getProfilesByIds = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_PROFILES,
profiles: data
});
},
(err) => {
- callTracker.getDirectProfiles = 0;
- dispatchError(err, 'getDirectProfiles');
+ callTracker.getProfilesByIds = 0;
+ dispatchError(err, 'getProfilesByIds');
}
);
}
@@ -548,173 +638,6 @@ export function search(terms, isOrSearch) {
);
}
-export function getPostsPage(id, maxPosts) {
- let channelId = id;
- if (channelId == null) {
- channelId = ChannelStore.getCurrentId();
- if (channelId == null) {
- return;
- }
- }
-
- if (isCallInProgress('getPostsPage_' + channelId)) {
- return;
- }
-
- var postList = PostStore.getAllPosts(id);
-
- var max = maxPosts;
- if (max == null) {
- max = Constants.POST_CHUNK_SIZE * Constants.MAX_POST_CHUNKS;
- }
-
- // if we already have more than POST_CHUNK_SIZE posts,
- // let's get the amount we have but rounded up to next multiple of POST_CHUNK_SIZE,
- // with a max at maxPosts
- var numPosts = Math.min(max, Constants.POST_CHUNK_SIZE);
- if (postList && postList.order.length > 0) {
- numPosts = Math.min(max, Constants.POST_CHUNK_SIZE * Math.ceil(postList.order.length / Constants.POST_CHUNK_SIZE));
- }
-
- if (channelId != null) {
- callTracker['getPostsPage_' + channelId] = utils.getTimestamp();
-
- Client.getPostsPage(
- channelId,
- 0,
- numPosts,
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_POSTS,
- id: channelId,
- before: true,
- numRequested: numPosts,
- checkLatest: true,
- post_list: data
- });
- },
- (err) => {
- dispatchError(err, 'getPostsPage');
- },
- () => {
- callTracker['getPostsPage_' + channelId] = 0;
- }
- );
- }
-}
-
-export function getPosts(id) {
- let channelId = id;
- if (channelId == null) {
- channelId = ChannelStore.getCurrentId();
- if (channelId == null) {
- return;
- }
- }
-
- if (isCallInProgress('getPosts_' + channelId)) {
- return;
- }
-
- const postList = PostStore.getAllPosts(channelId);
- const latestPostTime = PostStore.getLatestPostFromPageTime(id);
-
- if ($.isEmptyObject(postList) || postList.order.length < Constants.POST_CHUNK_SIZE || latestPostTime === 0) {
- getPostsPage(channelId, Constants.POST_CHUNK_SIZE);
- return;
- }
-
- callTracker['getPosts_' + channelId] = utils.getTimestamp();
-
- Client.getPosts(
- channelId,
- latestPostTime,
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_POSTS,
- id: channelId,
- before: true,
- numRequested: 0,
- post_list: data
- });
- },
- (err) => {
- dispatchError(err, 'getPosts');
- },
- () => {
- callTracker['getPosts_' + channelId] = 0;
- }
- );
-}
-
-export function getPostsBefore(postId, offset, numPost, isPost) {
- const channelId = ChannelStore.getCurrentId();
- if (channelId == null) {
- return;
- }
-
- if (isCallInProgress('getPostsBefore_' + channelId)) {
- return;
- }
-
- Client.getPostsBefore(
- channelId,
- postId,
- offset,
- numPost,
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_POSTS,
- id: channelId,
- before: true,
- numRequested: numPost,
- post_list: data,
- isPost
- });
- },
- (err) => {
- dispatchError(err, 'getPostsBefore');
- },
- () => {
- callTracker['getPostsBefore_' + channelId] = 0;
- }
- );
-}
-
-export function getPostsAfter(postId, offset, numPost, isPost) {
- const channelId = ChannelStore.getCurrentId();
- if (channelId == null) {
- return;
- }
-
- if (isCallInProgress('getPostsAfter_' + channelId)) {
- return;
- }
-
- Client.getPostsAfter(
- channelId,
- postId,
- offset,
- numPost,
- (data) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_POSTS,
- id: channelId,
- before: false,
- numRequested: numPost,
- post_list: data,
- isPost
- });
- },
- (err) => {
- dispatchError(err, 'getPostsAfter');
- },
- () => {
- callTracker['getPostsAfter_' + channelId] = 0;
- }
- );
-}
-
export function getFileInfosForPost(channelId, postId) {
const callName = 'getFileInfosForPost' + postId;
@@ -828,6 +751,58 @@ export function getMyTeam() {
);
}
+export function getTeamMember(teamId, userId) {
+ const callName = `getTeamMember${teamId}${userId}`;
+ if (isCallInProgress(callName)) {
+ return;
+ }
+
+ callTracker[callName] = utils.getTimestamp();
+ Client.getTeamMember(
+ (data) => {
+ callTracker[callName] = 0;
+
+ const memberMap = {};
+ memberMap[userId] = data;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_MEMBERS_IN_TEAM,
+ team_id: teamId,
+ team_members: memberMap
+ });
+ },
+ (err) => {
+ callTracker[callName] = 0;
+ dispatchError(err, 'getTeamMember');
+ }
+ );
+}
+
+export function getTeamStats(teamId) {
+ const callName = `getTeamStats${teamId}`;
+ if (isCallInProgress(callName)) {
+ return;
+ }
+
+ callTracker[callName] = utils.getTimestamp();
+ Client.getTeamStats(
+ teamId,
+ (data) => {
+ callTracker[callName] = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_TEAM_STATS,
+ team_id: teamId,
+ stats: data
+ });
+ },
+ (err) => {
+ callTracker[callName] = 0;
+ dispatchError(err, 'getTeamStats');
+ }
+ );
+}
+
export function getAllPreferences() {
if (isCallInProgress('getAllPreferences')) {
return;
@@ -987,6 +962,18 @@ export function getStandardAnalytics(teamId) {
if (data[index].name === 'team_count' && teamId == null) {
stats[StatTypes.TOTAL_TEAMS] = data[index].value;
}
+
+ if (data[index].name === 'total_websocket_connections') {
+ stats[StatTypes.TOTAL_WEBSOCKET_CONNECTIONS] = data[index].value;
+ }
+
+ if (data[index].name === 'total_master_db_connections') {
+ stats[StatTypes.TOTAL_MASTER_DB_CONNECTIONS] = data[index].value;
+ }
+
+ if (data[index].name === 'total_read_db_connections') {
+ stats[StatTypes.TOTAL_READ_DB_CONNECTIONS] = data[index].value;
+ }
}
AppDispatcher.handleServerAction({
@@ -1212,54 +1199,6 @@ export function getRecentAndNewUsersAnalytics(teamId) {
);
}
-export function listIncomingHooks() {
- if (isCallInProgress('listIncomingHooks')) {
- return;
- }
-
- callTracker.listIncomingHooks = utils.getTimestamp();
-
- Client.listIncomingHooks(
- (data) => {
- callTracker.listIncomingHooks = 0;
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_INCOMING_WEBHOOKS,
- teamId: Client.teamId,
- incomingWebhooks: data
- });
- },
- (err) => {
- callTracker.listIncomingHooks = 0;
- dispatchError(err, 'getIncomingHooks');
- }
- );
-}
-
-export function listOutgoingHooks() {
- if (isCallInProgress('listOutgoingHooks')) {
- return;
- }
-
- callTracker.listOutgoingHooks = utils.getTimestamp();
-
- Client.listOutgoingHooks(
- (data) => {
- callTracker.listOutgoingHooks = 0;
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_OUTGOING_WEBHOOKS,
- teamId: Client.teamId,
- outgoingWebhooks: data
- });
- },
- (err) => {
- callTracker.listOutgoingHooks = 0;
- dispatchError(err, 'getOutgoingHooks');
- }
- );
-}
-
export function addIncomingHook(hook, success, error) {
Client.addIncomingHook(
hook,
@@ -1353,30 +1292,6 @@ export function regenOutgoingHookToken(id) {
);
}
-export function listTeamCommands() {
- if (isCallInProgress('listTeamCommands')) {
- return;
- }
-
- callTracker.listTeamCommands = utils.getTimestamp();
-
- Client.listTeamCommands(
- (data) => {
- callTracker.listTeamCommands = 0;
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_COMMANDS,
- teamId: Client.teamId,
- commands: data
- });
- },
- (err) => {
- callTracker.listTeamCommands = 0;
- dispatchError(err, 'listTeamCommands');
- }
- );
-}
-
export function addCommand(command, success, error) {
Client.addCommand(
command,
@@ -1459,29 +1374,6 @@ export function getPublicLink(fileId, success, error) {
);
}
-export function listEmoji() {
- if (isCallInProgress('listEmoji')) {
- return;
- }
-
- callTracker.listEmoji = utils.getTimestamp();
-
- Client.listEmoji(
- (data) => {
- callTracker.listEmoji = 0;
-
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CUSTOM_EMOJIS,
- emojis: data
- });
- },
- (err) => {
- callTracker.listEmoji = 0;
- dispatchError(err, 'listEmoji');
- }
- );
-}
-
export function addEmoji(emoji, image, success, error) {
const callName = 'addEmoji' + emoji.name;
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 10f1a2879a..83d64358ce 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -71,7 +71,7 @@ export const ActionTypes = keyMirror({
RECEIVED_CHANNELS: null,
RECEIVED_CHANNEL: null,
RECEIVED_MORE_CHANNELS: null,
- RECEIVED_CHANNEL_EXTRA_INFO: null,
+ RECEIVED_CHANNEL_STATS: null,
FOCUS_POST: null,
RECEIVED_POSTS: null,
@@ -84,9 +84,11 @@ export const ActionTypes = keyMirror({
RECEIVED_MENTION_DATA: null,
RECEIVED_ADD_MENTION: null,
- RECEIVED_PROFILES_FOR_DM_LIST: null,
RECEIVED_PROFILES: null,
- RECEIVED_DIRECT_PROFILES: null,
+ RECEIVED_PROFILES_IN_TEAM: null,
+ RECEIVED_PROFILE: null,
+ RECEIVED_PROFILES_IN_CHANNEL: null,
+ RECEIVED_PROFILE_NOT_IN_CHANNEL: null,
RECEIVED_ME: null,
RECEIVED_SESSIONS: null,
RECEIVED_AUDITS: null,
@@ -129,8 +131,9 @@ export const ActionTypes = keyMirror({
RECEIVED_SERVER_COMPLIANCE_REPORTS: null,
RECEIVED_ALL_TEAMS: null,
RECEIVED_ALL_TEAM_LISTINGS: null,
- RECEIVED_TEAM_MEMBERS: null,
- RECEIVED_MEMBERS_FOR_TEAM: null,
+ RECEIVED_MY_TEAM_MEMBERS: null,
+ RECEIVED_MEMBERS_IN_TEAM: null,
+ RECEIVED_TEAM_STATS: null,
RECEIVED_LOCALE: null,
@@ -232,7 +235,10 @@ export const Constants = {
POST_PER_DAY: null,
USERS_WITH_POSTS_PER_DAY: null,
RECENTLY_ACTIVE_USERS: null,
- NEWLY_CREATED_USERS: null
+ NEWLY_CREATED_USERS: null,
+ TOTAL_WEBSOCKET_CONNECTIONS: null,
+ TOTAL_MASTER_DB_CONNECTIONS: null,
+ TOTAL_READ_DB_CONNECTIONS: null
}),
STAT_MAX_ACTIVE_USERS: 20,
STAT_MAX_NEW_USERS: 20,
@@ -313,7 +319,7 @@ export const Constants = {
SIGNIN_VERIFIED: 'verified',
SESSION_EXPIRED: 'expired',
POST_CHUNK_SIZE: 60,
- MAX_POST_CHUNKS: 3,
+ PROFILE_CHUNK_SIZE: 100,
POST_FOCUS_CONTEXT_RADIUS: 10,
POST_LOADING: 'loading',
POST_FAILED: 'failed',
@@ -843,7 +849,9 @@ export const Constants = {
MENTION_MEMBERS: 'mention.members',
MENTION_NONMEMBERS: 'mention.nonmembers',
MENTION_SPECIAL: 'mention.special',
- DEFAULT_NOTIFICATION_DURATION: 5000
+ DEFAULT_NOTIFICATION_DURATION: 5000,
+ STATUS_INTERVAL: 60000,
+ AUTOCOMPLETE_TIMEOUT: 200
};
export default Constants;
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 10a59c25c0..fcfec35928 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -10,7 +10,6 @@ import PreferenceStore from 'stores/preference_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import Constants from 'utils/constants.jsx';
var ActionTypes = Constants.ActionTypes;
-import * as AsyncClient from './async_client.jsx';
import Client from 'client/web_client.jsx';
import * as UserAgent from 'utils/user_agent.jsx';
@@ -1074,66 +1073,6 @@ export function windowHeight() {
return $(window).height();
}
-export function openDirectChannelToUser(user, successCb, errorCb) {
- AsyncClient.savePreference(
- Constants.Preferences.CATEGORY_DIRECT_CHANNEL_SHOW,
- user.id,
- 'true'
- );
-
- // if the user in another team and isn't already in the direct message
- // list then we should add him so his name shows up correctly.
- var profileUser = UserStore.getProfile(user.id);
- if (!profileUser) {
- UserStore.getDirectProfiles()[user.id] = user;
- }
-
- const channelName = this.getDirectChannelName(UserStore.getCurrentId(), user.id);
- let channel = ChannelStore.getByName(channelName);
-
- if (channel) {
- if ($.isFunction(successCb)) {
- successCb(channel, true);
- }
- } else {
- channel = {
- name: channelName,
- last_post_at: 0,
- total_msg_count: 0,
- type: 'D',
- display_name: user.username,
- teammate_id: user.id,
- status: UserStore.getStatus(user.id)
- };
-
- Client.createDirectChannel(
- user.id,
- (data) => {
- Client.getChannel(
- data.id,
- (data2) => {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_CHANNEL,
- channel: data2.channel,
- member: data2.member
- });
-
- if ($.isFunction(successCb)) {
- successCb(data2.channel, false);
- }
- }
- );
- },
- () => {
- browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/' + channelName);
- if ($.isFunction(errorCb)) {
- errorCb();
- }
- }
- );
- }
-}
-
// Use when sorting multiple channels or teams by their `display_name` field
export function sortByDisplayName(a, b) {
let aDisplayName = '';