Added capability to mention users by username (#3253)

mozilla · Jun 7, 2024 · 5bb0877 · 5bb0877
1 parent 17965f2
commit 5bb0877
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pontoon/base/views.py b/pontoon/base/views.py
@@ -676,6 +676,8 @@ def get_users(request):
         .exclude(profile__system_user=True)
         # Exclude deleted users
         .exclude(email__regex=r"^deleted-user-(\w+)@example.com$")
+        # Prefetch profile for retrieving username
+        .prefetch_related("profile")
     )
     payload = []
 
@@ -685,6 +687,7 @@ def get_users(request):
                 "gravatar": u.gravatar_url(44),
                 "name": u.name_or_email,
                 "url": u.profile_url,
+                "username": u.profile.username,
             }
         )
 

diff --git a/translate/src/api/user.ts b/translate/src/api/user.ts
@@ -52,6 +52,7 @@ export type MentionUser = {
   gravatar: string;
   name: string;
   url: string;
+  username: string | null;
 };
 
 /** Dismiss Add-On Promotion. */

diff --git a/translate/src/modules/comments/components/AddComment.tsx b/translate/src/modules/comments/components/AddComment.tsx
@@ -135,8 +135,10 @@ export function AddComment({
   }, [initFocus]);
 
   const suggestedUsers = mentionUsers
-    .filter((user) =>
-      user.name.toLowerCase().includes(mentionSearch.toLowerCase()),
+    .filter(
+      (user) =>
+        user.username?.toLowerCase().includes(mentionSearch.toLowerCase()) ||
+        user.name.toLowerCase().includes(mentionSearch.toLowerCase()),
     )
     .slice(0, 5);