This commit is contained in:
Tom Moor committed 2025-03-02 08:39:12 -05:00
1 parent 42f92fa289
commit 48cb456a4f
5 files changed
+16 -11

No files matched your search

+7 -5
View File
@@ -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,
-2
View File
@@ -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,
});
+7 -2
View File
@@ -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 + " " : ""}${
@@ -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 = {
+1 -1
View File
@@ -42,7 +42,7 @@ async function presentDocument(
const text =
!asData || options?.includeText
? DocumentHelper.toMarkdown(data)
? DocumentHelper.toMarkdown(data, { includeTitle: false })
: undefined;
const res: Record<string, any> = {