Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
MM-19935: System console user filters not returning expected re… (#4160)
Browse files Browse the repository at this point in the history
* remove unneeded options sent into redux function; caused a 400 bad req

* tests

* Revert "tests"

This reverts commit 9de9edb

* Revert "remove unneeded options sent into redux function; caused a 400 bad req"

This reverts commit f54da5e

* add sort field to getProfilesInTeam call

* tests
  • Loading branch information
cpoile authored and marianunez committed Nov 8, 2019
1 parent 76157e9 commit 0b33ca7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion actions/user_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function loadProfilesAndStatusesInChannel(channelId, page = 0, perPage =
export function loadProfilesAndTeamMembers(page, perPage, teamId, options) {
return async (doDispatch, doGetState) => {
const newTeamId = teamId || getCurrentTeamId(doGetState());
const {data} = await doDispatch(UserActions.getProfilesInTeam(newTeamId, page, perPage, options));
const {data} = await doDispatch(UserActions.getProfilesInTeam(newTeamId, page, perPage, '', options));
if (data) {
doDispatch(loadTeamMembersForProfilesList(data, newTeamId));
doDispatch(loadStatusesForProfilesList(data));
Expand Down
2 changes: 1 addition & 1 deletion actions/user_actions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe('Actions.User', () => {
});

test('loadProfilesAndTeamMembers', async () => {
const expectedActions = [{type: 'MOCK_GET_PROFILES_IN_TEAM', args: ['team_1', 0, 60, {}]}];
const expectedActions = [{type: 'MOCK_GET_PROFILES_IN_TEAM', args: ['team_1', 0, 60, '', {}]}];

let testStore = await mockStore({});
await testStore.dispatch(UserActions.loadProfilesAndTeamMembers(0, 60, 'team_1', {}));
Expand Down

0 comments on commit 0b33ca7

Please sign in to comment.