From 48cb456a4fb56bacc797cd22ff5d151fba74b6bb Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Fri, 28 Feb 2025 08:27:52 -0500 Subject: [PATCH] refactor --- server/commands/documentCreator.ts | 12 +++++++----- server/commands/documentDuplicator.ts | 2 -- server/models/helpers/DocumentHelper.tsx | 9 +++++++-- server/models/helpers/ProseMirrorHelper.test.ts | 2 +- server/presenters/document.ts | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/server/commands/documentCreator.ts b/server/commands/documentCreator.ts index 63d036f815..4de36318f2 100644 --- a/server/commands/documentCreator.ts +++ b/server/commands/documentCreator.ts @@ -1,9 +1,9 @@ import { Optional } from "utility-types"; -import { ProsemirrorHelper } from "@shared/utils/ProsemirrorHelper"; +import { ProsemirrorHelper as SharedProsemirrorHelper } from "@shared/utils/ProsemirrorHelper"; import { TextHelper } from "@shared/utils/TextHelper"; import { Document, Event, User } from "@server/models"; import { DocumentHelper } from "@server/models/helpers/DocumentHelper"; -import { ProsemirrorHelper as ProsemirrorHelper2 } from "@server/models/helpers/ProsemirrorHelper"; +import { ProsemirrorHelper } from "@server/models/helpers/ProsemirrorHelper"; import { APIContext } from "@server/types"; type Props = Optional< @@ -91,11 +91,11 @@ export default async function documentCreator({ : ""); const contentWithReplacements = text - ? ProsemirrorHelper2.toProsemirror(text).toJSON() + ? ProsemirrorHelper.toProsemirror(text).toJSON() : templateDocument ? template ? templateDocument.content - : ProsemirrorHelper.replaceTemplateVariables( + : SharedProsemirrorHelper.replaceTemplateVariables( await DocumentHelper.toJSON(templateDocument), user ) @@ -125,7 +125,9 @@ export default async function documentCreator({ state, }); - document.text = DocumentHelper.toMarkdown(document); + document.text = DocumentHelper.toMarkdown(document, { + includeTitle: false, + }); await document.save({ silent: !!createdAt, diff --git a/server/commands/documentDuplicator.ts b/server/commands/documentDuplicator.ts index 803c9d7b75..da542a2f94 100644 --- a/server/commands/documentDuplicator.ts +++ b/server/commands/documentDuplicator.ts @@ -52,7 +52,6 @@ export default async function documentDuplicator({ DocumentHelper.toProsemirror(document), ["comment"] ), - text: document.text, ...sharedProperties, }); @@ -86,7 +85,6 @@ export default async function documentDuplicator({ DocumentHelper.toProsemirror(childDocument), ["comment"] ), - text: childDocument.text, ...sharedProperties, }); diff --git a/server/models/helpers/DocumentHelper.tsx b/server/models/helpers/DocumentHelper.tsx index 610cbc6976..813ecf9349 100644 --- a/server/models/helpers/DocumentHelper.tsx +++ b/server/models/helpers/DocumentHelper.tsx @@ -147,10 +147,12 @@ export class DocumentHelper { * Returns the document as Markdown. This is a lossy conversion and should only be used for export. * * @param document The document or revision to convert + * @param options Options for the conversion * @returns The document title and content as a Markdown string */ static toMarkdown( - document: Document | Revision | Collection | ProsemirrorData + document: Document | Revision | Collection | ProsemirrorData, + options?: { includeTitle?: boolean } ) { const text = serializer .serialize(DocumentHelper.toProsemirror(document)) @@ -165,7 +167,10 @@ export class DocumentHelper { return text; } - if (document instanceof Document || document instanceof Revision) { + if ( + options?.includeTitle && + (document instanceof Document || document instanceof Revision) + ) { const iconType = determineIconType(document.icon); const title = `${iconType === IconType.Emoji ? document.icon + " " : ""}${ diff --git a/server/models/helpers/ProseMirrorHelper.test.ts b/server/models/helpers/ProseMirrorHelper.test.ts index 1329eac748..e61a60b4f7 100644 --- a/server/models/helpers/ProseMirrorHelper.test.ts +++ b/server/models/helpers/ProseMirrorHelper.test.ts @@ -3,7 +3,7 @@ import { MentionType, ProsemirrorData } from "@shared/types"; import { buildProseMirrorDoc } from "@server/test/factories"; import { MentionAttrs, ProsemirrorHelper } from "./ProsemirrorHelper"; -describe("ProseMirrorHelper", () => { +describe("ProsemirrorHelper", () => { describe("getNodeForMentionEmail", () => { it("should return the paragraph node", () => { const mentionAttrs: MentionAttrs = { diff --git a/server/presenters/document.ts b/server/presenters/document.ts index 3cc0fd7033..42a12f0d6e 100644 --- a/server/presenters/document.ts +++ b/server/presenters/document.ts @@ -42,7 +42,7 @@ async function presentDocument( const text = !asData || options?.includeText - ? DocumentHelper.toMarkdown(data) + ? DocumentHelper.toMarkdown(data, { includeTitle: false }) : undefined; const res: Record = {