From 4240685a614074e7db0c7d2822a10f3fa34cdc75 Mon Sep 17 00:00:00 2001 From: Peter Chinman Date: Mon, 1 Dec 2025 17:34:46 -0500 Subject: [PATCH 1/3] fix: correctly handle case when user is only participant --- .../src/components/EntityWithEverything.tsx | 36 +++++++++++-------- .../macro-entity/src/queries/email.ts | 11 +++--- .../packages/macro-entity/src/types/entity.ts | 3 +- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx b/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx index 030400d9f41..6df453ce76e 100644 --- a/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx +++ b/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx @@ -219,31 +219,38 @@ export function EntityWithEverything( const EntityTitle = () => { if (props.entity.type === 'email') { - const macroDisplayNames = - props.entity.participantEmails?.map((email) => { - return useDisplayName(emailToId(email))[0]; - }) ?? []; const isLikelyEmail = (value?: string) => typeof value === 'string' && value.includes('@'); + const combinedParticipantFirstNames = createMemo(() => { if (props.entity.type !== 'email') return []; const me = userEmail(); - const participantNames = props.entity.participantNames ?? []; + if ( + props.entity.participants?.length === 1 && + props.entity.participants?.[0].email === me + ) { + return ['me']; + } const namesSet = new Set(); - props.entity.participantEmails?.forEach((email, idx) => { - if (me && email === me) return; - const macroFirstName = macroDisplayNames[idx]?.().split(' ')[0]; - const participantFirstName = participantNames[idx].split(' ')[0]; + + props.entity.participants?.forEach((participant) => { + if (!participant.email) return; + if (me && participant.email === me) return; + const macroDisplayName = useDisplayName( + emailToId(participant.email) + )[0]?.(); + const macroFirstName = macroDisplayName?.split(' ')[0]; + const participantFirstName = participant.name?.split(' ')[0] ?? ''; if (macroFirstName && !isLikelyEmail(macroFirstName)) { namesSet.add(macroFirstName); } else if ( - isLikelyEmail(macroFirstName) && participantFirstName && !isLikelyEmail(participantFirstName) ) { namesSet.add(participantFirstName); } else { - namesSet.add(email.split('@')[0]); + const emailName = participant.email.split('@')[0]; + namesSet.add(emailName); } }); return Array.from(namesSet); @@ -251,10 +258,9 @@ export function EntityWithEverything( const displayedNames = () => { const names = combinedParticipantFirstNames(); - if (names.length <= 3 && names.length > 0) return names.join(', '); - if (names.length > 3) - return `${names[0]} .. ${names[names.length - 2]}, ${names[names.length - 1]}`; - return undefined; + if (!names || names.length === 0) return undefined; + if (names.length <= 3) return names.join(', '); + return `${names[0]} .. ${names[names.length - 2]}, ${names[names.length - 1]}`; }; return ( diff --git a/js/app/packages/macro-entity/src/queries/email.ts b/js/app/packages/macro-entity/src/queries/email.ts index 61b3a91e2c6..66e6204e092 100644 --- a/js/app/packages/macro-entity/src/queries/email.ts +++ b/js/app/packages/macro-entity/src/queries/email.ts @@ -77,10 +77,10 @@ export function createEmailsInfiniteQuery( select: (data) => data.pages.flatMap(({ items }) => items.map((email): EmailEntity => { - const participantEmails = email.contacts.map( - (p) => p.emailAddress ?? '' - ); - const participantNames = email.contacts.map((p) => p.name ?? ''); + const participants = email.contacts.map((p) => ({ + email: p.emailAddress ?? '', + name: p.name ?? '', + })); return { ...email, @@ -91,8 +91,7 @@ export function createEmailsInfiniteQuery( snippet: email.snippet ?? undefined, isImportant: email.isImportant ?? false, done: !email.inboxVisible, - participantEmails, - participantNames, + participants, senderEmail: email.senderEmail ?? undefined, senderName: email.senderName ?? email.senderEmail ?? undefined, }; diff --git a/js/app/packages/macro-entity/src/types/entity.ts b/js/app/packages/macro-entity/src/types/entity.ts index 17897427fa2..92c9ed3f2a9 100644 --- a/js/app/packages/macro-entity/src/types/entity.ts +++ b/js/app/packages/macro-entity/src/types/entity.ts @@ -47,8 +47,7 @@ export type EmailEntity = EntityBase & { snippet?: string; isImportant: boolean; done: boolean; - participantEmails?: string[]; - participantNames?: string[]; + participants?: Array<{ email: string; name: string }>; senderEmail?: string; senderName?: string; }; From ff46ced38adbe38e8ea31066027c8e4dadcb3025 Mon Sep 17 00:00:00 2001 From: Peter Chinman Date: Mon, 1 Dec 2025 17:35:42 -0500 Subject: [PATCH 2/3] biome --- .../macro-entity/src/components/EntityWithEverything.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx b/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx index 6df453ce76e..9fd467e5633 100644 --- a/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx +++ b/js/app/packages/macro-entity/src/components/EntityWithEverything.tsx @@ -232,7 +232,7 @@ export function EntityWithEverything( return ['me']; } const namesSet = new Set(); - + props.entity.participants?.forEach((participant) => { if (!participant.email) return; if (me && participant.email === me) return; From 9e0f0b7b904164ce42535eeb6989a557668cae1c Mon Sep 17 00:00:00 2001 From: Peter Chinman Date: Mon, 1 Dec 2025 17:40:13 -0500 Subject: [PATCH 3/3] fix --- js/app/packages/macro-entity/src/queries/dss.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/app/packages/macro-entity/src/queries/dss.ts b/js/app/packages/macro-entity/src/queries/dss.ts index ea2583c9a49..3150a8ae39f 100644 --- a/js/app/packages/macro-entity/src/queries/dss.ts +++ b/js/app/packages/macro-entity/src/queries/dss.ts @@ -256,6 +256,11 @@ const selectData: ( } if (item.tag === 'emailThread') { + const participants = item.data.participants?.map((p) => ({ + email: p.emailAddress ?? '', + name: p.name ?? '', + })); + return { ...item.data, senderEmail: item.data.senderEmail ?? undefined, @@ -266,6 +271,7 @@ const selectData: ( name: item.data.name || 'Email Thread', frecencyScore: item.frecency_score, viewedAt: item.data.viewedAt ?? undefined, + participants, }; }