diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-04-26 15:49:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-26 15:49:15 -0400 |
commit | 7307156c49b194c4afd946cd9e57715d45b5b21d (patch) | |
tree | 1601a0026859ff40e631b4aee9632b022ed6f40f /webapp/actions/user_actions.jsx | |
parent | 1fef5bf5fe37f161959fbef5d53deccf0168cced (diff) | |
download | chat-7307156c49b194c4afd946cd9e57715d45b5b21d.tar.gz chat-7307156c49b194c4afd946cd9e57715d45b5b21d.tar.bz2 chat-7307156c49b194c4afd946cd9e57715d45b5b21d.zip |
PLT-6213 Move team store and actions over to use redux (#6222)
* Move team store and actions over to user redux
* Fix JS error when inviting by email
Diffstat (limited to 'webapp/actions/user_actions.jsx')
-rw-r--r-- | webapp/actions/user_actions.jsx | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index d810b4c2e..c4e0f4fc6 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -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(); + } + ); } |