Skip to content

The open alternative to Salesforce, designed for AI.

feat(campaign): move the campaign envelope fields above the body (#23959)

Félix Malfait96ae37d68502
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx
index 607067c3e9a..5daf1dafba0 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx
@@ -19,15 +19,21 @@ const StyledContainer = styled.div`
display: flex;
flex: 1;
flex-direction: column;
- height: 100%;
+ min-height: 0;
position: relative;
`;
type CampaignBodyFieldProps = {
campaign: MessageCampaign;
+ // Lets the composer follow the canvas: its width is a per-campaign design
+ // setting, and the envelope block above lines up with it.
+ onEditorReady?: (editor: Editor | null) => void;
};
-export const CampaignBodyField = ({ campaign }: CampaignBodyFieldProps) => {
+export const CampaignBodyField = ({
+ campaign,
+ onEditorReady,
+}: CampaignBodyFieldProps) => {
const { body, setBody, flush, draftResyncKey } = useCampaignBodyState({
campaign,
});
@@ -41,8 +47,9 @@ export const CampaignBodyField = ({ campaign }: CampaignBodyFieldProps) => {
(editor: Editor | null) => {
setActiveEmailEditor(editor);
setBodyEditor(editor);
+ onEditorReady?.(editor);
},
- [setActiveEmailEditor],
+ [setActiveEmailEditor, onEditorReady],
);
return (
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx
new file mode 100644
index 00000000000..636672874c3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx
@@ -0,0 +1,35 @@
+import { styled } from '@linaria/react';
+import { type Editor } from '@tiptap/core';
+import { useState } from 'react';
+
+import { CampaignBodyField } from '@/activities/emails/components/CampaignBodyField';
+import { CampaignDetailsFields } from '@/activities/emails/components/CampaignDetailsFields';
+import { useCampaignCanvasWidth } from '@/activities/emails/hooks/useCampaignCanvasWidth';
+import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
+
+const StyledContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ min-height: 0;
+ width: 100%;
+`;
+
+type CampaignComposerProps = {
+ campaign: MessageCampaign;
+};
+
+// The envelope fields and the body are one surface rather than two widgets, so
+// the composer tab keeps a single full-bleed widget: stacking two widgets would
+// box each of them in its own card.
+export const CampaignComposer = ({ campaign }: CampaignComposerProps) => {
+ const [bodyEditor, setBodyEditor] = useState<Editor | null>(null);
+ const canvasWidth = useCampaignCanvasWidth(bodyEditor);
+
+ return (
+ <StyledContainer>
+ <CampaignDetailsFields campaign={campaign} width={canvasWidth} />
+ <CampaignBodyField campaign={campaign} onEditorReady={setBodyEditor} />
+ </StyledContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
index 83dec87d92c..f8ea00c9672 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
@@ -8,27 +8,42 @@ import { isDefined } from 'twenty-shared/utils';
import { type SelectOption } from 'twenty-ui/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+import {
+ CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH,
+ CampaignEnvelopeBox,
+} from '@/activities/emails/components/CampaignEnvelopeBox';
+import { EmailComposerFieldRow } from '@/activities/emails/components/EmailComposerFieldRow';
import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';
import { useCampaignDetailsState } from '@/activities/emails/hooks/useCampaignDetailsState';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';
-import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
import { useMyMessageChannels } from '@/settings/accounts/hooks/useMyMessageChannels';
import { Select } from '@/ui/input/components/Select';
-const StyledFieldsContainer = styled.div`
+const StyledSubjectInput = styled.input`
+ background: transparent;
+ border: none;
+ color: ${themeCssVariables.font.color.primary};
+ font-family: inherit;
+ font-size: ${themeCssVariables.font.size.md};
+ font-weight: ${themeCssVariables.font.weight.regular};
+ outline: none;
+ padding: 0;
+ width: 100%;
+`;
+
+const StyledHints = styled.div`
display: flex;
flex-direction: column;
gap: ${themeCssVariables.spacing[1]};
- padding: ${themeCssVariables.spacing[3]} ${themeCssVariables.spacing[2]};
+ padding: ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[3]};
`;
const StyledHint = styled.div`
color: ${themeCssVariables.font.color.tertiary};
font-size: ${themeCssVariables.font.size.xs};
- padding: ${themeCssVariables.spacing[1]} 0;
`;
type CampaignAudiencePreview = NonNullable<
@@ -64,10 +79,12 @@ const buildAudienceHint = (preview: CampaignAudiencePreview): string => {
type CampaignDetailsFieldsProps = {
campaign: MessageCampaign;
+ width: string;
};
export const CampaignDetailsFields = ({
campaign,
+ width,
}: CampaignDetailsFieldsProps) => {
const detailsState = useCampaignDetailsState({ campaign });
@@ -106,40 +123,59 @@ export const CampaignDetailsFields = ({
}),
);
+ const hasTopicOptions = topicOptions.length > 0;
+
return (
- <StyledFieldsContainer onBlur={() => detailsState.flush()}>
- <FormTextFieldInput
- key={`subject-${detailsState.draftResyncKey}`}
- label={t`Subject`}
- defaultValue={detailsState.subject}
- onChange={detailsState.setSubject}
- placeholder={t`Subject`}
- />
- <Select
- dropdownId="campaign-composer-from-account"
+ <CampaignEnvelopeBox
+ width={width}
+ onBlur={() => detailsState.flush()}
+ below={
+ (isDefined(audiencePreview) || hasTopicOptions) && (
+ <StyledHints>
+ {isDefined(audiencePreview) && (
+ <StyledHint>{buildAudienceHint(audiencePreview)}</StyledHint>
+ )}
+ {hasTopicOptions && (
+ <StyledHint>
+ {t`The unsubscribe topic this email belongs to. Recipients who opted out of it are skipped, and the unsubscribe link is scoped to it.`}
+ </StyledHint>
+ )}
+ </StyledHints>
+ )
+ }
+ >
+ <EmailComposerFieldRow
label={t`From`}
- fullWidth
- value={detailsState.fromAddress}
- options={senderOptions}
- emptyOption={{ label: t`Select a sender`, value: '' }}
- onChange={detailsState.setFromAddress}
- />
- <FormSingleRecordPicker
- key={`list-${detailsState.draftResyncKey}`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ <Select
+ dropdownId="campaign-composer-from-account"
+ fullWidth
+ value={detailsState.fromAddress}
+ options={senderOptions}
+ emptyOption={{ label: t`Select a sender`, value: '' }}
+ onChange={detailsState.setFromAddress}
+ />
+ </EmailComposerFieldRow>
+ <EmailComposerFieldRow
label={t`To`}
- objectNameSingulars={[CoreObjectNameSingular.MessageList]}
- defaultValue={detailsState.listId}
- onChange={detailsState.setListId}
- onCreate={handleCreateList}
- />
- {isDefined(audiencePreview) && (
- <StyledHint>{buildAudienceHint(audiencePreview)}</StyledHint>
- )}
- {topicOptions.length > 0 && (
- <>
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ <FormSingleRecordPicker
+ key={`list-${detailsState.draftResyncKey}`}
+ objectNameSingulars={[CoreObjectNameSingular.MessageList]}
+ defaultValue={detailsState.listId}
+ onChange={detailsState.setListId}
+ onCreate={handleCreateList}
+ />
+ </EmailComposerFieldRow>
+ {hasTopicOptions && (
+ <EmailComposerFieldRow
+ label={t`Unsubscribe topic`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
<Select
dropdownId="campaign-composer-unsubscribe-topic"
- label={t`Unsubscribe topic`}
fullWidth
value={detailsState.unsubscribeTopicId ?? ''}
options={topicOptions}
@@ -148,11 +184,20 @@ export const CampaignDetailsFields = ({
detailsState.setUnsubscribeTopicId(value === '' ? null : value)
}
/>
- <StyledHint>
- {t`The unsubscribe topic this email belongs to. Recipients who opted out of it are skipped, and the unsubscribe link is scoped to it.`}
- </StyledHint>
- </>
+ </EmailComposerFieldRow>
)}
- </StyledFieldsContainer>
+ <EmailComposerFieldRow
+ label={t`Subject`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ <StyledSubjectInput
+ key={`subject-${detailsState.draftResyncKey}`}
+ type="text"
+ aria-label={t`Subject`}
+ defaultValue={detailsState.subject}
+ onChange={(event) => detailsState.setSubject(event.target.value)}
+ />
+ </EmailComposerFieldRow>
+ </CampaignEnvelopeBox>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx
new file mode 100644
index 00000000000..c31c206a4d6
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx
@@ -0,0 +1,60 @@
+import { styled } from '@linaria/react';
+import { type ReactNode } from 'react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+// Widest label the campaign rows use ("Unsubscribe topic"), so every value
+// starts on the same column.
+export const CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH = '116px';
+
+const StyledContainer = styled.div`
+ align-items: center;
+ display: flex;
+ flex-direction: column;
+ flex-shrink: 0;
+ padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[6]} 0;
+ width: 100%;
+`;
+
+// Tracks the body page below rather than the window, so the two read as one
+// centred column. The body backdrop supplies the gap between them.
+const StyledColumn = styled.div<{ $width: string }>`
+ display: flex;
+ flex-direction: column;
+ max-width: ${({ $width }) => $width};
+ min-width: 0;
+ width: 100%;
+`;
+
+const StyledRows = styled.div`
+ background-color: ${themeCssVariables.background.secondary};
+ border: 1px solid ${themeCssVariables.border.color.medium};
+ border-radius: ${themeCssVariables.border.radius.md};
+ display: flex;
+ flex-direction: column;
+ /* Keeps the row hairlines from crossing the rounded corners. */
+ overflow: hidden;
+ width: 100%;
+`;
+
+type CampaignEnvelopeBoxProps = {
+ width: string;
+ children: ReactNode;
+ below?: ReactNode;
+ onBlur?: () => void;
+};
+
+// The shell both campaign headers share, so the draft and the sent view line up
+// on the same column and cannot drift apart.
+export const CampaignEnvelopeBox = ({
+ width,
+ children,
+ below,
+ onBlur,
+}: CampaignEnvelopeBoxProps) => (
+ <StyledContainer onBlur={onBlur}>
+ <StyledColumn $width={width}>
+ <StyledRows>{children}</StyledRows>
+ {below}
+ </StyledColumn>
+ </StyledContainer>
+);
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
new file mode 100644
index 00000000000..5ea7b616d11
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
@@ -0,0 +1,140 @@
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { isDefined, isValidUuid } from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+import {
+ CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH,
+ CampaignEnvelopeBox,
+} from '@/activities/emails/components/CampaignEnvelopeBox';
+import { EmailComposerFieldRow } from '@/activities/emails/components/EmailComposerFieldRow';
+import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
+import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
+import { RecordChip } from '@/object-record/components/RecordChip';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+
+const StyledValue = styled.span`
+ color: ${themeCssVariables.font.color.primary};
+ font-size: ${themeCssVariables.font.size.md};
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+`;
+
+const StyledEmptyValue = styled.span`
+ color: ${themeCssVariables.font.color.light};
+ font-size: ${themeCssVariables.font.size.md};
+`;
+
+type CampaignSentEnvelopeProps = {
+ campaign: MessageCampaign;
+ width: string;
+};
+
+// The sent counterpart of the draft envelope. It deliberately does not reuse
+// CampaignDetailsFields: that component owns the draft persistence state, which
+// has nothing to write for a campaign that has already gone out.
+export const CampaignSentEnvelope = ({
+ campaign,
+ width,
+}: CampaignSentEnvelopeProps) => {
+ const { unsubscribeTopics, loading: areTopicsLoading } =
+ useUnsubscribeTopics();
+
+ // withSoftDeleted so a list deleted after the send still names what the
+ // campaign went to.
+ const hasList = isDefined(campaign.listId) && isValidUuid(campaign.listId);
+
+ const { record: list, loading: isListLoading } = useFindOneRecord({
+ objectNameSingular: CoreObjectNameSingular.MessageList,
+ objectRecordId: campaign.listId ?? '',
+ withSoftDeleted: true,
+ skip: !hasList,
+ });
+
+ // A lookup that returns nothing does not tell us why: the list may be
+ // deleted, hidden by object or row-level permissions, or the query may have
+ // failed — and useFindOneRecord skips entirely without read permission, which
+ // is indistinguishable from an empty result. None of that is knowable here,
+ // so the row reports what is true in every case instead of guessing at one.
+ const isListUnresolved = hasList && !isDefined(list) && !isListLoading;
+
+ const fromAddress = campaign.fromAddress?.primaryEmail;
+ const subject = campaign.subject;
+
+ // The row follows the id the campaign was sent with, not whether the topic
+ // still exists: a topic deleted afterwards must not erase the fact that this
+ // send was scoped to one.
+ const hasUnsubscribeTopic = isDefined(campaign.unsubscribeTopicId);
+
+ const unsubscribeTopic = hasUnsubscribeTopic
+ ? unsubscribeTopics.find(
+ (topic) => topic.id === campaign.unsubscribeTopicId,
+ )
+ : undefined;
+
+ // Same rule as the list row: an id missing from the topics we can see may be
+ // deleted or may simply be one this role cannot read, and the two look alike.
+ const isTopicUnresolved =
+ hasUnsubscribeTopic && !isDefined(unsubscribeTopic) && !areTopicsLoading;
+
+ return (
+ <CampaignEnvelopeBox width={width}>
+ <EmailComposerFieldRow
+ label={t`From`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ {isNonEmptyString(fromAddress) ? (
+ <StyledValue>{fromAddress}</StyledValue>
+ ) : (
+ <StyledEmptyValue>{t`No sender`}</StyledEmptyValue>
+ )}
+ </EmailComposerFieldRow>
+ <EmailComposerFieldRow
+ label={t`To`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ {isDefined(list) ? (
+ <RecordChip
+ record={list}
+ objectNameSingular={CoreObjectNameSingular.MessageList}
+ />
+ ) : !hasList ? (
+ <StyledEmptyValue>{t`No list`}</StyledEmptyValue>
+ ) : (
+ isListUnresolved && (
+ <StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>
+ )
+ )}
+ </EmailComposerFieldRow>
+ {hasUnsubscribeTopic && (
+ <EmailComposerFieldRow
+ label={t`Unsubscribe topic`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ {isDefined(unsubscribeTopic) ? (
+ <StyledValue>
+ {unsubscribeTopic.name ?? t`Untitled topic`}
+ </StyledValue>
+ ) : (
+ isTopicUnresolved && (
+ <StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>
+ )
+ )}
+ </EmailComposerFieldRow>
+ )}
+ <EmailComposerFieldRow
+ label={t`Subject`}
+ labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
+ >
+ {isNonEmptyString(subject) ? (
+ <StyledValue>{subject}</StyledValue>
+ ) : (
+ <StyledEmptyValue>{t`No subject`}</StyledEmptyValue>
+ )}
+ </EmailComposerFieldRow>
+ </CampaignEnvelopeBox>
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx
index c6f66443ee9..40afc633f24 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx
@@ -1,16 +1,28 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { type Editor } from '@tiptap/core';
+import { useState } from 'react';
-import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
+import { CampaignSentEnvelope } from '@/activities/emails/components/CampaignSentEnvelope';
import { EmailEditorCanvas } from '@/activities/emails/editor/components/EmailEditorCanvas';
import { CAMPAIGN_BODY_EDITOR_PROFILE } from '@/activities/emails/editor/constants/CampaignBodyEditorProfile';
+import { useCampaignCanvasWidth } from '@/activities/emails/hooks/useCampaignCanvasWidth';
+import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';
const StyledContainer = styled.div`
display: flex;
- flex: 1;
flex-direction: column;
height: 100%;
+ min-height: 0;
+ width: 100%;
+`;
+
+const StyledBody = styled.div`
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ min-height: 0;
`;
type CampaignSentPreviewProps = {
@@ -18,15 +30,22 @@ type CampaignSentPreviewProps = {
};
export const CampaignSentPreview = ({ campaign }: CampaignSentPreviewProps) => {
+ const [bodyEditor, setBodyEditor] = useState<Editor | null>(null);
+ const canvasWidth = useCampaignCanvasWidth(bodyEditor);
+
return (
<StyledContainer>
- <FormAdvancedTextFieldInput
- defaultValue={campaign.bodyTemplate}
- readonly
- profile={CAMPAIGN_BODY_EDITOR_PROFILE}
- EditorComponent={EmailEditorCanvas}
- placeholder={t`No content`}
- />
+ <CampaignSentEnvelope campaign={campaign} width={canvasWidth} />
+ <StyledBody>
+ <FormAdvancedTextFieldInput
+ defaultValue={campaign.bodyTemplate}
+ readonly
+ profile={CAMPAIGN_BODY_EDITOR_PROFILE}
+ EditorComponent={EmailEditorCanvas}
+ placeholder={t`No content`}
+ onEditorReady={setBodyEditor}
+ />
+ </StyledBody>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx
index 20ed2655f94..9942eb49af4 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx
@@ -20,11 +20,12 @@ const StyledRow = styled.div`
}
`;
-const StyledLabel = styled.span`
+const StyledLabel = styled.span<{ $minWidth: string | undefined }>`
color: ${themeCssVariables.font.color.tertiary};
flex-shrink: 0;
font-size: ${themeCssVariables.font.size.md};
font-weight: ${themeCssVariables.font.weight.regular};
+ min-width: ${({ $minWidth }) => $minWidth ?? 'auto'};
`;
const StyledContent = styled.div`
@@ -38,6 +39,9 @@ type EmailComposerFieldRowProps = {
label: string;
children: ReactNode;
trailing?: ReactNode;
+ // A floor, not a fixed width: mixed-length labels line up without a long
+ // translation running underneath its control.
+ labelMinWidth?: string;
};
// The visible label is a plain span, so it cannot be associated with whatever
@@ -47,9 +51,12 @@ export const EmailComposerFieldRow = ({
label,
children,
trailing,
+ labelMinWidth,
}: EmailComposerFieldRowProps) => (
<StyledRow role="group" aria-label={label}>
- <StyledLabel aria-hidden="true">{label}</StyledLabel>
+ <StyledLabel aria-hidden="true" $minWidth={labelMinWidth}>
+ {label}
+ </StyledLabel>
<StyledContent>{children}</StyledContent>
{trailing}
</StyledRow>
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.ts
new file mode 100644
index 00000000000..1312552fe7f
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.ts
@@ -0,0 +1,24 @@
+import { type Editor } from '@tiptap/core';
+import { useEditorState } from '@tiptap/react';
+import {
+ CANVAS_THEME_DEFAULTS,
+ isDefined,
+ resolveCanvasTheme,
+} from 'twenty-shared/utils';
+
+// The body renders as a centred page whose width the Design panel writes onto
+// the document, so the envelope block above it reads that width rather than
+// assuming the default. Falls back to the default until the editor mounts,
+// which is the same value for a campaign that never changed its design.
+export const useCampaignCanvasWidth = (editor: Editor | null): string => {
+ const canvasWidth = useEditorState({
+ editor,
+ selector: ({ editor: currentEditor }) =>
+ isDefined(currentEditor)
+ ? (resolveCanvasTheme(currentEditor.state.doc.attrs.canvasTheme)
+ ?.width ?? CANVAS_THEME_DEFAULTS.width)
+ : CANVAS_THEME_DEFAULTS.width,
+ });
+
+ return canvasWidth ?? CANVAS_THEME_DEFAULTS.width;
+};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
index 4997596ce70..cb17ff117fd 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
@@ -2,6 +2,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { useCurrentPageLayoutOrThrow } from '@/page-layout/hooks/useCurrentPageLayoutOrThrow';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
import { usePageLayoutTabsFilteredByFeatureFlags } from '@/page-layout/hooks/usePageLayoutTabsFilteredByFeatureFlags';
+import { useWidgetVisibilityContext } from '@/page-layout/hooks/useWidgetVisibilityContext';
import { getTabsByDisplayMode } from '@/page-layout/utils/getTabsByDisplayMode';
import { getTabsRenderableForTargetObject } from '@/page-layout/utils/getTabsRenderableForTargetObject';
import { getTabsWithVisibleWidgets } from '@/page-layout/utils/getTabsWithVisibleWidgets';
@@ -19,6 +20,7 @@ export const usePageLayoutRenderableTabs = () => {
usePageLayoutTabsFilteredByFeatureFlags();
const isPageLayoutInEditMode = useIsPageLayoutInEditMode();
const { objectMetadataItems } = useObjectMetadataItems();
+ const widgetVisibilityContext = useWidgetVisibilityContext();
const targetObjectMetadataItem = isDefined(targetRecordIdentifier)
? objectMetadataItems.find(
@@ -29,9 +31,8 @@ export const usePageLayoutRenderableTabs = () => {
const tabsWithVisibleWidgets = getTabsWithVisibleWidgets({
tabs: featureFilteredPageLayoutTabs,
- isMobile,
- isInSidePanel,
isEditMode: isPageLayoutInEditMode,
+ context: widgetVisibilityContext,
});
// Edit mode keeps every tab visible (like getTabsWithVisibleWidgets) so a
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
index 3b1aa2ca330..c062a431ce0 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
@@ -1,33 +1,19 @@
-import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
import { usePageLayoutTabsFilteredByFeatureFlags } from '@/page-layout/hooks/usePageLayoutTabsFilteredByFeatureFlags';
+import { useWidgetVisibilityContext } from '@/page-layout/hooks/useWidgetVisibilityContext';
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
export const usePageLayoutTabWithVisibleWidgetsOrThrow = (
tabId: string,
): PageLayoutTab => {
- const isMobile = useIsMobile();
- const { isInSidePanel, targetRecordIdentifier } = useLayoutRenderingContext();
const isPageLayoutInEditMode = useIsPageLayoutInEditMode();
const { featureFilteredPageLayoutTabs } =
usePageLayoutTabsFilteredByFeatureFlags();
-
- const targetRecordStatus = useAtomFamilySelectorValue(
- recordStoreFamilySelector,
- { recordId: targetRecordIdentifier?.id ?? '', fieldName: 'status' },
- );
-
- const selectedRecords = isDefined(targetRecordIdentifier)
- ? [{ id: targetRecordIdentifier.id, status: targetRecordStatus }]
- : [];
+ const widgetVisibilityContext = useWidgetVisibilityContext();
const tab = featureFilteredPageLayoutTabs.find((tab) => tab.id === tabId);
@@ -47,15 +33,9 @@ export const usePageLayoutTabWithVisibleWidgetsOrThrow = (
};
}
- const context = buildWidgetVisibilityContext({
- isMobile,
- isInSidePanel,
- selectedRecords,
- });
-
const visibleWidgets = filterVisibleWidgets({
widgets: activeWidgets,
- context,
+ context: widgetVisibilityContext,
});
return {
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts b/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts
new file mode 100644
index 00000000000..c97f8bf0e86
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useWidgetVisibilityContext.ts
@@ -0,0 +1,32 @@
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
+import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
+import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
+import { useMemo } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { useIsMobile } from 'twenty-ui/utilities';
+
+// The one place widget visibility is derived. Every consumer reads the same
+// context, so a widget cannot be visible to one caller and hidden from another
+// — which is what makes "is this widget last in its tab" agree with "which
+// widgets does this tab render".
+export const useWidgetVisibilityContext = (): WidgetVisibilityContext => {
+ const isMobile = useIsMobile();
+ const { isInSidePanel, targetRecordIdentifier } = useLayoutRenderingContext();
+
+ const recordStore = useAtomFamilyStateValue(
+ recordStoreFamilyState,
+ targetRecordIdentifier?.id ?? '',
+ );
+
+ return useMemo(
+ () =>
+ buildWidgetVisibilityContext({
+ isMobile,
+ isInSidePanel,
+ targetRecord: isDefined(recordStore) ? recordStore : undefined,
+ }),
+ [isMobile, isInSidePanel, recordStore],
+ );
+};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildWidgetVisibilityContext.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildWidgetVisibilityContext.test.ts
index 5de0b885e0c..e18765426d5 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildWidgetVisibilityContext.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildWidgetVisibilityContext.test.ts
@@ -37,11 +37,11 @@ describe('buildWidgetVisibilityContext', () => {
expect(result).toEqual({ device: 'DESKTOP', selectedRecords: [] });
});
- it('should pass through selectedRecords', () => {
+ it('should expose the target record as a single-record selection', () => {
const result = buildWidgetVisibilityContext({
isMobile: false,
isInSidePanel: false,
- selectedRecords: [{ id: 'a', status: 'DRAFT' }],
+ targetRecord: { id: 'a', status: 'DRAFT' },
});
expect(result).toEqual({
@@ -49,4 +49,14 @@ describe('buildWidgetVisibilityContext', () => {
selectedRecords: [{ id: 'a', status: 'DRAFT' }],
});
});
+
+ it('should expose an empty selection when there is no target record', () => {
+ const result = buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ targetRecord: undefined,
+ });
+
+ expect(result.selectedRecords).toEqual([]);
+ });
});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
index 678f2559ac2..f7be51ec688 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
@@ -1,4 +1,5 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
+import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
import { getTabsWithVisibleWidgets } from '@/page-layout/utils/getTabsWithVisibleWidgets';
import {
WidgetConfigurationType,
@@ -71,9 +72,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(2);
@@ -95,9 +98,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(1);
@@ -121,9 +126,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(1);
@@ -139,9 +146,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(1);
@@ -154,9 +163,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(1);
@@ -179,9 +190,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: true,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(3);
@@ -200,9 +213,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: true,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(1);
@@ -216,9 +231,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: true,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(2);
@@ -240,9 +257,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: true,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(2);
@@ -255,9 +274,11 @@ describe('getTabsWithVisibleWidgets', () => {
it('should handle empty tabs array', () => {
const result = getTabsWithVisibleWidgets({
tabs: [],
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(0);
@@ -276,9 +297,11 @@ describe('getTabsWithVisibleWidgets', () => {
getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(tabs).toHaveLength(originalLength);
@@ -312,9 +335,11 @@ describe('getTabsWithVisibleWidgets', () => {
const result = getTabsWithVisibleWidgets({
tabs,
- isMobile: false,
- isInSidePanel: false,
isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
});
expect(result).toHaveLength(2);
@@ -324,4 +349,96 @@ describe('getTabsWithVisibleWidgets', () => {
expect(result[1].widgets).toHaveLength(2);
});
});
+
+ describe('with record-gated widgets', () => {
+ const createRecordGatedWidget = (
+ id: string,
+ conditionalAvailabilityExpression: string,
+ ): PageLayoutTab['widgets'][0] => ({
+ ...createMockWidget(id),
+ conditionalAvailabilityExpression,
+ });
+
+ // The campaign layout's sent-only gate. `noneEquals` rather than
+ // `not everyEquals`: the two agree on a loaded record, but an empty
+ // selection makes the first false and the second true, and the selection is
+ // empty until the record loads.
+ const sentOnlyTab = () =>
+ createMockTab('sent-only', [
+ createRecordGatedWidget(
+ 'widget-1',
+ 'noneEquals(selectedRecords, "status", "DRAFT")',
+ ),
+ ]);
+
+ it('should drop a tab whose widgets are all gated out by the selected record', () => {
+ const result = getTabsWithVisibleWidgets({
+ tabs: [sentOnlyTab(), createMockTab('always', [createMockWidget('w')])],
+ isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ targetRecord: { id: 'record-1', status: 'DRAFT' },
+ }),
+ });
+
+ expect(result).toHaveLength(1);
+ expect(result[0].id).toBe('always');
+ });
+
+ it('should keep a tab whose widgets the selected record allows', () => {
+ const result = getTabsWithVisibleWidgets({
+ tabs: [sentOnlyTab(), createMockTab('always', [createMockWidget('w')])],
+ isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ targetRecord: { id: 'record-1', status: 'SENT' },
+ }),
+ });
+
+ expect(result).toHaveLength(2);
+ expect(result[0].id).toBe('sent-only');
+ });
+
+ // The record store answers after the first render, so every campaign page
+ // load passes through this state: it must not show a tab it is about to
+ // take away. The second tab keeps the all-tabs-empty fallback, which would
+ // return the first tab regardless, from hiding the result.
+ it('should drop a record-gated tab while no record is given', () => {
+ const result = getTabsWithVisibleWidgets({
+ tabs: [sentOnlyTab(), createMockTab('always', [createMockWidget('w')])],
+ isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
+ });
+
+ expect(result).toHaveLength(1);
+ expect(result[0].id).toBe('always');
+ });
+
+ it('should drop a positively gated tab while no record is given', () => {
+ const result = getTabsWithVisibleWidgets({
+ tabs: [
+ createMockTab('draft-only', [
+ createRecordGatedWidget(
+ 'widget-1',
+ 'everyEquals(selectedRecords, "status", "DRAFT")',
+ ),
+ ]),
+ createMockTab('always', [createMockWidget('w')]),
+ ],
+ isEditMode: false,
+ context: buildWidgetVisibilityContext({
+ isMobile: false,
+ isInSidePanel: false,
+ }),
+ });
+
+ expect(result).toHaveLength(1);
+ expect(result[0].id).toBe('always');
+ });
+ });
});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/buildWidgetVisibilityContext.ts b/packages/twenty-front/src/modules/page-layout/utils/buildWidgetVisibilityContext.ts
index 822652b245d..5605261e677 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/buildWidgetVisibilityContext.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/buildWidgetVisibilityContext.ts
@@ -1,18 +1,28 @@
import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
+import { isDefined } from 'twenty-shared/utils';
type BuildWidgetVisibilityContextParams = {
isMobile: boolean;
isInSidePanel: boolean;
- selectedRecords?: Record<string, unknown>[];
+ // Deliberately the context's own record shape rather than ObjectRecord: the
+ // expression evaluator reads arbitrary fields by name and never needs the
+ // GraphQL metadata a full record carries.
+ targetRecord?: Record<string, unknown>;
};
export const buildWidgetVisibilityContext = ({
isMobile,
isInSidePanel,
- selectedRecords = [],
+ targetRecord,
}: BuildWidgetVisibilityContextParams): WidgetVisibilityContext => {
return {
device: isMobile || isInSidePanel ? 'MOBILE' : 'DESKTOP',
- selectedRecords,
+ // A record page has one record, but the expression language names this
+ // variable for list views where a selection can hold several. It stays
+ // plural so page layouts and command menu items keep one shared grammar.
+ // An absent record yields an empty selection, on which record predicates
+ // are false — so a widget gated on the record stays hidden until it loads
+ // rather than appearing and being taken away.
+ selectedRecords: isDefined(targetRecord) ? [targetRecord] : [],
};
};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts b/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
index 832f7a63b0a..a5a86238373 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
@@ -1,19 +1,17 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
+import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
type GetTabsWithVisibleWidgetsParams = {
tabs: PageLayoutTab[];
- isMobile: boolean;
- isInSidePanel: boolean;
isEditMode: boolean;
+ context: WidgetVisibilityContext;
};
export const getTabsWithVisibleWidgets = ({
tabs,
- isMobile,
- isInSidePanel,
isEditMode,
+ context,
}: GetTabsWithVisibleWidgetsParams): PageLayoutTab[] => {
const activeTabs = tabs.filter((tab) => tab.isActive);
@@ -21,8 +19,6 @@ export const getTabsWithVisibleWidgets = ({
return activeTabs;
}
- const context = buildWidgetVisibilityContext({ isMobile, isInSidePanel });
-
const tabsWithFilteredWidgets = activeTabs.map((tab) => ({
...tab,
widgets: filterVisibleWidgets({ widgets: tab.widgets, context }),
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
index dd1059b567f..d67f94f707c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
@@ -11,7 +11,6 @@ import { FrontComponentWidgetRenderer } from '@/page-layout/widgets/front-compon
import { GraphWidgetRenderer } from '@/page-layout/widgets/graph/components/GraphWidgetRenderer';
import { IframeWidget } from '@/page-layout/widgets/iframe/components/IframeWidget';
import { MessageCampaignBodyWidget } from '@/page-layout/widgets/message-campaign/components/MessageCampaignBodyWidget';
-import { MessageCampaignDetailsWidget } from '@/page-layout/widgets/message-campaign/components/MessageCampaignDetailsWidget';
import { NoteWidget } from '@/page-layout/widgets/notes/components/NoteWidget';
import { StandaloneRichTextWidgetRenderer } from '@/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidgetRenderer';
import { TaskWidget } from '@/page-layout/widgets/tasks/components/TaskWidget';
@@ -87,9 +86,6 @@ export const WidgetContentRenderer = ({
case WidgetType.MESSAGE_CAMPAIGN_BODY:
return <MessageCampaignBodyWidget />;
- case WidgetType.MESSAGE_CAMPAIGN_DETAILS:
- return <MessageCampaignDetailsWidget />;
-
case WidgetType.CALL_RECORDING_TRANSCRIPT:
return <CallRecordingTranscriptWidget />;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts
index 3d924f755c4..1979519a3d3 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts
@@ -1,18 +1,15 @@
import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
-import { buildWidgetVisibilityContext } from '@/page-layout/utils/buildWidgetVisibilityContext';
+import { useWidgetVisibilityContext } from '@/page-layout/hooks/useWidgetVisibilityContext';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
export const useIsCurrentWidgetLastOfTab = (widgetId: string): boolean => {
const { currentPageLayout } = useCurrentPageLayout();
- const isMobile = useIsMobile();
- const { isInSidePanel } = useLayoutRenderingContext();
const isPageLayoutInEditMode = useIsPageLayoutInEditMode();
+ const widgetVisibilityContext = useWidgetVisibilityContext();
if (!isDefined(currentPageLayout)) {
return false;
@@ -30,7 +27,7 @@ export const useIsCurrentWidgetLastOfTab = (widgetId: string): boolean => {
? tab.widgets
: filterVisibleWidgets({
widgets: tab.widgets,
- context: buildWidgetVisibilityContext({ isMobile, isInSidePanel }),
+ context: widgetVisibilityContext,
});
const visibleWidgets =
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignBodyWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignBodyWidget.tsx
index c2756d0b4de..cd12aa450fe 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignBodyWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignBodyWidget.tsx
@@ -1,6 +1,6 @@
import { isDefined } from 'twenty-shared/utils';
-import { CampaignBodyField } from '@/activities/emails/components/CampaignBodyField';
+import { CampaignComposer } from '@/activities/emails/components/CampaignComposer';
import { CampaignSentPreview } from '@/activities/emails/components/CampaignSentPreview';
import { useTargetMessageCampaign } from '@/activities/emails/hooks/useTargetMessageCampaign';
@@ -12,7 +12,7 @@ export const MessageCampaignBodyWidget = () => {
}
return isDraft ? (
- <CampaignBodyField key={campaign.id} campaign={campaign} />
+ <CampaignComposer key={campaign.id} campaign={campaign} />
) : (
<CampaignSentPreview key={campaign.id} campaign={campaign} />
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignDetailsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignDetailsWidget.tsx
deleted file mode 100644
index 4e5711e2523..00000000000
--- a/packages/twenty-front/src/modules/page-layout/widgets/message-campaign/components/MessageCampaignDetailsWidget.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { CampaignDetailsFields } from '@/activities/emails/components/CampaignDetailsFields';
-import { useTargetMessageCampaign } from '@/activities/emails/hooks/useTargetMessageCampaign';
-
-export const MessageCampaignDetailsWidget = () => {
- const { campaign, isDraft } = useTargetMessageCampaign();
-
- // The widget is also gated on DRAFT by its conditionalAvailabilityExpression;
- // this keeps the fields out of page layout edit mode on a sent campaign.
- if (!isDefined(campaign) || !isDraft) {
- return null;
- }
-
- return <CampaignDetailsFields key={campaign.id} campaign={campaign} />;
-};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-25/2-25-workspace-command-1785229940000-add-message-campaign-composer-tab.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-25/2-25-workspace-command-1785229940000-add-message-campaign-composer-tab.command.ts
index 287687df315..0029942d705 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-25/2-25-workspace-command-1785229940000-add-message-campaign-composer-tab.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-25/2-25-workspace-command-1785229940000-add-message-campaign-composer-tab.command.ts
@@ -77,18 +77,6 @@ const HOME_FIELDS_WIDGET_UNIVERSAL_IDENTIFIER =
.universalIdentifier,
);
-const HOME_DETAILS_WIDGET_UNIVERSAL_IDENTIFIER =
- toPre231RecordPageUniversalIdentifier(
- MESSAGE_CAMPAIGN_RECORD_PAGE_LAYOUT.tabs.home.widgets.details
- .universalIdentifier,
- );
-
-const HOME_LIST_WIDGET_UNIVERSAL_IDENTIFIER =
- toPre231RecordPageUniversalIdentifier(
- MESSAGE_CAMPAIGN_RECORD_PAGE_LAYOUT.tabs.home.widgets.list
- .universalIdentifier,
- );
-
const HOME_RECIPIENTS_WIDGET_UNIVERSAL_IDENTIFIER =
toPre231RecordPageUniversalIdentifier(
MESSAGE_CAMPAIGN_RECORD_PAGE_LAYOUT.tabs.home.widgets.recipients
@@ -172,15 +160,17 @@ export class AddMessageCampaignComposerTabCommand extends ProvisionedWorkspaceCo
],
});
+ // Every identifier here must still exist in the standard layout:
+ // getStandardFlatEntitiesToCreateOrThrow resolves against the current
+ // standard maps and throws when one is absent, failing the upgrade for
+ // every workspace crossing this version.
const pageLayoutWidgetsToCreate =
getStandardFlatEntitiesToCreateOrThrow<FlatPageLayoutWidget>({
standardFlatEntityMaps:
standardAllFlatEntityMaps.flatPageLayoutWidgetMaps,
existingFlatEntityMaps: flatPageLayoutWidgetMaps,
universalIdentifiers: [
- HOME_DETAILS_WIDGET_UNIVERSAL_IDENTIFIER,
COMPOSER_WIDGET_UNIVERSAL_IDENTIFIER,
- HOME_LIST_WIDGET_UNIVERSAL_IDENTIFIER,
HOME_RECIPIENTS_WIDGET_UNIVERSAL_IDENTIFIER,
HOME_FIELDS_WIDGET_UNIVERSAL_IDENTIFIER,
],
@@ -234,9 +224,7 @@ export class AddMessageCampaignComposerTabCommand extends ProvisionedWorkspaceCo
: [];
const pageLayoutWidgetsToUpdate = [
- HOME_DETAILS_WIDGET_UNIVERSAL_IDENTIFIER,
HOME_FIELDS_WIDGET_UNIVERSAL_IDENTIFIER,
- HOME_LIST_WIDGET_UNIVERSAL_IDENTIFIER,
HOME_RECIPIENTS_WIDGET_UNIVERSAL_IDENTIFIER,
]
.map((universalIdentifier) => {
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-upgrade-version-command.module.ts
index 4c9c4036c5f..2bf0fbe0fea 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-upgrade-version-command.module.ts
@@ -6,6 +6,7 @@ import { AddCalendarEventCallRecordingTabCommand } from 'src/database/commands/u
import { ReconcileStandardRecordPageCommand } from 'src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786437481000-reconcile-standard-record-page.command';
import { ReconcileWorkspaceCustomRecordPageCommand } from 'src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786437481500-reconcile-workspace-custom-record-page.command';
import { BackfillRecordPageCommand } from 'src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786437482000-backfill-record-page.command';
+import { TrimMessageCampaignRecordPageCommand } from 'src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786456707000-trim-message-campaign-record-page.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@@ -26,6 +27,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
ReconcileStandardRecordPageCommand,
ReconcileWorkspaceCustomRecordPageCommand,
BackfillRecordPageCommand,
+ TrimMessageCampaignRecordPageCommand,
],
})
export class V2_31_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786456707000-trim-message-campaign-record-page.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786456707000-trim-message-campaign-record-page.command.ts
new file mode 100644
index 00000000000..a0167a26a75
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-31/2-31-workspace-command-1786456707000-trim-message-campaign-record-page.command.ts
@@ -0,0 +1,172 @@
+import { Command } from 'nest-commander';
+
+import { STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const MESSAGE_CAMPAIGN_PAGE_LAYOUT_UNIVERSAL_IDENTIFIER =
+ STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.messageCampaignRecordPage
+ .universalIdentifier;
+
+const HOME_WIDGETS =
+ STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.messageCampaignRecordPage.tabs.home
+ .widgets;
+
+// details: its fields now sit above the body in the composer.
+// list: the envelope above the sent body already names the list it went to.
+const REMOVED_WIDGET_UNIVERSAL_IDENTIFIERS = [
+ HOME_WIDGETS.details.universalIdentifier,
+ HOME_WIDGETS.list.universalIdentifier,
+];
+
+// The widgets that stay move from "not everyEquals" to "noneEquals". The two
+// agree on a loaded record, but an empty selection makes the first true and the
+// second false, and the selection is empty until the record loads.
+const SENT_ONLY_WIDGET_UNIVERSAL_IDENTIFIERS = [
+ HOME_WIDGETS.fields.universalIdentifier,
+ HOME_WIDGETS.recipients.universalIdentifier,
+];
+
+@RegisteredWorkspaceCommand('2.31.0', 1786456707000)
+@Command({
+ name: 'upgrade:2-31:trim-message-campaign-record-page',
+ description:
+ 'Removes the message campaign details and list widgets, both of which the envelope above the body now covers, and makes the widgets that stay fail closed while the record loads',
+})
+export class TrimMessageCampaignRecordPageCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const isDryRun = options.dryRun ?? false;
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const { flatPageLayoutMaps, flatPageLayoutWidgetMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatPageLayoutMaps',
+ 'flatPageLayoutWidgetMaps',
+ ]);
+
+ const existingPageLayout =
+ flatPageLayoutMaps.byUniversalIdentifier[
+ MESSAGE_CAMPAIGN_PAGE_LAYOUT_UNIVERSAL_IDENTIFIER
+ ];
+
+ if (!isDefined(existingPageLayout)) {
+ this.logger.log(
+ `Message campaign page layout does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =
+ computeTwentyStandardApplicationAllFlatEntityMaps({
+ now: new Date().toISOString(),
+ workspaceId,
+ twentyStandardApplicationId: twentyStandardFlatApplication.id,
+ });
+
+ const pageLayoutWidgetsToDelete = REMOVED_WIDGET_UNIVERSAL_IDENTIFIERS.map(
+ (universalIdentifier) =>
+ flatPageLayoutWidgetMaps.byUniversalIdentifier[universalIdentifier],
+ ).filter((widget): widget is FlatPageLayoutWidget => isDefined(widget));
+
+ const pageLayoutWidgetsToUpdate = SENT_ONLY_WIDGET_UNIVERSAL_IDENTIFIERS.map(
+ (universalIdentifier) => {
+ const existingWidget =
+ flatPageLayoutWidgetMaps.byUniversalIdentifier[universalIdentifier];
+ const standardWidget =
+ standardAllFlatEntityMaps.flatPageLayoutWidgetMaps
+ .byUniversalIdentifier[universalIdentifier];
+
+ if (
+ !isDefined(existingWidget) ||
+ !isDefined(standardWidget) ||
+ existingWidget.conditionalAvailabilityExpression ===
+ standardWidget.conditionalAvailabilityExpression
+ ) {
+ return null;
+ }
+
+ return {
+ ...existingWidget,
+ conditionalAvailabilityExpression:
+ standardWidget.conditionalAvailabilityExpression,
+ };
+ },
+ ).filter((widget): widget is FlatPageLayoutWidget => isDefined(widget));
+
+ const totalOperationCount =
+ pageLayoutWidgetsToDelete.length + pageLayoutWidgetsToUpdate.length;
+
+ if (totalOperationCount === 0) {
+ this.logger.log(
+ `Message campaign record page already up to date for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Applying ${totalOperationCount} message campaign record page operation(s) for workspace ${workspaceId}`,
+ );
+
+ if (isDryRun) {
+ return;
+ }
+
+ const validateAndBuildResult =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ isSystemBuild: true,
+ applicationUniversalIdentifier:
+ twentyStandardFlatApplication.universalIdentifier,
+ workspaceId,
+ allFlatEntityOperationByMetadataName: {
+ pageLayoutWidget: {
+ flatEntityToCreate: [],
+ flatEntityToDelete: pageLayoutWidgetsToDelete,
+ flatEntityToUpdate: pageLayoutWidgetsToUpdate,
+ },
+ },
+ },
+ );
+
+ if (validateAndBuildResult.status === 'fail') {
+ throw new Error(
+ `Failed to update the message campaign record page for workspace ${workspaceId}: ${JSON.stringify(
+ validateAndBuildResult,
+ null,
+ 2,
+ )}`,
+ );
+ }
+
+ this.logger.log(
+ `Updated the message campaign record page for workspace ${workspaceId}`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
index 154497607b4..bd498dc19f7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
@@ -226,12 +226,6 @@ export const WIDGET_PROPS = {
gridPosition: GRID_POSITIONS.RICH_TEXT,
position: VERTICAL_LIST_LAYOUT_POSITIONS.FIRST,
},
- messageCampaignDetails: {
- title: 'Details',
- type: WidgetType.MESSAGE_CAMPAIGN_DETAILS,
- gridPosition: GRID_POSITIONS.FULL_WIDTH,
- position: VERTICAL_LIST_LAYOUT_POSITIONS.FIRST,
- },
workflowVersion: {
title: 'Flow',
type: WidgetType.WORKFLOW_VERSION,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-page-layout-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-page-layout-metadata-related-entity-ids.util.spec.ts.snap
index d0dd9b9ad73..a05c5309397 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-page-layout-metadata-related-entity-ids.util.spec.ts.snap
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-page-layout-metadata-related-entity-ids.util.spec.ts.snap
@@ -192,119 +192,113 @@ exports[`getStandardPageLayoutMetadataRelatedEntityIds should return standard pa
"id": "00000000-0000-0000-0000-000000000057",
"tabs": {
"composer": {
- "id": "00000000-0000-0000-0000-000000000063",
+ "id": "00000000-0000-0000-0000-000000000061",
"widgets": {
"messageCampaign": {
- "id": "00000000-0000-0000-0000-000000000064",
+ "id": "00000000-0000-0000-0000-000000000062",
},
},
},
"home": {
"id": "00000000-0000-0000-0000-000000000058",
"widgets": {
- "details": {
- "id": "00000000-0000-0000-0000-000000000059",
- },
"fields": {
- "id": "00000000-0000-0000-0000-000000000062",
- },
- "list": {
"id": "00000000-0000-0000-0000-000000000060",
},
"recipients": {
- "id": "00000000-0000-0000-0000-000000000061",
+ "id": "00000000-0000-0000-0000-000000000059",
},
},
},
},
},
"messageChannelMessageAssociationMessageFolderRecordPage": {
- "id": "00000000-0000-0000-0000-000000000070",
+ "id": "00000000-0000-0000-0000-000000000068",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000071",
+ "id": "00000000-0000-0000-0000-000000000069",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000072",
+ "id": "00000000-0000-0000-0000-000000000070",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000073",
+ "id": "00000000-0000-0000-0000-000000000071",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000074",
+ "id": "00000000-0000-0000-0000-000000000072",
},
},
},
},
},
"messageChannelMessageAssociationRecordPage": {
- "id": "00000000-0000-0000-0000-000000000065",
+ "id": "00000000-0000-0000-0000-000000000063",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000066",
+ "id": "00000000-0000-0000-0000-000000000064",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000067",
+ "id": "00000000-0000-0000-0000-000000000065",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000068",
+ "id": "00000000-0000-0000-0000-000000000066",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000069",
+ "id": "00000000-0000-0000-0000-000000000067",
},
},
},
},
},
"messageListRecordPage": {
- "id": "00000000-0000-0000-0000-000000000080",
+ "id": "00000000-0000-0000-0000-000000000078",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000081",
+ "id": "00000000-0000-0000-0000-000000000079",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000082",
+ "id": "00000000-0000-0000-0000-000000000080",
},
"members": {
- "id": "00000000-0000-0000-0000-000000000083",
+ "id": "00000000-0000-0000-0000-000000000081",
},
},
},
},
},
"messageParticipantRecordPage": {
- "id": "00000000-0000-0000-0000-000000000075",
+ "id": "00000000-0000-0000-0000-000000000073",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000076",
+ "id": "00000000-0000-0000-0000-000000000074",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000077",
+ "id": "00000000-0000-0000-0000-000000000075",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000078",
+ "id": "00000000-0000-0000-0000-000000000076",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000079",
+ "id": "00000000-0000-0000-0000-000000000077",
},
},
},
},
},
"messageThreadRecordPage": {
- "id": "00000000-0000-0000-0000-000000000084",
+ "id": "00000000-0000-0000-0000-000000000082",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000085",
+ "id": "00000000-0000-0000-0000-000000000083",
"widgets": {
"emailThread": {
- "id": "00000000-0000-0000-0000-000000000086",
+ "id": "00000000-0000-0000-0000-000000000084",
},
},
},
@@ -345,302 +339,302 @@ exports[`getStandardPageLayoutMetadataRelatedEntityIds should return standard pa
},
},
"noteRecordPage": {
- "id": "00000000-0000-0000-0000-000000000087",
+ "id": "00000000-0000-0000-0000-000000000085",
"tabs": {
"files": {
- "id": "00000000-0000-0000-0000-000000000095",
+ "id": "00000000-0000-0000-0000-000000000093",
"widgets": {
"files": {
- "id": "00000000-0000-0000-0000-000000000096",
+ "id": "00000000-0000-0000-0000-000000000094",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000088",
+ "id": "00000000-0000-0000-0000-000000000086",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000089",
+ "id": "00000000-0000-0000-0000-000000000087",
},
"noteRichText": {
- "id": "00000000-0000-0000-0000-000000000090",
+ "id": "00000000-0000-0000-0000-000000000088",
},
},
},
"note": {
- "id": "00000000-0000-0000-0000-000000000091",
+ "id": "00000000-0000-0000-0000-000000000089",
"widgets": {
"noteRichText": {
- "id": "00000000-0000-0000-0000-000000000092",
+ "id": "00000000-0000-0000-0000-000000000090",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000093",
+ "id": "00000000-0000-0000-0000-000000000091",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000094",
+ "id": "00000000-0000-0000-0000-000000000092",
},
},
},
},
},
"opportunityRecordPage": {
- "id": "00000000-0000-0000-0000-000000000097",
+ "id": "00000000-0000-0000-0000-000000000095",
"tabs": {
"calendar": {
- "id": "00000000-0000-0000-0000-000000000113",
+ "id": "00000000-0000-0000-0000-000000000111",
"widgets": {
"calendar": {
- "id": "00000000-0000-0000-0000-000000000114",
+ "id": "00000000-0000-0000-0000-000000000112",
},
},
},
"emails": {
- "id": "00000000-0000-0000-0000-000000000111",
+ "id": "00000000-0000-0000-0000-000000000109",
"widgets": {
"emails": {
- "id": "00000000-0000-0000-0000-000000000112",
+ "id": "00000000-0000-0000-0000-000000000110",
},
},
},
"files": {
- "id": "00000000-0000-0000-0000-000000000109",
+ "id": "00000000-0000-0000-0000-000000000107",
"widgets": {
"files": {
- "id": "00000000-0000-0000-0000-000000000110",
+ "id": "00000000-0000-0000-0000-000000000108",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000098",
+ "id": "00000000-0000-0000-0000-000000000096",
"widgets": {
"company": {
- "id": "00000000-0000-0000-0000-000000000101",
+ "id": "00000000-0000-0000-0000-000000000099",
},
"fields": {
- "id": "00000000-0000-0000-0000-000000000099",
+ "id": "00000000-0000-0000-0000-000000000097",
},
"owner": {
- "id": "00000000-0000-0000-0000-000000000102",
+ "id": "00000000-0000-0000-0000-000000000100",
},
"pointOfContact": {
- "id": "00000000-0000-0000-0000-000000000100",
+ "id": "00000000-0000-0000-0000-000000000098",
},
},
},
"notes": {
- "id": "00000000-0000-0000-0000-000000000107",
+ "id": "00000000-0000-0000-0000-000000000105",
"widgets": {
"notes": {
- "id": "00000000-0000-0000-0000-000000000108",
+ "id": "00000000-0000-0000-0000-000000000106",
},
},
},
"tasks": {
- "id": "00000000-0000-0000-0000-000000000105",
+ "id": "00000000-0000-0000-0000-000000000103",
"widgets": {
"tasks": {
- "id": "00000000-0000-0000-0000-000000000106",
+ "id": "00000000-0000-0000-0000-000000000104",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000103",
+ "id": "00000000-0000-0000-0000-000000000101",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000104",
+ "id": "00000000-0000-0000-0000-000000000102",
},
},
},
},
},
"personRecordPage": {
- "id": "00000000-0000-0000-0000-000000000115",
+ "id": "00000000-0000-0000-0000-000000000113",
"tabs": {
"calendar": {
- "id": "00000000-0000-0000-0000-000000000131",
+ "id": "00000000-0000-0000-0000-000000000129",
"widgets": {
"calendar": {
- "id": "00000000-0000-0000-0000-000000000132",
+ "id": "00000000-0000-0000-0000-000000000130",
},
},
},
"emails": {
- "id": "00000000-0000-0000-0000-000000000129",
+ "id": "00000000-0000-0000-0000-000000000127",
"widgets": {
"emails": {
- "id": "00000000-0000-0000-0000-000000000130",
+ "id": "00000000-0000-0000-0000-000000000128",
},
},
},
"files": {
- "id": "00000000-0000-0000-0000-000000000127",
+ "id": "00000000-0000-0000-0000-000000000125",
"widgets": {
"files": {
- "id": "00000000-0000-0000-0000-000000000128",
+ "id": "00000000-0000-0000-0000-000000000126",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000116",
+ "id": "00000000-0000-0000-0000-000000000114",
"widgets": {
"company": {
- "id": "00000000-0000-0000-0000-000000000118",
+ "id": "00000000-0000-0000-0000-000000000116",
},
"fields": {
- "id": "00000000-0000-0000-0000-000000000117",
+ "id": "00000000-0000-0000-0000-000000000115",
},
"listMemberships": {
- "id": "00000000-0000-0000-0000-000000000120",
+ "id": "00000000-0000-0000-0000-000000000118",
},
"pointOfContactForOpportunities": {
- "id": "00000000-0000-0000-0000-000000000119",
+ "id": "00000000-0000-0000-0000-000000000117",
},
},
},
"notes": {
- "id": "00000000-0000-0000-0000-000000000125",
+ "id": "00000000-0000-0000-0000-000000000123",
"widgets": {
"notes": {
- "id": "00000000-0000-0000-0000-000000000126",
+ "id": "00000000-0000-0000-0000-000000000124",
},
},
},
"tasks": {
- "id": "00000000-0000-0000-0000-000000000123",
+ "id": "00000000-0000-0000-0000-000000000121",
"widgets": {
"tasks": {
- "id": "00000000-0000-0000-0000-000000000124",
+ "id": "00000000-0000-0000-0000-000000000122",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000121",
+ "id": "00000000-0000-0000-0000-000000000119",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000122",
+ "id": "00000000-0000-0000-0000-000000000120",
},
},
},
},
},
"taskRecordPage": {
- "id": "00000000-0000-0000-0000-000000000133",
+ "id": "00000000-0000-0000-0000-000000000131",
"tabs": {
"files": {
- "id": "00000000-0000-0000-0000-000000000141",
+ "id": "00000000-0000-0000-0000-000000000139",
"widgets": {
"files": {
- "id": "00000000-0000-0000-0000-000000000142",
+ "id": "00000000-0000-0000-0000-000000000140",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000134",
+ "id": "00000000-0000-0000-0000-000000000132",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000135",
+ "id": "00000000-0000-0000-0000-000000000133",
},
"taskRichText": {
- "id": "00000000-0000-0000-0000-000000000136",
+ "id": "00000000-0000-0000-0000-000000000134",
},
},
},
"note": {
- "id": "00000000-0000-0000-0000-000000000137",
+ "id": "00000000-0000-0000-0000-000000000135",
"widgets": {
"taskRichText": {
- "id": "00000000-0000-0000-0000-000000000138",
+ "id": "00000000-0000-0000-0000-000000000136",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000139",
+ "id": "00000000-0000-0000-0000-000000000137",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000140",
+ "id": "00000000-0000-0000-0000-000000000138",
},
},
},
},
},
"workflowAutomatedTriggerRecordPage": {
- "id": "00000000-0000-0000-0000-000000000146",
+ "id": "00000000-0000-0000-0000-000000000144",
"tabs": {
"home": {
- "id": "00000000-0000-0000-0000-000000000147",
+ "id": "00000000-0000-0000-0000-000000000145",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000148",
+ "id": "00000000-0000-0000-0000-000000000146",
},
},
},
"timeline": {
- "id": "00000000-0000-0000-0000-000000000149",
+ "id": "00000000-0000-0000-0000-000000000147",
"widgets": {
"timeline": {
- "id": "00000000-0000-0000-0000-000000000150",
+ "id": "00000000-0000-0000-0000-000000000148",
},
},
},
},
},
"workflowRecordPage": {
- "id": "00000000-0000-0000-0000-000000000143",
+ "id": "00000000-0000-0000-0000-000000000141",
"tabs": {
"flow": {
- "id": "00000000-0000-0000-0000-000000000144",
+ "id": "00000000-0000-0000-0000-000000000142",
"widgets": {
"workflow": {
- "id": "00000000-0000-0000-0000-000000000145",
+ "id": "00000000-0000-0000-0000-000000000143",
},
},
},
},
},
"workflowRunRecordPage": {
- "id": "00000000-0000-0000-0000-000000000157",
+ "id": "00000000-0000-0000-0000-000000000155",
"tabs": {
"flow": {
- "id": "00000000-0000-0000-0000-000000000161",
+ "id": "00000000-0000-0000-0000-000000000159",
"widgets": {
"workflowRun": {
- "id": "00000000-0000-0000-0000-000000000162",
+ "id": "00000000-0000-0000-0000-000000000160",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000158",
+ "id": "00000000-0000-0000-0000-000000000156",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000159",
+ "id": "00000000-0000-0000-0000-000000000157",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000160",
+ "id": "00000000-0000-0000-0000-000000000158",
},
},
},
},
},
"workflowVersionRecordPage": {
- "id": "00000000-0000-0000-0000-000000000151",
+ "id": "00000000-0000-0000-0000-000000000149",
"tabs": {
"flow": {
- "id": "00000000-0000-0000-0000-000000000155",
+ "id": "00000000-0000-0000-0000-000000000153",
"widgets": {
"workflowVersion": {
- "id": "00000000-0000-0000-0000-000000000156",
+ "id": "00000000-0000-0000-0000-000000000154",
},
},
},
"home": {
- "id": "00000000-0000-0000-0000-000000000152",
+ "id": "00000000-0000-0000-0000-000000000150",
"widgets": {
"fields": {
- "id": "00000000-0000-0000-0000-000000000153",
+ "id": "00000000-0000-0000-0000-000000000151",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000154",
+ "id": "00000000-0000-0000-0000-000000000152",
},
},
},
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-config/standard-message-campaign-page-layout.config.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-config/standard-message-campaign-page-layout.config.ts
index d7ec05db85a..f0cf11d66f8 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-config/standard-message-campaign-page-layout.config.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-config/standard-message-campaign-page-layout.config.ts
@@ -23,27 +23,6 @@ const MESSAGE_CAMPAIGN_PAGE_TABS = {
.home.universalIdentifier,
...TAB_PROPS.home,
widgets: {
- details: {
- universalIdentifier:
- STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.messageCampaignRecordPage
- .tabs.home.widgets.details.universalIdentifier,
- ...WIDGET_PROPS.messageCampaignDetails,
- conditionalAvailabilityExpression:
- 'everyEquals(selectedRecords, "status", "DRAFT")',
- },
- list: {
- universalIdentifier:
- STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.messageCampaignRecordPage
- .tabs.home.widgets.list.universalIdentifier,
- title: 'List',
- type: WidgetType.FIELD,
- gridPosition: GRID_POSITIONS.FULL_WIDTH,
- position: VERTICAL_LIST_LAYOUT_POSITIONS.THIRD,
- fieldUniversalIdentifier:
- STANDARD_OBJECTS.messageCampaign.fields.list.universalIdentifier,
- conditionalAvailabilityExpression:
- 'not everyEquals(selectedRecords, "status", "DRAFT")',
- },
recipients: {
universalIdentifier:
STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.messageCampaignRecordPage
@@ -56,7 +35,7 @@ const MESSAGE_CAMPAIGN_PAGE_TABS = {
STANDARD_OBJECTS.messageCampaign.fields.recipients
.universalIdentifier,
conditionalAvailabilityExpression:
- 'not everyEquals(selectedRecords, "status", "DRAFT")',
+ 'noneEquals(selectedRecords, "status", "DRAFT")',
},
fields: {
universalIdentifier:
@@ -65,7 +44,7 @@ const MESSAGE_CAMPAIGN_PAGE_TABS = {
...WIDGET_PROPS.fields,
position: VERTICAL_LIST_LAYOUT_POSITIONS.SECOND,
conditionalAvailabilityExpression:
- 'not everyEquals(selectedRecords, "status", "DRAFT")',
+ 'noneEquals(selectedRecords, "status", "DRAFT")',
},
},
},