Skip to content

The open alternative to Salesforce, designed for AI.

Show email thread messages when participants are missing (#26155)

neo773b5d8bee31a18
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
index fd5e874b834..fb8a128a79a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
@@ -8,7 +8,7 @@ import { EmailThreadMessageSender } from '@/activities/emails/components/EmailTh
import { EmailThreadNotShared } from '@/activities/emails/components/EmailThreadNotShared';
import { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';
import { MessageParticipantRole } from 'twenty-shared/types';
-import { isDefined, isFieldValueRestricted } from 'twenty-shared/utils';
+import { isFieldValueRestricted } from 'twenty-shared/utils';
import { MessageChannelVisibility } from '~/generated/graphql';
type EmailThreadMessageProps = {
@@ -30,13 +30,6 @@ export const EmailThreadMessage = ({
(participant) => participant.role !== MessageParticipantRole.FROM,
);
- if (
- !isDefined(message.sender) ||
- (!message.isDraft && receivers.length === 0)
- ) {
- return null;
- }
-
const { isDraft } = message;
const isRestricted = isFieldValueRestricted(message.text);
@@ -76,7 +69,7 @@ export const EmailThreadMessage = ({
sender={message.sender}
sentAt={message.receivedAt}
/>
- {!isDraft && isOpen && (
+ {!isDraft && isOpen && receivers.length > 0 && (
<EmailThreadMessageReceivers receivers={receivers} />
)}
</>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index ba9f00fffc7..b4bfe211a35 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -1,4 +1,5 @@
import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
import { ParticipantChip } from '@/activities/components/ParticipantChip';
import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
@@ -18,6 +19,12 @@ const StyledEmailThreadMessageSender = styled.div`
justify-content: space-between;
`;
+const StyledUnknownSender = styled.span`
+ color: ${themeCssVariables.font.color.tertiary};
+ font-size: ${themeCssVariables.font.size.md};
+ padding: ${themeCssVariables.spacing[1]};
+`;
+
const StyledThreadMessageSentAt = styled.div`
align-items: flex-end;
color: ${themeCssVariables.font.color.tertiary};
@@ -26,7 +33,7 @@ const StyledThreadMessageSentAt = styled.div`
`;
type EmailThreadMessageSenderProps = {
- sender: EmailThreadMessageParticipant;
+ sender?: EmailThreadMessageParticipant;
sentAt: string | null;
};
@@ -55,7 +62,11 @@ export const EmailThreadMessageSender = ({
return (
<StyledEmailThreadMessageSender>
- <ParticipantChip participant={sender} variant="bold" />
+ {isDefined(sender) ? (
+ <ParticipantChip participant={sender} variant="bold" />
+ ) : (
+ <StyledUnknownSender>{t`Unknown sender`}</StyledUnknownSender>
+ )}
{sentAtContent}
</StyledEmailThreadMessageSender>
);
diff --git a/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessage.test.tsx b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessage.test.tsx
new file mode 100644
index 00000000000..f3230a19229
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessage.test.tsx
@@ -0,0 +1,62 @@
+import { render, screen } from '@testing-library/react';
+import { MessageParticipantRole } from 'twenty-shared/types';
+
+import { EmailThreadMessage } from '@/activities/emails/components/EmailThreadMessage';
+import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
+import { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';
+
+const SENDER = {
+ id: 'sender-id',
+ role: MessageParticipantRole.FROM,
+ displayName: 'Ada Lovelace',
+ handle: '[email protected]',
+} as EmailThreadMessageParticipant;
+
+const buildMessage = (
+ overrides: Partial<EmailThreadMessageWithSender>,
+): EmailThreadMessageWithSender =>
+ ({
+ id: 'message-id',
+ text: 'I came across your recent article',
+ receivedAt: null,
+ subject: 'Hello',
+ headerMessageId: 'header-message-id',
+ messageThreadId: 'thread-id',
+ isDraft: false,
+ messageParticipants: [SENDER],
+ sender: SENDER,
+ ...overrides,
+ }) as EmailThreadMessageWithSender;
+
+describe('EmailThreadMessage', () => {
+ it('renders the message body when no recipient is readable', () => {
+ render(
+ <EmailThreadMessage
+ message={buildMessage({})}
+ isExpanded
+ onDraftClick={jest.fn()}
+ />,
+ );
+
+ expect(screen.getByText('Ada Lovelace')).toBeInTheDocument();
+ expect(
+ screen.getByText('I came across your recent article'),
+ ).toBeInTheDocument();
+ expect(screen.queryByText(/^to:/)).not.toBeInTheDocument();
+ });
+
+ it('renders the message body when the sender is not readable', () => {
+ render(
+ <EmailThreadMessage
+ message={buildMessage({ sender: undefined, messageParticipants: [] })}
+ isExpanded
+ onDraftClick={jest.fn()}
+ />,
+ );
+
+ expect(screen.getByText('Unknown sender')).toBeInTheDocument();
+ expect(
+ screen.getByText('I came across your recent article'),
+ ).toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx
index 539ca24c831..7957ab9bb4f 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx
@@ -39,4 +39,16 @@ describe('EmailThreadMessageSender', () => {
expect(screen.getByText('Ada Lovelace')).toBeInTheDocument();
expect(screen.getByText('about 2 hours ago')).toBeInTheDocument();
});
+
+ it('renders an unknown sender placeholder when the sender is not readable', () => {
+ render(
+ <EmailThreadMessageSender
+ sender={undefined}
+ sentAt={TWO_HOURS_BEFORE_NOW}
+ />,
+ );
+
+ expect(screen.getByText('Unknown sender')).toBeInTheDocument();
+ expect(screen.getByText('about 2 hours ago')).toBeInTheDocument();
+ });
});
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
index 384d6c263e4..772e9869cbb 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
@@ -14,20 +14,20 @@ import {
CoreObjectNameSingular,
MessageParticipantRole,
} from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
export const useEmailThread = (threadId: string | null) => {
const { upsertRecordsInStore } = useUpsertRecordsInStore();
const [lastMessageId, setLastMessageId] = useState<string | null>(null);
const [isMessagesFetchComplete, setIsMessagesFetchComplete] = useState(false);
- const { record: thread } = useFindOneRecord<EmailThread>({
- objectNameSingular: CoreObjectNameSingular.MessageThread,
- objectRecordId: threadId ?? '',
- recordGqlFields: {
- id: true,
- },
- });
+ const { record: thread, loading: threadRecordLoading } =
+ useFindOneRecord<EmailThread>({
+ objectNameSingular: CoreObjectNameSingular.MessageThread,
+ objectRecordId: threadId ?? '',
+ recordGqlFields: {
+ id: true,
+ },
+ });
useEffect(() => {
if (thread) {
@@ -81,6 +81,7 @@ export const useEmailThread = (threadId: string | null) => {
const { records: messageSenders } =
useFindManyRecords<EmailThreadMessageParticipant>({
+ limit: FETCH_ALL_MESSAGES_OPERATION_SIGNATURE.variables.limit,
filter: {
messageId: {
in: messages.map(({ id }) => id),
@@ -136,22 +137,18 @@ export const useEmailThread = (threadId: string | null) => {
loading: replyConnectedAccountLoading,
} = useReplyConnectedAccount(lastMessageChannelId);
- const messagesWithSender: EmailThreadMessageWithSender[] = messages
- .map((message) => {
- const sender = messageSenders.find(
- (messageSender) => messageSender.messageId === message.id,
- );
-
- if (!sender) {
- return null;
- }
-
- return {
- ...message,
- sender,
- };
- })
- .filter(isDefined);
+ const messagesWithSender: EmailThreadMessageWithSender[] = messages.map(
+ (message) => ({
+ ...message,
+ sender:
+ messageSenders.find(
+ (messageSender) => messageSender.messageId === message.id,
+ ) ??
+ message.messageParticipants.find(
+ (participant) => participant.role === MessageParticipantRole.FROM,
+ ),
+ }),
+ );
const messageChannelLoading =
replyConnectedAccountLoading || messageChannelMessageAssociationLoading;
@@ -163,7 +160,7 @@ export const useEmailThread = (threadId: string | null) => {
connectedAccountId,
connectedAccountHandle,
connectedAccountProvider,
- threadLoading: messagesLoading,
+ threadLoading: threadRecordLoading || messagesLoading,
messageChannelLoading,
lastMessageExternalId,
fetchMoreMessages,
diff --git a/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessageWithSender.ts b/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessageWithSender.ts
index 0f9823f65e3..bd0ee3a2e3d 100644
--- a/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessageWithSender.ts
+++ b/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessageWithSender.ts
@@ -2,5 +2,5 @@ import { type EmailThreadMessage } from '@/activities/emails/types/EmailThreadMe
import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
export type EmailThreadMessageWithSender = EmailThreadMessage & {
- sender: EmailThreadMessageParticipant;
+ sender?: EmailThreadMessageParticipant;
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
index 701ea001541..f1b661c9751 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx
@@ -20,6 +20,13 @@ import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import {
+ AnimatedPlaceholder,
+ AnimatedPlaceholderEmptyContainer,
+ AnimatedPlaceholderEmptySubTitle,
+ AnimatedPlaceholderEmptyTextContainer,
+ AnimatedPlaceholderEmptyTitle,
+} from 'twenty-ui/primitives/feedback';
type EmailThreadWidgetProps = {
widget: PageLayoutWidget;
@@ -91,7 +98,7 @@ export const EmailThreadWidget = ({
composerIntent === 'opened' ||
(composerIntent === null && isDefined(trailingDraft));
- if (threadLoading || !thread || !messages.length) {
+ if (threadLoading) {
return (
<StyledWidgetContentContainer>
<WidgetRelationsHeader />
@@ -102,6 +109,27 @@ export const EmailThreadWidget = ({
);
}
+ if (!isDefined(thread) || !isDefined(lastMessage)) {
+ return (
+ <StyledWidgetContentContainer>
+ <WidgetRelationsHeader />
+ <StyledWidgetScrollContainer>
+ <AnimatedPlaceholderEmptyContainer>
+ <AnimatedPlaceholder type="emptyInbox" />
+ <AnimatedPlaceholderEmptyTextContainer>
+ <AnimatedPlaceholderEmptyTitle>
+ {t`No messages to show`}
+ </AnimatedPlaceholderEmptyTitle>
+ <AnimatedPlaceholderEmptySubTitle>
+ {t`The messages in this thread are missing or incomplete.`}
+ </AnimatedPlaceholderEmptySubTitle>
+ </AnimatedPlaceholderEmptyTextContainer>
+ </AnimatedPlaceholderEmptyContainer>
+ </StyledWidgetScrollContainer>
+ </StyledWidgetContentContainer>
+ );
+ }
+
return (
<StyledWidgetContentContainer>
<WidgetRelationsHeader />