Merge remote-tracking branch 'origin/math2'

# Conflicts:
#	package-lock.json

src/public/app/services/tab_manager.js

@@ -115,6 +115,7 @@ export default class TabManager extends Component {
 
             // using pushState instead of directly modifying document.location because it does not trigger hashchange
             window.history.pushState(null, "", url);
+        }
 
         document.title = "Trilium Notes";
 
@@ -122,7 +123,6 @@ export default class TabManager extends Component {
             // it helps navigating in history if note title is included in the title
             document.title += " - " + activeTabContext.note.title;
         }
-        }
 
         this.triggerEvent('activeNoteChanged'); // trigger this even in on popstate event
     }

src/public/app/services/tree_cache.js

@@ -196,8 +196,8 @@ class TreeCache {
             if (note.type === 'search') {
                 const searchResultNoteIds = await server.get('search-note/' + note.noteId);
 
-                if (!searchResultNoteIds) {
+                if (!Array.isArray(searchResultNoteIds)) {
-                    throw new Error(`Search note ${note.noteId} failed.`);
+                    throw new Error(`Search note ${note.noteId} failed: ${searchResultNoteIds}`);
                 }
 
                 // force to load all the notes at once instead of one by one

src/public/app/widgets/attribute_detail.js

@@ -283,7 +283,9 @@ export default class AttributeDetailWidget extends TabAwareWidget {
                     return false;
                 }
 
-                this.attribute.value = suggestion.notePath;
+                const pathChunks = suggestion.notePath.split('/');
+
+                this.attribute.value = pathChunks[pathChunks.length - 1]; // noteId
 
                 this.triggerCommand('updateAttributeList', { attributes: this.allAttributes });
                 this.updateRelatedNotes();

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

@@ -181,7 +181,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         });
     }
 
-    addTextToActiveEditorEvent(text) {
+    addTextToActiveEditorEvent({text}) {
         if (!this.isActive()) {
             return;
         }

src/routes/api/search.js

@@ -38,7 +38,8 @@ async function searchFromNote(req) {
     }
 
     if (note.isDeleted) {
-        return [400, `Note ${req.params.noteId} is deleted.`];
+        // this can be triggered from recent changes and it's harmless to return empty list rather than fail
+        return [];
     }
 
     if (note.type !== 'search') {

src/services/import/opml.js

@@ -11,8 +11,8 @@ const htmlSanitizer = require('../html_sanitizer');
  * @param {Note} parentNote
  * @return {Promise<*[]|*>}
  */
-function importOpml(taskContext, fileBuffer, parentNote) {
+async function importOpml(taskContext, fileBuffer, parentNote) {
-    const xml = new Promise(function(resolve, reject)
+    const xml = await new Promise(function(resolve, reject)
     {
         parseString(fileBuffer, function (err, result) {
             if (err) {