Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(share): honor shareExternalLink in the share tree (closes #8448)
matt wilkiee2d16419cfd5
diff --git a/apps/server/src/share/content_renderer.spec.ts b/apps/server/src/share/content_renderer.spec.tsindex 04a4744b7a..8b4f96dbbc 100644--- a/apps/server/src/share/content_renderer.spec.ts+++ b/apps/server/src/share/content_renderer.spec.ts@@ -670,6 +670,31 @@ describe("content_renderer", () => {expect(Object.keys(internal?.attributes ?? {}).sort()).toEqual([ "class", "href" ]);});+ it("links to the first non-empty value of either external link label", () => {+ const documented = renderTreeItemAnchor({+ "id": "external2",+ "#shareExternalLink": "https://example.com/page"+ });+ const bothLabels = renderTreeItemAnchor({+ "id": "external3",+ "#shareExternal": "",+ "#shareExternalLink": "https://example.com/page"+ });++ for (const anchor of [ documented, bothLabels ]) {+ expect(anchor?.getAttribute("href")).toBe("https://example.com/page");+ expect(anchor?.getAttribute("target")).toBe("_blank");+ expect(anchor?.getAttribute("rel")).toBe("noopener noreferrer");+ expect(Object.keys(anchor?.attributes ?? {}).sort())+ .toEqual([ "class", "href", "rel", "target" ]);+ }++ const noUrl = renderTreeItemAnchor({ "id": "external4", "#shareExternal": "" });++ expect(noUrl?.getAttribute("href")).toBe("./external4");+ expect(Object.keys(noUrl?.attributes ?? {}).sort()).toEqual([ "class", "href" ]);+ });+function renderTreeItemAnchor(noteDef: Parameters<typeof buildShareNote>[0]) {const note = buildShareNote(noteDef);const subRootNote = buildShareNote({ id: `subRoot-${noteDef.id}` });@@ -698,11 +723,21 @@ describe("content_renderer", () => {"title": "External","#shareExternal": "https://example.com/page"},+ {+ "id": "pageBothLabels",+ "title": "Both labels",+ "#shareExternal": "",+ "#shareExternalLink": "https://example.com/other"+ },{ id: "pageInternal", title: "Internal" }]});const anchors = renderPageAnchors("pageParent");+ const bothLabels = anchors.find((a) => a.textContent === "Both labels");+ expect(bothLabels?.getAttribute("href")).toBe("https://example.com/other");+ expect(bothLabels?.getAttribute("target")).toBe("_blank");+const external = anchors.find((a) => a.textContent === "External");expect(external?.getAttribute("href")).toBe("https://example.com/page");expect(external?.getAttribute("target")).toBe("_blank");diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejsindex 0b8f2fcf2b..8059581411 100644--- a/packages/share-theme/src/templates/page.ejs+++ b/packages/share-theme/src/templates/page.ejs@@ -184,9 +184,9 @@ content = content.replaceAll(headingRe, (...match) => {<%const action = note.type === "book" ? "getChildNotes" : "getVisibleChildNotes";for (const childNote of note[action]()) {- const isExternalLink = childNote.hasLabel("shareExternal") || childNote.hasLabel("shareExternalLink");- const rawHref = isExternalLink ? childNote.getLabelValue("shareExternal") ?? childNote.getLabelValue("shareExternalLink") : `./${childNote.shareId}`;- const linkHref = isExternalLink ? sanitizeUrl(rawHref ?? "") : rawHref;+ const externalHref = childNote.getLabelValue("shareExternalLink") || childNote.getLabelValue("shareExternal");+ const isExternalLink = !!externalHref;+ const linkHref = isExternalLink ? sanitizeUrl(externalHref) : `./${childNote.shareId}`;%><li><a class="type-<%= childNote.type %>" href="<%= linkHref %>"<% if (isExternalLink) { %> target="_blank" rel="noopener noreferrer"<% } %>><%= childNote.title %></a>diff --git a/packages/share-theme/src/templates/tree_item.ejs b/packages/share-theme/src/templates/tree_item.ejsindex 9345032d8a..078a45d933 100644--- a/packages/share-theme/src/templates/tree_item.ejs+++ b/packages/share-theme/src/templates/tree_item.ejs@@ -1,10 +1,11 @@<%const linkClass = `type-${note.type}` + (activeNote.noteId === note.noteId ? " active" : "");-const isExternalLink = note.hasLabel("shareExternal");+const externalHref = note.getLabelValue("shareExternalLink") || note.getLabelValue("shareExternal");+const isExternalLink = !!externalHref;let linkHref;if (isExternalLink) {- linkHref = sanitizeUrl(note.getLabelValue("shareExternal") ?? "");+ linkHref = sanitizeUrl(externalHref);} else if (note.shareId) {linkHref = `./${note.shareId}`;}