Skip to content

Commit 8a1d006

Browse files
authored
Merge pull request #154 from nezed-forks/153-wrong-user-in-wip-limit
[#153] Look for exact match first
2 parents f73df21 + de97b8f commit 8a1d006

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/shared/jiraApi.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,13 @@ export const getUser = query =>
168168
if (res2.status === 'fulfilled') return res2.value;
169169
})
170170
.then(users => {
171-
return users.find(user => user.name?.includes(query) || user.displayName?.includes(query)) ?? users[0];
171+
if (!query) return users[0];
172+
173+
const exactMatch = users.find(user => user.name === query || user.displayName === query);
174+
if (exactMatch) return exactMatch;
175+
176+
const substringMatch = users.find(user => user.name?.includes(query) || user.displayName?.includes(query));
177+
if (substringMatch) return substringMatch;
178+
179+
return users[0];
172180
});

0 commit comments

Comments
 (0)