Skip to content

Build your personal knowledge base with Trilium Notes

test(share): cover external link label precedence

matt wilkieeb8f6079abbe
diff --git a/apps/server/src/share/content_renderer.spec.ts b/apps/server/src/share/content_renderer.spec.ts
index 8b4f96dbbc..c849cbc7b5 100644
--- a/apps/server/src/share/content_renderer.spec.ts
+++ b/apps/server/src/share/content_renderer.spec.ts
@@ -693,6 +693,14 @@ describe("content_renderer", () => {
expect(noUrl?.getAttribute("href")).toBe("./external4");
expect(Object.keys(noUrl?.attributes ?? {}).sort()).toEqual([ "class", "href" ]);
+
+ const twoUrls = renderTreeItemAnchor({
+ "id": "external5",
+ "#shareExternal": "https://example.com/legacy",
+ "#shareExternalLink": "https://example.com/documented"
+ });
+
+ expect(twoUrls?.getAttribute("href")).toBe("https://example.com/documented");
});
function renderTreeItemAnchor(noteDef: Parameters<typeof buildShareNote>[0]) {
diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejs
index 8059581411..adb0fbf28a 100644
--- a/packages/share-theme/src/templates/page.ejs
+++ b/packages/share-theme/src/templates/page.ejs
@@ -184,9 +184,12 @@ content = content.replaceAll(headingRe, (...match) => {
<%
const action = note.type === "book" ? "getChildNotes" : "getVisibleChildNotes";
for (const childNote of note[action]()) {
- const externalHref = childNote.getLabelValue("shareExternalLink") || childNote.getLabelValue("shareExternal");
+ const externalHref = childNote.getLabelValue("shareExternalLink")
+ || childNote.getLabelValue("shareExternal");
const isExternalLink = !!externalHref;
- const linkHref = isExternalLink ? sanitizeUrl(externalHref) : `./${childNote.shareId}`;
+ 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>