Skip to content
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

Jump to bottom

[Content] Prevent users with no first or last names from crashing the app #3059

Merged
merged 1 commit into from
Nov 20, 2024
Merged

[Content] Prevent users with no first or last names from crashing the app #3059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/shell/components/Comment/MentionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ export const MentionList = forwardRef(
const _filterKeyword = filterKeyword?.toLowerCase();

return [...users]
?.sort((userA, userB) => userA.firstName.localeCompare(userB.firstName))
?.sort((userA, userB) => {
const userAName = userA.firstName || userA.lastName || "";
const userBName = userB.firstName || userB.lastName || "";

if (!userAName) return 1;
if (!userBName) return -1;

return userAName.localeCompare(userBName);
})
.filter(
(user) =>
user.email?.toLowerCase()?.includes(_filterKeyword) ||
Expand Down Expand Up @@ -178,7 +186,7 @@ export const MentionList = forwardRef(
/>
</ListItemAvatar>
<ListItemText
primary={`${user.firstName} ${user.lastName}`}
primary={`${user.firstName || ""} ${user.lastName || ""}`}
secondary={user.email}
/>
</ListItemButton>
Expand Down
Loading