Skip to content

The open alternative to Salesforce, designed for AI.

Edit campaign variable fallbacks from the chip (#27916)

neo773b45b37c87409
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 36aa5ad7fda..66987e8683e 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx
@@ -1,9 +1,13 @@
import { styled } from '@linaria/react';
+import { type Editor } from '@tiptap/core';
+import { useCallback } from 'react';
+import { isDefined } from 'twenty-shared/utils';
import { useCampaignBodyState } from '@/activities/emails/hooks/useCampaignBodyState';
import { EmailEditorCanvas } from '@/activities/emails/editor/components/EmailEditorCanvas';
import { CAMPAIGN_BODY_EDITOR_PROFILE } from '@/activities/emails/editor/constants/CampaignBodyEditorProfile';
import { useUploadEmailImage } from '@/activities/emails/hooks/useUploadEmailImage';
+import { activeEmailCampaignIdState } from '@/activities/emails/states/activeEmailCampaignIdState';
import { activeEmailEditorState } from '@/activities/emails/states/activeEmailEditorState';
import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';
@@ -25,8 +29,17 @@ export const CampaignBodyField = ({ campaign }: CampaignBodyFieldProps) => {
campaign,
});
const setActiveEmailEditor = useSetAtomState(activeEmailEditorState);
+ const setActiveEmailCampaignId = useSetAtomState(activeEmailCampaignIdState);
const { uploadEmailImage } = useUploadEmailImage();
+ const handleEditorReady = useCallback(
+ (editor: Editor | null) => {
+ setActiveEmailEditor(editor);
+ setActiveEmailCampaignId(isDefined(editor) ? campaign.id : null);
+ },
+ [setActiveEmailEditor, setActiveEmailCampaignId, campaign.id],
+ );
+
return (
<StyledContainer onBlur={() => flush()}>
<FormAdvancedTextFieldInput
@@ -35,7 +48,7 @@ export const CampaignBodyField = ({ campaign }: CampaignBodyFieldProps) => {
onChange={setBody}
profile={CAMPAIGN_BODY_EDITOR_PROFILE}
EditorComponent={EmailEditorCanvas}
- onEditorReady={setActiveEmailEditor}
+ onEditorReady={handleEditorReady}
onImageUpload={uploadEmailImage}
/>
</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 11510b15b3f..f79e24e2155 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { useId, useRef } from 'react';
+import { useId } from 'react';
import {
CoreObjectNameSingular,
MessageChannelType,
@@ -13,21 +13,18 @@ import { type SelectOption } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
-import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';
import { CampaignEnvelopeBox } from '@/activities/emails/components/CampaignEnvelopeBox';
+import { CampaignVariablePicker } from '@/activities/emails/components/CampaignVariablePicker';
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 { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
import { useMyMessageChannels } from '@/settings/accounts/hooks/useMyMessageChannels';
import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';
import { Select } from '@/ui/input/components/Select';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
-import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
-import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
-import { useRemoveFocusItemFromFocusStackOnUnmount } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount';
-import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
const StyledWarningContainer = styled.div`
padding: ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[3]};
@@ -45,36 +42,11 @@ export const CampaignDetailsFields = ({
}: CampaignDetailsFieldsProps) => {
const detailsState = useCampaignDetailsState({ campaign });
const instanceId = useId();
- const subjectFocusId = `campaign-subject-input-${instanceId}`;
const listDropdownId = `campaign-list-picker-${instanceId}`;
- const subjectInputRef = useRef<HTMLInputElement>(null);
const { openDropdown } = useOpenDropdown();
const openDropdownById = (dropdownId: string) =>
openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });
- const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();
- const { removeFocusItemFromFocusStackById } =
- useRemoveFocusItemFromFocusStackById();
- useRemoveFocusItemFromFocusStackOnUnmount({
- focusId: subjectFocusId,
- isEnabled: true,
- });
-
- const handleSubjectFocus = () =>
- pushFocusItemToFocusStack({
- focusId: subjectFocusId,
- component: {
- type: FocusComponentType.FORM_FIELD_INPUT,
- instanceId: subjectFocusId,
- },
- globalHotkeysConfig: {
- enableGlobalHotkeysConflictingWithKeyboard: false,
- },
- });
-
- const handleSubjectBlur = () =>
- removeFocusItemFromFocusStackById({ focusId: subjectFocusId });
-
const { channels } = useMyMessageChannels();
const { unsubscribeTopics } = useUnsubscribeTopics();
const { createOneRecord: createMessageList } = useCreateOneRecord({
@@ -204,20 +176,15 @@ export const CampaignDetailsFields = ({
/>
</ComposerFieldRow>
)}
- <ComposerFieldRow
- label={t`Subject`}
- onClick={() => subjectInputRef.current?.focus()}
- >
- <StyledComposerTextInput
+ <ComposerFieldRow label={t`Subject`}>
+ <FormTextFieldInput
key={`subject-${detailsState.draftResyncKey}`}
- ref={subjectInputRef}
- type="text"
- aria-label={t`Subject`}
+ ariaLabel={t`Subject`}
placeholder={t`Add a subject`}
defaultValue={detailsState.subject}
- onChange={(event) => detailsState.setSubject(event.target.value)}
- onFocus={handleSubjectFocus}
- onBlur={handleSubjectBlur}
+ onChange={detailsState.setSubject}
+ VariablePicker={CampaignVariablePicker}
+ enableTemplateVariableFallback
/>
</ComposerFieldRow>
</CampaignEnvelopeBox>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignVariablePicker.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignVariablePicker.tsx
new file mode 100644
index 00000000000..d3c3bdb8566
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignVariablePicker.tsx
@@ -0,0 +1,77 @@
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { Dropdown } from 'twenty-ui/components/navigation';
+import { IconVariable, IconVariablePlus } from 'twenty-ui/icon';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
+
+import { useCampaignEmailEditorVariables } from '@/activities/emails/hooks/useCampaignEmailEditorVariables';
+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';
+import { type VariablePickerComponent } from '@/ui/input/types/VariablePickerComponent';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
+
+const StyledCampaignVariablePickerContainer = styled.div`
+ align-items: center;
+ background-color: ${themeCssVariables.background.transparent.lighter};
+ border: 1px solid ${themeCssVariables.border.color.medium};
+ border-radius: 0 ${themeCssVariables.border.radius.sm}
+ ${themeCssVariables.border.radius.sm} 0;
+ color: ${themeCssVariables.font.color.tertiary};
+ cursor: pointer;
+ display: flex;
+ justify-content: center;
+ padding: ${themeCssVariables.spacing[2]};
+
+ &:hover {
+ background-color: ${themeCssVariables.background.transparent.light};
+ }
+`;
+
+export const CampaignVariablePicker: VariablePickerComponent = ({
+ instanceId,
+ disabled,
+ onVariableSelect,
+}) => {
+ const { t } = useLingui();
+ const theme = useTheme();
+ const { variables, formatTemplateVariableWithExistingFallback } =
+ useCampaignEmailEditorVariables();
+
+ return (
+ <DropdownRoot
+ dropdownId={`campaign-variable-picker-${instanceId}`}
+ type="picker"
+ >
+ <Dropdown.Trigger
+ aria-label={t`Insert variable`}
+ nativeButton={false}
+ disabled={disabled}
+ render={<StyledCampaignVariablePickerContainer />}
+ >
+ <IconVariablePlus size={theme.icon.size.md} />
+ </Dropdown.Trigger>
+ <DropdownContent
+ align="end"
+ sideOffset={4}
+ width={GenericDropdownContentWidth.Large}
+ >
+ <Dropdown.Section scrollable>
+ {variables.map(({ label, name }) => (
+ <Dropdown.OptionItem
+ key={name}
+ startIcon={<SelectOptionIcon Icon={IconVariable} />}
+ onSelect={() =>
+ onVariableSelect(
+ formatTemplateVariableWithExistingFallback(name),
+ )
+ }
+ >
+ {label}
+ </Dropdown.OptionItem>
+ ))}
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/__stories__/CampaignVariablePicker.stories.tsx b/packages/twenty-front/src/modules/activities/emails/components/__stories__/CampaignVariablePicker.stories.tsx
new file mode 100644
index 00000000000..d4cf94e2445
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/__stories__/CampaignVariablePicker.stories.tsx
@@ -0,0 +1,36 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+
+import { CampaignVariablePicker } from '@/activities/emails/components/CampaignVariablePicker';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
+
+const meta: Meta<typeof CampaignVariablePicker> = {
+ title: 'Modules/Activities/Emails/CampaignVariablePicker',
+ component: CampaignVariablePicker,
+ decorators: [ComponentDecorator, ObjectMetadataItemsDecorator],
+ args: {
+ instanceId: 'campaign-variable-picker-story',
+ onVariableSelect: fn(),
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof CampaignVariablePicker>;
+
+export const Default: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Insert variable' }),
+ );
+
+ await userEvent.click(await body.findByText('Full name'));
+
+ await waitFor(() => {
+ expect(args.onVariableSelect).toHaveBeenCalledWith('{{fullName}}');
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts b/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts
index d4c1ef8ec34..31672b711e6 100644
--- a/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts
+++ b/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts
@@ -1,6 +1,6 @@
import { EmailThemedDocument } from '@/activities/emails/editor/extensions/EmailThemedDocument';
-import { CampaignVariableTag } from '@/activities/emails/editor/extensions/campaign-variables/CampaignVariableTag';
import { BlockDragAndDrop } from '@/advanced-text-editor/extensions/BlockDragAndDrop';
+import { TemplateVariableWithFallbackTag } from '@/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackTag';
import { ADVANCED_TEXT_EDITOR_BLOCK_EXTENSIONS } from '@/advanced-text-editor/constants/AdvancedTextEditorBlockExtensions';
import { type AdvancedTextEditorProfile } from '@/advanced-text-editor/types/AdvancedTextEditorProfile';
import { buildFullRichTextExtensions } from '@/advanced-text-editor/utils/buildFullRichTextExtensions';
@@ -13,7 +13,7 @@ export const CAMPAIGN_BODY_EDITOR_PROFILE = {
documentExtension: EmailThemedDocument,
buildExtensions: (context) => [
...buildFullRichTextExtensions(context),
- CampaignVariableTag,
+ TemplateVariableWithFallbackTag,
...ADVANCED_TEXT_EDITOR_BLOCK_EXTENSIONS,
BlockDragAndDrop,
],
diff --git a/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableChip.tsx b/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableChip.tsx
deleted file mode 100644
index 55dc9f43b4b..00000000000
--- a/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableChip.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { VariableChip } from '@/advanced-text-editor/extensions/variable-tag/VariableChip';
-import { type NodeViewProps } from '@tiptap/react';
-
-type CampaignVariableChipProps = NodeViewProps;
-
-export const CampaignVariableChip = ({
- deleteNode,
- editor,
- node,
-}: CampaignVariableChipProps) => {
- const variable =
- typeof node.attrs.variable === 'string' ? node.attrs.variable : '';
-
- return (
- <VariableChip deleteNode={deleteNode} editor={editor} label={variable} />
- );
-};
diff --git a/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableTag.ts b/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableTag.ts
deleted file mode 100644
index b157bc3c994..00000000000
--- a/packages/twenty-front/src/modules/activities/emails/editor/extensions/campaign-variables/CampaignVariableTag.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ReactNodeViewRenderer } from '@tiptap/react';
-
-import { CampaignVariableChip } from '@/activities/emails/editor/extensions/campaign-variables/CampaignVariableChip';
-import { VariableTag } from '@/advanced-text-editor/extensions/variable-tag/VariableTag';
-
-export const CampaignVariableTag = VariableTag.extend({
- addNodeView() {
- return ReactNodeViewRenderer(CampaignVariableChip);
- },
-});
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignEmailEditorVariables.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignEmailEditorVariables.ts
index fe9f94f634d..f35bb43a0c7 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignEmailEditorVariables.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignEmailEditorVariables.ts
@@ -1,7 +1,17 @@
+import { activeEmailCampaignIdState } from '@/activities/emails/states/activeEmailCampaignIdState';
+import { activeEmailEditorState } from '@/activities/emails/states/activeEmailEditorState';
+import { findTemplateVariableFallbacksByName } from '@/advanced-text-editor/utils/findTemplateVariableFallbacksByName';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
+import { isString } from '@sniptt/guards';
import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { listCampaignVariablesForFields } from 'twenty-shared/utils';
+import {
+ formatTemplateVariableWithFallback,
+ listCampaignVariablesForFields,
+} from 'twenty-shared/utils';
export const useCampaignEmailEditorVariables = () => {
const { t } = useLingui();
@@ -9,15 +19,50 @@ export const useCampaignEmailEditorVariables = () => {
useObjectMetadataItem({
objectNameSingular: CoreObjectNameSingular.Person,
});
+ const activeEmailCampaignId = useAtomStateValue(activeEmailCampaignIdState);
+ const activeEmailEditor = useAtomStateValue(activeEmailEditorState);
+ const subject = useAtomFamilySelectorValue(recordStoreFamilySelector, {
+ recordId: activeEmailCampaignId ?? '',
+ fieldName: 'subject',
+ });
const variables = [
...listCampaignVariablesForFields(personObjectMetadataItem.fields, {
firstName: t`First name`,
lastName: t`Last name`,
- }).map(({ label, name }) => ({ label, value: `{{${name}}}` })),
- { label: t`Full name`, value: '{{fullName}}' },
- { label: t`Person ID`, value: '{{personId}}' },
+ }).map(({ label, name }) => ({ label, name })),
+ { label: t`Full name`, name: 'fullName' },
+ { label: t`Person ID`, name: 'personId' },
];
- return { variables };
+ const findExistingFallbacksByName = () =>
+ findTemplateVariableFallbacksByName({
+ rawContent: isString(subject) ? subject : '',
+ editorContent: activeEmailEditor?.getJSON(),
+ });
+
+ const formatTemplateVariableWithExistingFallback = (name: string) =>
+ formatTemplateVariableWithFallback({
+ name,
+ fallback: findExistingFallbacksByName().get(name),
+ });
+
+ const listVariablesWithExistingFallback = () => {
+ const existingFallbacksByName = findExistingFallbacksByName();
+
+ return variables.map(({ label, name }) => ({
+ label,
+ name,
+ rawTemplateVariable: formatTemplateVariableWithFallback({
+ name,
+ fallback: existingFallbacksByName.get(name),
+ }),
+ }));
+ };
+
+ return {
+ variables,
+ formatTemplateVariableWithExistingFallback,
+ listVariablesWithExistingFallback,
+ };
};
diff --git a/packages/twenty-front/src/modules/activities/emails/states/activeEmailCampaignIdState.ts b/packages/twenty-front/src/modules/activities/emails/states/activeEmailCampaignIdState.ts
new file mode 100644
index 00000000000..fff688dca93
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/states/activeEmailCampaignIdState.ts
@@ -0,0 +1,6 @@
+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
+
+export const activeEmailCampaignIdState = createAtomState<string | null>({
+ key: 'activeEmailCampaignIdState',
+ defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdownForm.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdownForm.tsx
index c2d6ddc74c0..eeeb7a62e68 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdownForm.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdownForm.tsx
@@ -1,11 +1,8 @@
+import { TextInputDropdownForm } from '@/advanced-text-editor/components/TextInputDropdownForm';
import { type EditLinkEditor } from '@/advanced-text-editor/types/EditLinkEditor';
-import { TextInput } from '@/ui/input/components/TextInput';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
-import { useState, type FocusEvent, type FormEvent } from 'react';
import { getSafeUrl } from 'twenty-shared/utils';
type EditLinkDropdownFormProps = {
@@ -18,21 +15,9 @@ export const EditLinkDropdownForm = ({
editor,
}: EditLinkDropdownFormProps) => {
const { t } = useLingui();
- const [value, setValue] = useState(defaultValue);
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- );
const { closeDropdown } = useCloseDropdown();
- const handleSubmit = (
- event: FormEvent<HTMLFormElement> | FocusEvent<HTMLInputElement>,
- ) => {
- event.preventDefault();
-
- if (!isDropdownOpen) {
- return;
- }
-
+ const handleSubmit = (value: string) => {
if (!isNonEmptyString(value)) {
closeDropdown();
editor.chain().focus().extendMarkRange('link').unsetLink().run();
@@ -50,15 +35,10 @@ export const EditLinkDropdownForm = ({
};
return (
- <form onSubmit={handleSubmit}>
- <TextInput
- aria-label={t`Enter link`}
- placeholder={t`Enter link`}
- value={value}
- onChange={setValue}
- onBlur={handleSubmit}
- autoFocus
- />
- </form>
+ <TextInputDropdownForm
+ defaultValue={defaultValue}
+ label={t`Enter link`}
+ onSubmit={handleSubmit}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TextInputDropdownForm.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TextInputDropdownForm.tsx
new file mode 100644
index 00000000000..bbbb842cad3
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TextInputDropdownForm.tsx
@@ -0,0 +1,46 @@
+import { TextInput } from '@/ui/input/components/TextInput';
+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useState, type FocusEvent, type FormEvent } from 'react';
+
+type TextInputDropdownFormProps = {
+ defaultValue: string;
+ label: string;
+ onSubmit: (value: string) => void;
+};
+
+export const TextInputDropdownForm = ({
+ defaultValue,
+ label,
+ onSubmit,
+}: TextInputDropdownFormProps) => {
+ const [value, setValue] = useState(defaultValue);
+ const isDropdownOpen = useAtomComponentStateValue(
+ isDropdownOpenComponentState,
+ );
+
+ const handleSubmit = (
+ event: FormEvent<HTMLFormElement> | FocusEvent<HTMLInputElement>,
+ ) => {
+ event.preventDefault();
+
+ if (!isDropdownOpen) {
+ return;
+ }
+
+ onSubmit(value);
+ };
+
+ return (
+ <form onSubmit={handleSubmit}>
+ <TextInput
+ aria-label={label}
+ placeholder={label}
+ value={value}
+ onChange={setValue}
+ onBlur={handleSubmit}
+ autoFocus
+ />
+ </form>
+ );
+};
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackChip.tsx b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackChip.tsx
new file mode 100644
index 00000000000..94b55701889
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackChip.tsx
@@ -0,0 +1,131 @@
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString, isString } from '@sniptt/guards';
+import { NodeViewWrapper, type NodeViewProps } from '@tiptap/react';
+import { useId } from 'react';
+import {
+ formatTemplateVariableWithFallback,
+ isDefined,
+ parseTemplateVariableWithFallback,
+} from 'twenty-shared/utils';
+import { Dropdown } from 'twenty-ui/components/navigation';
+import { IconAlertTriangle } from 'twenty-ui/icon';
+import { Tooltip } from 'twenty-ui/primitives/surfaces';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
+
+import { TextInputDropdownForm } from '@/advanced-text-editor/components/TextInputDropdownForm';
+import { VariableChip } from '@/advanced-text-editor/extensions/variable-tag/VariableChip';
+import { BaseChip } from '@/ui/input/components/BaseChip';
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
+
+const StyledWrapper = styled.span`
+ display: inline-block;
+ padding-inline: ${themeCssVariables.spacing[0.5]};
+`;
+
+const StyledMissingFallbackIcon = styled.span`
+ display: flex;
+`;
+
+type TemplateVariableWithFallbackChipProps = NodeViewProps;
+
+export const TemplateVariableWithFallbackChip = ({
+ deleteNode,
+ editor,
+ node,
+ updateAttributes,
+}: TemplateVariableWithFallbackChipProps) => {
+ const { t } = useLingui();
+ const theme = useTheme();
+ const dropdownId = `template-variable-fallback-dropdown-${useId()}`;
+ const { closeDropdown } = useCloseDropdown();
+
+ const rawTemplateVariable = isString(node.attrs.variable)
+ ? node.attrs.variable
+ : '';
+ const templateVariableWithFallback =
+ parseTemplateVariableWithFallback(rawTemplateVariable);
+
+ if (!isDefined(templateVariableWithFallback) || !editor.isEditable) {
+ return (
+ <VariableChip
+ deleteNode={deleteNode}
+ editor={editor}
+ label={rawTemplateVariable}
+ />
+ );
+ }
+
+ const handleFallbackSubmit = (fallback: string) => {
+ const rawTemplateVariableWithSubmittedFallback =
+ formatTemplateVariableWithFallback({
+ name: templateVariableWithFallback.name,
+ fallback: fallback.replace(/[{}]/g, ''),
+ });
+
+ closeDropdown(dropdownId);
+ editor.commands.focus();
+
+ if (rawTemplateVariableWithSubmittedFallback !== rawTemplateVariable) {
+ updateAttributes({ variable: rawTemplateVariableWithSubmittedFallback });
+ }
+ };
+
+ const missingFallbackIcon = isNonEmptyString(
+ templateVariableWithFallback.fallback,
+ ) ? undefined : (
+ <Tooltip
+ content={t`Add a fallback value to avoid empty personalization`}
+ delay={TooltipDelay.shortDelay}
+ >
+ <StyledMissingFallbackIcon>
+ <IconAlertTriangle
+ size={theme.icon.size.sm}
+ stroke={theme.icon.stroke.sm}
+ color={theme.color.orange}
+ />
+ </StyledMissingFallbackIcon>
+ </Tooltip>
+ );
+
+ return (
+ <NodeViewWrapper as={StyledWrapper} style={{ whiteSpace: 'nowrap' }}>
+ <DropdownRoot dropdownId={dropdownId} type="panel">
+ <Dropdown.Trigger
+ render={<span />}
+ nativeButton={false}
+ aria-label={t`Edit fallback value`}
+ >
+ <BaseChip
+ label={`{{${templateVariableWithFallback.name}}}`}
+ title={rawTemplateVariable}
+ leftIcon={missingFallbackIcon}
+ onRemove={(event) => {
+ event.stopPropagation();
+ deleteNode();
+ }}
+ removeAriaLabel={t`Remove variable`}
+ />
+ </Dropdown.Trigger>
+ <DropdownContent
+ align="start"
+ finalFocus={(interaction) =>
+ interaction === 'keyboard' ? editor.view.dom : false
+ }
+ aria-label={t`Fallback value`}
+ >
+ <Dropdown.Section>
+ <TextInputDropdownForm
+ defaultValue={templateVariableWithFallback.fallback ?? ''}
+ label={t`Fallback value`}
+ onSubmit={handleFallbackSubmit}
+ />
+ </Dropdown.Section>
+ </DropdownContent>
+ </DropdownRoot>
+ </NodeViewWrapper>
+ );
+};
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackTag.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackTag.ts
new file mode 100644
index 00000000000..6d7c4a59658
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackTag.ts
@@ -0,0 +1,10 @@
+import { ReactNodeViewRenderer } from '@tiptap/react';
+
+import { VariableTag } from '@/advanced-text-editor/extensions/variable-tag/VariableTag';
+import { TemplateVariableWithFallbackChip } from '@/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackChip';
+
+export const TemplateVariableWithFallbackTag = VariableTag.extend({
+ addNodeView() {
+ return ReactNodeViewRenderer(TemplateVariableWithFallbackChip);
+ },
+});
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/VariableTag.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/VariableTag.ts
index fbdc7e38d38..9cdd4198e82 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/VariableTag.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/VariableTag.ts
@@ -1,6 +1,7 @@
import { VariableTagChip } from '@/advanced-text-editor/extensions/variable-tag/VariableTagChip';
import { Node } from '@tiptap/core';
import { mergeAttributes, ReactNodeViewRenderer } from '@tiptap/react';
+import { parseTemplateVariableWithFallback } from 'twenty-shared/utils';
import { extractRawVariableNamePart } from 'twenty-shared/workflow';
declare module '@tiptap/core' {
@@ -43,7 +44,8 @@ export const VariableTag = Node.create({
class: 'variable-tag',
}),
extractRawVariableNamePart({
- rawVariableName: variable,
+ rawVariableName:
+ parseTemplateVariableWithFallback(variable)?.name ?? variable,
part: 'selectedField',
}),
];
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/__tests__/VariableTag.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/__tests__/VariableTag.test.ts
new file mode 100644
index 00000000000..fcaf3f4b4bc
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/variable-tag/__tests__/VariableTag.test.ts
@@ -0,0 +1,33 @@
+import { VariableTag } from '@/advanced-text-editor/extensions/variable-tag/VariableTag';
+import { Editor } from '@tiptap/core';
+import { Document } from '@tiptap/extension-document';
+import { Paragraph } from '@tiptap/extension-paragraph';
+import { Text } from '@tiptap/extension-text';
+
+const renderVariableTagHtml = (variable: string) => {
+ const editor = new Editor({
+ extensions: [Document, Paragraph, Text, VariableTag],
+ content: {
+ type: 'doc',
+ content: [
+ {
+ type: 'paragraph',
+ content: [{ type: 'variableTag', attrs: { variable } }],
+ },
+ ],
+ },
+ });
+ const html = editor.getHTML();
+
+ editor.destroy();
+
+ return html;
+};
+
+describe('VariableTag', () => {
+ it('should export the field name of a variable with a fallback', () => {
+ expect(
+ renderVariableTagHtml('{{name.firstName | default: "Mr. X"}}'),
+ ).toContain('>firstName</span>');
+ });
+});
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/findTemplateVariableFallbacksByName.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/findTemplateVariableFallbacksByName.test.ts
new file mode 100644
index 00000000000..72509dd310b
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/findTemplateVariableFallbacksByName.test.ts
@@ -0,0 +1,52 @@
+import type { JSONContent } from '@tiptap/react';
+
+import { findTemplateVariableFallbacksByName } from '@/advanced-text-editor/utils/findTemplateVariableFallbacksByName';
+
+const buildEditorContent = (rawTemplateVariables: string[]): JSONContent => ({
+ type: 'doc',
+ content: [
+ {
+ type: 'section',
+ content: [
+ {
+ type: 'paragraph',
+ content: rawTemplateVariables.map((rawTemplateVariable) => ({
+ type: 'variableTag',
+ attrs: { variable: rawTemplateVariable },
+ })),
+ },
+ ],
+ },
+ ],
+});
+
+describe('findTemplateVariableFallbacksByName', () => {
+ it('should prefer the raw content fallback over a different editor content fallback', () => {
+ expect(
+ findTemplateVariableFallbacksByName({
+ rawContent: 'Hi {{name.firstName | default: "there"}}',
+ editorContent: buildEditorContent([
+ '{{name.firstName | default: "friend"}}',
+ ]),
+ }).get('name.firstName'),
+ ).toBe('there');
+ });
+
+ it('should find the fallback of each variable on chips nested in the editor content', () => {
+ expect(
+ findTemplateVariableFallbacksByName({
+ rawContent: 'Hi {{name.firstName}}',
+ editorContent: buildEditorContent([
+ '{{jobTitle | default: "builder"}}',
+ '{{name.firstName}}',
+ '{{name.firstName | default: "friend"}}',
+ ]),
+ }),
+ ).toEqual(
+ new Map([
+ ['jobTitle', 'builder'],
+ ['name.firstName', 'friend'],
+ ]),
+ );
+ });
+});
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInitialEditorContent.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInitialEditorContent.test.ts
index 608ff9c83ed..28bfd90861f 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInitialEditorContent.test.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInitialEditorContent.test.ts
@@ -282,6 +282,18 @@ describe('getInitialEditorContent', () => {
`);
});
+ it('should keep a variable with a fallback in one tag', () => {
+ const variable = '{{jobTitle | default: "the \\"boss\\" | x"}}';
+
+ expect(
+ getInitialEditorContent(`For ${variable} only`).content?.[0]?.content,
+ ).toEqual([
+ { type: 'text', text: 'For ' },
+ { type: 'variableTag', attrs: { variable } },
+ { type: 'text', text: ' only' },
+ ]);
+ });
+
it('should handle trailing newlines', () => {
expect(getInitialEditorContent('Hello\n')).toMatchInlineSnapshot(`
{
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/findTemplateVariableFallbacksByName.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/findTemplateVariableFallbacksByName.ts
new file mode 100644
index 00000000000..2c75a47fc63
--- /dev/null
+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/findTemplateVariableFallbacksByName.ts
@@ -0,0 +1,58 @@
+import { isNonEmptyString, isString } from '@sniptt/guards';
+import type { JSONContent } from '@tiptap/react';
+import {
+ TIPTAP_NODE_TYPES,
+ isDefined,
+ parseTemplateVariableWithFallback,
+ TEMPLATE_VARIABLE_PATTERN,
+} from 'twenty-shared/utils';
+
+type FindTemplateVariableFallbacksByNameArgs = {
+ rawContent: string;
+ editorContent: JSONContent | undefined;
+};
+
+const listEditorContentRawTemplateVariables = (node: JSONContent): string[] => [
+ ...(node.type === TIPTAP_NODE_TYPES.VARIABLE_TAG &&
+ isString(node.attrs?.variable)
+ ? [node.attrs.variable]
+ : []),
+ ...(node.content ?? []).flatMap(listEditorContentRawTemplateVariables),
+];
+
+export const findTemplateVariableFallbacksByName = ({
+ rawContent,
+ editorContent,
+}: FindTemplateVariableFallbacksByNameArgs): Map<string, string> => {
+ const rawContentRawTemplateVariables = Array.from(
+ rawContent.matchAll(TEMPLATE_VARIABLE_PATTERN),
+ ([rawTemplateVariable]) => rawTemplateVariable,
+ );
+ const editorContentRawTemplateVariables = isDefined(editorContent)
+ ? listEditorContentRawTemplateVariables(editorContent)
+ : [];
+ const fallbacksByName = new Map<string, string>();
+
+ for (const rawTemplateVariable of [
+ ...rawContentRawTemplateVariables,
+ ...editorContentRawTemplateVariables,
+ ]) {
+ const templateVariableWithFallback =
+ parseTemplateVariableWithFallback(rawTemplateVariable);
+
+ if (
+ !isDefined(templateVariableWithFallback) ||
+ !isNonEmptyString(templateVariableWithFallback.fallback) ||
+ fallbacksByName.has(templateVariableWithFallback.name)
+ ) {
+ continue;
+ }
+
+ fallbacksByName.set(
+ templateVariableWithFallback.name,
+ templateVariableWithFallback.fallback,
+ );
+ }
+
+ return fallbacksByName;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
index a74294848bc..42c7ea8fc1e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx
@@ -22,6 +22,8 @@ type FormTextFieldInputProps = {
readonly?: boolean;
placeholder?: string;
VariablePicker?: VariablePickerComponent;
+ ariaLabel?: string;
+ enableTemplateVariableFallback?: boolean;
};
export const FormTextFieldInput = ({
@@ -35,6 +37,8 @@ export const FormTextFieldInput = ({
multiline,
readonly,
VariablePicker,
+ ariaLabel,
+ enableTemplateVariableFallback,
}: FormTextFieldInputProps) => {
const instanceId = useId();
const labelId = `${instanceId}-label`;
@@ -45,6 +49,8 @@ export const FormTextFieldInput = ({
readonly,
defaultValue,
ariaLabelledBy: label ? labelId : undefined,
+ ariaLabel,
+ enableTemplateVariableFallback,
onUpdate: (editor) => {
const jsonContent = editor.getJSON();
const parsedContent = parseEditorContent(jsonContent);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
index d615c3f4f52..1c0bb1ebeec 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
@@ -229,6 +229,57 @@ export const DisabledWithVariable: Story = {
},
};
+export const WithTemplateVariableFallback: Story = {
+ args: {
+ label: 'Subject',
+ defaultValue: 'Hi {{jobTitle | default: "there"}}',
+ enableTemplateVariableFallback: true,
+ onChange: fn(),
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ expect(await canvas.findByText('{{jobTitle}}')).toBeVisible();
+
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Edit fallback value' }),
+ );
+
+ expect(
+ await body.findByRole('textbox', { name: 'Fallback value' }),
+ ).toHaveValue('there');
+ },
+};
+
+export const WithMissingTemplateVariableFallback: Story = {
+ args: {
+ label: 'Subject',
+ defaultValue: 'Hi {{jobTitle}}',
+ enableTemplateVariableFallback: true,
+ onChange: fn(),
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ await canvas.findByRole('button', { name: 'Edit fallback value' }),
+ );
+
+ await userEvent.type(
+ await body.findByRole('textbox', { name: 'Fallback value' }),
+ 'there{Enter}',
+ );
+
+ await waitFor(() => {
+ expect(args.onChange).toHaveBeenLastCalledWith(
+ 'Hi {{jobTitle | default: "there"}}',
+ );
+ });
+ },
+};
+
export const HasHistory: Story = {
args: {
label: 'Text',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/__tests__/useTextVariableEditor.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/__tests__/useTextVariableEditor.test.ts
index 9b41d09fbc4..c533f900ff0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/__tests__/useTextVariableEditor.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/__tests__/useTextVariableEditor.test.ts
@@ -36,6 +36,7 @@ const setup = (
multiline: boolean;
readonly: boolean;
defaultValue: string | null;
+ enableTemplateVariableFallback: boolean;
}> = {},
) => {
const onUpdate = jest.fn();
@@ -46,6 +47,7 @@ const setup = (
readonly: opts.readonly ?? false,
defaultValue: opts.defaultValue ?? undefined,
onUpdate,
+ enableTemplateVariableFallback: opts.enableTemplateVariableFallback,
}),
);
@@ -193,5 +195,19 @@ describe('useTextVariableEditor', () => {
it('should fall through for empty clipboard', () => {
expect(paste(use({ multiline: true }), '')).toBe(false);
});
+
+ it('should turn pasted variables into variable tags', () => {
+ const editor = use({ enableTemplateVariableFallback: true });
+
+ expect(paste(editor, 'Hi {{name | default: "there"}}!')).toBe(true);
+ expect(editor.getJSON().content?.[0]?.content).toEqual([
+ { type: 'text', text: 'Hi ' },
+ {
+ type: 'variableTag',
+ attrs: { variable: '{{name | default: "there"}}' },
+ },
+ { type: 'text', text: '!' },
+ ]);
+ });
});
});
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
index fb7934964bf..6d1d3e37a91 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/hooks/useTextVariableEditor.ts
@@ -1,3 +1,4 @@
+import { TemplateVariableWithFallbackTag } from '@/advanced-text-editor/extensions/variable-tag/TemplateVariableWithFallbackTag';
import { getInitialEditorContent } from '@/advanced-text-editor/utils/getInitialEditorContent';
import { WorkflowVariableTag } from '@/workflow/workflow-variables/extensions/WorkflowVariableTag';
import Document from '@tiptap/extension-document';
@@ -11,6 +12,7 @@ import { Slice } from '@tiptap/pm/model';
import { type Editor, useEditor } from '@tiptap/react';
import { useEffect } from 'react';
import { isDefined, parseJson } from 'twenty-shared/utils';
+import { CAPTURE_ALL_VARIABLE_TAG_INNER_REGEX } from 'twenty-shared/workflow';
import { type JsonValue } from 'type-fest';
type UseTextVariableEditorProps = {
@@ -20,6 +22,8 @@ type UseTextVariableEditorProps = {
defaultValue: string | undefined | null;
onUpdate: (editor: Editor) => void;
ariaLabelledBy?: string;
+ ariaLabel?: string;
+ enableTemplateVariableFallback?: boolean;
};
const isJsonObject = (text: string): boolean => {
@@ -38,7 +42,13 @@ export const useTextVariableEditor = ({
defaultValue,
onUpdate,
ariaLabelledBy,
+ ariaLabel,
+ enableTemplateVariableFallback = false,
}: UseTextVariableEditorProps) => {
+ const variableTagExtension = enableTemplateVariableFallback
+ ? TemplateVariableWithFallbackTag
+ : WorkflowVariableTag;
+
const editor = useEditor({
extensions: [
Document,
@@ -47,7 +57,7 @@ export const useTextVariableEditor = ({
Placeholder.configure({
placeholder,
}),
- WorkflowVariableTag,
+ variableTagExtension,
...(multiline
? [
HardBreak.configure({
@@ -71,6 +81,7 @@ export const useTextVariableEditor = ({
...(isDefined(ariaLabelledBy)
? { 'aria-labelledby': ariaLabelledBy }
: {}),
+ ...(isDefined(ariaLabel) ? { 'aria-label': ariaLabel } : {}),
},
handleKeyDown: (view, event) => {
if (event.key === 'Enter' && !event.shiftKey) {
@@ -113,7 +124,16 @@ export const useTextVariableEditor = ({
return true;
}
- if (multiline && plainText.includes('\n')) {
+ const isMultilinePasteIntoMultilineEditor =
+ multiline && plainText.includes('\n');
+ const isSingleLinePasteWithVariableTags =
+ !plainText.includes('\n') &&
+ isDefined(plainText.match(CAPTURE_ALL_VARIABLE_TAG_INNER_REGEX));
+
+ if (
+ isMultilinePasteIntoMultilineEditor ||
+ isSingleLinePasteWithVariableTags
+ ) {
const docNode = schema.nodeFromJSON(
getInitialEditorContent(plainText),
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx
index 310ec3eb7ac..5478583d4dc 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx
@@ -12,6 +12,7 @@ import { themeCssVariables } from 'twenty-ui/theme';
import { useCampaignEmailEditorVariables } from '@/activities/emails/hooks/useCampaignEmailEditorVariables';
import { useUploadEmailImage } from '@/activities/emails/hooks/useUploadEmailImage';
+import { useLiveEditorState } from '@/advanced-text-editor/hooks/useLiveEditorState';
import { ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES } from '@/advanced-text-editor/constants/AdvancedTextEditorBlockInsertionRecipes';
import { ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS } from '@/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems';
import { type AdvancedTextEditorBlockInsertionItem } from '@/advanced-text-editor/types/AdvancedTextEditorBlockCatalog';
@@ -50,7 +51,11 @@ type EmailBlockInsertListProps = {
export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {
const { i18n, t } = useLingui();
const imageFileInputRef = useRef<HTMLInputElement>(null);
- const { variables } = useCampaignEmailEditorVariables();
+ const { listVariablesWithExistingFallback } =
+ useCampaignEmailEditorVariables();
+ const variablesWithExistingFallback = useLiveEditorState(editor, () =>
+ listVariablesWithExistingFallback(),
+ );
const { uploadEmailImage } = useUploadEmailImage();
const { closeSidePanelMenu } = useSidePanelMenu();
@@ -162,19 +167,20 @@ export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {
iconColor: themeCssVariables.color.orange9,
})}
</CommandMenuItemSectionGroup>
- {isNonEmptyArray(variables) && (
+ {isNonEmptyArray(variablesWithExistingFallback) && (
<CommandMenuItemSectionGroup heading={t`Variables`}>
- {variables.map(({ label, value }) =>
- renderDraggableItem({
- id: value,
- Icon: IconVariable,
- iconColor: themeCssVariables.color.blue9,
- label,
- content: {
- type: TIPTAP_NODE_TYPES.VARIABLE_TAG,
- attrs: { variable: value },
- },
- }),
+ {variablesWithExistingFallback.map(
+ ({ label, name, rawTemplateVariable }) =>
+ renderDraggableItem({
+ id: name,
+ Icon: IconVariable,
+ iconColor: themeCssVariables.color.blue9,
+ label,
+ content: {
+ type: TIPTAP_NODE_TYPES.VARIABLE_TAG,
+ attrs: { variable: rawTemplateVariable },
+ },
+ }),
)}
</CommandMenuItemSectionGroup>
)}