From 632ae27b88888693e8bdd9ddd6b259fc1095b74e Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Tue, 20 Sep 2022 18:21:04 +0800
Subject: [PATCH] core&ui: UserSelectAutoComplete: show displayName

---
 packages/hydrooj/src/handler/user.ts                        | 1 +
 .../autocomplete/components/UserSelectAutoComplete.tsx      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts
index f69e475f3..7eb15908a 100644
--- a/packages/hydrooj/src/handler/user.ts
+++ b/packages/hydrooj/src/handler/user.ts
@@ -43,6 +43,7 @@ registerValue('User', [
     ['priv', 'Int!', 'User Privilege'],
     ['avatarUrl', 'String'],
     ['tfa', 'Boolean!'],
+    ['displayName', 'String'],
 ]);
 
 registerResolver(
diff --git a/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.tsx b/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.tsx
index 0618ba8d5..b887cfcaf 100644
--- a/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.tsx
+++ b/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.tsx
@@ -14,6 +14,7 @@ const UserSelectAutoComplete = forwardRef<AutoCompleteHandle<Udoc>, AutoComplete
       users(search: ${query}) {
         _id
         uname
+        displayName
         avatarUrl
       }
     `, ['data', 'users'])}
@@ -21,9 +22,10 @@ const UserSelectAutoComplete = forwardRef<AutoCompleteHandle<Udoc>, AutoComplete
       users(ids: ${ids.map((i) => +i)}) {
         _id
         uname
+        displayName
       }
     `, ['data', 'users'])}
-    itemText={(user) => user.uname}
+    itemText={(user) => user.uname + (user.displayName ? ` (${ user.displayName })` : '')}
     itemKey={(user) => (props.multi ? user._id.toString() : user.uname)}
     renderItem={(user) => (
       <div className="media">
@@ -31,7 +33,7 @@ const UserSelectAutoComplete = forwardRef<AutoCompleteHandle<Udoc>, AutoComplete
           <img className="small user-profile-avatar" alt="" src={user.avatarUrl} width="30" height="30" />
         </div>
         <div className="media__body medium">
-          <div className="user-select__uname">{user.uname}</div>
+          <div className="user-select__uname">{user.uname}{user.displayName && ` (${user.displayName})`}</div>
           <div className="user-select__uid">UID = {user._id}</div>
         </div>
       </div>