Merge remote-tracking branch 'origin/stable' into stable

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.43.0-beta",
+  "version": "0.43.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7923,9 +7923,9 @@
       "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
     },
     "node-abi": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz",
-      "integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz",
+      "integrity": "sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw==",
       "requires": {
         "semver": "^5.4.1"
       },

package.json

@@ -54,7 +54,7 @@
     "jimp": "0.10.3",
     "mime-types": "2.1.27",
     "multer": "1.4.2",
-    "node-abi": "2.16.0",
+    "node-abi": "2.18.0",
     "open": "7.0.3",
     "portscanner": "2.2.0",
     "rand-token": "1.0.1",

src/public/app/widgets/collapsible_widgets/link_map.js

@@ -1,4 +1,5 @@
 import CollapsibleWidget from "../collapsible_widget.js";
+import treeCache from "../../services/tree_cache.js";
 
 let linkMapContainerIdCtr = 1;
 
@@ -89,5 +90,19 @@ export default class LinkMapWidget extends CollapsibleWidget {
         if (loadResults.getAttributes().find(attr => attr.type === 'relation' && (attr.noteId === this.noteId || attr.value === this.noteId))) {
             this.noteSwitched();
         }
+
+        const changedNoteIds = loadResults.getNoteIds();
+
+        if (changedNoteIds.length > 0) {
+            const $linkMapContainer = this.$body.find('.link-map-container');
+
+            for (const noteId of changedNoteIds) {
+                const note = treeCache.notes[noteId];
+
+                if (note) {
+                    $linkMapContainer.find(`a[data-note-path="${noteId}"]`).text(note.title);
+                }
+            }
+        }
     }
 }

src/public/app/widgets/note_tree.js

@@ -32,6 +32,7 @@ const TPL = `
     .tree {
         height: 100%;
         overflow: auto;
+        padding-bottom: 20px;
     }
     
     .refresh-search-button {

src/public/app/widgets/side_pane_toggles.js

@@ -20,8 +20,8 @@ const TPL = `
     }
     </style>
     
-    <button class="hide-left-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Show sidebar"></button>
-    <button class="show-left-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Hide sidebar"></button>
+    <button class="hide-left-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Hide sidebar"></button>
+    <button class="show-left-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Show sidebar"></button>
             
     <button class="hide-right-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Hide sidebar"></button>
     <button class="show-right-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Show sidebar"></button>

src/services/image.js

@@ -98,7 +98,17 @@ async function saveImage(parentNoteId, uploadBuffer, originalName, shrinkImageSw
 
 async function shrinkImage(buffer, originalName) {
     // we do resizing with max (100) quality which will be trimmed during optimization step next
-    const resizedImage = await resize(buffer, 100);
+    let resizedImage;
+
+    try {
+        resizedImage = await resize(buffer, 100);
+    }
+    catch (e) {
+        log.error("Failed to resize image '" + originalName + "'\nStack: " + e.stack);
+
+        resizedImage = buffer;
+    }
+
     let finalImageBuffer;
 
     const jpegQuality = await optionService.getOptionInt('imageJpegQuality');
@@ -107,7 +117,15 @@ async function shrinkImage(buffer, originalName) {
         finalImageBuffer = await optimize(resizedImage, jpegQuality);
     } catch (e) {
         log.error("Failed to optimize image '" + originalName + "'\nStack: " + e.stack);
-        finalImageBuffer = await resize(buffer, jpegQuality);
+
+        try {
+            finalImageBuffer = await resize(buffer, jpegQuality);
+        }
+        catch (e) {
+            log.error("Failed to resize image '" + originalName + "'\nStack: " + e.stack);
+
+            finalImageBuffer = buffer;
+        }
     }
 
     // if resizing & shrinking did not help with size then save the original