share tree should include branch prefixes, fixes #4096

src/share/routes.js

@@ -9,21 +9,28 @@ const contentRenderer = require("./content_renderer");
 const assetPath = require("../services/asset_path");
 const appPath = require("../services/app_path");
 
+/**
+ * @param {SNote} note
+ * @return {{note: SNote, branch: SBranch}|{}}
+ */
 function getSharedSubTreeRoot(note) {
     if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
         // share root itself is not shared
-        return null;
+        return {};
     }
 
     // every path leads to share root, but which one to choose?
     // for the sake of simplicity, URLs are not note paths
-    const parentNote = note.getParentNotes()[0];
+    const parentBranch = note.getParentBranches()[0];
 
-    if (parentNote.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
+    if (parentBranch.parentNoteId === shareRoot.SHARE_ROOT_NOTE_ID) {
-        return note;
+        return {
+            note,
+            branch: parentBranch
+        };
     }
 
-    return getSharedSubTreeRoot(parentNote);
+    return getSharedSubTreeRoot(parentBranch.getParentNote());
 }
 
 function addNoIndexHeader(note, res) {

src/share/shaca/entities/sbranch.js

@@ -52,6 +52,11 @@ class SBranch extends AbstractShacaEntity {
     get parentNote() {
         return this.shaca.notes[this.parentNoteId];
     }
+
+    /** @returns {SNote} */
+    getParentNote() {
+        return this.parentNote;
+    }
 }
 
 module.exports = SBranch;

src/share/shaca/entities/snote.js

@@ -68,6 +68,13 @@ class SNote extends AbstractShacaEntity {
         return this.children.map(childNote => this.shaca.getBranchFromChildAndParent(childNote.noteId, this.noteId));
     }
 
+    /** @returns {SBranch[]} */
+    getVisibleChildBranches() {
+        return this.getChildBranches()
+            .filter(branch => !branch.isHidden
+                && !branch.getNote().isLabelTruthy('shareHiddenFromTree'));
+    }
+
     /** @returns {SNote[]} */
     getParentNotes() {
         return this.parents;
@@ -80,10 +87,8 @@ class SNote extends AbstractShacaEntity {
 
     /** @returns {SNote[]} */
     getVisibleChildNotes() {
-        return this.getChildBranches()
+        return this.getVisibleChildBranches()
-            .filter(branch => !branch.isHidden)
+            .map(branch => branch.getNote());
-            .map(branch => branch.getNote())
-            .filter(childNote => !childNote.isLabelTruthy('shareHiddenFromTree'));
     }
 
     /** @returns {boolean} */

src/views/share/page.ejs

@@ -75,11 +75,11 @@
         <% } %>
     </div>
 
-    <% if (subRoot.hasVisibleChildren()) { %>
+    <% if (subRoot.note.hasVisibleChildren()) { %>
         <button id="toggleMenuButton"></button>
 
         <nav id="menu">
-            <%- include('tree_item', {note: subRoot, activeNote: note}) %>
+            <%- include('tree_item', {note: subRoot.note, branch: subRoot.branch, activeNote: note}) %>
         </nav>
     <% } %>
 </div>

src/views/share/tree_item.ejs

@@ -1,16 +1,18 @@
 <p>
+    <% const titleWithPrefix = (branch.prefix ? `${branch.prefix} - ` : '') + note.title; %>
+
     <% if (activeNote.noteId === note.noteId) { %>
-    <strong><%= note.title %></strong>
+    <strong><%= titleWithPrefix %></strong>
     <% } else { %>
-    <a class="type-<%= note.type %>" href="./<%= note.shareId %>"><%= note.title %></a>
+    <a class="type-<%= note.type %>" href="./<%= note.shareId %>"><%= titleWithPrefix %></a>
     <% } %>
 </p>
 
 <% if (note.hasChildren()) { %>
 <ul>
-    <% note.getVisibleChildNotes().forEach(function (childNote) { %>
+    <% note.getVisibleChildBranches().forEach(function (branch) { %>
         <li>
-            <%- include('tree_item', {note: childNote}) %>
+            <%- include('tree_item', {branch: branch, note: branch.getNote()}) %>
         </li>
     <% }) %>
 </ul>