diff --git a/app/actions/definitions/templates.tsx b/app/actions/definitions/templates.tsx
index 187cec8cac..e88e859a7a 100644
--- a/app/actions/definitions/templates.tsx
+++ b/app/actions/definitions/templates.tsx
@@ -84,7 +84,7 @@ export const deleteTemplate = dialogActionFactory({
{isReply
? this.t("{{ actorName }} replied to a thread in", { actorName })
: this.t("{{ actorName }} commented on", { actorName })}{" "}
- {document.titleWithDefault}{" "}
+ {document.displayTitle}{" "}
{collection?.name
? this.t("in the {{ collectionName }} collection", {
collectionName: collection.name,
diff --git a/server/emails/templates/CommentMentionedEmail.tsx b/server/emails/templates/CommentMentionedEmail.tsx
index 69691abaf2..260de7b305 100644
--- a/server/emails/templates/CommentMentionedEmail.tsx
+++ b/server/emails/templates/CommentMentionedEmail.tsx
@@ -95,7 +95,7 @@ export default class CommentMentionedEmail extends BaseEmail<
protected subject({ document }: Props) {
return this.t("Mentioned you in “{{ documentTitle }}”", {
- documentTitle: document.titleWithDefault,
+ documentTitle: document.displayTitle,
});
}
@@ -116,7 +116,7 @@ export default class CommentMentionedEmail extends BaseEmail<
}: Props): string {
const action = this.t(
"{{ actorName }} mentioned you in a comment on “{{ documentTitle }}”",
- { actorName, documentTitle: document.titleWithDefault }
+ { actorName, documentTitle: document.displayTitle }
);
const inCollection = collection.name
? ` ${this.t("in the {{ collectionName }} collection", { collectionName: collection.name })}`
@@ -149,12 +149,12 @@ ${this.t("Open Thread")}: ${teamUrl}${document.url}?commentId=${commentId}
{this.t("{{ actorName }} mentioned you in a comment on", {
actorName,
})}{" "}
- {document.titleWithDefault}{" "}
+ {document.displayTitle}{" "}
{collection.name
? this.t("in the {{ collectionName }} collection", {
collectionName: collection.name,
diff --git a/server/emails/templates/CommentResolvedEmail.tsx b/server/emails/templates/CommentResolvedEmail.tsx
index 91d0ded895..4f4b312782 100644
--- a/server/emails/templates/CommentResolvedEmail.tsx
+++ b/server/emails/templates/CommentResolvedEmail.tsx
@@ -95,7 +95,7 @@ export default class CommentResolvedEmail extends BaseEmail<
protected subject({ document }: Props) {
return this.t("Resolved a comment thread in “{{ documentTitle }}”", {
- documentTitle: document.titleWithDefault,
+ documentTitle: document.displayTitle,
});
}
@@ -116,7 +116,7 @@ export default class CommentResolvedEmail extends BaseEmail<
}: Props): string {
const action = this.t(
"{{ actorName }} resolved a comment thread on “{{ documentTitle }}”",
- { actorName, documentTitle: document.titleWithDefault }
+ { actorName, documentTitle: document.displayTitle }
);
const inCollection = collection.name
? ` ${this.t("in the {{ collectionName }} collection", { collectionName: collection.name })}`
@@ -145,10 +145,10 @@ export default class CommentResolvedEmail extends BaseEmail<
{this.t("{{ actorName }} resolved a comment on", { actorName })}{" "}
- {document.titleWithDefault}{" "}
+ {document.displayTitle}{" "}
{collection.name
? this.t("in the {{ collectionName }} collection", {
collectionName: collection.name,
diff --git a/server/emails/templates/DocumentAccessRequestEmail.tsx b/server/emails/templates/DocumentAccessRequestEmail.tsx
index 94c9fe198b..db7fba073a 100644
--- a/server/emails/templates/DocumentAccessRequestEmail.tsx
+++ b/server/emails/templates/DocumentAccessRequestEmail.tsx
@@ -47,7 +47,7 @@ export default class DocumentAccessRequestEmail extends BaseEmail<
}
protected subject({ actor, document }: Props) {
- return `${actor.name} is requesting access to "${document.titleWithDefault}"`;
+ return `${actor.name} is requesting access to "${document.displayTitle}"`;
}
protected preview({ actor }: Props): string {
@@ -60,7 +60,7 @@ export default class DocumentAccessRequestEmail extends BaseEmail<
protected renderAsText({ actor, teamUrl, document }: Props): string {
return `
-${actor.name} is requesting access to "${document.titleWithDefault}".
+${actor.name} is requesting access to "${document.displayTitle}".
Open the document to share it with them: ${teamUrl}${document.path}
`;
@@ -78,10 +78,10 @@ Open the document to share it with them: ${teamUrl}${document.path}
{actor.name} is requesting access to the{" "} - {document.titleWithDefault} document. + {document.displayTitle} document.
Open the document to share it with them.
diff --git a/server/emails/templates/DocumentMentionedEmail.tsx b/server/emails/templates/DocumentMentionedEmail.tsx index 0f0a7a910a..2e92501a3c 100644 --- a/server/emails/templates/DocumentMentionedEmail.tsx +++ b/server/emails/templates/DocumentMentionedEmail.tsx @@ -94,7 +94,7 @@ export default class DocumentMentionedEmail extends BaseEmail< protected subject({ document }: Props) { return this.t(`Mentioned you in “{{ documentTitle }}”`, { - documentTitle: document.titleWithDefault, + documentTitle: document.displayTitle, }); } @@ -119,7 +119,7 @@ export default class DocumentMentionedEmail extends BaseEmail< return ` ${this.t("You were mentioned")} -${this.t(`{{ actorName }} mentioned you in the document “{{ documentTitle }}”.`, { actorName, documentTitle: document.titleWithDefault })} +${this.t(`{{ actorName }} mentioned you in the document “{{ documentTitle }}”.`, { actorName, documentTitle: document.displayTitle })} ${this.t("Open Document")}: ${teamUrl}${document.url} `; @@ -142,7 +142,7 @@ ${this.t("Open Document")}: ${teamUrl}${document.url} {this.t("{{ actorName }} mentioned you in the document", { actorName, })}{" "} - {document.titleWithDefault}. + {document.displayTitle}.
{body && ( <> diff --git a/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx b/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx index 770c548663..3d1ac5068d 100644 --- a/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx +++ b/server/emails/templates/DocumentPublishedOrUpdatedEmail.tsx @@ -118,7 +118,7 @@ export default class DocumentPublishedOrUpdatedEmail extends BaseEmail< protected subject({ document, eventType }: Props) { return this.t(`“{{ documentTitle }}” {{ eventName }}`, { - documentTitle: document.titleWithDefault, + documentTitle: document.displayTitle, eventName: this.eventName(eventType), }); } @@ -153,9 +153,9 @@ export default class DocumentPublishedOrUpdatedEmail extends BaseEmail< const eventName = this.eventName(eventType); return ` -${this.t("“{{ documentTitle }}” {{ eventName }}", { documentTitle: document.titleWithDefault, eventName })} +${this.t("“{{ documentTitle }}” {{ eventName }}", { documentTitle: document.displayTitle, eventName })} -${this.t("{{ actorName }} {{ eventName }} the document “{{ documentTitle }}”", { actorName, eventName, documentTitle: document.titleWithDefault })}${ +${this.t("{{ actorName }} {{ eventName }} the document “{{ documentTitle }}”", { actorName, eventName, documentTitle: document.displayTitle })}${ collection?.name ? `, ${this.t("in the {{ collectionName }} collection", { collectionName: collection.name })}` : "" @@ -188,7 +188,7 @@ ${this.t("Open Document")}: ${teamUrl}${document.url}{this.t("{{ actorName }} invited you to {{ permission }} the", { actorName, permission, })}{" "} - {document.titleWithDefault}{" "} + {document.displayTitle}{" "} {this.t("document")}.
diff --git a/server/emails/templates/GroupCommentMentionedEmail.tsx b/server/emails/templates/GroupCommentMentionedEmail.tsx
index 56957114e8..1a31c0c7c1 100644
--- a/server/emails/templates/GroupCommentMentionedEmail.tsx
+++ b/server/emails/templates/GroupCommentMentionedEmail.tsx
@@ -104,7 +104,7 @@ export default class GroupCommentMentionedEmail extends BaseEmail<
protected subject({ document, groupName }: Props) {
return this.t(
"The {{ groupName }} group was mentioned in “{{ documentTitle }}”",
- { groupName, documentTitle: document.titleWithDefault }
+ { groupName, documentTitle: document.displayTitle }
);
}
@@ -129,7 +129,7 @@ export default class GroupCommentMentionedEmail extends BaseEmail<
}: Props): string {
const action = this.t(
"{{ actorName }} mentioned the “{{ groupName }}” group in a comment on “{{ documentTitle }}”",
- { actorName, groupName, documentTitle: document.titleWithDefault }
+ { actorName, groupName, documentTitle: document.displayTitle }
);
const inCollection = collection.name
? ` ${this.t("in the {{ collectionName }} collection", { collectionName: collection.name })}`
@@ -163,13 +163,13 @@ ${this.t("Open Thread")}: ${teamUrl}${document.url}?commentId=${commentId}
{this.t( "{{ actorName }} mentioned the “{{ groupName }}” group in a comment on", { actorName, groupName } )}{" "} - {document.titleWithDefault}{" "} + {document.displayTitle}{" "} {collection.name ? this.t("in the {{ collectionName }} collection", { collectionName: collection.name, diff --git a/server/emails/templates/GroupDocumentMentionedEmail.tsx b/server/emails/templates/GroupDocumentMentionedEmail.tsx index 31c29eca62..3db3b76aaa 100644 --- a/server/emails/templates/GroupDocumentMentionedEmail.tsx +++ b/server/emails/templates/GroupDocumentMentionedEmail.tsx @@ -103,7 +103,7 @@ export default class GroupDocumentMentionedEmail extends BaseEmail< `The {{ groupName }} group was mentioned in “{{ documentTitle }}”`, { groupName, - documentTitle: document.titleWithDefault, + documentTitle: document.displayTitle, } ); } @@ -135,7 +135,7 @@ export default class GroupDocumentMentionedEmail extends BaseEmail< groupName, }: Props): string { return ` -${this.t(`{{ actorName }} mentioned the “{{ groupName }}” group in the document “{{ documentTitle }}”.`, { actorName, groupName, documentTitle: document.titleWithDefault })} +${this.t(`{{ actorName }} mentioned the “{{ groupName }}” group in the document “{{ documentTitle }}”.`, { actorName, groupName, documentTitle: document.displayTitle })} ${this.t("Open Document")}: ${teamUrl}${document.url} `; @@ -159,7 +159,7 @@ ${this.t("Open Document")}: ${teamUrl}${document.url} "{{ actorName }} mentioned the “{{ groupName }}” group in the document", { actorName, groupName } )}{" "} - {document.titleWithDefault}. + {document.displayTitle}.
{body && ( <> diff --git a/server/models/Document.ts b/server/models/Document.ts index fb4005d540..43cebb06e6 100644 --- a/server/models/Document.ts +++ b/server/models/Document.ts @@ -1107,7 +1107,7 @@ class Document extends ArchivableModel< * * @returns boolean */ - get titleWithDefault(): string { + get displayTitle(): string { return this.title || "Untitled"; } diff --git a/server/models/FileOperation.ts b/server/models/FileOperation.ts index 2282a59ec9..db7e78ec28 100644 --- a/server/models/FileOperation.ts +++ b/server/models/FileOperation.ts @@ -178,7 +178,7 @@ class FileOperation extends ParanoidModel< const source = "document" in options ? { - name: options.document.titleWithDefault, + name: options.document.displayTitle, documentId: options.document.id, teamId: options.document.teamId, options: personalOwnerId ? { personalOwnerId } : null, diff --git a/server/models/helpers/OKFHelper.ts b/server/models/helpers/OKFHelper.ts index 42c961ed83..e1b4bb365f 100644 --- a/server/models/helpers/OKFHelper.ts +++ b/server/models/helpers/OKFHelper.ts @@ -63,7 +63,7 @@ export default class OKFHelper { const data: Frontmatter = { type: this.conceptType, - title: document.titleWithDefault, + title: document.displayTitle, ...(description ? { description } : {}), resource: `${origin}${document.path}`, status: this.status(document), diff --git a/server/presenters/fileOperation.ts b/server/presenters/fileOperation.ts index 0c624e0e2a..4df2331f83 100644 --- a/server/presenters/fileOperation.ts +++ b/server/presenters/fileOperation.ts @@ -9,7 +9,7 @@ export default function presentFileOperation(data: FileOperation) { format: data.format, name: data.collection?.name || - data.document?.titleWithDefault || + data.document?.displayTitle || path.basename(data.key || ""), state: data.state, error: data.error, diff --git a/server/presenters/unfurl.ts b/server/presenters/unfurl.ts index 3633fb4cca..18d14dc1c2 100644 --- a/server/presenters/unfurl.ts +++ b/server/presenters/unfurl.ts @@ -114,7 +114,7 @@ const presentDocument = ( url: url ?? `${document.url}${anchor ?? ""}`, type: UnfurlResourceType.Document, id: document.id, - title: document.titleWithDefault, + title: document.displayTitle, summary: sectionSummary || document.getSummary(), lastActivityByViewer: viewer ? presentLastActivityInfoFor(document, viewer) diff --git a/server/queues/tasks/ExportDocumentTreeTask.ts b/server/queues/tasks/ExportDocumentTreeTask.ts index 3a39fa9559..04c584e13e 100644 --- a/server/queues/tasks/ExportDocumentTreeTask.ts +++ b/server/queues/tasks/ExportDocumentTreeTask.ts @@ -289,7 +289,7 @@ export default abstract class ExportDocumentTreeTask extends ExportTask { }) { const pathMap = new Map