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

on search success and other user/s are selected already, remove current user first before profile match filtering (#1876)

Browse source
This commit is contained in:
Saturnino Abril 2018-07-05 01:15:21 +08:00 committed by Elias Nahum
parent da8b5e92cc
commit 665bb862a8
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/screens/more_dms/more_dms.js
View file

@ -95,10 +95,17 @@ class MoreDirectMessages extends PureComponent {
nextProps.getRequest.status === RequestStatus.SUCCESS) {
const profiles = this.sliceProfiles(nextProps.profiles);
this.setState({profiles, showNoResults: true});
} else if (this.state.searching &&
nextProps.searchRequest.status === RequestStatus.SUCCESS) {
} else if (
this.state.searching &&
nextProps.searchRequest.status === RequestStatus.SUCCESS
) {
let profiles = nextProps.profiles;
if (this.state.selectedCount > 0) {
profiles = this.removeCurrentUserFromProfiles(profiles);
}
const exactMatches = [];
let results = filterProfilesMatchingTerm(nextProps.profiles, this.state.term).filter((p) => {
const results = filterProfilesMatchingTerm(profiles, this.state.term).filter((p) => {
if (p.username === this.state.term || p.username.startsWith(this.state.term)) {
exactMatches.push(p);
return false;
@ -107,10 +114,6 @@ class MoreDirectMessages extends PureComponent {
return true;
});
if (this.state.selectedCount > 0) {
results = this.removeCurrentUserFromProfiles(results);
}
this.setState({profiles: [...exactMatches, ...results], showNoResults: true});
}
}