Skip to content

Guest user modal update #8563

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

Open
ericokuma wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Guest user modal update #8563

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90456ca
Refactor AddGuestsDialog to use resetDialogState function
cursoragent Dec 23, 2025
a753fc4
Refactor AddGuestsDialog to use computed property for selected projects
cursoragent Dec 23, 2025
cb6c2cf
Fix: Prevent closing AddGuestsDialog on project selection
cursoragent Dec 23, 2025
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
48 changes: 33 additions & 15 deletions web-admin/src/features/organizations/user-management/dialogs/AddGuestsDialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
let projectDropdownOpen = false;
let selectedRole: "admin" | "editor" | "viewer" = "viewer";
let roleDropdownOpen = false;
let hasAutoSelectedProject = false;

function resetDialogState() {
failedInvites = [];
selectedProjects = [];
selectedRole = "viewer";
hasAutoSelectedProject = false;
}

// Projects list
$: projectsQuery = createAdminServiceListProjectsForOrganization(
Expand All @@ -63,6 +71,20 @@
$: selectedRoleLabel =
ORG_ROLES_OPTIONS.find((o) => o.value === selectedRole)?.label ?? "";

$: selectedProjectsLabel = (() => {
if (selectedProjects.length === 0) return "Select projects";
if (selectedProjects.length === 1) return selectedProjects[0];
return `${selectedProjects.length} Project${selectedProjects.length > 1 ? "s" : ""}`;
})();

$: if (open && !hasAutoSelectedProject && projects.length > 0) {
const firstProjectName = projects[0]?.name;
if (firstProjectName) {
selectedProjects = [firstProjectName];
hasAutoSelectedProject = true;
}
}

function toggleProjectSelection(projectName: string) {
const idx = selectedProjects.indexOf(projectName);
if (idx >= 0) {
Expand Down Expand Up @@ -153,8 +175,7 @@

if (failedInvites.length === 0) {
open = false;
selectedProjects = [];
selectedRole = "viewer";
resetDialogState();
}
},
validationMethod: "oninput",
Expand All @@ -173,15 +194,11 @@
onOutsideClick={(e) => {
e.preventDefault();
open = false;
failedInvites = [];
selectedProjects = [];
selectedRole = "viewer";
resetDialogState();
}}
onOpenChange={(open) => {
if (!open) {
failedInvites = [];
selectedProjects = [];
selectedRole = "viewer";
onOpenChange={(dialogOpen) => {
if (!dialogOpen) {
resetDialogState();
}
}}
>
Expand Down Expand Up @@ -231,16 +248,17 @@
{:else if projects.length === 0}
<div class="text-xs text-slate-500">No projects</div>
{:else}
<Dropdown.Root bind:open={projectDropdownOpen}>
<Dropdown.Root
bind:open={projectDropdownOpen}
closeOnItemClick={false}
>
<Dropdown.Trigger
class="min-w-[260px] flex flex-row justify-between gap-1 items-center rounded-sm border border-gray-300 {projectDropdownOpen
? 'bg-slate-200'
: 'hover:bg-slate-100'} px-2 py-1"
>
<span>
{selectedProjects.length > 0
? `${selectedProjects.length} Project${selectedProjects.length > 1 ? "s" : ""}`
: "Select projects"}
{selectedProjectsLabel}
</span>
{#if projectDropdownOpen}
<CaretUpIcon size="12px" />
Expand All @@ -253,7 +271,7 @@
<Dropdown.CheckboxItem
class="font-normal flex items-center overflow-hidden"
checked={selectedProjects.includes(p.name)}
on:click={() => toggleProjectSelection(p.name)}
onCheckedChange={() => toggleProjectSelection(p.name)}
>
<span class="truncate w-full" title={p.name}>{p.name}</span>
</Dropdown.CheckboxItem>
Expand Down
Loading