Skip to content

Commit d6dd570

Browse files
committed
Show user email in cohort member selection dropdown
Display email alongside display name in both the user search dropdown and the selected user display on the cohort page.
1 parent 52f09f4 commit d6dd570

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

frontend/src/routes/admin/cohorts/[name]/+page.svelte

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
return globalUsers.filter((u) => !memberUserIds.has(u.id));
5454
});
5555
56-
let selectedUserName = $derived(
57-
selectedUserId ? (globalUsers.find((u) => u.id === selectedUserId)?.display_name ?? '') : ''
56+
let selectedUser = $derived(
57+
selectedUserId ? globalUsers.find((u) => u.id === selectedUserId) : null
5858
);
5959
6060
function closePopoverAndFocusTrigger() {
@@ -239,8 +239,17 @@
239239
role="combobox"
240240
bind:ref={userTriggerRef}
241241
>
242-
{selectedUserId ? selectedUserName : 'Search users...'}
243-
<ChevronsUpDown class="ml-2 h-4 w-4 shrink-0 opacity-50" />
242+
<div class="flex flex-col text-left text-sm">
243+
{#if selectedUser}
244+
<span>{selectedUser.display_name}</span>
245+
{#if selectedUser.email}
246+
<span class="text-xs text-muted-foreground">{selectedUser.email}</span>
247+
{/if}
248+
{:else}
249+
Search users...
250+
{/if}
251+
</div>
252+
<ChevronsUpDown class="h-4 w-4 shrink-0 opacity-50" />
244253
</Popover.Trigger>
245254
<Popover.Content class="w-64 p-0">
246255
<Command.Root>
@@ -256,10 +265,15 @@
256265
closePopoverAndFocusTrigger();
257266
}}
258267
>
259-
{user.display_name}
268+
<div class="flex flex-1 flex-col">
269+
<span>{user.display_name}</span>
270+
{#if user.email}
271+
<span class="text-xs text-muted-foreground">{user.email}</span>
272+
{/if}
273+
</div>
260274
<Check
261275
class={cn(
262-
'ml-auto h-4 w-4',
276+
'h-4 w-4 shrink-0',
263277
user.id !== selectedUserId && 'text-transparent'
264278
)}
265279
/>

0 commit comments

Comments
 (0)