Skip to content

Commit

Permalink
Show direct match on top for user search (#17303)
Browse files Browse the repository at this point in the history
This PR makes sure that direct matches in the user search always show on top of the result list.

The following places were checked to follow the desired behavior now:
- Search when adding a user to a team
- Search when adding a user as a collaborator to a repository

Signed-off-by: Maximilian Weiler <16721506+maweil@users.noreply.github.com>
  • Loading branch information
maweil committed Oct 14, 2021
1 parent fa8b8c0 commit 030f696
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions web_src/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2233,15 +2233,21 @@ function searchUsers() {
url: `${AppSubUrl}/api/v1/users/search?q={query}`,
onResponse(response) {
const items = [];
const searchQueryUppercase = $searchUserBox.find('input').val().toUpperCase();
$.each(response.data, (_i, item) => {
let title = item.login;
if (item.full_name && item.full_name.length > 0) {
title += ` (${htmlEscape(item.full_name)})`;
}
items.push({
const resultItem = {
title,
image: item.avatar_url
});
};
if (searchQueryUppercase === item.login.toUpperCase()) {
items.unshift(resultItem);
} else {
items.push(resultItem);
}
});

return {results: items};
Expand Down

0 comments on commit 030f696

Please sign in to comment.