release 0.40.2

.idea/.gitignore

@@ -2,4 +2,5 @@
 /workspace.xml
 
 # Datasource local storage ignored files
-/dataSources.local.xml
+/dataSources.local.xml
+/dataSources/

db/migrations/0157__fix_contentLength.sql

@@ -0,0 +1 @@
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.39.5",
+  "version": "0.40.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.40.0-beta",
+  "version": "0.40.2",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/entities/note.js

@@ -110,6 +110,10 @@ class Note extends Entity {
     async getJsonContent() {
         const content = await this.getContent();
 
+        if (!content || !content.trim()) {
+            return null;
+        }
+
         return JSON.parse(content);
     }
 
@@ -119,9 +123,11 @@ class Note extends Entity {
             throw new Error(`Cannot set null content to note ${this.noteId}`);
         }
 
+        content = Buffer.isBuffer(content) ? content : Buffer.from(content);
+
         // force updating note itself so that dateModified is represented correctly even for the content
         this.forcedChange = true;
-        this.contentLength = content.length;
+        this.contentLength = content.byteLength;
         await this.save();
 
         this.content = content;
@@ -130,7 +136,7 @@ class Note extends Entity {
             noteId: this.noteId,
             content: content,
             utcDateModified: dateUtils.utcNowDateTime(),
-            hash: utils.hash(this.noteId + "|" + content)
+            hash: utils.hash(this.noteId + "|" + content.toString())
         };
 
         if (this.isProtected) {

src/public/javascripts/mobile.js

@@ -87,6 +87,8 @@ async function showTree() {
             });
         }
     });
+
+    treeService.setTree($.ui.fancytree.getTree("#tree"));
 }
 
 $detail.on("click", ".note-menu-button", async e => {

src/public/javascripts/services/entrypoints.js

@@ -241,7 +241,7 @@ function registerEntrypoints() {
 
         d.showDialog(selectedOrActiveNodes);
     }));
-    
+
     keyboardActionService.setGlobalActionHandler("CreateNoteIntoDayNote", async () => {
         const todayNote = await dateNoteService.getTodayNote();
 
@@ -288,6 +288,8 @@ function registerEntrypoints() {
 
         searchNotesService.searchInSubtree(node.data.noteId);
     });
+
+    keyboardActionService.setGlobalActionHandler("CopyWithoutFormatting", utils.copySelectionToClipboard);
 }
 
 export default {

src/public/javascripts/services/sidebar.js

@@ -5,6 +5,7 @@ import splitService from "./split.js";
 import optionService from "./options.js";
 import server from "./server.js";
 import noteDetailService from "./note_detail.js";
+import utils from "./utils.js";
 
 const $sidebar = $("#right-pane");
 const $sidebarContainer = $('#sidebar-container');
@@ -15,6 +16,10 @@ const $hideSidebarButton = $("#hide-sidebar-button");
 optionService.waitForOptions().then(options => toggleSidebar(options.is('rightPaneVisible')));
 
 function toggleSidebar(show) {
+    if (utils.isMobile()) {
+        return;
+    }
+
     $sidebar.toggle(show);
     $showSidebarButton.toggle(!show);
     $hideSidebarButton.toggle(show);

src/public/javascripts/services/tab_context.js

@@ -303,7 +303,11 @@ class TabContext {
 
         let type = this.note.type;
 
-        if (type === 'text' && !disableAutoBook && utils.isHtmlEmpty(this.note.content) && this.note.hasChildren()) {
+        if (type === 'text'
+            && !disableAutoBook
+            && utils.isHtmlEmpty(this.note.content)
+            && this.note.hasChildren()
+            && utils.isDesktop()) {
             type = 'book';
         }
 

src/public/javascripts/services/tree.js

@@ -913,6 +913,10 @@ function getNodeByKey(key) {
     return tree.getNodeByKey(key);
 }
 
+function setTree(treeInstance) {
+    tree = treeInstance;
+}
+
 keyboardActionService.setGlobalActionHandler('CollapseTree', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
 $collapseTreeButton.on('click', () => collapseTree());
 
@@ -949,5 +953,6 @@ export default {
     focusTree,
     scrollToActiveNote,
     duplicateNote,
-    getNodeByKey
+    getNodeByKey,
+    setTree
 };

src/public/javascripts/services/utils.js

@@ -241,6 +241,13 @@ function getUrlForDownload(url) {
     }
 }
 
+function copySelectionToClipboard() {
+    const text = window.getSelection().toString();
+    if (navigator.clipboard) {
+        navigator.clipboard.writeText(text);
+    }
+}
+
 export default {
     reloadApp,
     parseDate,
@@ -273,5 +280,6 @@ export default {
     isHtmlEmpty,
     clearBrowserCache,
     getUrlForDownload,
-    normalizeShortcut
+    normalizeShortcut,
+    copySelectionToClipboard
 };

src/public/javascripts/widgets/calendar.js

@@ -41,7 +41,7 @@ class CalendarWidget extends StandardWidget {
     }
 
     init($el, activeDate) {
-        this.activeDate = new Date(Date.parse(activeDate));
+        this.activeDate = new Date(activeDate + "T12:00:00"); // attaching time fixes local timezone handling
         this.todaysDate = new Date();
         this.date = new Date(this.activeDate.getTime());
 

src/routes/api/search.js

@@ -29,8 +29,12 @@ async function searchFromNote(req) {
         return [404, `Note ${req.params.noteId} has not been found.`];
     }
 
+    if (note.isDeleted) {
+        return [400, `Note ${req.params.noteId} is deleted.`];
+    }
+
     if (note.type !== 'search') {
-        return [400, '`Note ${req.params.noteId} is not search note.`']
+        return [400, `Note ${req.params.noteId} is not search note.`]
     }
 
     const json = await note.getJsonContent();
@@ -41,18 +45,28 @@ async function searchFromNote(req) {
 
     let noteIds;
 
-    if (json.searchString.startsWith('=')) {
+    try {
-        const relationName = json.searchString.substr(1).trim();
+        if (json.searchString.startsWith('=')) {
+            const relationName = json.searchString.substr(1).trim();
 
-        noteIds = await searchFromRelation(note, relationName);
+            noteIds = await searchFromRelation(note, relationName);
+        } else {
+            noteIds = await searchService.searchForNoteIds(json.searchString);
+        }
     }
-    else {
+    catch (e) {
-        noteIds = await searchService.searchForNoteIds(json.searchString);
+        log.error(`Search failed for note ${note.noteId}: ` + e.message + ": " + e.stack);
+
+        throw new Error("Search failed, see logs for details.");
     }
 
     // we won't return search note's own noteId
     noteIds = noteIds.filter(noteId => noteId !== note.noteId);
 
+    if (noteIds.length > 200) {
+        noteIds = noteIds.slice(0, 200);
+    }
+
     return noteIds.map(noteCacheService.getNotePath).filter(res => !!res);
 }
 

src/services/app_info.js

@@ -4,7 +4,7 @@ const build = require('./build');
 const packageJson = require('../../package');
 const {TRILIUM_DATA_DIR} = require('./data_dir');
 
-const APP_DB_VERSION = 156;
+const APP_DB_VERSION = 157;
 const SYNC_VERSION = 14;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-01-11T09:54:31+01:00", buildRevision: "5e91b1b5e0fa04affbc1a5a43a874cadc382fe11" };
+module.exports = { buildDate:"2020-02-01T10:17:51+01:00", buildRevision: "0f25c8a95f381d99b66735b9c0af3e319edb72ed" };

src/services/cloning.js

@@ -7,6 +7,7 @@ const noteService = require('./notes');
 const repository = require('./repository');
 const Branch = require('../entities/branch');
 const TaskContext = require("./task_context.js");
+const utils = require('./utils');
 
 async function cloneNoteToParent(noteId, parentNoteId, prefix) {
     if (await isNoteDeleted(noteId) || await isNoteDeleted(parentNoteId)) {
@@ -54,7 +55,8 @@ async function ensureNoteIsAbsentFromParent(noteId, parentNoteId) {
     const branch = await repository.getEntity(`SELECT * FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]);
 
     if (branch) {
-        await noteService.deleteBranch(branch, new TaskContext());
+        const deleteId = utils.randomString(10);
+        await noteService.deleteBranch(branch, deleteId, new TaskContext());
     }
 }
 

src/services/date_notes.js

@@ -40,7 +40,9 @@ async function getRootCalendarNote() {
             parentNoteId: 'root',
             title: 'Calendar',
             target: 'into',
-            isProtected: false
+            isProtected: false,
+            type: 'text',
+            content: ''
         })).note;
 
         await attributeService.createLabel(rootNote.noteId, CALENDAR_ROOT_LABEL);

src/services/keyboard_actions.js

@@ -306,6 +306,10 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     {
         actionName: "ZoomIn",
         defaultShortcuts: ["CommandOrControl+="]
+    },
+    {
+        actionName: "CopyWithoutFormatting",
+        defaultShortcuts: ["CommandOrControl+Alt+C"]
     }
 ];
 

src/services/ws.js

@@ -71,22 +71,36 @@ function sendMessageToAllClients(message) {
     }
 }
 
+async function fillInAdditionalProperties(sync) {
+    // fill in some extra data needed by the frontend
+    if (sync.entityName === 'attributes') {
+        sync.noteId = await sql.getValue(`SELECT noteId
+                                          FROM attributes
+                                          WHERE attributeId = ?`, [sync.entityId]);
+    } else if (sync.entityName === 'note_revisions') {
+        sync.noteId = await sql.getValue(`SELECT noteId
+                                          FROM note_revisions
+                                          WHERE noteRevisionId = ?`, [sync.entityId]);
+    } else if (sync.entityName === 'branches') {
+        const {noteId, parentNoteId} = await sql.getRow(`SELECT noteId, parentNoteId
+                                                         FROM branches
+                                                         WHERE branchId = ?`, [sync.entityId]);
+
+        sync.noteId = noteId;
+        sync.parentNoteId = parentNoteId;
+    }
+}
+
 async function sendPing(client) {
     const syncData = require('./sync_table').getEntitySyncsNewerThan(lastAcceptedSyncIds[client.id]);
 
     for (const sync of syncData) {
-        // fill in some extra data needed by the frontend
+        try {
-        if (sync.entityName === 'attributes') {
+            await fillInAdditionalProperties(sync);
-            sync.noteId = await sql.getValue(`SELECT noteId FROM attributes WHERE attributeId = ?`, [sync.entityId]);
         }
-        else if (sync.entityName === 'note_revisions') {
+        catch (e) {
-            sync.noteId = await sql.getValue(`SELECT noteId FROM note_revisions WHERE noteRevisionId = ?`, [sync.entityId]);
+            log.error("Could not fill additional properties for sync " + JSON.stringify(sync)
-        }
+                + " because of error: " + e.message + ": " + e.stack);
-        else if (sync.entityName === 'branches') {
-            const {noteId, parentNoteId} = await sql.getRow(`SELECT noteId, parentNoteId FROM branches WHERE branchId = ?`, [sync.entityId]);
-
-            sync.noteId = noteId;
-            sync.parentNoteId = parentNoteId;
         }
     }