Skip to content

The open alternative to Salesforce, designed for AI.

[rich-text] Keep formatting in rich text written by workflows (#26445)

Thomas des Francscda299a9b1d1
diff --git a/packages/twenty-shared/src/utils/tiptap/__tests__/convert-tiptap-blocks-to-markdown.test.ts b/packages/twenty-shared/src/utils/tiptap/__tests__/convert-tiptap-blocks-to-markdown.test.ts
index da468191d82..b7da093390e 100644
--- a/packages/twenty-shared/src/utils/tiptap/__tests__/convert-tiptap-blocks-to-markdown.test.ts
+++ b/packages/twenty-shared/src/utils/tiptap/__tests__/convert-tiptap-blocks-to-markdown.test.ts
@@ -63,6 +63,51 @@ describe('convertTipTapBlocksToMarkdown', () => {
expect(convertTipTapBlocksToMarkdown(document)).toBe('hello');
});
+ it.each([
+ {
+ name: 'bold text in a plain paragraph',
+ blocks: [
+ {
+ type: 'paragraph',
+ content: [{ type: 'text', text: 'Bold', marks: [{ type: 'bold' }] }],
+ },
+ ],
+ markdown: '**Bold**',
+ },
+ {
+ name: 'a heading level',
+ blocks: [
+ {
+ type: 'heading',
+ attrs: { level: 2 },
+ content: [{ type: 'text', text: 'Title' }],
+ },
+ ],
+ markdown: '## Title',
+ },
+ {
+ name: 'a line break',
+ blocks: [
+ {
+ type: 'paragraph',
+ content: [
+ { type: 'text', text: 'First' },
+ { type: 'hardBreak' },
+ { type: 'text', text: 'Second' },
+ ],
+ },
+ ],
+ markdown: 'First\nSecond',
+ },
+ ])(
+ 'should convert $name without any TipTap-only block',
+ ({ blocks, markdown }) => {
+ expect(convertTipTapBlocksToMarkdown(JSON.stringify(blocks))).toBe(
+ markdown,
+ );
+ },
+ );
+
it('should return undefined for invalid json', () => {
expect(convertTipTapBlocksToMarkdown('not json')).toBeUndefined();
});
diff --git a/packages/twenty-shared/src/utils/tiptap/convert-tiptap-blocks-to-markdown.ts b/packages/twenty-shared/src/utils/tiptap/convert-tiptap-blocks-to-markdown.ts
index 7ada4e651f4..a00778b7478 100644
--- a/packages/twenty-shared/src/utils/tiptap/convert-tiptap-blocks-to-markdown.ts
+++ b/packages/twenty-shared/src/utils/tiptap/convert-tiptap-blocks-to-markdown.ts
@@ -1,3 +1,5 @@
+import { isDefined } from '@/utils/validation';
+
import { isTipTapNode } from './parse-tiptap-json-document';
import { type TipTapDocument } from './tiptap-document';
import { tipTapDocumentToMarkdown } from './tiptap-document-to-markdown';
@@ -17,11 +19,17 @@ const TIPTAP_ONLY_NODE_TYPES: string[] = [
TIPTAP_NODE_TYPES.BUTTON,
TIPTAP_NODE_TYPES.DIVIDER,
TIPTAP_NODE_TYPES.HTML,
+ TIPTAP_NODE_TYPES.HARD_BREAK,
+ TIPTAP_NODE_TYPES.VARIABLE_TAG,
+ TIPTAP_NODE_TYPES.MENTION_TAG,
+ TIPTAP_NODE_TYPES.SKILL_TAG,
];
-const containsTipTapOnlyNode = (node: TipTapNode): boolean =>
+const containsTipTapOnlyContent = (node: TipTapNode): boolean =>
TIPTAP_ONLY_NODE_TYPES.includes(node.type) ||
- (node.content ?? []).some(containsTipTapOnlyNode);
+ isDefined(node.attrs) ||
+ isDefined(node.marks) ||
+ (node.content ?? []).some(containsTipTapOnlyContent);
export const convertTipTapBlocksToMarkdown = (
serializedBlocks: string,
@@ -36,7 +44,7 @@ export const convertTipTapBlocksToMarkdown = (
const nodes = Array.isArray(parsedBlocks) ? parsedBlocks : [parsedBlocks];
- if (!nodes.every(isTipTapNode) || !nodes.some(containsTipTapOnlyNode)) {
+ if (!nodes.every(isTipTapNode) || !nodes.some(containsTipTapOnlyContent)) {
return undefined;
}