Skip to content

Fixed: You can't search a room with names like "x.y" #13186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cead22 merged 7 commits into from
Dec 2, 2022
Merged

Fixed: You can't search a room with names like "x.y" #13186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc9ebb7
Fixed: You can't search a room with names like 'x.y'
s77rt Nov 30, 2022
aa59999
Remove dots only from the local part of the email
s77rt Nov 30, 2022
16493ff
Updated a test
s77rt Dec 1, 2022
8057b09
Added a comment about the dot remover email regex
s77rt Dec 1, 2022
988705c
Added an empty line before comment (lint fix)
s77rt Dec 1, 2022
f337bcd
Update tests/unit/OptionsListUtilsTest.js
s77rt Dec 1, 2022
6c62e60
Update OptionsListUtils.js
s77rt Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function getParticipantNames(personalDetailList) {
}

/**
* A very optimized method to remove unique items from an array.
* A very optimized method to remove duplicates from an array.
* Taken from https://stackoverflow.com/a/9229821/9114791
*
* @param {Array} items
Expand Down Expand Up @@ -186,7 +186,11 @@ function getSearchText(report, reportName, personalDetailList, isChatRoomOrPolic
if (!isChatRoomOrPolicyExpenseChat) {
for (let i = 0; i < personalDetailList.length; i++) {
const personalDetail = personalDetailList[i];
searchTerms = searchTerms.concat([personalDetail.displayName, personalDetail.login.replace(/\./g, '')]);

// The regex below is used to remove dots only from the local part of the user email (local-part@domain)
// so that we can match emails that have dots without explicitly writing the dots (e.g: fistlast@domain will match first.last@domain)
// More info https://github.com/Expensify/App/issues/8007
searchTerms = searchTerms.concat([personalDetail.displayName, personalDetail.login, personalDetail.login.replace(/\.(?=[^\s@]*@)/g, '')]);
}
}
if (report) {
Expand Down Expand Up @@ -381,16 +385,13 @@ function createOption(logins, personalDetails, report, reportActions = {}, {
* @returns {Boolean}
*/
function isSearchStringMatch(searchValue, searchText, participantNames = new Set(), isChatRoom = false) {
const searchWords = _.map(
searchValue
.replace(/\./g, '')
.replace(/,/g, ' ')
.split(' '),
word => word.trim(),
);
return _.every(searchWords, (word) => {
const searchWords = _.compact(uniqFast([
searchValue,
..._.map(searchValue.replace(/,/g, ' ').split(' '), word => word.trim()),
]));
const valueToSearch = searchText && searchText.replace(new RegExp(/&nbsp;/g), '');
return _.some(searchWords, (word) => {
const matchRegex = new RegExp(Str.escapeForRegExp(word), 'i');
const valueToSearch = searchText && searchText.replace(new RegExp(/&nbsp;/g), '');
return matchRegex.test(valueToSearch) || (!isChatRoom && participantNames.has(word));
});
}
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/OptionsListUtilsTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,11 @@ describe('OptionsListUtils', () => {
expect(results.personalDetails.length).toBe(0);
expect(results.userToInvite).not.toBe(null);

// When we add a search term for which exist options for it excluding its period.
// When we add a search term with a period, with options for it that don't contain the period
results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'peter.parker@expensify.com');

// Then we will have an options at all and there should be a userToInvite too.
expect(results.recentReports.length).toBe(1);
// Then we should have no options at all but there should be a userToInvite
expect(results.recentReports.length).toBe(0);
expect(results.userToInvite).not.toBe(null);

// When we add a search term for which no options exist and the searchValue itself
Expand Down