release 0.39.6

.idea/.gitignore

@@ -3,3 +3,4 @@
 
 # Datasource local storage ignored files
 /dataSources.local.xml
+/dataSources/

docs/frontend_api/FrontendScriptApi.html

@@ -1240,6 +1240,143 @@
 
 
 
+        
+            
+
+    
+
+    
+    <h4 class="name" id="addTextToActiveTabEditor"><span class="type-signature"></span>addTextToActiveTabEditor<span class="signature">(text)</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    Adds given text to the editor cursor
+</div>
+
+
+
+
+
+
+
+
+
+    <h5>Parameters:</h5>
+    
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>text</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line305">line 305</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         
             
 
@@ -1366,7 +1503,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line390">line 390</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line406">line 406</a>
     </li></ul></dd>
     
 
@@ -1785,7 +1922,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line303">line 303</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line311">line 311</a>
     </li></ul></dd>
     
 
@@ -1891,7 +2028,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line309">line 309</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line325">line 325</a>
     </li></ul></dd>
     
 
@@ -1949,6 +2086,119 @@
     
 
     
+    <h4 class="name" id="getActiveTabTextEditor"><span class="type-signature"></span>getActiveTabTextEditor<span class="signature">()</span><span class="type-signature"> &rarr; {Editor|null}</span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    See https://ckeditor.com/docs/ckeditor5/latest/api/module_core_editor_editor-Editor.html for a documentation on the returned instance.
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line319">line 319</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    CKEditor instance or null (e.g. if active note is not a text note)
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Editor</span>
+|
+
+<span class="param-type">null</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
     <h4 class="name" id="getDateNote"><span class="type-signature"></span>getDateNote<span class="signature">(date)</span><span class="type-signature"> &rarr; {Promise.&lt;<a href="NoteShort.html">NoteShort</a>>}</span></h4>
     
 
@@ -2050,7 +2300,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line356">line 356</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line372">line 372</a>
     </li></ul></dd>
     
 
@@ -2312,7 +2562,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line365">line 365</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line381">line 381</a>
     </li></ul></dd>
     
 
@@ -2775,7 +3025,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line347">line 347</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line363">line 363</a>
     </li></ul></dd>
     
 
@@ -2930,7 +3180,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line374">line 374</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line390">line 390</a>
     </li></ul></dd>
     
 
@@ -3039,7 +3289,7 @@ note.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line320">line 320</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line336">line 336</a>
     </li></ul></dd>
     
 
@@ -3194,7 +3444,7 @@ note.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line328">line 328</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line344">line 344</a>
     </li></ul></dd>
     
 
@@ -3433,7 +3683,7 @@ note.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line339">line 339</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line355">line 355</a>
     </li></ul></dd>
     
 
@@ -4606,7 +4856,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line383">line 383</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line399">line 399</a>
     </li></ul></dd>
     
 
@@ -4757,7 +5007,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line334">line 334</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line350">line 350</a>
     </li></ul></dd>
     
 
@@ -5123,7 +5373,7 @@ Typical use case is when new note has been created, we should wait until it is s
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line401">line 401</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line417">line 417</a>
     </li></ul></dd>
     
 

docs/frontend_api/services_frontend_script_api.js.html

@@ -324,12 +324,28 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      */
     this.createNoteLink = linkService.createNoteLink;
 
+    /**
+     * Adds given text to the editor cursor
+     *
+     * @param {string} text
+     * @method
+     */
+    this.addTextToActiveTabEditor = linkService.addTextToEditor;
+
     /**
      * @method
      * @returns {NoteFull} active note (loaded into right pane)
      */
     this.getActiveTabNote = noteDetailService.getActiveTabNote;
 
+    /**
+     * See https://ckeditor.com/docs/ckeditor5/latest/api/module_core_editor_editor-Editor.html for a documentation on the returned instance.
+     *
+     * @method
+     * @returns {Editor|null} CKEditor instance or null (e.g. if active note is not a text note)
+     */
+    this.getActiveTabTextEditor = noteDetailService.getActiveEditor;
+
     /**
      * @method
      * @returns {Promise<string|null>} returns note path of active note or null if there isn't active note

package-lock.json

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

package.json

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

src/entities/note.js

@@ -805,7 +805,7 @@ class Note extends Entity {
             WHERE noteId = ? AND 
                   isDeleted = 0 AND 
                   type = 'relation' AND 
-                  name IN ('internalLink', 'imageLink', 'relationMapLink')`, [this.noteId]);
+                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
     }
 
     /**

src/public/javascripts/dialogs/options/other.js

@@ -6,7 +6,7 @@ const TPL = `
 <div>
     <h4>Spell check</h4>
 
-    <p>These options apply only for desktop builds, browsers will use their own native spell check.</p>
+    <p>These options apply only for desktop builds, browsers will use their own native spell check. App restart is required after change.</p>
 
     <div class="custom-control custom-checkbox">
         <input type="checkbox" class="custom-control-input" id="spell-check-enabled">

src/public/javascripts/services/context_menu.js

@@ -76,8 +76,7 @@ async function initContextMenu(event, contextMenu) {
     // in such case we'll position it above click coordinates so it will fit into client
     const clickPosition = event.pageY;
     const clientHeight = document.documentElement.clientHeight;
-    const contextMenuHeight = $contextMenuContainer.height();
+    const contextMenuHeight = $contextMenuContainer.outerHeight() + 30;
-
     let top;
 
     if (clickPosition + contextMenuHeight > clientHeight) {

src/public/javascripts/services/frontend_script_api.js

@@ -296,12 +296,28 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
      */
     this.createNoteLink = linkService.createNoteLink;
 
+    /**
+     * Adds given text to the editor cursor
+     *
+     * @param {string} text - this must be clear text, HTML is not supported.
+     * @method
+     */
+    this.addTextToActiveTabEditor = linkService.addTextToEditor;
+
     /**
      * @method
      * @returns {NoteFull} active note (loaded into right pane)
      */
     this.getActiveTabNote = noteDetailService.getActiveTabNote;
 
+    /**
+     * See https://ckeditor.com/docs/ckeditor5/latest/api/module_core_editor_editor-Editor.html for a documentation on the returned instance.
+     *
+     * @method
+     * @returns {Editor|null} CKEditor instance or null (e.g. if active note is not a text note)
+     */
+    this.getActiveTabTextEditor = noteDetailService.getActiveEditor;
+
     /**
      * @method
      * @returns {Promise<string|null>} returns note path of active note or null if there isn't active note

src/public/javascripts/services/note_detail.js

@@ -201,17 +201,13 @@ async function loadNoteDetail(origNotePath, options = {}) {
     const newTab = !!options.newTab;
     const activate = !!options.activate;
 
-    const notePath = await treeService.resolveNotePath(origNotePath);
+    let notePath = await treeService.resolveNotePath(origNotePath);
 
     if (!notePath) {
         console.error(`Cannot resolve note path ${origNotePath}`);
 
         // fallback to display something
-        if (tabContexts.length === 0) {
+        notePath = 'root';
-            await openEmptyTab();
-        }
-
-        return;
     }
 
     const noteId = treeUtils.getNoteIdFromNotePath(notePath);

src/public/javascripts/services/note_detail_text.js

@@ -47,6 +47,7 @@ class NoteDetailText {
         this.ctx = ctx;
         this.$component = ctx.$tabContent.find('.note-detail-text');
         this.$editorEl = this.$component.find('.note-detail-text-editor');
+        this.textEditorPromise = null;
         this.textEditor = null;
 
         this.$component.on("dblclick", "img", e => {
@@ -67,7 +68,23 @@ class NoteDetailText {
     }
 
     async render() {
-        if (!this.textEditor) {
+        if (!this.textEditorPromise) {
+            this.textEditorPromise = this.initEditor();
+        }
+
+        await this.textEditorPromise;
+
+        // lazy loading above can take time and tab might have been already switched to another note
+        if (this.ctx.note && this.ctx.note.type === 'text') {
+            this.textEditor.isReadOnly = await this.isReadOnly();
+
+            this.$component.show();
+
+            this.textEditor.setData(this.ctx.note.content);
+        }
+    }
+
+    async initEditor() {
         await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);
 
         const codeBlockLanguages =
@@ -85,10 +102,7 @@ class NoteDetailText {
         // display of $component in both branches.
         this.$component.show();
 
-            // textEditor might have been initialized during previous await so checking again
+        const textEditorInstance = await BalloonEditor.create(this.$editorEl[0], {
-            // looks like double initialization can freeze CKEditor pretty badly
-            if (!this.textEditor) {
-                this.textEditor = await BalloonEditor.create(this.$editorEl[0], {
             placeholder: "Type the content of your note here ...",
             mention: mentionSetup,
             codeBlock: {
@@ -98,22 +112,13 @@ class NoteDetailText {
 
         if (glob.isDev && ENABLE_INSPECTOR) {
             await import('../../libraries/ckeditor/inspector.js');
-                    CKEditorInspector.attach(this.textEditor);
+            CKEditorInspector.attach(textEditorInstance);
         }
 
+        this.textEditor = textEditorInstance;
+
         this.onNoteChange(() => this.ctx.noteChanged());
     }
-        }
-
-        // lazy loading above can take time and tab might have been already switched to another note
-        if (this.ctx.note && this.ctx.note.type === 'text') {
-            this.textEditor.isReadOnly = await this.isReadOnly();
-
-            this.$component.show();
-
-            this.textEditor.setData(this.ctx.note.content);
-        }
-    }
 
     getContent() {
         const content = this.textEditor.getData();

src/public/javascripts/services/protected_session.js

@@ -42,6 +42,8 @@ async function setupProtectedSession(password) {
         return;
     }
 
+    $("#container").addClass('protected-session-active');
+
     protectedSessionHolder.setProtectedSessionId(response.protectedSessionId);
     protectedSessionHolder.touchProtectedSession();
 

src/public/javascripts/services/spell_check.js

@@ -3,15 +3,16 @@ import optionsService from "./options.js";
 export async function initSpellCheck() {
     const options = await optionsService.waitForOptions();
 
-    if (!options.is('spellCheckEnabled')) {
-        return;
-    }
-
     const {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} = require('electron-spellchecker');
     const {remote, shell} = require('electron');
 
     const spellCheckHandler = new SpellCheckHandler();
+
+    // not fully disabling the spellcheck since we want to preserve the context menu
+    // this will just get rid of the "red squiggles"
+    if (options.is('spellCheckEnabled')) {
         spellCheckHandler.attachToInput();
+    }
 
     spellCheckHandler.switchLanguage(options.get('spellCheckLanguageCode'));
 

src/public/javascripts/services/tab_context.js

@@ -350,8 +350,6 @@ class TabContext {
 
         this.$savedIndicator.fadeIn();
 
-        this.$scriptArea.empty();
-
         // run async
         bundleService.executeRelationBundles(this.note, 'runOnNoteChange', this);
 

src/public/stylesheets/desktop.css

@@ -110,7 +110,7 @@ body {
 
 #context-menu-container {
     max-height: 100vh;
-    overflow: auto; /* make it scrollable when exceeding total height of the window */
+    /* !!! Cannot set overflow: auto, submenus will break !!! */
 }
 
 #context-menu-container, #context-menu-container .dropdown-menu {

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2020-01-04T22:01:20+01:00", buildRevision: "3b8b4da149fbc1b17d09253693823f5135a55f2e" };
+module.exports = { buildDate:"2020-01-18T20:52:14+01:00", buildRevision: "0ec11d29ba2d524ff80b49ab8dc40f3f8cf3835b" };

src/services/consistency_checks.js

@@ -18,18 +18,6 @@ class ConsistencyChecks {
         this.fixedIssues = false;
     }
 
-    async findIssues(query, errorCb) {
-        const results = await sql.getRows(query);
-
-        for (const res of results) {
-            logError(errorCb(res));
-
-            this.unrecoveredConsistencyErrors = true;
-        }
-
-        return results;
-    }
-
     async findAndFixIssues(query, fixerCb) {
         const results = await sql.getRows(query);
 
@@ -175,13 +163,6 @@ class ConsistencyChecks {
                     logError(`Relation ${attributeId} references missing note ${noteId}`)
                 }
             });
-
-        await this.findIssues(`
-                    SELECT noteRevisionId, note_revisions.noteId
-                    FROM note_revisions
-                             LEFT JOIN notes USING (noteId)
-                    WHERE notes.noteId IS NULL`,
-            ({noteRevisionId, noteId}) => `Note revision ${noteRevisionId} references missing note ${noteId}`);
     }
 
     async findExistencyIssues() {
@@ -335,13 +316,22 @@ class ConsistencyChecks {
                 }
             });
 
-        await this.findIssues(`
+        await this.findAndFixIssues(`
                     SELECT noteId
                     FROM notes
                              JOIN note_contents USING (noteId)
                     WHERE isErased = 1
                       AND content IS NOT NULL`,
-            ({noteId}) => `Note ${noteId} content is not null even though the note is erased`);
+            async ({noteId}) => {
+            if (this.autoFix) {
+                await sql.execute(`UPDATE note_contents SET content = NULL WHERE noteId = ?`, [noteId]);
+
+                logFix(`Note ${noteId} content has been set to null since the note is erased`);
+            }
+            else {
+                logError(`Note ${noteId} content is not null even though the note is erased`);
+            }
+        });
 
         await this.findAndFixIssues(`
                     SELECT noteId, noteRevisionId
@@ -398,20 +388,40 @@ class ConsistencyChecks {
                 }
             });
 
-        await this.findIssues(`
+        await this.findAndFixIssues(`
                     SELECT noteRevisionId
                     FROM note_revisions
                              JOIN note_revision_contents USING (noteRevisionId)
                     WHERE isErased = 1
                       AND content IS NOT NULL`,
-            ({noteRevisionId}) => `Note revision ${noteRevisionId} content is not null even though the note revision is erased`);
+            async ({noteRevisionId}) => {
+                if (this.autoFix) {
+                    await sql.execute(`UPDATE note_revision_contents SET content = NULL WHERE noteRevisionId = ?`, [noteRevisionId]);
 
-        await this.findIssues(`
+                    logFix(`Note revision ${noteRevisionId} content was set to null since the note revision is erased`);
+                }
+                else {
+                    logError(`Note revision ${noteRevisionId} content is not null even though the note revision is erased`);
+                }
+            });
+
+        await this.findAndFixIssues(`
                     SELECT noteId
                     FROM notes
                     WHERE isErased = 1
                       AND isDeleted = 0`,
-            ({noteId}) => `Note ${noteId} is not deleted even though it is erased`);
+            async ({noteId}) => {
+                if (this.autoFix) {
+                    const note = await repository.getNote(noteId);
+                    note.isDeleted = true;
+                    await note.save();
+
+                    logFix(`Note ${noteId} was set to deleted since it is erased`);
+                }
+                else {
+                    logError(`Note ${noteId} is not deleted even though it is erased`);
+                }
+            });
 
         await this.findAndFixIssues(`
                     SELECT parentNoteId

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/import/tar.js

@@ -147,7 +147,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
                 continue;
             }
 
-            if (attr.type === 'relation' && ['internalLink', 'imageLink', 'relationMapLink'].includes(attr.name)) {
+            if (attr.type === 'relation' && ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(attr.name)) {
                 // these relations are created automatically and as such don't need to be duplicated in the import
                 continue;
             }

src/services/notes.js

@@ -242,6 +242,20 @@ function findInternalLinks(content, foundLinks) {
     return content.replace(/href="[^"]*#root/g, 'href="#root');
 }
 
+function findIncludeNoteLinks(content, foundLinks) {
+    const re = /<section class="include-note" data-note-id="([a-zA-Z0-9]+)">/g;
+    let match;
+
+    while (match = re.exec(content)) {
+        foundLinks.push({
+            name: 'includeNoteLink',
+            value: match[1]
+        });
+    }
+
+    return content;
+}
+
 function findRelationMapLinks(content, foundLinks) {
     const obj = JSON.parse(content);
 
@@ -267,6 +281,7 @@ async function saveLinks(note, content) {
     if (note.type === 'text') {
         content = findImageLinks(content, foundLinks);
         content = findInternalLinks(content, foundLinks);
+        content = findIncludeNoteLinks(content, foundLinks);
     }
     else if (note.type === 'relation-map') {
         findRelationMapLinks(content, foundLinks);
@@ -490,6 +505,8 @@ async function eraseDeletedNotes() {
         SET isErased = 1,
             title = NULL
         WHERE isErased = 0 AND noteId IN (???)`, noteIdsToErase);
+
+    log.info(`Erased notes: ${JSON.stringify(noteIdsToErase)}`);
 }
 
 async function duplicateNote(noteId, parentNoteId) {

src/services/parse_filters.js

@@ -1,6 +1,6 @@
 const dayjs = require("dayjs");
 
-const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\p{L}\p{Number}_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*(\S+|"[^"]+"))?/igu;
+const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\p{L}\p{Number}_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*([^\s=*]+|"[^"]+"))?/igu;
 const smartValueRegex = /^(NOW|TODAY|WEEK|MONTH|YEAR) *([+\-] *\d+)?$/i;
 
 function calculateSmartValue(v) {

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;
         }
     }
 

src/views/dialogs/about.ejs

@@ -9,7 +9,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                <table class="table">
+                <table class="table table-borderless">
                     <tr>
                         <th>Homepage:</th>
                         <td><a href="https://github.com/zadam/trilium" class="external">https://github.com/zadam/trilium</a></td>