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

# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js

src/public/app/services/utils.js

@@ -64,8 +64,19 @@ function assertArguments() {
     }
 }
 
+const entityMap = {
+    '&': '&',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#39;',
+    '/': '&#x2F;',
+    '`': '&#x60;',
+    '=': '&#x3D;'
+};
+
 function escapeHtml(str) {
-    return $('<div/>').text(str).html();
+    return str.replace(/[&<>"'`=\/]/g, s => entityMap[s]);
 }
 
 async function stopWatch(what, func) {

src/public/app/widgets/note_tree.js

@@ -249,9 +249,39 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
         this.initialized = this.initFancyTree();
 
+        this.setupNoteTitleTooltip();
+
         return this.$widget;
     }
 
+    setupNoteTitleTooltip() {
+        // the following will dynamically set tree item's tooltip if the whole item's text is not currently visible
+        // if the whole text is visible then no tooltip is show since that's unnecessarily distracting
+        // see https://github.com/zadam/trilium/pull/1120 for discussion
+
+        // code inspired by https://gist.github.com/jtsternberg/c272d7de5b967cec2d3d
+        const isEnclosing = ($container, $sub) => {
+            const conOffset           = $container.offset();
+            const conDistanceFromTop  = conOffset.top + $container.outerHeight(true);
+            const conDistanceFromLeft = conOffset.left + $container.outerWidth(true);
+
+            const subOffset           = $sub.offset();
+            const subDistanceFromTop  = subOffset.top + $sub.outerHeight(true);
+            const subDistanceFromLeft = subOffset.left + $sub.outerWidth(true);
+
+            return conDistanceFromTop > subDistanceFromTop
+                && conOffset.top < subOffset.top
+                && conDistanceFromLeft > subDistanceFromLeft
+                && conOffset.left < subOffset.left;
+        };
+
+        this.$tree.on("mouseenter", "span.fancytree-title", e => {
+            e.currentTarget.title = isEnclosing(this.$tree, $(e.currentTarget))
+                ? ""
+                : e.currentTarget.innerText;
+        });
+    }
+
     get hideArchivedNotes() {
         return options.is("hideArchivedNotes_" + this.treeName);
     }
@@ -751,7 +781,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         utils.assertArguments(notePath);
 
         const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
-        /** @var {FancytreeNode} */
+        /** @const {FancytreeNode} */
         let parentNode = null;
 
         const runPath = await treeService.getRunPath(notePath, logErrors);
@@ -836,13 +866,14 @@ export default class NoteTreeWidget extends TabAwareWidget {
         const branch = treeCache.getBranch(node.data.branchId);
 
         const isFolder = this.isFolder(note);
+        const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
 
         node.data.isProtected = note.isProtected;
         node.data.noteType = note.type;
         node.folder = isFolder;
         node.icon = this.getIcon(note, isFolder);
         node.extraClasses = this.getExtraClasses(note);
-        node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
+        node.title = utils.escapeHtml(title);
 
         if (node.isExpanded() !== branch.isExpanded) {
             node.setExpanded(branch.isExpanded, {noEvents: true});

src/routes/api/notes.js

@@ -164,10 +164,16 @@ function changeTitle(req) {
         return [400, `Note ${noteId} is not available for change`];
     }
 
+    const noteTitleChanged = note.title !== title;
+
     note.title = title;
 
     note.save();
 
+    if (noteTitleChanged) {
+        await noteService.triggerNoteTitleChanged(note);
+    }
+
     return note;
 }
 

src/routes/custom.js

@@ -2,64 +2,73 @@ const repository = require('../services/repository');
 const log = require('../services/log');
 const fileUploadService = require('./api/files.js');
 const scriptService = require('../services/script');
+const cls = require('../services/cls');
+
+async function handleRequest(req, res) {
+    // express puts content after first slash into 0 index element
+
+    const path = req.params.path + req.params[0];
+
+    const attrs = repository.getEntities("SELECT * FROM attributes WHERE isDeleted = 0 AND type = 'label' AND name IN ('customRequestHandler', 'customResourceProvider')");
+
+    for (const attr of attrs) {
+        const regex = new RegExp(attr.value);
+        let match;
+
+        try {
+            match = path.match(regex);
+        }
+        catch (e) {
+            log.error(`Testing path for label ${attr.attributeId}, regex=${attr.value} failed with error ` + e.stack);
+            continue;
+        }
+
+        if (!match) {
+            continue;
+        }
+
+        if (attr.name === 'customRequestHandler') {
+            const note = attr.getNote();
+
+            log.info(`Handling custom request "${path}" with note ${note.noteId}`);
+
+            try {
+                scriptService.executeNote(note, {
+                    pathParams: match.slice(1),
+                    req,
+                    res
+                });
+            }
+            catch (e) {
+                log.error(`Custom handler ${note.noteId} failed with ${e.message}`);
+
+                res.status(500).send(e.message);
+            }
+        }
+        else if (attr.name === 'customResourceProvider') {
+            fileUploadService.downloadNoteFile(attr.noteId, res);
+        }
+        else {
+            throw new Error("Unrecognized attribute name " + attr.name);
+        }
+
+        return; // only first handler is executed
+    }
+
+    const message = `No handler matched for custom ${path} request.`;
+
+    log.info(message);
+    res.status(404).send(message);
+}
 
 function register(router) {
     // explicitly no CSRF middleware since it's meant to allow integration from external services
 
-    router.all('/custom/:path*', (req, res, next) => {
-        // express puts content after first slash into 0 index element
-        const path = req.params.path + req.params[0];
+    router.all('/custom/:path*', async (req, res, next) => {
+        cls.namespace.bindEmitter(req);
+        cls.namespace.bindEmitter(res);
 
-        const attrs = repository.getEntities("SELECT * FROM attributes WHERE isDeleted = 0 AND type = 'label' AND name IN ('customRequestHandler', 'customResourceProvider')");
-
-        for (const attr of attrs) {
-            const regex = new RegExp(attr.value);
-            let match;
-
-            try {
-                match = path.match(regex);
-            }
-            catch (e) {
-                log.error(`Testing path for label ${attr.attributeId}, regex=${attr.value} failed with error ` + e.stack);
-                continue;
-            }
-
-            if (!match) {
-                continue;
-            }
-
-            if (attr.name === 'customRequestHandler') {
-                const note = attr.getNote();
-
-                log.info(`Handling custom request "${path}" with note ${note.noteId}`);
-
-                try {
-                    scriptService.executeNote(note, {
-                        pathParams: match.slice(1),
-                        req,
-                        res
-                    });
-                }
-                catch (e) {
-                    log.error(`Custom handler ${note.noteId} failed with ${e.message}`);
-
-                    res.status(500).send(e.message);
-                }
-            }
-            else if (attr.name === 'customResourceProvider') {
-                fileUploadService.downloadNoteFile(attr.noteId, res);
-            }
-            else {
-                throw new Error("Unrecognized attribute name " + attr.name);
-            }
-
-            return; // only first handler is executed
-        }
-
-        const message = `No handler matched for custom ${path} request.`;
-
-        log.info(message);
-        res.status(404).send(message);
+        cls.init(() => handleRequest(req, res));
     });
 }
 

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-06-15T23:26:12+02:00", buildRevision: "9791dab97d9e86c4b02ca593198caffd1b72bbfb" };
+module.exports = { buildDate:"2020-06-23T10:11:17+02:00", buildRevision: "89aa4fbc73fc6c357e04e037d6a1191fa4058d80" };

src/services/export/zip.js

@@ -3,7 +3,6 @@
 const html = require('html');
 const repository = require('../repository');
 const dateUtils = require('../date_utils');
-const zip = require('tar-stream');
 const path = require('path');
 const mimeTypes = require('mime-types');
 const mdService = require('./md');

src/services/handlers.js

@@ -68,6 +68,9 @@ eventService.subscribe(eventService.ENTITY_CREATED, ({ entityName, entity }) =>
 
             note.setContent(targetNote.getContent());
         }
+        else if (entity.type === 'label' && entity.name === 'sorted') {
+            await treeService.sortNotesAlphabetically(entity.noteId);
+        }
     }
     else if (entityName === 'notes') {
         runAttachedRelations(entity, 'runOnNoteCreation', entity);

src/services/import/single.js

@@ -24,7 +24,7 @@ function importSingleFile(taskContext, file, parentNote) {
         return importCodeNote(taskContext, file, parentNote);
     }
 
-    if (["image/jpeg", "image/gif", "image/png", "image/webp"].includes(mime)) {
+    if (mime.startsWith("image/")) {
         return importImage(file, parentNote, taskContext);
     }
 

src/services/notes.js

@@ -778,5 +778,6 @@ module.exports = {
     protectNoteRecursively,
     scanForLinks,
     duplicateNote,
-    getUndeletedParentBranches
+    getUndeletedParentBranches,
+    triggerNoteTitleChanged
 };