Skip to content

Fix user selection dropdown hover when multiple users have same name #388

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

Merged
crthpl merged 3 commits into from
Apr 13, 2026
+58 −42
Merged

Fix user selection dropdown hover when multiple users have same name #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52f09f4
Show user email on admin page even while editing display name
crthpl Apr 13, 2026
d6dd570
Show user email in cohort member selection dropdown
crthpl Apr 13, 2026
4e0c41b
Fix user selection dropdown hover when multiple users have same name
crthpl Apr 13, 2026
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
72 changes: 37 additions & 35 deletions frontend/src/routes/admin/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,42 +397,44 @@
{#each filteredUsers as user (user.id)}
<div class="rounded-lg border p-2 px-3">
<div class="flex items-center justify-between">
<div class="flex items-center gap-2">
{#if editingUserId === user.id}
<input
class="w-48 rounded-md border bg-background px-2 py-0.5 text-sm"
bind:value={editingName}
onkeydown={(e) => {
if (e.key === 'Enter') saveEditingName();
if (e.key === 'Escape') editingUserId = null;
}}
/>
<button
class="rounded p-0.5 hover:bg-muted"
onclick={saveEditingName}
title="Save"
>
<Check class="h-4 w-4 text-green-600" />
</button>
<button
class="rounded p-0.5 hover:bg-muted"
onclick={() => (editingUserId = null)}
title="Cancel"
>
<X class="h-4 w-4 text-muted-foreground" />
</button>
{:else}
<span class="font-medium">{user.display_name}</span>
<button
class="rounded p-0.5 opacity-40 hover:bg-muted hover:opacity-100"
onclick={() => startEditingName(user)}
title="Edit display name"
>
<Pencil class="h-3.5 w-3.5" />
</button>
{#if user.email}
<span class="text-sm text-muted-foreground">{user.email}</span>
<div class="flex flex-col gap-1">
<div class="flex items-center gap-2">
{#if editingUserId === user.id}
<input
class="w-48 rounded-md border bg-background px-2 py-0.5 text-sm"
bind:value={editingName}
onkeydown={(e) => {
if (e.key === 'Enter') saveEditingName();
if (e.key === 'Escape') editingUserId = null;
}}
/>
<button
class="rounded p-0.5 hover:bg-muted"
onclick={saveEditingName}
title="Save"
>
<Check class="h-4 w-4 text-green-600" />
</button>
<button
class="rounded p-0.5 hover:bg-muted"
onclick={() => (editingUserId = null)}
title="Cancel"
>
<X class="h-4 w-4 text-muted-foreground" />
</button>
{:else}
<span class="font-medium">{user.display_name}</span>
<button
class="rounded p-0.5 opacity-40 hover:bg-muted hover:opacity-100"
onclick={() => startEditingName(user)}
title="Edit display name"
>
<Pencil class="h-3.5 w-3.5" />
</button>
{/if}
</div>
{#if user.email}
<span class="text-sm text-muted-foreground">{user.email}</span>
{/if}
</div>
<div class="flex items-center gap-2">
Expand Down
28 changes: 21 additions & 7 deletions frontend/src/routes/admin/cohorts/[name]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
return globalUsers.filter((u) => !memberUserIds.has(u.id));
});

let selectedUserName = $derived(
selectedUserId ? (globalUsers.find((u) => u.id === selectedUserId)?.display_name ?? '') : ''
let selectedUser = $derived(
selectedUserId ? globalUsers.find((u) => u.id === selectedUserId) : null
);

function closePopoverAndFocusTrigger() {
Expand Down Expand Up @@ -239,8 +239,17 @@
role="combobox"
bind:ref={userTriggerRef}
>
{selectedUserId ? selectedUserName : 'Search users...'}
<ChevronsUpDown class="ml-2 h-4 w-4 shrink-0 opacity-50" />
<div class="flex flex-col text-left text-sm">
{#if selectedUser}
<span>{selectedUser.display_name}</span>
{#if selectedUser.email}
<span class="text-xs text-muted-foreground">{selectedUser.email}</span>
{/if}
{:else}
Search users...
{/if}
</div>
<ChevronsUpDown class="h-4 w-4 shrink-0 opacity-50" />
</Popover.Trigger>
<Popover.Content class="w-64 p-0">
<Command.Root>
Expand All @@ -250,16 +259,21 @@
<Command.Group>
{#each availableUsers as user (user.id)}
<Command.Item
value={user.display_name}
value={String(user.id)}
onSelect={() => {
selectedUserId = user.id;
closePopoverAndFocusTrigger();
}}
>
{user.display_name}
<div class="flex flex-1 flex-col">
<span>{user.display_name}</span>
{#if user.email}
<span class="text-xs text-muted-foreground">{user.email}</span>
{/if}
</div>
<Check
class={cn(
'ml-auto h-4 w-4',
'h-4 w-4 shrink-0',
user.id !== selectedUserId && 'text-transparent'
)}
/>
Expand Down
Loading