From f8712c3ea4904de8465f45620da788b8efe9adcc Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 9 Jan 2025 12:50:56 -0800 Subject: [PATCH] fix(avatars): fall back to email if name is empty The fetch avatar API won't render properly if an empty string is provided for the name so we should fall back to the email if the name is empty. --- src/lib/layout/header.svelte | 4 ++-- src/routes/(console)/account/header.svelte | 2 +- src/routes/(console)/account/organizations/+page.svelte | 2 +- .../(console)/organization-[organization]/header.svelte | 2 +- .../organization-[organization]/settings/+page.svelte | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index 390cad41b..5158456e7 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -156,9 +156,9 @@ {#if $user}
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte index 04404d65c..37aafa8cb 100644 --- a/src/routes/(console)/account/organizations/+page.svelte +++ b/src/routes/(console)/account/organizations/+page.svelte @@ -28,7 +28,7 @@ const getMemberships = async (teamId: string) => { const memberships = await sdk.forConsole.teams.listMemberships(teamId); - return memberships.memberships.map((team) => team.userName); + return memberships.memberships.map((team) => team.userName || team.userEmail); }; function isCloudOrg( diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte index 090c9b82a..c2438d1f3 100644 --- a/src/routes/(console)/organization-[organization]/header.svelte +++ b/src/routes/(console)/organization-[organization]/header.svelte @@ -58,7 +58,7 @@ } else newOrgModal.set(true); } - $: avatars = $members.memberships?.map((m) => m.userName) ?? []; + $: avatars = $members.memberships?.map((m) => m.userName || m.userEmail) ?? []; $: organizationId = $page.params.organization; $: path = `${base}/organization-${organizationId}`; $: tabs = [ diff --git a/src/routes/(console)/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte index c70eb1a8e..98b236e6d 100644 --- a/src/routes/(console)/organization-[organization]/settings/+page.svelte +++ b/src/routes/(console)/organization-[organization]/settings/+page.svelte @@ -42,7 +42,7 @@ } } - $: avatars = $members.memberships.map((team) => team.userName); + $: avatars = $members.memberships.map((m) => m.userName || m.userEmail); $: orgProjects = `${$projects.total} ${$projects.total === 1 ? 'project' : 'projects'}`; $: orgMembers = `${$organization.total} ${$organization.total === 1 ? 'member' : 'members'}`;