IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6213 Move team store and actions over to use redux (#6222)

Browse Source 
* Move team store and actions over to user redux

* Fix JS error when inviting by email
This commit is contained in:
Joram Wilander
2017-04-26 15:49:15 -04:00
committed by GitHub
parent 1fef5bf5fe
commit 7307156c49
27 changed files with 387 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webapp/actions/global_actions.jsx
View File

@@ -36,6 +36,7 @@ import store from 'stores/redux_store.jsx';
const dispatch = store.dispatch;
const getState = store.getState;
import {ChannelTypes} from 'mattermost-redux/action_types';
import {removeUserFromTeam} from 'mattermost-redux/actions/teams';
export function emitChannelClickEvent(channel) {
function userVisitedFakeChannel(chan, success, fail) {
@@ -189,16 +190,7 @@ export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) {
}
export function emitLeaveTeam() {
Client.removeUserFromTeam(
TeamStore.getCurrentId(),
UserStore.getCurrentId(),
() => {
// DO nothing. The websocket should cause a re-direct
},
(err) => {
AsyncClient.dispatchError(err, 'removeUserFromTeam');
}
);
removeUserFromTeam(TeamStore.getCurrentId(), UserStore.getCurrentId())(dispatch, getState);
}
export function emitLoadMorePostsEvent() {
@@ -467,7 +459,6 @@ export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = tr
export function clientLogout(redirectTo = '/') {
BrowserStore.clear();
ErrorStore.clearLastError();
TeamStore.clear();
ChannelStore.clear();
stopPeriodicStatusUpdates();
WebsocketActions.close();

208
webapp/actions/team_actions.jsx
View File

@@ -1,15 +1,10 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import UserStore from 'stores/user_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'client/web_client.jsx';
import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
import {browserHistory} from 'react-router/es6';
@@ -19,85 +14,84 @@ const dispatch = store.dispatch;
const getState = store.getState;
import {getUser} from 'mattermost-redux/actions/users';
import {
createTeam as createTeamRedux,
updateTeam as updateTeamRedux,
removeUserFromTeam as removeUserFromTeamRedux,
getTeamStats,
checkIfTeamExists as checkIfTeamExistsRedux,
updateTeamMemberRoles as updateTeamMemberRolesRedux,
addUsersToTeam as addUsersToTeamRedux,
sendEmailInvitesToTeam,
getTeamsForUser as getTeamsForUserRedux,
getTeamMembersForUser as getTeamMembersForUserRedux
} from 'mattermost-redux/actions/teams';
export function checkIfTeamExists(teamName, onSuccess, onError) {
Client.findTeamByName(teamName, onSuccess, onError);
}
export function createTeam(team, onSuccess, onError) {
Client.createTeam(team,
(rteam) => {
AppDispatcher.handleServerAction({
type: ActionTypes.CREATED_TEAM,
team: rteam,
member: {team_id: rteam.id, user_id: UserStore.getCurrentId(), roles: 'team_admin team_user'}
});
browserHistory.push('/' + rteam.name + '/channels/town-square');
if (onSuccess) {
onSuccess(rteam);
}
},
onError
);
}
export function updateTeam(team, onSuccess, onError) {
Client.updateTeam(team,
(rteam) => {
AppDispatcher.handleServerAction({
type: ActionTypes.UPDATE_TEAM,
team: rteam
});
browserHistory.push('/' + rteam.name + '/channels/town-square');
if (onSuccess) {
onSuccess(rteam);
}
},
onError
);
}
export function removeUserFromTeam(teamId, userId, success, error) {
Client.removeUserFromTeam(
teamId,
userId,
() => {
TeamStore.removeMemberInTeam(teamId, userId);
UserStore.removeProfileFromTeam(teamId, userId);
UserStore.emitInTeamChange();
getUser(userId)(dispatch, getState);
AsyncClient.getTeamStats(teamId);
if (success) {
success();
}
},
(err) => {
AsyncClient.dispatchError(err, 'removeUserFromTeam');
if (error) {
error(err);
checkIfTeamExistsRedux(teamName)(dispatch, getState).then(
(exists) => {
if (exists != null && onSuccess) {
onSuccess(exists);
} else if (exists == null && onError) {
const serverError = getState().requests.teams.getTeam.error;
onError({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function updateTeamMemberRoles(teamId, userId, newRoles, success, error) {
Client.updateTeamMemberRoles(teamId, userId, newRoles,
() => {
AsyncClient.getTeamMember(teamId, userId);
export function createTeam(team, onSuccess, onError) {
createTeamRedux(team)(dispatch, getState).then(
(rteam) => {
if (rteam && onSuccess) {
browserHistory.push('/' + rteam.name + '/channels/town-square');
onSuccess(rteam);
} else if (rteam == null && onError) {
const serverError = getState().requests.teams.createTeam.error;
onError({id: serverError.server_error_id, ...serverError});
}
}
);
}
if (success) {
success();
export function updateTeam(team, onSuccess, onError) {
updateTeamRedux(team)(dispatch, getState).then(
(rteam) => {
if (rteam && onSuccess) {
browserHistory.push('/' + rteam.name + '/channels/town-square');
onSuccess(rteam);
} else if (rteam == null && onError) {
const serverError = getState().requests.teams.updateTeam.error;
onError({id: serverError.server_error_id, ...serverError});
}
},
(err) => {
if (error) {
error(err);
);
}
export function removeUserFromTeam(teamId, userId, success, error) {
removeUserFromTeamRedux(teamId, userId)(dispatch, getState).then(
(data) => {
getUser(userId)(dispatch, getState);
getTeamStats(teamId)(dispatch, getState);
if (data && success) {
success();
} else if (data == null && error) {
const serverError = getState().requests.teams.removeUserFromTeam.error;
error({id: serverError.server_error_id, ...serverError});
}
},
);
}
export function updateTeamMemberRoles(teamId, userId, newRoles, success, error) {
updateTeamMemberRolesRedux(teamId, userId, newRoles)(dispatch, getState).then(
(data) => {
if (data && success) {
success();
} else if (data == null && error) {
const serverError = getState().requests.teams.updateTeamMember.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -122,25 +116,13 @@ export function addUserToTeamFromInvite(data, hash, inviteId, success, error) {
}
export function addUsersToTeam(teamId, userIds, success, error) {
Client.addUsersToTeam(
teamId,
userIds,
addUsersToTeamRedux(teamId, userIds)(dispatch, getState).then(
(teamMembers) => {
teamMembers.forEach((member) => {
TeamStore.removeMemberNotInTeam(teamId, member.user_id);
UserStore.removeProfileNotInTeam(teamId, member.user_id);
});
UserStore.emitNotInTeamChange();
if (success) {
if (teamMembers && success) {
success(teamMembers);
}
},
(err) => {
AsyncClient.dispatchError(err, 'addUsersToTeam');
if (error) {
error(err);
} else if (teamMembers == null && error) {
const serverError = getState().requests.teams.addUserToTeam.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -163,16 +145,20 @@ export function getInviteInfo(inviteId, success, error) {
}
export function inviteMembers(data, success, error) {
Client.inviteMembers(
data,
() => {
if (success) {
if (!data.invites) {
success();
}
const emails = [];
data.invites.forEach((i) => {
emails.push(i.email);
});
sendEmailInvitesToTeam(TeamStore.getCurrentId(), emails)(dispatch, getState).then(
(result) => {
if (result && success) {
success();
}
},
(err) => {
if (err) {
error(err);
} else if (result == null && error) {
const serverError = getState().requests.teams.emailInvite.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -184,9 +170,27 @@ export function switchTeams(url) {
}
export function getTeamsForUser(userId, success, error) {
Client.getTeamsForUser(userId, success, error);
getTeamsForUserRedux(userId)(dispatch, getState).then(
(result) => {
if (result && success) {
success(result);
} else if (result == null && error) {
const serverError = getState().requests.teams.getTeams.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
}
export function getTeamMembersForUser(userId, success, error) {
Client.getTeamMembersForUser(userId, success, error);
getTeamMembersForUserRedux(userId)(dispatch, getState).then(
(result) => {
if (result && success) {
success(result);
} else if (result == null && error) {
const serverError = getState().requests.teams.getTeamMembers.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
}

47
webapp/actions/user_actions.jsx
View File

@@ -39,10 +39,12 @@ import {
updateUserPassword,
createUser,
login,
loadMe as loadMeRedux
loadMe as loadMeRedux,
updateUserRoles as updateUserRolesRedux
} from 'mattermost-redux/actions/users';
import {getClientConfig, getLicenseConfig} from 'mattermost-redux/actions/general';
import {getTeamMembersByIds, getMyTeamMembers} from 'mattermost-redux/actions/teams';
export function loadMe(callback) {
loadMeRedux()(dispatch, getState).then(
@@ -169,30 +171,13 @@ export function loadProfilesWithoutTeam(page, perPage, success) {
}
function loadTeamMembersForProfiles(userIds, teamId, success, error) {
Client.getTeamMembersByIds(
teamId,
userIds,
getTeamMembersByIds(teamId, userIds)(dispatch, getState).then(
(data) => {
const memberMap = {};
for (let i = 0; i < data.length; i++) {
memberMap[data[i].user_id] = data[i];
}
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_MEMBERS_IN_TEAM,
team_id: teamId,
team_members: memberMap
});
if (success) {
if (data && success) {
success(data);
}
},
(err) => {
AsyncClient.dispatchError(err, 'getTeamMembersByIds');
if (error) {
error(err);
} else if (data == null && error) {
const serverError = getState().requests.teams.getTeamMembers.error;
error({id: serverError.server_error_id, ...serverError});
}
}
);
@@ -585,7 +570,7 @@ export function updateUserNotifyProps(props, success, error) {
}
export function updateUserRoles(userId, newRoles, success, error) {
updateUserRoles(userId, newRoles)(dispatch, getState).then(
updateUserRolesRedux(userId, newRoles)(dispatch, getState).then(
(data) => {
if (data && success) {
success(data);
@@ -852,13 +837,9 @@ export function getMissingProfiles(ids) {
}
export function loadMyTeamMembers() {
Client.getMyTeamMembers((data) => {
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_MY_TEAM_MEMBERS,
team_members: data
});
AsyncClient.getMyTeamsUnread();
}, (err) => {
AsyncClient.dispatchError(err, 'getMyTeamMembers');
});
getMyTeamMembers()(dispatch, getState).then(
() => {
AsyncClient.getMyTeamsUnread();
}
);
}

1
webapp/actions/websocket_actions.jsx
View File

@@ -280,7 +280,6 @@ function handleLeaveTeamEvent(msg) {
// if they are on the team being removed redirect them to default team
if (TeamStore.getCurrentId() === msg.data.team_id) {
TeamStore.setCurrentId('');
Client.setTeamId('');
BrowserStore.removeGlobalItem('team');
BrowserStore.removeGlobalItem(msg.data.team_id);

27
webapp/components/admin_console/system_users/index.js Normal file
View File

@@ -0,0 +1,27 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeams, getTeamStats} from 'mattermost-redux/actions/teams';
import {getUser} from 'mattermost-redux/actions/users';
import SystemUsers from './system_users.jsx';
function mapStateToProps(state, ownProps) {
return {
...ownProps
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getTeams,
getTeamStats,
getUser
}, dispatch)
};
}
export default connect(mapStateToProps, mapDispatchToProps)(SystemUsers);

16
webapp/components/admin_console/system_users/system_users.jsx
View File

@@ -16,7 +16,7 @@ import AnalyticsStore from 'stores/analytics_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {getAllTeams, getStandardAnalytics, getTeamStats, getUser} from 'utils/async_client.jsx';
import {getStandardAnalytics} from 'utils/async_client.jsx';
import {Constants, StatTypes, UserSearchOptions} from 'utils/constants.jsx';
import {convertTeamMapToList} from 'utils/team_utils.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -33,6 +33,14 @@ const USER_ID_LENGTH = 26;
const USERS_PER_PAGE = 50;
export default class SystemUsers extends React.Component {
static propTypes = {
actions: React.PropTypes.shape({
getTeams: React.PropTypes.func.isRequired,
getTeamStats: React.PropTypes.func.isRequired,
getUser: React.PropTypes.func.isRequired
}).isRequired
}
constructor(props) {
super(props);
@@ -76,7 +84,7 @@ export default class SystemUsers extends React.Component {
UserStore.addWithoutTeamChangeListener(this.updateUsersFromStore);
this.loadDataForTeam(this.state.teamId);
getAllTeams();
this.props.actions.getTeams(0, 1000);
}
componentWillUpdate(nextProps, nextState) {
@@ -155,7 +163,7 @@ export default class SystemUsers extends React.Component {
loadProfilesWithoutTeam(0, Constants.PROFILE_CHUNK_SIZE, this.loadComplete);
} else {
loadProfilesAndTeamMembers(0, Constants.PROFILE_CHUNK_SIZE, teamId, this.loadComplete);
getTeamStats(teamId);
this.props.actions.getTeamStats(teamId);
}
}
@@ -240,7 +248,7 @@ export default class SystemUsers extends React.Component {
return;
}
getUser(
this.props.actions.getUser(
id,
() => {
this.setState({

24
webapp/components/analytics/team_analytics/index.js Normal file
View File

@@ -0,0 +1,24 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeams} from 'mattermost-redux/actions/teams';
import TeamAnalytics from './team_analytics.jsx';
function mapStateToProps(state, ownProps) {
return {
...ownProps
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getTeams
}, dispatch)
};
}
export default connect(mapStateToProps, mapDispatchToProps)(TeamAnalytics);

16
webapp/components/analytics/team_analytics.jsx → webapp/components/analytics/team_analytics/team_analytics.jsx
View File

@@ -15,14 +15,20 @@ import * as AsyncClient from 'utils/async_client.jsx';
import {StatTypes} from 'utils/constants.jsx';
import {convertTeamMapToList} from 'utils/team_utils.jsx';
import LineChart from './line_chart.jsx';
import StatisticCount from './statistic_count.jsx';
import TableChart from './table_chart.jsx';
import {formatPostsPerDayData, formatUsersWithPostsPerDayData} from './system_analytics.jsx';
import LineChart from 'components/analytics/line_chart.jsx';
import StatisticCount from 'components/analytics/statistic_count.jsx';
import TableChart from 'components/analytics/table_chart.jsx';
import {formatPostsPerDayData, formatUsersWithPostsPerDayData} from 'components/analytics/system_analytics.jsx';
const LAST_ANALYTICS_TEAM = 'last_analytics_team';
export default class TeamAnalytics extends React.Component {
static propTypes = {
actions: React.PropTypes.shape({
getTeams: React.PropTypes.func.isRequired
}).isRequired
}
constructor(props) {
super(props);
@@ -50,7 +56,7 @@ export default class TeamAnalytics extends React.Component {
}
if (this.state.teams.length === 0) {
AsyncClient.getAllTeams();
this.props.actions.getTeams(0, 1000);
}
}

6
webapp/components/channel_invite_modal/channel_invite_modal.jsx
View File

@@ -11,7 +11,6 @@ import TeamStore from 'stores/team_store.jsx';
import {searchUsers} from 'actions/user_actions.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as UserAgent from 'utils/user_agent.jsx';
import Constants from 'utils/constants.jsx';
@@ -29,7 +28,8 @@ export default class ChannelInviteModal extends React.Component {
onHide: React.PropTypes.func.isRequired,
channel: React.PropTypes.object.isRequired,
actions: React.PropTypes.shape({
getProfilesNotInChannel: React.PropTypes.func.isRequired
getProfilesNotInChannel: React.PropTypes.func.isRequired,
getTeamStats: React.PropTypes.func.isRequired
}).isRequired
}
@@ -64,7 +64,7 @@ export default class ChannelInviteModal extends React.Component {
UserStore.addStatusesChangeListener(this.onStatusChange);
this.props.actions.getProfilesNotInChannel(TeamStore.getCurrentId(), this.props.channel.id, 0);
AsyncClient.getTeamStats(TeamStore.getCurrentId());
this.props.actions.getTeamStats(TeamStore.getCurrentId());
}
componentWillUnmount() {

4
webapp/components/channel_invite_modal/index.js
View File

@@ -4,6 +4,7 @@
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getProfilesNotInChannel} from 'mattermost-redux/actions/users';
import {getTeamStats} from 'mattermost-redux/actions/teams';
import ChannelInviteModal from './channel_invite_modal.jsx';
@@ -16,7 +17,8 @@ function mapStateToProps(state, ownProps) {
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getProfilesNotInChannel
getProfilesNotInChannel,
getTeamStats
}, dispatch)
};
}

24
webapp/components/member_list_team/index.js Normal file
View File

@@ -0,0 +1,24 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeamStats} from 'mattermost-redux/actions/teams';
import MemberListTeam from './member_list_team.jsx';
function mapStateToProps(state, ownProps) {
return {
...ownProps
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getTeamStats
}, dispatch)
};
}
export default connect(mapStateToProps, mapDispatchToProps)(MemberListTeam);

27
webapp/components/member_list_team.jsx → webapp/components/member_list_team/member_list_team.jsx
View File

@@ -8,7 +8,6 @@ import UserStore from 'stores/user_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import {searchUsers, loadProfilesAndTeamMembers, loadTeamMembersForProfilesList} from 'actions/user_actions.jsx';
import {getTeamStats} from 'utils/async_client.jsx';
import Constants from 'utils/constants.jsx';
@@ -22,11 +21,17 @@ import {searchProfilesInCurrentTeam} from 'mattermost-redux/selectors/entities/u
const USERS_PER_PAGE = 50;
export default class MemberListTeam extends React.Component {
static propTypes = {
isAdmin: React.PropTypes.bool,
actions: React.PropTypes.shape({
getTeamStats: React.PropTypes.func.isRequired
}).isRequired
}
constructor(props) {
super(props);
this.onChange = this.onChange.bind(this);
this.onTeamChange = this.onTeamChange.bind(this);
this.onStatsChange = this.onStatsChange.bind(this);
this.search = this.search.bind(this);
this.loadComplete = this.loadComplete.bind(this);
@@ -45,19 +50,19 @@ export default class MemberListTeam extends React.Component {
}
componentDidMount() {
UserStore.addInTeamChangeListener(this.onTeamChange);
UserStore.addInTeamChangeListener(this.onChange);
UserStore.addStatusesChangeListener(this.onChange);
TeamStore.addChangeListener(this.onTeamChange);
TeamStore.addChangeListener(this.onChange);
TeamStore.addStatsChangeListener(this.onStatsChange);
loadProfilesAndTeamMembers(0, Constants.PROFILE_CHUNK_SIZE, TeamStore.getCurrentId(), this.loadComplete);
getTeamStats(TeamStore.getCurrentId());
this.props.actions.getTeamStats(TeamStore.getCurrentId());
}
componentWillUnmount() {
UserStore.removeInTeamChangeListener(this.onTeamChange);
UserStore.removeInTeamChangeListener(this.onChange);
UserStore.removeStatusesChangeListener(this.onChange);
TeamStore.removeChangeListener(this.onTeamChange);
TeamStore.removeChangeListener(this.onChange);
TeamStore.removeStatsChangeListener(this.onStatsChange);
}
@@ -65,10 +70,6 @@ export default class MemberListTeam extends React.Component {
this.setState({loading: false});
}
onTeamChange() {
this.onChange(true);
}
onChange() {
let users;
if (this.term) {
@@ -163,7 +164,3 @@ export default class MemberListTeam extends React.Component {
);
}
}
MemberListTeam.propTypes = {
isAdmin: React.PropTypes.bool
};

24
webapp/components/select_team/index.js Normal file
View File

@@ -0,0 +1,24 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeams} from 'mattermost-redux/actions/teams';
import SelectTeam from './select_team.jsx';
function mapStateToProps(state, ownProps) {
return {
...ownProps
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getTeams
}, dispatch)
};
}
export default connect(mapStateToProps, mapDispatchToProps)(SelectTeam);

8
webapp/components/select_team/select_team.jsx
View File

@@ -7,7 +7,6 @@ import * as UserAgent from 'utils/user_agent.jsx';
import * as Utils from 'utils/utils.jsx';
import ErrorBar from 'components/error_bar.jsx';
import LoadingScreen from 'components/loading_screen.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import SelectTeamItem from './components/select_team_item.jsx';
@@ -19,6 +18,11 @@ import React from 'react';
import logoImage from 'images/logo.png';
export default class SelectTeam extends React.Component {
static propTypes = {
actions: React.PropTypes.shape({
getTeams: React.PropTypes.func.isRequired
}).isRequired
}
constructor(props) {
super(props);
@@ -33,7 +37,7 @@ export default class SelectTeam extends React.Component {
componentDidMount() {
TeamStore.addChangeListener(this.onTeamChange);
AsyncClient.getAllTeamListings();
this.props.actions.getTeams(0, 200);
}
componentWillUnmount() {

8
webapp/components/team_general_tab.jsx
View File

@@ -86,7 +86,7 @@ class GeneralTab extends React.Component {
var state = {serverError: '', clientError: ''};
var data = this.props.team;
var data = {...this.props.team};
data.allow_open_invite = this.state.allow_open_invite;
updateTeam(data,
() => {
@@ -119,7 +119,7 @@ class GeneralTab extends React.Component {
return;
}
var data = this.props.team;
var data = {...this.props.team};
data.display_name = this.state.name;
updateTeam(data,
() => {
@@ -152,7 +152,7 @@ class GeneralTab extends React.Component {
return;
}
var data = this.props.team;
var data = {...this.props.team};
data.invite_id = this.state.invite_id;
updateTeam(data,
() => {
@@ -189,7 +189,7 @@ class GeneralTab extends React.Component {
return;
}
var data = this.props.team;
var data = {...this.props.team};
data.description = this.state.description;
updateTeam(data,
() => {

4
webapp/components/team_members_dropdown/index.js
View File

@@ -4,6 +4,7 @@
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getUser} from 'mattermost-redux/actions/users';
import {getTeamStats} from 'mattermost-redux/actions/teams';
import TeamMembersDropdown from './team_members_dropdown.jsx';
@@ -16,7 +17,8 @@ function mapStateToProps(state, ownProps) {
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getUser
getUser,
getTeamStats
}, dispatch)
};
}

9
webapp/components/team_members_dropdown/team_members_dropdown.jsx
View File

@@ -22,7 +22,8 @@ export default class TeamMembersDropdown extends React.Component {
user: React.PropTypes.object.isRequired,
teamMember: React.PropTypes.object.isRequired,
actions: React.PropTypes.shape({
getUser: React.PropTypes.func.isRequired
getUser: React.PropTypes.func.isRequired,
getTeamStats: React.PropTypes.func.isRequired
}).isRequired
}
@@ -76,7 +77,7 @@ export default class TeamMembersDropdown extends React.Component {
() => {
UserStore.removeProfileFromTeam(this.props.teamMember.team_id, this.props.user.id);
UserStore.emitInTeamChange();
AsyncClient.getTeamStats(this.props.teamMember.team_id);
this.props.actions.getTeamStats(this.props.teamMember.team_id);
},
(err) => {
this.setState({serverError: err.message});
@@ -88,7 +89,7 @@ export default class TeamMembersDropdown extends React.Component {
updateActive(this.props.user.id, true,
() => {
AsyncClient.getChannelStats(ChannelStore.getCurrentId());
AsyncClient.getTeamStats(this.props.teamMember.team_id);
this.props.actions.getTeamStats(this.props.teamMember.team_id);
},
(err) => {
this.setState({serverError: err.message});
@@ -100,7 +101,7 @@ export default class TeamMembersDropdown extends React.Component {
updateActive(this.props.user.id, false,
() => {
AsyncClient.getChannelStats(ChannelStore.getCurrentId());
AsyncClient.getTeamStats(this.props.teamMember.team_id);
this.props.actions.getTeamStats(this.props.teamMember.team_id);
},
(err) => {
this.setState({serverError: err.message});

2
webapp/components/team_members_modal.jsx
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import MemberListTeam from './member_list_team.jsx';
import MemberListTeam from 'components/member_list_team';
import TeamStore from 'stores/team_store.jsx';
import {FormattedMessage} from 'react-intl';

24
webapp/components/team_sidebar/index.js Normal file
View File

@@ -0,0 +1,24 @@
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {getTeams} from 'mattermost-redux/actions/teams';
import TeamSidebar from './team_sidebar_controller.jsx';
function mapStateToProps(state, ownProps) {
return {
...ownProps
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
getTeams
}, dispatch)
};
}
export default connect(mapStateToProps, mapDispatchToProps)(TeamSidebar);

9
webapp/components/team_sidebar/team_sidebar_controller.jsx
View File

@@ -6,7 +6,6 @@ import TeamButton from './components/team_button.jsx';
import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import {sortTeamsByDisplayName} from 'utils/team_utils.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -15,6 +14,12 @@ import React from 'react';
import {FormattedMessage} from 'react-intl';
export default class TeamSidebar extends React.Component {
static propTypes = {
actions: React.PropTypes.shape({
getTeams: React.PropTypes.func.isRequired
}).isRequired
}
constructor(props) {
super(props);
@@ -44,7 +49,7 @@ export default class TeamSidebar extends React.Component {
window.addEventListener('resize', this.handleResize);
TeamStore.addChangeListener(this.onChange);
TeamStore.addUnreadChangeListener(this.onChange);
AsyncClient.getAllTeamListings();
this.props.actions.getTeams(0, 200);
this.setStyles();
}

2
webapp/package.json
View File

@@ -22,7 +22,7 @@
"localforage": "1.5.0",
"marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
"match-at": "0.1.0",
"mattermost-redux": "mattermost/mattermost-redux#webapp-part2",
"mattermost-redux": "mattermost/mattermost-redux#webapp-part3",
"object-assign": "4.1.1",
"pdfjs-dist": "1.7.363",
"perfect-scrollbar": "0.6.16",

4
webapp/routes/route_admin_console.jsx
View File

@@ -41,8 +41,8 @@ import NativeAppLinkSettings from 'components/admin_console/native_app_link_sett
import ComplianceSettings from 'components/admin_console/compliance_settings.jsx';
import RateSettings from 'components/admin_console/rate_settings.jsx';
import DeveloperSettings from 'components/admin_console/developer_settings.jsx';
import SystemUsers from 'components/admin_console/system_users/system_users.jsx';
import TeamAnalytics from 'components/analytics/team_analytics.jsx';
import SystemUsers from 'components/admin_console/system_users';
import TeamAnalytics from 'components/analytics/team_analytics';
import LicenseSettings from 'components/admin_console/license_settings.jsx';
import Audits from 'components/admin_console/audits.jsx';
import Logs from 'components/admin_console/logs.jsx';

2
webapp/routes/route_root.jsx
View File

@@ -149,7 +149,7 @@ export default {
{
path: 'select_team',
getComponents: (location, callback) => {
System.import('components/select_team/select_team.jsx').then(RouteUtils.importComponentSuccess(callback));
System.import('components/select_team').then(RouteUtils.importComponentSuccess(callback));
}
},
{

6
webapp/routes/route_team.jsx
View File

@@ -174,7 +174,7 @@ export default {
onEnter: onChannelEnter,
getComponents: (location, callback) => {
Promise.all([
System.import('components/team_sidebar/team_sidebar_controller.jsx'),
System.import('components/team_sidebar'),
System.import('components/sidebar.jsx'),
System.import('components/channel_view.jsx')
]).then(
@@ -187,7 +187,7 @@ export default {
onEnter: onPermalinkEnter,
getComponents: (location, callback) => {
Promise.all([
System.import('components/team_sidebar/team_sidebar_controller.jsx'),
System.import('components/team_sidebar'),
System.import('components/sidebar.jsx'),
System.import('components/permalink_view.jsx')
]).then(
@@ -199,7 +199,7 @@ export default {
path: 'tutorial',
getComponents: (location, callback) => {
Promise.all([
System.import('components/team_sidebar/team_sidebar_controller.jsx'),
System.import('components/team_sidebar'),
System.import('components/sidebar.jsx'),
System.import('components/tutorial/tutorial_view.jsx')
]).then(

27
webapp/stores/admin_store.jsx
View File

@@ -13,6 +13,8 @@ const CONFIG_CHANGE_EVENT = 'config_change';
const ALL_TEAMS_EVENT = 'all_team_change';
const SERVER_COMPLIANCE_REPORT_CHANGE_EVENT = 'server_compliance_reports_change';
import store from 'stores/redux_store.jsx';
class AdminStoreClass extends EventEmitter {
constructor() {
super();
@@ -21,8 +23,19 @@ class AdminStoreClass extends EventEmitter {
this.audits = null;
this.config = null;
this.clusterId = null;
this.teams = {};
this.complianceReports = null;
this.entities = store.getState().entities.teams;
store.subscribe(() => {
const newEntities = store.getState().entities.teams;
if (newEntities.teams !== this.entities.teams) {
this.emitAllTeamsChange();
}
this.entities = newEntities;
});
}
emitLogChange() {
@@ -126,15 +139,11 @@ class AdminStoreClass extends EventEmitter {
}
getAllTeams() {
return this.teams;
}
saveAllTeams(teams) {
this.teams = teams;
return store.getState().entities.teams.teams;
}
getTeam(id) {
return this.teams[id];
return this.getAllTeams()[id];
}
}
@@ -161,10 +170,6 @@ AdminStoreClass.dispatchToken = AppDispatcher.register((payload) => {
AdminStore.saveClusterId(action.clusterId);
AdminStore.emitConfigChange();
break;
case ActionTypes.RECEIVED_ALL_TEAMS:
AdminStore.saveAllTeams(action.teams);
AdminStore.emitAllTeamsChange();
break;
default:
}
});

115
webapp/stores/team_store.jsx
View File

@@ -26,31 +26,33 @@ var Utils;
class TeamStoreClass extends EventEmitter {
constructor() {
super();
this.clear();
this.entities = store.getState().entities.teams;
store.subscribe(() => {
const newEntities = store.getState().entities.teams;
if (newEntities.currentTeamId !== this.entities.currentTeamId) {
this.emitChange();
}
if (newEntities.teams !== this.entities.teams) {
this.emitChange();
}
if (newEntities.myMembers !== this.entities.myMembers) {
this.emitChange();
this.emitUnreadChange();
}
if (newEntities.membersInTeam !== this.entities.membersInTeam) {
this.emitChange();
}
if (newEntities.stats !== this.entities.stats) {
this.emitStatsChange();
}
this.entities = newEntities;
});
}
clear() {
this.entities = {};
this.members_in_team = {};
this.members_not_in_team = {};
this.stats = {};
this.teamListings = {};
this.currentTeamId = '';
}
emitChange() {
this.emit(CHANGE_EVENT);
}
@@ -107,15 +109,19 @@ class TeamStoreClass extends EventEmitter {
}
getAll() {
return store.getState().entities.teams.teams;
const list = Selectors.getMyTeams(store.getState());
const teams = {};
list.forEach((t) => {
teams[t.id] = t;
});
return teams;
}
getCurrentId() {
return this.currentTeamId;
return Selectors.getCurrentTeamId(store.getState());
}
setCurrentId(id) {
this.currentTeamId = id;
store.dispatch({
type: TeamTypes.SELECT_TEAM,
data: id
@@ -123,7 +129,7 @@ class TeamStoreClass extends EventEmitter {
}
getCurrent() {
const team = this.getAll()[this.currentTeamId];
const team = Selectors.getCurrentTeam(store.getState());
if (team) {
return team;
@@ -133,7 +139,7 @@ class TeamStoreClass extends EventEmitter {
}
getCurrentTeamUrl() {
return this.getTeamUrl(this.currentTeamId);
return this.getTeamUrl(this.getCurrentId());
}
getCurrentTeamRelativeUrl() {
@@ -171,7 +177,7 @@ class TeamStoreClass extends EventEmitter {
let stats;
if (teamId) {
stats = this.stats[teamId];
stats = Selectors.getTeamStats(store.getState())[teamId];
}
if (stats) {
@@ -199,22 +205,10 @@ class TeamStoreClass extends EventEmitter {
updateTeam(team) {
const t = JSON.parse(team);
const teams = this.getAll();
const teams = Object.assign({}, this.getAll(), this.getTeamListings());
if (teams && teams[t.id]) {
this.saveTeam(t);
}
if (this.teamListings && this.teamListings[t.id]) {
if (t.allow_open_invite) {
this.teamListings[t.id] = t;
} else {
Reflect.deleteProperty(this.teamListings, t.id);
}
} else if (t.allow_open_invite) {
this.teamListings[t.id] = t;
}
this.emitChange();
}
saveMyTeam(team) {
@@ -223,7 +217,10 @@ class TeamStoreClass extends EventEmitter {
}
saveStats(teamId, stats) {
this.stats[teamId] = stats;
store.dispatch({
type: TeamTypes.RECEIVED_TEAM_STATS,
data: stats
});
}
saveMyTeamMembers(members) {
@@ -274,52 +271,37 @@ class TeamStoreClass extends EventEmitter {
}
saveMembersInTeam(teamId = this.getCurrentId(), members) {
const oldMembers = this.members_in_team[teamId] || {};
this.members_in_team[teamId] = Object.assign({}, oldMembers, members);
}
saveMembersNotInTeam(teamId = this.getCurrentId(), nonmembers) {
this.members_not_in_team[teamId] = nonmembers;
store.dispatch({
type: TeamTypes.RECEIVED_MEMBERS_IN_TEAM,
data: Object.values(members)
});
}
removeMemberInTeam(teamId = this.getCurrentId(), userId) {
if (this.members_in_team[teamId]) {
Reflect.deleteProperty(this.members_in_team[teamId], userId);
}
}
removeMemberNotInTeam(teamId = this.getCurrentId(), userId) {
if (this.members_not_in_team[teamId]) {
Reflect.deleteProperty(this.members_not_in_team[teamId], userId);
}
store.dispatch({
type: TeamTypes.REMOVE_MEMBER_FROM_TEAM,
data: {team_id: teamId, user_id: userId}
});
}
getMembersInTeam(teamId = this.getCurrentId()) {
return Object.assign({}, this.members_in_team[teamId]) || {};
return Selectors.getMembersInTeams(store.getState())[teamId] || {};
}
getMemberInTeam(teamId = this.getCurrentId(), userId) {
return Selectors.getTeamMember(store.getState(), teamId, userId);
}
hasActiveMemberInTeam(teamId = this.getCurrentId(), userId) {
if (this.members_in_team[teamId] && this.members_in_team[teamId][userId]) {
if (this.getMemberInTeam(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;
}
saveTeamListings(teams) {
this.teamListings = teams;
}
getTeamListings() {
return this.teamListings;
return Selectors.getJoinableTeams(store.getState());
}
isTeamAdminForAnyTeam() {
@@ -384,6 +366,11 @@ class TeamStoreClass extends EventEmitter {
const member = Object.assign({}, this.getMyTeamMembers().filter((m) => m.team_id === id)[0]);
member.msg_count++;
store.dispatch({
type: TeamTypes.RECEIVED_MY_TEAM_MEMBER,
data: member
});
}
incrementMentionsIfNeeded(id, msgProps) {
@@ -395,6 +382,11 @@ class TeamStoreClass extends EventEmitter {
if (mentions.indexOf(UserStore.getCurrentId()) !== -1) {
const member = Object.assign({}, this.getMyTeamMembers().filter((m) => m.team_id === id)[0]);
member.mention_count++;
store.dispatch({
type: TeamTypes.RECEIVED_MY_TEAM_MEMBER,
data: member
});
}
}
}
@@ -440,9 +432,6 @@ TeamStore.dispatchToken = AppDispatcher.register((payload) => {
break;
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:

120
webapp/utils/async_client.jsx
View File

@@ -418,50 +418,6 @@ export function getConfig(success, error) {
);
}
export function getAllTeams() {
if (isCallInProgress('getAllTeams')) {
return;
}
callTracker.getAllTeams = utils.getTimestamp();
Client.getAllTeams(
(data) => {
callTracker.getAllTeams = 0;
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_ALL_TEAMS,
teams: data
});
},
(err) => {
callTracker.getAllTeams = 0;
dispatchError(err, 'getAllTeams');
}
);
}
export function getAllTeamListings() {
if (isCallInProgress('getAllTeamListings')) {
return;
}
callTracker.getAllTeamListings = utils.getTimestamp();
Client.getAllTeamListings(
(data) => {
callTracker.getAllTeamListings = 0;
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_ALL_TEAM_LISTINGS,
teams: data
});
},
(err) => {
callTracker.getAllTeams = 0;
dispatchError(err, 'getAllTeamListings');
}
);
}
export function search(terms, isOrSearch) {
if (isCallInProgress('search_' + String(terms))) {
return;
@@ -559,57 +515,6 @@ export function getStatuses() {
);
}
export function getMyTeam() {
if (isCallInProgress('getMyTeam')) {
return null;
}
callTracker.getMyTeam = utils.getTimestamp();
return Client.getMyTeam(
(data) => {
callTracker.getMyTeam = 0;
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_MY_TEAM,
team: data
});
},
(err) => {
callTracker.getMyTeam = 0;
dispatchError(err, 'getMyTeam');
}
);
}
export function getTeamMember(teamId, userId) {
const callName = `getTeamMember${teamId}${userId}`;
if (isCallInProgress(callName)) {
return;
}
callTracker[callName] = utils.getTimestamp();
Client.getTeamMember(
teamId,
userId,
(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 getMyTeamsUnread(teamId) {
const members = TeamStore.getMyTeamMembers();
if (members.length > 1) {
@@ -637,31 +542,6 @@ export function getMyTeamsUnread(teamId) {
}
}
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;