Skip to content

The open alternative to Salesforce, designed for AI.

Show the server's send blocker in the campaign send panel (#28360)

neo773d09f3356fd58
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 026eaec1028..475dcfbf193 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -8279,12 +8279,12 @@ export type CreateCalendarEventMutationVariables = Exact<{
export type CreateCalendarEventMutation = { __typename?: 'Mutation', createCalendarEvent: { __typename?: 'CreateCalendarEventOutput', success: boolean, error?: string | null, iCalUid?: string | null, calendarEventId?: string | null, conferenceLink?: string | null } };
-export type PreviewMessageCampaignAudienceQueryVariables = Exact<{
- input: PreviewMessageCampaignAudienceInput;
+export type PreviewMessageCampaignSendQueryVariables = Exact<{
+ input: PreviewMessageCampaignSendInput;
}>;
-export type PreviewMessageCampaignAudienceQuery = { __typename?: 'Query', previewMessageCampaignAudience: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, trackingRefused: number, sendable: number } };
+export type PreviewMessageCampaignSendQuery = { __typename?: 'Query', previewMessageCampaignSend: { __typename?: 'PreviewMessageCampaignSendOutputDTO', audience?: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, trackingRefused: number, sendable: number } | null, blockers: Array<{ __typename?: 'MessageCampaignSendBlockerDTO', code: string, message: string }> } };
export type UnsubscribeTopicsQueryVariables = Exact<{ [key: string]: never; }>;
@@ -11063,7 +11063,7 @@ export const ViewSortFragmentFragmentDoc = {"kind":"Document","definitions":[{"k
export const ViewGroupFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewGroupFragmentFragment, unknown>;
export const ViewFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"View"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isCompact"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"mainGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"shouldHideEmptyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanColumnWidth"}},{"kind":"Field","name":{"kind":"Name","value":"groupLoadLimit"}},{"kind":"Field","name":{"kind":"Name","value":"anyFieldFilterValue"}},{"kind":"Field","name":{"kind":"Name","value":"calendarFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEndFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarLayout"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"createdByUserWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewSorts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewSortFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewGroupFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewField"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFieldGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilter"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"operand"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"relationTargetFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilterGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"parentViewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"logicalOperator"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewSortFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewSort"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewFragmentFragment, unknown>;
export const CreateCalendarEventDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateCalendarEvent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCalendarEventInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCalendarEvent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"iCalUid"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEventId"}},{"kind":"Field","name":{"kind":"Name","value":"conferenceLink"}}]}}]}}]} as unknown as DocumentNode<CreateCalendarEventMutation, CreateCalendarEventMutationVariables>;
-export const PreviewMessageCampaignAudienceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PreviewMessageCampaignAudience"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PreviewMessageCampaignAudienceInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"previewMessageCampaignAudience"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"trackingRefused"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]} as unknown as DocumentNode<PreviewMessageCampaignAudienceQuery, PreviewMessageCampaignAudienceQueryVariables>;
+export const PreviewMessageCampaignSendDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PreviewMessageCampaignSend"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PreviewMessageCampaignSendInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"previewMessageCampaignSend"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"audience"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"trackingRefused"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}},{"kind":"Field","name":{"kind":"Name","value":"blockers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]} as unknown as DocumentNode<PreviewMessageCampaignSendQuery, PreviewMessageCampaignSendQueryVariables>;
export const UnsubscribeTopicsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UnsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}}]}}]}}]} as unknown as DocumentNode<UnsubscribeTopicsQuery, UnsubscribeTopicsQueryVariables>;
export const CancelMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CancelMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"canceledMessageCount"}}]}}]}}]} as unknown as DocumentNode<CancelMessageCampaignMutation, CancelMessageCampaignMutationVariables>;
export const SendEmailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendEmail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendEmailInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendEmail"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"messageThreadId"}}]}}]}}]} as unknown as DocumentNode<SendEmailMutation, SendEmailMutationVariables>;
diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts b/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts
deleted file mode 100644
index 1ca70a6c2bc..00000000000
--- a/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import gql from 'graphql-tag';
-
-export const PREVIEW_MESSAGE_CAMPAIGN_AUDIENCE = gql`
- query PreviewMessageCampaignAudience(
- $input: PreviewMessageCampaignAudienceInput!
- ) {
- previewMessageCampaignAudience(input: $input) {
- totalMembers
- withoutEmail
- duplicateEmails
- hardSuppressed
- globallyUnsubscribed
- topicUnsubscribed
- trackingRefused
- sendable
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignSend.ts b/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignSend.ts
new file mode 100644
index 00000000000..23cd59c49b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignSend.ts
@@ -0,0 +1,22 @@
+import gql from 'graphql-tag';
+
+export const PREVIEW_MESSAGE_CAMPAIGN_SEND = gql`
+ query PreviewMessageCampaignSend($input: PreviewMessageCampaignSendInput!) {
+ previewMessageCampaignSend(input: $input) {
+ audience {
+ totalMembers
+ withoutEmail
+ duplicateEmails
+ hardSuppressed
+ globallyUnsubscribed
+ topicUnsubscribed
+ trackingRefused
+ sendable
+ }
+ blockers {
+ code
+ message
+ }
+ }
+ }
+`;
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
index 9d23830cf03..dd5dc480641 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/usePersistedCampaignDraft.test.tsx
@@ -1,5 +1,6 @@
import { act, renderHook } from '@testing-library/react';
+import { PREVIEW_MESSAGE_CAMPAIGN_SEND } from '@/activities/emails/graphql/metadata-queries/previewMessageCampaignSend';
import { usePersistedCampaignDraft } from '@/activities/emails/hooks/usePersistedCampaignDraft';
const mockUpdateOneRecord = jest.fn().mockResolvedValue({});
@@ -8,6 +9,12 @@ jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({
useUpdateOneRecord: () => ({ updateOneRecord: mockUpdateOneRecord }),
}));
+const mockRefetchQueries = jest.fn().mockResolvedValue([]);
+
+jest.mock('@apollo/client/react', () => ({
+ useApolloClient: () => ({ refetchQueries: mockRefetchQueries }),
+}));
+
const mockEnqueueToast = jest.fn();
jest.mock('twenty-ui/components/feedback', () => ({
@@ -75,6 +82,40 @@ describe('usePersistedCampaignDraft', () => {
expect(result.current.draftResyncKey).toBe(resyncKeyBeforeEcho);
});
+ it('should refresh the send preview once a save lands, and not when it fails', async () => {
+ const { result } = renderDraftHook('');
+
+ act(() => {
+ result.current.updateDraft({ subject: 'Typed locally' });
+ });
+
+ await act(async () => {
+ jest.runOnlyPendingTimers();
+ });
+
+ expect(mockRefetchQueries).toHaveBeenCalledTimes(1);
+ expect(mockRefetchQueries).toHaveBeenCalledWith({
+ include: [PREVIEW_MESSAGE_CAMPAIGN_SEND],
+ });
+
+ mockRefetchQueries.mockClear();
+ mockUpdateOneRecord.mockRejectedValueOnce(new Error('Save failed'));
+
+ act(() => {
+ result.current.updateDraft({ subject: 'Typed again' });
+ });
+
+ await act(async () => {
+ jest.runOnlyPendingTimers();
+ });
+
+ expect(mockRefetchQueries).not.toHaveBeenCalled();
+ expect(mockEnqueueToast).toHaveBeenCalledTimes(1);
+ expect(mockEnqueueToast).toHaveBeenCalledWith(
+ expect.objectContaining({ status: 'error' }),
+ );
+ });
+
it('should let unsaved local edits win over a concurrent remote change', () => {
const { result, rerender } = renderDraftHook('');
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignAudiencePreview.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignAudiencePreview.ts
deleted file mode 100644
index 2cd8439001a..00000000000
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignAudiencePreview.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useQuery } from '@apollo/client/react';
-
-import { isNonEmptyString } from '@sniptt/guards';
-import { isDefined } from 'twenty-shared/utils';
-
-import { PREVIEW_MESSAGE_CAMPAIGN_AUDIENCE } from '@/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience';
-import {
- type PreviewMessageCampaignAudienceQuery,
- type PreviewMessageCampaignAudienceQueryVariables,
-} from '~/generated-metadata/graphql';
-
-type UseCampaignAudiencePreviewArgs = {
- listId: string | null;
- unsubscribeTopicId: string | null;
-};
-
-export const useCampaignAudiencePreview = ({
- listId,
- unsubscribeTopicId,
-}: UseCampaignAudiencePreviewArgs) => {
- const { data, error } = useQuery<
- PreviewMessageCampaignAudienceQuery,
- PreviewMessageCampaignAudienceQueryVariables
- >(PREVIEW_MESSAGE_CAMPAIGN_AUDIENCE, {
- skip: !isNonEmptyString(listId),
- variables: {
- input: {
- listId: listId ?? '',
- unsubscribeTopicId: unsubscribeTopicId ?? undefined,
- },
- },
- fetchPolicy: 'cache-and-network',
- });
-
- return {
- audiencePreview: isDefined(error)
- ? null
- : (data?.previewMessageCampaignAudience ?? null),
- hasFailed: isDefined(error),
- };
-};
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignSendPreview.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignSendPreview.ts
new file mode 100644
index 00000000000..73654fcd6c3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignSendPreview.ts
@@ -0,0 +1,41 @@
+import { useQuery } from '@apollo/client/react';
+import { isNonEmptyString } from '@sniptt/guards';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { PREVIEW_MESSAGE_CAMPAIGN_SEND } from '@/activities/emails/graphql/metadata-queries/previewMessageCampaignSend';
+import {
+ type PreviewMessageCampaignSendQuery,
+ type PreviewMessageCampaignSendQueryVariables,
+} from '~/generated-metadata/graphql';
+
+type UseCampaignSendPreviewArgs = {
+ campaignId: string;
+ scheduledAt: string | null;
+};
+
+export const useCampaignSendPreview = ({
+ campaignId,
+ scheduledAt,
+}: UseCampaignSendPreviewArgs) => {
+ const { data, error } = useQuery<
+ PreviewMessageCampaignSendQuery,
+ PreviewMessageCampaignSendQueryVariables
+ >(PREVIEW_MESSAGE_CAMPAIGN_SEND, {
+ variables: {
+ input: {
+ campaignId,
+ scheduledAt: scheduledAt ?? undefined,
+ },
+ },
+ fetchPolicy: 'cache-and-network',
+ skip: !isNonEmptyString(campaignId),
+ });
+
+ return {
+ sendPreview: isDefined(error)
+ ? null
+ : (data?.previewMessageCampaignSend ?? null),
+ hasFailed: isDefined(error),
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts b/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
index 5f51c135edf..216eeab0ba7 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/usePersistedCampaignDraft.ts
@@ -1,6 +1,8 @@
+import { useApolloClient } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { PREVIEW_MESSAGE_CAMPAIGN_SEND } from '@/activities/emails/graphql/metadata-queries/previewMessageCampaignSend';
import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { useRecordSeededDraft } from '@/object-record/record-seeded-draft/hooks/useRecordSeededDraft';
@@ -21,6 +23,7 @@ export const usePersistedCampaignDraft = <TDraft extends object>({
}: UsePersistedCampaignDraftArgs<TDraft>) => {
const { updateOneRecord } = useUpdateOneRecord();
const { enqueueToast } = useToast();
+ const apolloClient = useApolloClient();
const { draft, updateDraft, flush, draftResyncKey } = useRecordSeededDraft({
upstreamDraft: initialDraft(),
@@ -29,11 +32,18 @@ export const usePersistedCampaignDraft = <TDraft extends object>({
objectNameSingular: CoreObjectNameSingular.MessageCampaign,
idToUpdate: campaignId,
updateOneRecordInput: toUpdateOneRecordInput(nextDraft),
- }).catch(() =>
- enqueueToast({
- status: 'error',
- children: t`Failed to save the campaign`,
- }),
+ }).then(
+ () =>
+ apolloClient
+ .refetchQueries({
+ include: [PREVIEW_MESSAGE_CAMPAIGN_SEND],
+ })
+ .catch(() => undefined),
+ () =>
+ enqueueToast({
+ status: 'error',
+ children: t`Failed to save the campaign`,
+ }),
);
},
});
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
index 8cb3774e020..99887935d92 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx
@@ -110,7 +110,7 @@ export const SettingsUnsubscribersList = () => {
unsubscribeTopicId,
}: Pick<MessageSuppression, 'reason' | 'unsubscribeTopicId'>) => {
if (reason === MessageSuppressionReason.TRACKING) {
- return t`Clicks only`;
+ return t`Opens and clicks only`;
}
if (!isDefined(unsubscribeTopicId)) {
@@ -132,7 +132,7 @@ export const SettingsUnsubscribersList = () => {
<StyledContainer>
<SettingsTableListSection<MessageSuppression>
title={t`Opt-outs`}
- description={t`Email addresses that opted out of campaign emails, a topic, or click tracking`}
+ description={t`Email addresses that opted out of campaign emails, a topic, or open and click tracking`}
toolbar={
<StyledToolbar>
<StyledSearch>
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx
index 202f79a58f0..7d481cea081 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx
@@ -1,14 +1,10 @@
import { plural, t } from '@lingui/core/macro';
-import { isNonEmptyString } from '@sniptt/guards';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { IconSend } from 'twenty-ui/icon';
import { useTheme } from 'twenty-ui/theme';
-import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';
-import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
+import { useCampaignSendPreview } from '@/activities/emails/hooks/useCampaignSendPreview';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
import { sendCampaignCampaignIdComponentState } from '@/side-panel/pages/send-campaign/states/sendCampaignCampaignIdComponentState';
import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -28,16 +24,12 @@ export const SidePanelSendCampaignInfo = ({
sidePanelPageInstanceId,
);
- const { record: campaign } = useFindOneRecord<MessageCampaign>({
- objectNameSingular: CoreObjectNameSingular.MessageCampaign,
- objectRecordId: sendCampaignCampaignId,
- skip: !isNonEmptyString(sendCampaignCampaignId),
+ const { sendPreview } = useCampaignSendPreview({
+ campaignId: sendCampaignCampaignId,
+ scheduledAt: null,
});
- const { audiencePreview } = useCampaignAudiencePreview({
- listId: campaign?.listId ?? null,
- unsubscribeTopicId: campaign?.unsubscribeTopicId ?? null,
- });
+ const audiencePreview = sendPreview?.audience ?? null;
return (
<HeaderIdentifier
diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
index 196f8821370..ae77bc38c61 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
@@ -14,7 +14,7 @@ import { IconClock, IconSend } from 'twenty-ui/icon';
import { Button, Field } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
-import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';
+import { useCampaignSendPreview } from '@/activities/emails/hooks/useCampaignSendPreview';
import { useSendMessageCampaign } from '@/activities/emails/hooks/useSendMessageCampaign';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
import { type CampaignDeliveryTiming } from '@/activities/emails/types/CampaignDeliveryTiming';
@@ -32,7 +32,6 @@ import { SendCampaignRecipientsCard } from '@/side-panel/pages/send-campaign/com
import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { formatDisplayList } from '~/utils/format/formatDisplayList';
const StyledContainer = styled.div`
display: flex;
@@ -76,18 +75,21 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
skip: !hasList,
});
- const { audiencePreview, hasFailed: hasAudiencePreviewFailed } =
- useCampaignAudiencePreview({
- listId: campaign.listId,
- unsubscribeTopicId: campaign.unsubscribeTopicId,
+ const isScheduling = deliveryTiming === 'LATER';
+
+ const { sendPreview, hasFailed: hasSendPreviewFailed } =
+ useCampaignSendPreview({
+ campaignId: campaign.id,
+ scheduledAt: isScheduling ? scheduledAt : null,
});
+ const audiencePreview = sendPreview?.audience ?? null;
+
const listName = isNonEmptyString(list?.name) ? list.name : null;
const topicName =
unsubscribeTopics.find((topic) => topic.id === campaign.unsubscribeTopicId)
?.name ?? null;
- const isScheduling = deliveryTiming === 'LATER';
const isScheduledInTheFuture =
isNonEmptyString(scheduledAt) &&
new Date(scheduledAt).getTime() > Date.now();
@@ -99,35 +101,17 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
hasValidSendTime: isScheduledInTheFuture,
});
- const missingDetails = [
- hasList ? null : t`a list`,
- isNonEmptyString(campaign.fromAddress?.primaryEmail) ? null : t`a sender`,
- isNonEmptyString(campaign.subject) ? null : t`a subject`,
- isNonEmptyString(campaign.bodyTemplate) ? null : t`some content`,
- ].filter(isNonEmptyString);
-
- const hasNoReachableRecipient =
- isDefined(audiencePreview) && audiencePreview.sendable === 0;
-
- const blockingMessage =
- missingDetails.length > 0
- ? t`Add ${formatDisplayList(missingDetails)} before sending.`
- : hasNoReachableRecipient
- ? t`No one on this list can receive this campaign.`
- : null;
-
- const isAudienceSettled =
- isDefined(audiencePreview) || hasAudiencePreviewFailed;
+ const blockingMessage = sendPreview?.blockers[0]?.message ?? null;
const canSend =
+ isDefined(sendPreview) &&
!isDefined(blockingMessage) &&
- isAudienceSettled &&
!hasInvalidSendTime &&
!isSending;
const trackingRefusedHint =
isDefined(audiencePreview) && audiencePreview.trackingRefused > 0
- ? t`${formatNumber(audiencePreview.trackingRefused)} opted out of email tracking, their clicks are not recorded.`
+ ? t`${formatNumber(audiencePreview.trackingRefused)} opted out of email tracking, their opens and clicks are not recorded.`
: null;
const handleDeliveryTimingChange = (timing: CampaignDeliveryTiming) => {
@@ -173,15 +157,16 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
{hasList && (
<FormFieldInputContainer>
<Field.Label>{t`Recipients`}</Field.Label>
- {isDefined(audiencePreview) ? (
+ {isDefined(audiencePreview) && (
<SendCampaignRecipientsCard
audiencePreview={audiencePreview}
listName={listName}
topicName={topicName}
/>
- ) : (
+ )}
+ {!isDefined(sendPreview) && (
<Field.Description>
- {hasAudiencePreviewFailed
+ {hasSendPreviewFailed
? t`Recipient count unavailable`
: t`Counting recipients...`}
</Field.Description>