Merge branch 'refs/heads/stable'

# Conflicts:
#	package-lock.json

src/public/app/menus/tree_context_menu.js

@@ -50,10 +50,10 @@ export default class TreeContextMenu {
             { title: 'Open in a new tab <kbd>Ctrl+Click</kbd>', command: "openInTab", uiIcon: "bx bx-empty", enabled: noSelectedNotes },
             { title: 'Open in a new split', command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
             { title: 'Insert note after <kbd data-command="createNoteAfter"></kbd>', command: "insertNoteAfter", uiIcon: "bx bx-plus",
-                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter", {removeDeprecatedTypes: true}) : null,
+                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter") : null,
                 enabled: insertNoteAfterEnabled && noSelectedNotes },
             { title: 'Insert child note <kbd data-command="createNoteInto"></kbd>', command: "insertChildNote", uiIcon: "bx bx-plus",
-                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote", {removeDeprecatedTypes: true}) : null,
+                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
                 enabled: notSearch && noSelectedNotes },
             { title: 'Delete <kbd data-command="deleteNotes"></kbd>', command: "deleteNotes", uiIcon: "bx bx-trash",
                 enabled: isNotRoot && !isHoisted && parentNotSearch },

src/public/app/services/note_types.js

@@ -1,21 +1,19 @@
 import server from "./server.js";
 import froca from "./froca.js";
 
-async function getNoteTypeItems(command, opts = {}) {
+async function getNoteTypeItems(command) {
-    const removeDeprecatedTypes = !!opts.removeDeprecatedTypes;
-
     const items = [
         { title: "Text", command: command, type: "text", uiIcon: "bx bx-note" },
         { title: "Code", command: command, type: "code", uiIcon: "bx bx-code" },
         { title: "Saved Search", command: command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bx-map-alt", deprecated: true },
+        { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bx-map-alt" },
         { title: "Note Map", command: command, type: "noteMap", uiIcon: "bx bx-map-alt" },
         { title: "Render Note", command: command, type: "render", uiIcon: "bx bx-extension" },
         { title: "Book", command: command, type: "book", uiIcon: "bx bx-book" },
         { title: "Mermaid Diagram", command: command, type: "mermaid", uiIcon: "bx bx-selection" },
         { title: "Canvas", command: command, type: "canvas", uiIcon: "bx bx-pen" },
         { title: "Web View", command: command, type: "webView", uiIcon: "bx bx-globe-alt" },
-    ].filter(item => !removeDeprecatedTypes || !item.deprecated);
+    ];
 
     const templateNoteIds = await server.get("search-templates");
     const templateNotes = await froca.getNotes(templateNoteIds);

src/public/app/widgets/type_widgets/relation_map.js

@@ -184,8 +184,6 @@ export default class RelationMapTypeWidget extends TypeWidget {
     }
 
     async loadMapData() {
-        toastService.showMessage("Relation Map has been deprecated since Trilium 0.63 and will be removed in a future version. Migrate your content to some other note type (e.g. canvas) as soon as possible.", 5000);
-
         this.mapData = {
             notes: [],
             // it is important to have this exact value here so that initial transform is the same as this

src/services/notes.js

@@ -458,13 +458,18 @@ function findIncludeNoteLinks(content, foundLinks) {
 }
 
 function findRelationMapLinks(content, foundLinks) {
-    const obj = JSON.parse(content);
+    try {
+        const obj = JSON.parse(content);
 
-    for (const note of obj.notes) {
+        for (const note of obj.notes) {
-        foundLinks.push({
+            foundLinks.push({
-            name: 'relationMapLink',
+                name: 'relationMapLink',
-            value: note.noteId
+                value: note.noteId
-        });
+            });
+        }
+    }
+    catch (e) {
+        log.error("Could not scan for relation map links: " + e.message);
     }
 }