Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/context-menu/menu-items-badge-support

apps/client/package.json

@@ -33,7 +33,7 @@
     "dayjs-plugin-utc": "0.1.2",
     "debounce": "2.2.0",
     "draggabilly": "3.0.0",
-    "force-graph": "1.49.6",
+    "force-graph": "1.50.1",
     "globals": "16.3.0",
     "i18next": "25.3.0",
     "i18next-http-backend": "3.0.2",
@@ -47,7 +47,7 @@
     "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
     "marked": "16.0.0",
-    "mermaid": "11.7.0",
+    "mermaid": "11.8.0",
     "mind-elixir": "4.6.2",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",

apps/client/src/services/note_types.ts

@@ -8,18 +8,35 @@ const SEPARATOR = { title: "----" };
 
 async function getNoteTypeItems(command?: TreeCommandNames) {
     const items: MenuItem<TreeCommandNames>[] = [
+        // The suggested note type ordering method: insert the item into the corresponding group,
+        // then ensure the items within the group are ordered alphabetically.
+        // Please keep the order synced with the listing found also in aps/client/src/widgets/note_types.ts.
+
+        // The default note type (always the first item)
         { title: t("note_types.text"), command, type: "text", uiIcon: "bx bx-note" },
-        { title: t("note_types.code"), command, type: "code", uiIcon: "bx bx-code" },
-        { title: t("note_types.saved-search"), command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: t("note_types.relation-map"), command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
-        { title: t("note_types.note-map"), command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
-        { title: t("note_types.render-note"), command, type: "render", uiIcon: "bx bx-extension" },
+        
+        // Text notes group
         { title: t("note_types.book"), command, type: "book", uiIcon: "bx bx-book" },
-        { title: t("note_types.mermaid-diagram"), command, type: "mermaid", uiIcon: "bx bx-selection" },
+
+        // Graphic notes
         { title: t("note_types.canvas"), command, type: "canvas", uiIcon: "bx bx-pen" },
-        { title: t("note_types.web-view"), command, type: "webView", uiIcon: "bx bx-globe-alt" },
-        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" },
+        { title: t("note_types.mermaid-diagram"), command, type: "mermaid", uiIcon: "bx bx-selection" },
+        
+        // Map notes
         { title: t("note_types.geo-map"), command, type: "geoMap", uiIcon: "bx bx-map-alt" },
+        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" },
+        { title: t("note_types.note-map"), command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
+        { title: t("note_types.relation-map"), command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
+
+        // Misc note types
+        { title: t("note_types.render-note"), command, type: "render", uiIcon: "bx bx-extension" },
+        { title: t("note_types.saved-search"), command, type: "search", uiIcon: "bx bx-file-find" },
+        { title: t("note_types.web-view"), command, type: "webView", uiIcon: "bx bx-globe-alt" },
+
+        // Code notes
+        { title: t("note_types.code"), command, type: "code", uiIcon: "bx bx-code" },
+
+        // Templates
         ...await getBuiltInTemplates(command),
         ...await getUserTemplates(command)
     ];

apps/client/src/widgets/note_map.ts

@@ -324,7 +324,13 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
         }
 
         const mapRootNoteId = this.getMapRootNoteId();
-        const data = await this.loadNotesAndRelations(mapRootNoteId);
+
+        const labelValues = (name: string) => this.note?.getLabels(name).map(l => l.value) ?? [];
+
+        const excludeRelations = labelValues("mapExcludeRelation");
+        const includeRelations = labelValues("mapIncludeRelation");
+
+        const data = await this.loadNotesAndRelations(mapRootNoteId, excludeRelations, includeRelations);
 
         const nodeLinkRatio = data.nodes.length / data.links.length;
         const magnifiedRatio = Math.pow(nodeLinkRatio, 1.5);
@@ -473,8 +479,10 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
         ctx.restore();
     }
 
-    async loadNotesAndRelations(mapRootNoteId: string): Promise<NotesAndRelationsData> {
-        const resp = await server.post<PostNotesMapResponse>(`note-map/${mapRootNoteId}/${this.mapType}`);
+    async loadNotesAndRelations(mapRootNoteId: string, excludeRelations: string[], includeRelations: string[]): Promise<NotesAndRelationsData> {
+        const resp = await server.post<PostNotesMapResponse>(`note-map/${mapRootNoteId}/${this.mapType}`, {
+            excludeRelations, includeRelations
+        });
 
         this.calculateNodeSizes(resp);
 

apps/client/src/widgets/note_type.ts

@@ -19,6 +19,7 @@ interface NoteTypeMapping {
 const NOTE_TYPES: NoteTypeMapping[] = [
     // The suggested note type ordering method: insert the item into the corresponding group,
     // then ensure the items within the group are ordered alphabetically.
+    // Please keep the order synced with the listing found also in apps/client/src/services/note_types.ts.
 
     // The default note type (always the first item)
     { type: "text", mime: "text/html", title: t("note_types.text"), selectable: true },

apps/server/src/routes/api/note_map.ts

@@ -110,6 +110,11 @@ function getLinkMap(req: Request) {
     const ignoreExcludeFromNoteMap = mapRootNote.isLabelTruthy("excludeFromNoteMap");
     let unfilteredNotes;
 
+    const toSet = (data: unknown) => new Set<string>(data instanceof Array ? data : []);
+
+    const excludeRelations = toSet(req.body.excludeRelations);
+    const includeRelations = toSet(req.body.includeRelations);
+
     if (mapRootNote.type === "search") {
         // for search notes, we want to consider the direct search results only without the descendants
         unfilteredNotes = mapRootNote.getSearchResultNotes();
@@ -152,6 +157,10 @@ function getLinkMap(req: Request) {
                 }
 
                 return !parentNote.getChildNotes().find((childNote) => childNote.noteId === rel.value);
+            } else if (includeRelations.size != 0 && !includeRelations.has(rel.name)) {
+                return false;
+            } else if (excludeRelations.has(rel.name)) {
+                return false;
             } else {
                 return true;
             }

apps/server/src/services/builtin_attributes.ts

@@ -45,6 +45,8 @@ export default [
     { type: "label", name: "pageSize" },
     { type: "label", name: "viewType" },
     { type: "label", name: "mapRootNoteId" },
+    { type: "label", name: "mapExcludeRelation" },
+    { type: "label", name: "mapIncludeRelation" },
     { type: "label", name: "bookmarkFolder" },
     { type: "label", name: "sorted" },
     { type: "label", name: "sortDirection" },

docs/User Guide/User Guide/Note Types/Note Map.md

@@ -3,4 +3,6 @@
 
 A Note map is a note type which displays a standalone version of the feature of the same name: [Note Map (Link map, Tree map)](../Advanced%20Usage/Note%20Map%20\(Link%20map%2C%20Tree%20map\).md).
 
-Once created, the note map will display the relations between notes. Only the notes that are part of the parent of the note map will be displayed (including their children).
+Once created, the note map will display the relations between notes. Only the notes that are part of the parent of the note map will be displayed (including their children).
+
+The labels `mapIncludeRelation` and `mapExcludeRelation`, if set, filter the note map to include only the specified relations or to exclude the specified relations, respectively.

package.json

@@ -89,7 +89,7 @@
       "@nx/js": "patches/@nx__js.patch"
     },
     "overrides": {
-      "mermaid": "11.7.0",
+      "mermaid": "11.8.0",
       "preact": "10.26.9",
       "roughjs": "4.6.6",
       "@types/express-serve-static-core": "5.0.6",