diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte index b2d06806c..7f2243e03 100644 --- a/src/routes/(console)/organization-[organization]/createMember.svelte +++ b/src/routes/(console)/organization-[organization]/createMember.svelte @@ -58,6 +58,7 @@ role = isSelfHosted ? 'owner' : 'developer'; accessType = 'all'; projectAccess = []; + orgProjects = []; } }); diff --git a/src/routes/(console)/organization-[organization]/members/+page.ts b/src/routes/(console)/organization-[organization]/members/+page.ts index 8946a4d7b..64247d2d8 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.ts +++ b/src/routes/(console)/organization-[organization]/members/+page.ts @@ -21,7 +21,7 @@ export const load: PageLoad = async ({ url, params, route, depends }) => { }), sdk.forConsole.organization(params.organization).listProjects({ queries: [Query.limit(100), Query.equal('teamId', params.organization)] - }) + }).catch(() => null) ]); return { diff --git a/src/routes/(console)/organization-[organization]/members/edit.svelte b/src/routes/(console)/organization-[organization]/members/edit.svelte index b60ddfb7a..1cc83974c 100644 --- a/src/routes/(console)/organization-[organization]/members/edit.svelte +++ b/src/routes/(console)/organization-[organization]/members/edit.svelte @@ -44,7 +44,7 @@ $effect(() => { if (showEdit && selectedMember) { const memberRoles = selectedMember.roles ?? []; - if (memberRoles.some(isProjectSpecificRole)) { + if (supportsProjectRoles && memberRoles.some(isProjectSpecificRole)) { accessType = 'specific'; projectAccess = memberRoles.filter(isProjectSpecificRole).map((r) => { const parsed = parseProjectRole(r); diff --git a/src/routes/(console)/organization-[organization]/projectAccessSelector.svelte b/src/routes/(console)/organization-[organization]/projectAccessSelector.svelte index 14bcc5df2..d98ae0a23 100644 --- a/src/routes/(console)/organization-[organization]/projectAccessSelector.svelte +++ b/src/routes/(console)/organization-[organization]/projectAccessSelector.svelte @@ -25,7 +25,7 @@ .map((p) => ({ label: p.name, value: p.$id })); } - const allSelected = $derived(projects.length > 0 && projectAccess.length >= projects.length); + const allSelected = $derived(projects.length === 0 || projectAccess.length >= projects.length); function addRow() { projectAccess = [...projectAccess, { projectId: '', roleName: 'developer' }];