Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

fix: user search by text instead of regex #924

Merged
merged 3 commits into from
Apr 29, 2022
Merged
Changes from all commits
Commits
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
24 changes: 9 additions & 15 deletions src/hooks/useUsersFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,14 @@ const filterUsersByQuery = (users: IUser[], filter: IUsersFilter): IUser[] => {
return users;
}

// Try to parse the search query as a RegExp.
// Return all users if it can't be parsed.
try {
const regExp = new RegExp(filter.query, 'i');
return users.filter(user => filterUserByRegExp(user, regExp));
} catch (err) {
if (err instanceof SyntaxError) {
return users;
} else {
throw err;
}
}
return users.filter(user => {
return filterUserByText(user, filter.query);
});
};

const filterUserByRegExp = (user: IUser, regExp: RegExp): boolean =>
regExp.test(user.name ?? '') ||
regExp.test(user.username ?? user.email ?? '');
const filterUserByText = (user: IUser, search: string = ''): boolean => {
const fieldsToSearch = [user.name ?? '', user.username ?? user.email ?? ''];
return fieldsToSearch.some(field =>
field.toLowerCase().includes(search.toLowerCase())
);
};