toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-19731 Fix at-channel autocomplete to return out of channel mentions (#3477)

Browse source 
* MM-19731 Fix at-channel autocomplete to return out of channel mentions

* profiles not in channel test deleted use case

* fix typo
This commit is contained in:
Elias Nahum 2019-10-30 04:22:28 +02:00 committed by CJ
parent a142e8e168
commit f16d8baf46
2 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/selectors/autocomplete.js
View file

@ -99,15 +99,20 @@ export const filterMembersNotInChannel = createSelector(
let profiles;
if (matchTerm) {
profiles = profilesNotInChannel.filter((p) => {
return ((p.id !== currentUserId && p.detele_at === 0) && (
p.username.toLowerCase().includes(matchTerm) || p.email.toLowerCase().includes(matchTerm) ||
p.first_name.toLowerCase().includes(matchTerm) || p.last_name.toLowerCase().includes(matchTerm)));
return (
p.username.toLowerCase().includes(matchTerm) ||
p.email.toLowerCase().includes(matchTerm) ||
p.first_name.toLowerCase().includes(matchTerm) ||
p.last_name.toLowerCase().includes(matchTerm)
) && (p.delete_at === 0 && p.id !== currentUserId);
});
} else {
profiles = profilesNotInChannel.filter((p) => p.delete_at === 0);
}
return profiles.map((p) => p.id);
return profiles.map((p) => {
return p.id;
});
}
);

39
app/selectors/autocomplete.test.js
View file

@ -5,6 +5,7 @@ import assert from 'assert';
import {
getMatchTermForAtMention,
filterMembersNotInChannel,
} from 'app/selectors/autocomplete';
/* eslint-disable max-nested-callbacks */
@ -56,4 +57,42 @@ describe('Selectors.Autocomplete', () => {
});
});
});
it('Should return profiles not in channel', () => {
const state = {
entities: {
channels: {
currentChannelId: 'current-channel-id',
},
users: {
currentUserId: 'current-user-id',
profiles: {
'current-user-id': {id: 'current-user-id', username: 'current', delete_at: 0},
'test-user-id': {id: 'test-user-id', username: 'test', first_name: 'Test', last_name: 'User', email: 'test@example.com', delete_at: 0},
'another-user-id': {id: 'another-user-id', username: 'another', first_name: 'Another', last_name: 'One', email: 'another@example.com', delete_at: 0},
'deleted-user-id': {id: 'deleted-user-id', username: 'deleted', first_name: 'Remvoed', last_name: 'Friend', email: 'deleted@example.com', delete_at: 123},
},
profilesNotInChannel: {
'current-channel-id': new Set(['test-user-id', 'another-user-id', 'deleted-user-id']),
},
},
},
};
let profiles = filterMembersNotInChannel(state, '');
expect(profiles.length).toBe(2);
// filter to get the current user, should return zero results
profiles = filterMembersNotInChannel(state, 'current');
expect(profiles.length).toBe(0);
profiles = filterMembersNotInChannel(state, 'tes');
expect(profiles.length).toBe(1);
profiles = filterMembersNotInChannel(state, 'one');
expect(profiles.length).toBe(1);
profiles = filterMembersNotInChannel(state, 'example');
expect(profiles.length).toBe(2);
});
});