From 742df25bc2a05442970e912598f1bd5c70081945 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 09:49:56 +0200
Subject: [PATCH 01/16] collapse/expand only folder notes

---
 .idea/inspectionProfiles/Project_Default.xml |  1 +
 package-lock.json                            |  6 +++---
 package.json                                 |  2 +-
 src/public/app/widgets/note_tree.js          | 12 ++++++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 146ab09b7..84795bdad 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
diff --git a/package-lock.json b/package-lock.json
index d1b5a9a5e..5e3957808 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3345,9 +3345,9 @@
       }
     },
     "electron": {
-      "version": "9.0.0-beta.21",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.21.tgz",
-      "integrity": "sha512-xFOD8I4RB9IkpVKnzoHwHvDNGvGl1IinpYTyQ7o7FAgSnkvP/upI1JtzE5Ff6PlAdyIGnbC+Rz1hJIfmAXxVuQ==",
+      "version": "9.0.0-beta.22",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.22.tgz",
+      "integrity": "sha512-dfqAf+CXXTKcNDj7DU7mYsmx+oZQcXOvJnZ8ZsgAHjrE9Tv8zsYUgCP3JlO4Z8CIazgleKXYmgh6H2stdK7fEA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index 4d96ee213..cb68c60c4 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "yazl": "^2.5.1"
   },
   "devDependencies": {
-    "electron": "9.0.0-beta.21",
+    "electron": "9.0.0-beta.22",
     "electron-builder": "22.6.0",
     "electron-packager": "14.2.1",
     "electron-rebuild": "1.10.1",
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index de97e8450..2aa86a861 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -611,7 +611,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
                 // unfortunately the two steps can't be combined
                 await node.visitAndLoad(_ => {}, true);
 
-                node.visit(node => node.setExpanded(true), true);
+                node.visit(node => {
+                    if (node.isFolder()) {
+                        node.setExpanded(true);
+                    }
+                }, true);
             }
             finally {
                 this.tree.autoLoadingDisabled = false;
@@ -627,7 +631,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
 
         this.batchUpdate(() => {
-            node.visit(node => node.setExpanded(false), true);
+            node.visit(node => {
+                if (node.isFolder()) {
+                    node.setExpanded(false);
+                }
+            }, true);
         });
     }
 

From 2a3091f788e653c3fe7894e7580924bb816ed5d0 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 13:15:08 +0200
Subject: [PATCH 02/16] reimplemented expand/collapse differently for better
 performance

---
 package-lock.json                     |  6 +--
 package.json                          |  2 +-
 src/public/app/entities/note_short.js |  2 +
 src/public/app/services/tree_cache.js |  6 +--
 src/public/app/widgets/note_tree.js   | 59 +++++++++------------------
 src/routes/api/branches.js            | 22 ++++++++++
 src/routes/routes.js                  |  1 +
 7 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5e3957808..d1b5a9a5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3345,9 +3345,9 @@
       }
     },
     "electron": {
-      "version": "9.0.0-beta.22",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.22.tgz",
-      "integrity": "sha512-dfqAf+CXXTKcNDj7DU7mYsmx+oZQcXOvJnZ8ZsgAHjrE9Tv8zsYUgCP3JlO4Z8CIazgleKXYmgh6H2stdK7fEA==",
+      "version": "9.0.0-beta.21",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.21.tgz",
+      "integrity": "sha512-xFOD8I4RB9IkpVKnzoHwHvDNGvGl1IinpYTyQ7o7FAgSnkvP/upI1JtzE5Ff6PlAdyIGnbC+Rz1hJIfmAXxVuQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index cb68c60c4..4d96ee213 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "yazl": "^2.5.1"
   },
   "devDependencies": {
-    "electron": "9.0.0-beta.22",
+    "electron": "9.0.0-beta.21",
     "electron-builder": "22.6.0",
     "electron-packager": "14.2.1",
     "electron-rebuild": "1.10.1",
diff --git a/src/public/app/entities/note_short.js b/src/public/app/entities/note_short.js
index 68e14f3be..2b1dbf610 100644
--- a/src/public/app/entities/note_short.js
+++ b/src/public/app/entities/note_short.js
@@ -8,6 +8,8 @@ const RELATION = 'relation';
 const RELATION_DEFINITION = 'relation-definition';
 
 /**
+ * FIXME: since there's no "full note" anymore we can rename this to Note
+ *
  * This note's representation is used in note tree and is kept in TreeCache.
  */
 class NoteShort {
diff --git a/src/public/app/services/tree_cache.js b/src/public/app/services/tree_cache.js
index 7f4095f40..3f92901e6 100644
--- a/src/public/app/services/tree_cache.js
+++ b/src/public/app/services/tree_cache.js
@@ -246,10 +246,10 @@ class TreeCache {
         return this.notes[noteId];
     }
 
-    getBranches(branchIds) {
+    getBranches(branchIds, silentNotFoundError = false) {
         return branchIds
-            .map(branchId => this.getBranch(branchId))
-            .filter(b => b !== null);
+            .map(branchId => this.getBranch(branchId, silentNotFoundError))
+            .filter(b => !!b);
     }
 
     /** @return {Branch} */
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 2aa86a861..0959dafdd 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -362,17 +362,13 @@ export default class NoteTreeWidget extends TabAwareWidget {
             },
             // this is done to automatically lazy load all expanded notes after tree load
             loadChildren: (event, data) => {
-                // semaphore since the conflict when two processes are trying to load the same data
-                // breaks the fancytree
-                if (!this.tree || !this.tree.autoLoadingDisabled) {
-                    data.node.visit((subNode) => {
-                        // Load all lazy/unloaded child nodes
-                        // (which will trigger `loadChildren` recursively)
-                        if (subNode.isUndefined() && subNode.isExpanded()) {
-                            subNode.load();
-                        }
-                    });
-                }
+                data.node.visit((subNode) => {
+                    // Load all lazy/unloaded child nodes
+                    // (which will trigger `loadChildren` recursively)
+                    if (subNode.isUndefined() && subNode.isExpanded()) {
+                        subNode.load();
+                    }
+                });
             }
         });
 
@@ -596,47 +592,30 @@ export default class NoteTreeWidget extends TabAwareWidget {
         return notes;
     }
 
-    async expandTree(node = null) {
+    async setExpandedStatusForSubtree(node, isExpanded) {
         if (!node) {
             const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
 
             node = this.getNodesByNoteId(hoistedNoteId)[0];
         }
 
-        this.batchUpdate(async () => {
-            try {
-                this.tree.autoLoadingDisabled = true;
+        const {branchIds} = await server.put(`branches/${node.data.branchId}/expanded-subtree/${isExpanded ? 1 : 0}`);
 
-                // trick - first force load of the whole subtree and then visit and expand.
-                // unfortunately the two steps can't be combined
-                await node.visitAndLoad(_ => {}, true);
+        treeCache.getBranches(branchIds, true).forEach(branch => branch.isExpanded = isExpanded);
 
-                node.visit(node => {
-                    if (node.isFolder()) {
-                        node.setExpanded(true);
-                    }
-                }, true);
-            }
-            finally {
-                this.tree.autoLoadingDisabled = false;
-            }
+        await this.batchUpdate(async () => {
+            await node.load(true);
+
+            await node.setExpanded(isExpanded, {noEvents: true});
         });
     }
 
-    collapseTree(node = null) {
-        if (!node) {
-            const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
+    async expandTree(node = null) {
+        await this.setExpandedStatusForSubtree(node, true);
+    }
 
-            node = this.getNodesByNoteId(hoistedNoteId)[0];
-        }
-
-        this.batchUpdate(() => {
-            node.visit(node => {
-                if (node.isFolder()) {
-                    node.setExpanded(false);
-                }
-            }, true);
-        });
+    async collapseTree(node = null) {
+        await this.setExpandedStatusForSubtree(node, false);
     }
 
     /**
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index 6917f5981..7bceaa4cc 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -118,6 +118,27 @@ async function setExpanded(req) {
     // we don't sync expanded label
 }
 
+async function setExpandedForSubtree(req) {
+    const {branchId, expanded} = req.params;
+
+    const branchIds = await sql.getColumn(`
+        WITH RECURSIVE
+        tree(branchId, noteId) AS (
+            SELECT branchId, noteId FROM branches WHERE branchId = ?
+            UNION
+            SELECT branches.branchId, branches.noteId FROM branches
+                JOIN tree ON branches.parentNoteId = tree.noteId
+            WHERE branches.isDeleted = 0
+        )
+        SELECT branchId FROM tree`, [branchId]);
+
+    await sql.executeMany(`UPDATE branches SET isExpanded = ${expanded} WHERE branchId IN (???)`, branchIds);
+
+    return {
+        branchIds
+    };
+}
+
 async function deleteBranch(req) {
     const last = req.query.last === 'true';
     const branch = await repository.getBranch(req.params.branchId);
@@ -149,6 +170,7 @@ module.exports = {
     moveBranchBeforeNote,
     moveBranchAfterNote,
     setExpanded,
+    setExpandedForSubtree,
     deleteBranch,
     setPrefix
 };
\ No newline at end of file
diff --git a/src/routes/routes.js b/src/routes/routes.js
index 13783ec35..439ae1201 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -127,6 +127,7 @@ function register(app) {
     apiRoute(PUT, '/api/branches/:branchId/move-before/:beforeBranchId', branchesApiRoute.moveBranchBeforeNote);
     apiRoute(PUT, '/api/branches/:branchId/move-after/:afterBranchId', branchesApiRoute.moveBranchAfterNote);
     apiRoute(PUT, '/api/branches/:branchId/expanded/:expanded', branchesApiRoute.setExpanded);
+    apiRoute(PUT, '/api/branches/:branchId/expanded-subtree/:expanded', branchesApiRoute.setExpandedForSubtree);
     apiRoute(DELETE, '/api/branches/:branchId', branchesApiRoute.deleteBranch);
 
     apiRoute(GET, '/api/autocomplete', autocompleteApiRoute.getAutocomplete);

From 43e12fbea257c37155c8848ab73151c59de97214 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 13:52:12 +0200
Subject: [PATCH 03/16] small fixes for collapse/expand

---
 src/public/app/services/tree_cache.js        |  2 +-
 src/public/app/services/tree_context_menu.js |  2 +-
 src/public/app/widgets/note_tree.js          |  4 +++-
 src/routes/api/branches.js                   | 11 ++++++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/public/app/services/tree_cache.js b/src/public/app/services/tree_cache.js
index 3f92901e6..baf7350b3 100644
--- a/src/public/app/services/tree_cache.js
+++ b/src/public/app/services/tree_cache.js
@@ -231,7 +231,7 @@ class TreeCache {
     /** @return {Promise<NoteShort>} */
     async getNote(noteId, silentNotFoundError = false) {
         if (noteId === 'none') {
-            console.log(`No 'none' note.`);
+            console.trace(`No 'none' note.`);
             return null;
         }
         else if (!noteId) {
diff --git a/src/public/app/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js
index dd0b9a6bd..0478a05ff 100644
--- a/src/public/app/services/tree_context_menu.js
+++ b/src/public/app/services/tree_context_menu.js
@@ -40,9 +40,9 @@ class TreeContextMenu {
     async getMenuItems() {
         const note = await treeCache.getNote(this.node.data.noteId);
         const branch = treeCache.getBranch(this.node.data.branchId);
-        const parentNote = await treeCache.getNote(branch.parentNoteId);
         const isNotRoot = note.noteId !== 'root';
         const isHoisted = note.noteId === hoistedNoteService.getHoistedNoteId();
+        const parentNote = isNotRoot ? await treeCache.getNote(branch.parentNoteId) : null;
 
         // some actions don't support multi-note so they are disabled when notes are selected
         // the only exception is when the only selected note is the one that was right-clicked, then
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 0959dafdd..11b80f8fc 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -606,7 +606,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
         await this.batchUpdate(async () => {
             await node.load(true);
 
-            await node.setExpanded(isExpanded, {noEvents: true});
+            if (node.data.noteId !== 'root') { // root is always expanded
+                await node.setExpanded(isExpanded, {noEvents: true});
+            }
         });
     }
 
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index 7bceaa4cc..b0cfe0578 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -114,14 +114,16 @@ async function moveBranchAfterNote(req) {
 async function setExpanded(req) {
     const {branchId, expanded} = req.params;
 
-    await sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]);
-    // we don't sync expanded label
+    if (branchId !== 'root') {
+        await sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]);
+        // we don't sync expanded label
+    }
 }
 
 async function setExpandedForSubtree(req) {
     const {branchId, expanded} = req.params;
 
-    const branchIds = await sql.getColumn(`
+    let branchIds = await sql.getColumn(`
         WITH RECURSIVE
         tree(branchId, noteId) AS (
             SELECT branchId, noteId FROM branches WHERE branchId = ?
@@ -132,6 +134,9 @@ async function setExpandedForSubtree(req) {
         )
         SELECT branchId FROM tree`, [branchId]);
 
+    // root is always expanded
+    branchIds = branchIds.filter(branchId => branchId !== 'root');
+
     await sql.executeMany(`UPDATE branches SET isExpanded = ${expanded} WHERE branchId IN (???)`, branchIds);
 
     return {

From 4eb2407c73224cb2da620a3808ed5ae245b6dd4a Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 13:59:49 +0200
Subject: [PATCH 04/16] fix folder icon for hidden included images

---
 src/public/app/widgets/note_tree.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 11b80f8fc..455ff4166 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -419,7 +419,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         return labels.map(l => l.value).join(' ');
     }
 
-    getIcon(note) {
+    getIcon(note, isFolder) {
         const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
 
         const iconClass = this.getIconClass(note);
@@ -434,7 +434,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
             return "bx bxs-arrow-from-bottom";
         }
         else if (note.type === 'text') {
-            if (note.hasChildren()) {
+            if (isFolder) {
                 return "bx bx-folder";
             }
             else {
@@ -456,6 +456,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
         const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
         const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
 
+        const isFolder = await this.isFolder(note);
+
         const node = {
             noteId: note.noteId,
             parentNoteId: branch.parentNoteId,
@@ -464,10 +466,10 @@ export default class NoteTreeWidget extends TabAwareWidget {
             noteType: note.type,
             title: utils.escapeHtml(title),
             extraClasses: this.getExtraClasses(note),
-            icon: this.getIcon(note),
+            icon: this.getIcon(note, isFolder),
             refKey: note.noteId,
             lazy: true,
-            folder: await this.isFolder(note),
+            folder: isFolder,
             expanded: branch.isExpanded || hoistedNoteId === note.noteId,
             key: utils.randomString(12) // this should prevent some "duplicate key" errors
         };
@@ -733,10 +735,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
         const note = treeCache.getNoteFromCache(node.data.noteId);
         const branch = treeCache.getBranch(node.data.branchId);
 
+        const isFolder = await this.isFolder(note);
+
         node.data.isProtected = note.isProtected;
         node.data.noteType = note.type;
-        node.folder = await this.isFolder(note);
-        node.icon = this.getIcon(note);
+        node.folder = isFolder;
+        node.icon = this.getIcon(note, isFolder);
         node.extraClasses = this.getExtraClasses(note);
         node.title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
         node.renderTitle();

From 227c3e4dccf90ccf18eb0dc320c812d207d611b9 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 14:33:59 +0200
Subject: [PATCH 05/16] fixes for offline downloading of images

---
 src/services/notes.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/services/notes.js b/src/services/notes.js
index d1cd0ab7f..c8948dbee 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -276,9 +276,9 @@ async function downloadImage(noteId, imageUrl) {
 const downloadImagePromises = {};
 
 function replaceUrl(content, url, imageNote) {
-    const quoted = url.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const quoted = url.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
 
-    return content.replace(new RegExp(`\s+src=[\"']${quoted}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`);
+    return content.replace(new RegExp(`\\s+src=[\"']${quoted}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`);
 }
 
 async function downloadImages(noteId, content) {
@@ -288,11 +288,11 @@ async function downloadImages(noteId, content) {
     const origContent = content;
 
     while (match = re.exec(origContent)) {
-        const url = match[1].toLowerCase();
+        const url = match[1];
 
         if (!url.startsWith('api/images/')
             // this is and exception for the web clipper's "imageId"
-            && (url.length !== 20 || url.startsWith('http'))) {
+            && (url.length !== 20 || url.toLowerCase().startsWith('http'))) {
             if (url in downloadImagePromises) {
                 // download is already in progress
                 continue;
@@ -347,7 +347,7 @@ async function downloadImages(noteId, content) {
             for (const url in imageUrlToNoteIdMapping) {
                 const imageNote = imageNotes.find(note => note.noteId === imageUrlToNoteIdMapping[url]);
 
-                if (imageNote) {
+                if (imageNote && !imageNote.isDeleted) {
                     updatedContent = replaceUrl(updatedContent, url, imageNote);
                 }
             }
@@ -356,6 +356,8 @@ async function downloadImages(noteId, content) {
             if (updatedContent !== origContent) {
                 await origNote.setContent(updatedContent);
 
+                await scanForLinks(origNote);
+
                 console.log(`Fixed the image links for note ${noteId} to the offline saved.`);
             }
         }, 5000);
@@ -376,11 +378,11 @@ async function saveLinks(note, content) {
     const foundLinks = [];
 
     if (note.type === 'text') {
+        content = await downloadImages(note.noteId, content);
+
         content = findImageLinks(content, foundLinks);
         content = findInternalLinks(content, foundLinks);
         content = findIncludeNoteLinks(content, foundLinks);
-
-        content = await downloadImages(note.noteId, content);
     }
     else if (note.type === 'relation-map') {
         findRelationMapLinks(content, foundLinks);

From 647790885dc296c5b659b7672123640285e751a8 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 21:27:24 +0200
Subject: [PATCH 06/16] downgrade sqlite3 library which has issues with
 electron build

---
 package-lock.json            | 108 ++++++++++++++++-------------------
 package.json                 |   4 +-
 src/services/options_init.js |   4 +-
 src/services/sql.js          |   4 ++
 src/services/sql_init.js     |   9 +--
 5 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1b5a9a5e..6df66d018 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1192,38 +1192,38 @@
       "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
     },
     "app-builder-bin": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.8.tgz",
-      "integrity": "sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw==",
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.6.tgz",
+      "integrity": "sha512-gY9ABoV5jh67IrPEwF81R8l9LwE3RqHUyU3rIKitwqMpKhplN5OZC6WEHOXO3XhwiLCIlr9LLI6OPhr3bmtQIg==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.6.0.tgz",
-      "integrity": "sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.5.1.tgz",
+      "integrity": "sha512-VtB/PD8actR1317D/0uGzuJIYbpw4pRrfMB6IyTLwGynUd3ihqiCFjejVWHjCwopgCct2kE0MvLwo8P49xHIeQ==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@develar/schema-utils": "~2.6.5",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.5.1",
         "builder-util-runtime": "8.7.0",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
-        "ejs": "^3.1.2",
-        "electron-publish": "22.6.0",
+        "ejs": "^3.0.2",
+        "electron-publish": "22.5.1",
         "fs-extra": "^9.0.0",
         "hosted-git-info": "^3.0.4",
         "is-ci": "^2.0.0",
-        "isbinaryfile": "^4.0.6",
+        "isbinaryfile": "^4.0.5",
         "js-yaml": "^3.13.1",
         "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
         "normalize-package-data": "^2.5.0",
         "read-config-file": "6.0.0",
         "sanitize-filename": "^1.6.3",
-        "semver": "^7.3.2",
+        "semver": "^7.1.3",
         "temp-file": "^3.3.7"
       },
       "dependencies": {
@@ -1864,23 +1864,23 @@
       }
     },
     "builder-util": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.6.0.tgz",
-      "integrity": "sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.5.1.tgz",
+      "integrity": "sha512-CelDTP3+fvDfZfbwy3PXif7mudPaWankJ8vrRg/NtCGvL+hXnwycnJZr46d5EQL7AgQcpJ27o9LTdfu61cxTFw==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@types/debug": "^4.1.5",
         "@types/fs-extra": "^8.1.0",
-        "app-builder-bin": "3.5.8",
+        "app-builder-bin": "3.5.6",
         "bluebird-lst": "^1.0.9",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^4.0.0",
+        "chalk": "^3.0.0",
         "debug": "^4.1.1",
         "fs-extra": "^9.0.0",
         "is-ci": "^2.0.0",
         "js-yaml": "^3.13.1",
-        "source-map-support": "^0.5.19",
+        "source-map-support": "^0.5.16",
         "stat-mode": "^1.0.0",
         "temp-file": "^3.3.7"
       },
@@ -1896,9 +1896,9 @@
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1920,16 +1920,6 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "source-map-support": {
-          "version": "0.5.19",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-          "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        },
         "stat-mode": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
@@ -3153,13 +3143,13 @@
       }
     },
     "dmg-builder": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.6.0.tgz",
-      "integrity": "sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.5.1.tgz",
+      "integrity": "sha512-AwIiyGwgqhA8Ty/YnEU20aSzfrWZns6suOBTqddD+rLDI4jEASKGQadfvcXRSWgaK/VQW0GrhheXrhJpzZzt3g==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "22.6.0",
-        "builder-util": "22.6.0",
+        "app-builder-lib": "22.5.1",
+        "builder-util": "22.5.1",
         "fs-extra": "^9.0.0",
         "iconv-lite": "^0.5.1",
         "js-yaml": "^3.13.1",
@@ -3345,9 +3335,9 @@
       }
     },
     "electron": {
-      "version": "9.0.0-beta.21",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.21.tgz",
-      "integrity": "sha512-xFOD8I4RB9IkpVKnzoHwHvDNGvGl1IinpYTyQ7o7FAgSnkvP/upI1JtzE5Ff6PlAdyIGnbC+Rz1hJIfmAXxVuQ==",
+      "version": "9.0.0-beta.18",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.18.tgz",
+      "integrity": "sha512-mOdPB4nPc4kO2uwpvvbNZz0RDrRDIko/C8XFmOZmz7k3JaU7r0h/tLxdeypiqfLwxW/Bu1n+uwqG1X34i3fTEw==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -3356,18 +3346,18 @@
       }
     },
     "electron-builder": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.6.0.tgz",
-      "integrity": "sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.5.1.tgz",
+      "integrity": "sha512-7gnHN8Ml5zecDerN8/ljAwUKtE+hhGLuT/X2/zO0FJM2q2hlLx/6ZgzESFILKqnPQFEBRxQ8SL1OxjdIY0HIrw==",
       "dev": true,
       "requires": {
         "@types/yargs": "^15.0.4",
-        "app-builder-lib": "22.6.0",
+        "app-builder-lib": "22.5.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.5.1",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^4.0.0",
-        "dmg-builder": "22.6.0",
+        "chalk": "^3.0.0",
+        "dmg-builder": "22.5.1",
         "fs-extra": "^9.0.0",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
@@ -3388,9 +3378,9 @@
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -3734,16 +3724,16 @@
       }
     },
     "electron-publish": {
-      "version": "22.6.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.6.0.tgz",
-      "integrity": "sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.5.1.tgz",
+      "integrity": "sha512-g5bwLAHZT6A++yU1+Et+fncnFAdXXgkRao9rzTFAvhQ0QJBsmLiyOd0Ta2RI/EQcVoy6jyHtxFs7CWIXE5aZOA==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^8.1.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.6.0",
+        "builder-util": "22.5.1",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^4.0.0",
+        "chalk": "^3.0.0",
         "fs-extra": "^9.0.0",
         "lazy-val": "^1.0.4",
         "mime": "^2.4.4"
@@ -3760,9 +3750,9 @@
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -3785,9 +3775,9 @@
           "dev": true
         },
         "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+          "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
           "dev": true
         },
         "supports-color": {
diff --git a/package.json b/package.json
index 4d96ee213..f218eddfe 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "session-file-store": "1.4.0",
     "simple-node-logger": "18.12.24",
     "sqlite": "4.0.7",
-    "sqlite3": "4.2.0",
+    "sqlite3": "4.1.1",
     "string-similarity": "4.0.1",
     "tar-stream": "2.1.2",
     "turndown": "6.0.0",
@@ -78,7 +78,7 @@
     "yazl": "^2.5.1"
   },
   "devDependencies": {
-    "electron": "9.0.0-beta.21",
+    "electron": "9.0.0-beta.22",
     "electron-builder": "22.6.0",
     "electron-packager": "14.2.1",
     "electron-rebuild": "1.10.1",
diff --git a/src/services/options_init.js b/src/services/options_init.js
index 43d8060d9..ad5b509b6 100644
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -83,8 +83,8 @@ const defaultOptions = [
     { name: 'rightPaneVisible', value: 'true', isSynced: false },
     { name: 'nativeTitleBarVisible', value: 'false', isSynced: false },
     { name: 'eraseNotesAfterTimeInSeconds', value: '604800', isSynced: true }, // default is 7 days
-    { name: 'hideArchivedNotes_main', value: 'false', isSynced: false }, // default is 7 days
-    { name: 'hideIncludedImages_main', value: 'true', isSynced: false } // default is 7 days
+    { name: 'hideArchivedNotes_main', value: 'false', isSynced: false },
+    { name: 'hideIncludedImages_main', value: 'true', isSynced: false }
 ];
 
 async function initStartupOptions() {
diff --git a/src/services/sql.js b/src/services/sql.js
index a928f319e..325dbc292 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -163,6 +163,10 @@ async function executeScript(query) {
 }
 
 async function wrap(func, query) {
+    if (!dbConnection) {
+        throw new Error("DB connection not initialized yet");
+    }
+
     const thisError = new Error();
 
     try {
diff --git a/src/services/sql_init.js b/src/services/sql_init.js
index d258ea4e8..eaf0aaf23 100644
--- a/src/services/sql_init.js
+++ b/src/services/sql_init.js
@@ -13,16 +13,11 @@ const port = require('./port');
 const Option = require('../entities/option');
 const TaskContext = require('./task_context.js');
 
-async function createConnection() {
-    return await sqlite.open({
+const dbConnection = new Promise(async (resolve, reject) => {
+    const db = await sqlite.open({
         filename: dataDir.DOCUMENT_PATH,
         driver: sqlite3.Database
     });
-}
-
-const dbConnection = new Promise(async (resolve, reject) => {
-    // no need to create new connection now since DB stays the same all the time
-    const db = await createConnection();
 
     db.run('PRAGMA journal_mode = WAL;');
 

From 8b5536ee3a164fa691f977e8ae26db4d784f744e Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sun, 3 May 2020 22:49:20 +0200
Subject: [PATCH 07/16] note title widget and protected session entering fixes

---
 src/public/app/services/protected_session.js | 11 ++++++++++-
 src/public/app/services/tree_cache.js        | 14 ++++++++------
 src/public/app/widgets/note_title.js         |  7 ++++++-
 src/public/app/widgets/note_tree.js          | 20 +++-----------------
 src/services/consistency_checks.js           |  3 +++
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/public/app/services/protected_session.js b/src/public/app/services/protected_session.js
index 100df55e1..29f6e4e9a 100644
--- a/src/public/app/services/protected_session.js
+++ b/src/public/app/services/protected_session.js
@@ -31,6 +31,15 @@ function enterProtectedSession() {
     return dfd.promise();
 }
 
+async function reloadData() {
+    const allNoteIds = Object.keys(treeCache.notes);
+
+    await treeCache.loadInitialTree();
+
+    // make sure that all notes used in the application are loaded, including the ones not shown in the tree
+    await treeCache.reloadNotes(allNoteIds, true);
+}
+
 async function setupProtectedSession(password) {
     const response = await enterProtectedSessionOnServer(password);
 
@@ -42,7 +51,7 @@ async function setupProtectedSession(password) {
     protectedSessionHolder.setProtectedSessionId(response.protectedSessionId);
     protectedSessionHolder.touchProtectedSession();
 
-    await treeCache.loadInitialTree();
+    await reloadData();
 
     await appContext.triggerEvent('treeCacheReloaded');
 
diff --git a/src/public/app/services/tree_cache.js b/src/public/app/services/tree_cache.js
index baf7350b3..4b18b7fa8 100644
--- a/src/public/app/services/tree_cache.js
+++ b/src/public/app/services/tree_cache.js
@@ -20,6 +20,8 @@ class TreeCache {
     async loadInitialTree() {
         const resp = await server.get('tree');
 
+        await this.loadParents(resp, false);
+
         // clear the cache only directly before adding new content which is important for e.g. switching to protected session
 
         /** @type {Object.<string, NoteShort>} */
@@ -34,22 +36,22 @@ class TreeCache {
         /** @type {Object.<string, Promise<NoteComplement>>} */
         this.noteComplementPromises = {};
 
-        await this.loadParents(resp);
         this.addResp(resp);
     }
 
-    async loadParents(resp) {
+    async loadParents(resp, additiveLoad) {
         const noteIds = new Set(resp.notes.map(note => note.noteId));
         const missingNoteIds = [];
+        const existingNotes = additiveLoad ? this.notes : {};
 
         for (const branch of resp.branches) {
-            if (!(branch.parentNoteId in this.notes) && !noteIds.has(branch.parentNoteId) && branch.parentNoteId !== 'none') {
+            if (!(branch.parentNoteId in existingNotes) && !noteIds.has(branch.parentNoteId) && branch.parentNoteId !== 'none') {
                 missingNoteIds.push(branch.parentNoteId);
             }
         }
 
         for (const attr of resp.attributes) {
-            if (attr.type === 'relation' && attr.name === 'template' && !(attr.value in this.notes) && !noteIds.has(attr.value)) {
+            if (attr.type === 'relation' && attr.name === 'template' && !(attr.value in existingNotes) && !noteIds.has(attr.value)) {
                 missingNoteIds.push(attr.value);
             }
         }
@@ -61,7 +63,7 @@ class TreeCache {
             resp.branches = resp.branches.concat(newResp.branches);
             resp.attributes = resp.attributes.concat(newResp.attributes);
 
-            await this.loadParents(resp);
+            await this.loadParents(resp, additiveLoad);
         }
     }
 
@@ -154,7 +156,7 @@ class TreeCache {
 
         const resp = await server.post('tree/load', { noteIds });
 
-        await this.loadParents(resp);
+        await this.loadParents(resp, true);
         this.addResp(resp);
 
         for (const note of resp.notes) {
diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js
index f44421049..576dd5b81 100644
--- a/src/public/app/widgets/note_title.js
+++ b/src/public/app/widgets/note_title.js
@@ -57,6 +57,10 @@ export default class NoteTitleWidget extends TabAwareWidget {
 
         this.$noteTitle.prop("readonly", note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable());
 
+        this.setProtectedStatus(note);
+    }
+
+    setProtectedStatus(note) {
         this.$noteTitle.toggleClass("protected", !!note.isProtected);
     }
 
@@ -88,7 +92,8 @@ export default class NoteTitleWidget extends TabAwareWidget {
 
     entitiesReloadedEvent({loadResults}) {
         if (loadResults.isNoteReloaded(this.noteId)) {
-            this.refresh();
+            // not updating the title specifically since the synced title might be older than what the user is currently typing
+            this.setProtectedStatus(this.note);
         }
     }
 
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 455ff4166..8e897d7fd 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -486,7 +486,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
             return true;
         }
         else {
-            const childBranches = await this.getChildBranches(note);
+            const childBranches = this.getChildBranches(note);
 
             return childBranches.length > 0;
         }
@@ -497,7 +497,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
         const noteList = [];
 
-        for (const branch of await this.getChildBranches(parentNote)) {
+        for (const branch of this.getChildBranches(parentNote)) {
             const node = await this.prepareNode(branch);
 
             noteList.push(node);
@@ -506,7 +506,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         return noteList;
     }
 
-    async getChildBranches(parentNote) {
+    getChildBranches(parentNote) {
         let childBranches = parentNote.getChildBranches();
 
         if (!childBranches) {
@@ -521,20 +521,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
             childBranches = childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId));
         }
 
-        if (this.hideArchivedNotes) {
-            const filteredBranches = [];
-
-            for (const childBranch of childBranches) {
-                const childNote = await childBranch.getNote();
-
-                if (!childNote.hasLabel('archived')) {
-                    filteredBranches.push(childBranch);
-                }
-            }
-
-            childBranches = filteredBranches;
-        }
-
         return childBranches;
     }
 
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index a5898c397..ce8b50f05 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -617,6 +617,9 @@ class ConsistencyChecks {
 
         await this.findSyncRowsIssues();
 
+        // root branch should always be expanded
+        await sql.execute("UPDATE branches SET isExpanded = 1 WHERE branchId = 'root'");
+
         if (this.unrecoveredConsistencyErrors) {
             // we run this only if basic checks passed since this assumes basic data consistency
 

From b89a2df462c152323705858c62fa285923a9d7d5 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 10:03:54 +0200
Subject: [PATCH 08/16] fix image being redownloaded from localhost

---
 src/public/app/widgets/note_tree.js | 11 ++++++++++-
 src/services/notes.js               |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 8e897d7fd..f99a0b2d1 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -51,7 +51,7 @@ const TPL = `
         position: absolute;
         top: 10px;
         right: 20px;
-        z-index: 1000;
+        z-index: 100;
     }
     
     .tree-settings-popup {
@@ -514,6 +514,15 @@ export default class NoteTreeWidget extends TabAwareWidget {
             return;
         }
 
+        if (parentNote.title === 'Siemens M55') {
+            console.log("this.hideIncludedImages", this.hideIncludedImages);
+            console.log("this.hideIncludedImages", this.hideIncludedImages);
+            console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
+            console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
+            const imageLinks = parentNote.getRelations('imageLink');
+            console.log("childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId))", childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId)));
+        }
+
         if (this.hideIncludedImages) {
             const imageLinks = parentNote.getRelations('imageLink');
 
diff --git a/src/services/notes.js b/src/services/notes.js
index c8948dbee..4df9846e8 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -290,7 +290,7 @@ async function downloadImages(noteId, content) {
     while (match = re.exec(origContent)) {
         const url = match[1];
 
-        if (!url.startsWith('api/images/')
+        if (!url.includes('api/images/')
             // this is and exception for the web clipper's "imageId"
             && (url.length !== 20 || url.toLowerCase().startsWith('http'))) {
             if (url in downloadImagePromises) {

From ae1220b970d70d1e2ce039bd667345904056b0b2 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 10:04:50 +0200
Subject: [PATCH 09/16] remove debug

---
 src/public/app/widgets/note_tree.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index f99a0b2d1..962880aa8 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -514,15 +514,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
             return;
         }
 
-        if (parentNote.title === 'Siemens M55') {
-            console.log("this.hideIncludedImages", this.hideIncludedImages);
-            console.log("this.hideIncludedImages", this.hideIncludedImages);
-            console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
-            console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
-            const imageLinks = parentNote.getRelations('imageLink');
-            console.log("childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId))", childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId)));
-        }
-
         if (this.hideIncludedImages) {
             const imageLinks = parentNote.getRelations('imageLink');
 

From 109bead1c79f258d9ed74518d01873e83618ee49 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 10:19:11 +0200
Subject: [PATCH 10/16] removed unnecessary async/awaits

---
 src/public/app/widgets/note_tree.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 962880aa8..1e1f2ca60 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -456,7 +456,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title;
         const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
 
-        const isFolder = await this.isFolder(note);
+        const isFolder = this.isFolder(note);
 
         const node = {
             noteId: note.noteId,
@@ -481,7 +481,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
         return node;
     }
 
-    async isFolder(note) {
+    isFolder(note) {
         if (note.type === 'search') {
             return true;
         }
@@ -717,11 +717,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
         return this.getNodeFromPath(notePath, true, expandOpts);
     }
 
-    async updateNode(node) {
+    updateNode(node) {
         const note = treeCache.getNoteFromCache(node.data.noteId);
         const branch = treeCache.getBranch(node.data.branchId);
 
-        const isFolder = await this.isFolder(note);
+        const isFolder = this.isFolder(note);
 
         node.data.isProtected = note.isProtected;
         node.data.noteType = note.type;

From 4c6e9480e4be291a002c11de91abb8c314f0bc2e Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 21:49:03 +0200
Subject: [PATCH 11/16] revert #980 because of performance issues

---
 .idea/dataSources.xml              |  2 +-
 src/services/build_search_query.js | 69 ++++++++----------------------
 src/services/parse_filters.js      | 32 --------------
 3 files changed, 20 insertions(+), 83 deletions(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index cd4172576..a9dfc5250 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -5,7 +5,7 @@
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
     </data-source>
     <data-source source="LOCAL" name="document" uuid="066dc5f4-4097-429e-8cf1-3adc0a9d648a">
       <driver-ref>sqlite.xerial</driver-ref>
diff --git a/src/services/build_search_query.js b/src/services/build_search_query.js
index 6060daf6a..a7867aa03 100644
--- a/src/services/build_search_query.js
+++ b/src/services/build_search_query.js
@@ -12,9 +12,7 @@ const VIRTUAL_ATTRIBUTES = [
     "type",
     "mime",
     "text",
-    "parentCount",
-    "attributeName",
-    "attributeValue"
+    "parentCount"
 ];
 
 module.exports = function(filters, selectedColumns = 'notes.*') {
@@ -35,29 +33,11 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
 
             // forcing to use particular index since SQLite query planner would often choose something pretty bad
             joins[alias] = `LEFT JOIN attributes AS ${alias} INDEXED BY IDX_attributes_noteId_index `
-                + `ON ${alias}.noteId = notes.noteId AND ${alias}.isDeleted = 0 `
-                + `AND ${alias}.name = '${property}' `;
+                + `ON ${alias}.noteId = notes.noteId `
+                + `AND ${alias}.name = '${property}' AND ${alias}.isDeleted = 0`;
 
             accessor = `${alias}.value`;
         }
-        else if (['attributeType', 'attributeName', 'attributeValue'].includes(property)) {
-            const alias = "attr_filter";
-
-            if (!(alias in joins)) {
-                joins[alias] = `LEFT JOIN attributes AS ${alias} INDEXED BY IDX_attributes_noteId_index `
-                    + `ON ${alias}.noteId = notes.noteId AND ${alias}.isDeleted = 0`;
-            }
-
-            if (property === 'attributeType') {
-                accessor = `${alias}.type`
-            } else if (property === 'attributeName') {
-                accessor = `${alias}.name`
-            } else if (property === 'attributeValue') {
-                accessor = `${alias}.value`
-            } else {
-                throw new Error(`Unrecognized property ${property}`);
-            }
-        }
         else if (property === 'content') {
             const alias = "note_contents";
 
@@ -93,40 +73,33 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
         });
     }
 
+    let where = '1';
     const params = [];
 
-    function parseWhereFilters(filters) {
-        let whereStmt = '';
-
         for (const filter of filters) {
             if (['isarchived', 'in', 'orderby', 'limit'].includes(filter.name.toLowerCase())) {
                 continue; // these are not real filters
             }
 
-            if (whereStmt) {
-                whereStmt += " " + filter.relation + " ";
-            }
-
-            if (filter.children) {
-                whereStmt += "(" + parseWhereFilters(filter.children) + ")";
-                continue;
-            }
+        where += " " + filter.relation + " ";
 
             const accessor = getAccessor(filter.name);
 
             if (filter.operator === 'exists') {
-                whereStmt += `${accessor} IS NOT NULL`;
-            } else if (filter.operator === 'not-exists') {
-                whereStmt += `${accessor} IS NULL`;
-            } else if (filter.operator === '=' || filter.operator === '!=') {
-                whereStmt += `${accessor} ${filter.operator} ?`;
+            where += `${accessor} IS NOT NULL`;
+        }
+        else if (filter.operator === 'not-exists') {
+            where += `${accessor} IS NULL`;
+        }
+        else if (filter.operator === '=' || filter.operator === '!=') {
+            where += `${accessor} ${filter.operator} ?`;
                 params.push(filter.value);
             } else if (filter.operator === '*=' || filter.operator === '!*=') {
-                whereStmt += `${accessor}`
+            where += `${accessor}`
                     + (filter.operator.includes('!') ? ' NOT' : '')
                     + ` LIKE ` + utils.prepareSqlForLike('%', filter.value, '');
             } else if (filter.operator === '=*' || filter.operator === '!=*') {
-                whereStmt += `${accessor}`
+            where += `${accessor}`
                     + (filter.operator.includes('!') ? ' NOT' : '')
                     + ` LIKE ` + utils.prepareSqlForLike('', filter.value, '%');
             } else if (filter.operator === '*=*' || filter.operator === '!*=*') {
@@ -145,8 +118,9 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
                     condition = `(${condition} AND notes.isProtected = 0)`;
                 }
 
-                whereStmt += condition;
-            } else if ([">", ">=", "<", "<="].includes(filter.operator)) {
+            where += condition;
+        }
+        else if ([">", ">=", "<", "<="].includes(filter.operator)) {
                 let floatParam;
 
                 // from https://stackoverflow.com/questions/12643009/regular-expression-for-floating-point-numbers
@@ -156,10 +130,10 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
 
                 if (floatParam === undefined || isNaN(floatParam)) {
                     // if the value can't be parsed as float then we assume that string comparison should be used instead of numeric
-                    whereStmt += `${accessor} ${filter.operator} ?`;
+                where += `${accessor} ${filter.operator} ?`;
                     params.push(filter.value);
                 } else {
-                    whereStmt += `CAST(${accessor} AS DECIMAL) ${filter.operator} ?`;
+                where += `CAST(${accessor} AS DECIMAL) ${filter.operator} ?`;
                     params.push(floatParam);
                 }
             } else {
@@ -167,11 +141,6 @@ module.exports = function(filters, selectedColumns = 'notes.*') {
             }
         }
 
-        return whereStmt;
-    }
-
-    const where = parseWhereFilters(filters);
-
     if (orderBy.length === 0) {
         // if no ordering is given then order at least by note title
         orderBy.push("notes.title");
diff --git a/src/services/parse_filters.js b/src/services/parse_filters.js
index cccec35bb..412c9b527 100644
--- a/src/services/parse_filters.js
+++ b/src/services/parse_filters.js
@@ -60,20 +60,6 @@ module.exports = function (searchText) {
                 operator: '*=*',
                 value: searchText
             });
-
-            filters.push({
-                relation: 'or',
-                name: 'attributeName',
-                operator: '*=*',
-                value: searchText
-            });
-
-            filters.push({
-                relation: 'or',
-                name: 'attributeValue',
-                operator: '*=*',
-                value: searchText
-            });
         }
         else {
             const tokens = searchText.split(/\s+/);
@@ -81,27 +67,9 @@ module.exports = function (searchText) {
             for (const token of tokens) {
                 filters.push({
                     relation: 'and',
-                    name: 'sub',
-                    children: [
-                        {
-                            relation: 'or',
                             name: 'text',
                             operator: '*=*',
                             value: token
-                        },
-                        {
-                            relation: 'or',
-                            name: 'attributeName',
-                            operator: '*=*',
-                            value: token
-                        },
-                        {
-                            relation: 'or',
-                            name: 'attributeValue',
-                            operator: '*=*',
-                            value: token
-                        }
-                    ]
                 });
             }
         }

From cafcb67a8a3a1943acac829590b34ff729b57e09 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 21:58:40 +0200
Subject: [PATCH 12/16] remove dangling autocompletes after closing the tab

---
 src/public/app/services/tab_manager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js
index a69cd5551..13efc64a7 100644
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -265,6 +265,9 @@ export default class TabManager extends Component {
 
         this.children = this.children.filter(tc => tc.tabId !== tabId);
 
+        // remove dangling autocompletes after closing the tab
+        $(".algolia-autocomplete").remove();
+
         this.triggerEvent('tabRemoved', {tabId});
 
         this.tabsUpdate.scheduleUpdate();

From deb0b24c4c47c0d71b1b0b70566991b241dd9d6e Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Mon, 4 May 2020 21:59:14 +0200
Subject: [PATCH 13/16] release 0.42.0-beta

---
 package.json          | 2 +-
 src/services/build.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f218eddfe..9f4eb42ac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.41.6",
+  "version": "0.42.0-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
diff --git a/src/services/build.js b/src/services/build.js
index 853f0d3c3..e47c8290e 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2020-04-27T23:46:48+02:00", buildRevision: "0a9462241360e0baac71863af3ce7fb07cfd8c87" };
+module.exports = { buildDate:"2020-05-04T21:59:14+02:00", buildRevision: "cafcb67a8a3a1943acac829590b34ff729b57e09" };

From e8a33a5ee75fb0265042334b121864a5d94f09a2 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Tue, 5 May 2020 18:56:12 +0200
Subject: [PATCH 14/16] fix note title not updating when changing the title

---
 package-lock.json                   | 124 +++++++++++++++-------------
 package.json                        |   2 +-
 src/public/app/widgets/note_tree.js |  21 ++---
 3 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6df66d018..56d4c5c00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.41.6",
+  "version": "0.42.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1192,38 +1192,38 @@
       "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
     },
     "app-builder-bin": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.6.tgz",
-      "integrity": "sha512-gY9ABoV5jh67IrPEwF81R8l9LwE3RqHUyU3rIKitwqMpKhplN5OZC6WEHOXO3XhwiLCIlr9LLI6OPhr3bmtQIg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.8.tgz",
+      "integrity": "sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.5.1.tgz",
-      "integrity": "sha512-VtB/PD8actR1317D/0uGzuJIYbpw4pRrfMB6IyTLwGynUd3ihqiCFjejVWHjCwopgCct2kE0MvLwo8P49xHIeQ==",
+      "version": "22.6.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.6.0.tgz",
+      "integrity": "sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@develar/schema-utils": "~2.6.5",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.5.1",
+        "builder-util": "22.6.0",
         "builder-util-runtime": "8.7.0",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
-        "ejs": "^3.0.2",
-        "electron-publish": "22.5.1",
+        "ejs": "^3.1.2",
+        "electron-publish": "22.6.0",
         "fs-extra": "^9.0.0",
         "hosted-git-info": "^3.0.4",
         "is-ci": "^2.0.0",
-        "isbinaryfile": "^4.0.5",
+        "isbinaryfile": "^4.0.6",
         "js-yaml": "^3.13.1",
         "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
         "normalize-package-data": "^2.5.0",
         "read-config-file": "6.0.0",
         "sanitize-filename": "^1.6.3",
-        "semver": "^7.1.3",
+        "semver": "^7.3.2",
         "temp-file": "^3.3.7"
       },
       "dependencies": {
@@ -1864,23 +1864,23 @@
       }
     },
     "builder-util": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.5.1.tgz",
-      "integrity": "sha512-CelDTP3+fvDfZfbwy3PXif7mudPaWankJ8vrRg/NtCGvL+hXnwycnJZr46d5EQL7AgQcpJ27o9LTdfu61cxTFw==",
+      "version": "22.6.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.6.0.tgz",
+      "integrity": "sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng==",
       "dev": true,
       "requires": {
         "7zip-bin": "~5.0.3",
         "@types/debug": "^4.1.5",
         "@types/fs-extra": "^8.1.0",
-        "app-builder-bin": "3.5.6",
+        "app-builder-bin": "3.5.8",
         "bluebird-lst": "^1.0.9",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^3.0.0",
+        "chalk": "^4.0.0",
         "debug": "^4.1.1",
         "fs-extra": "^9.0.0",
         "is-ci": "^2.0.0",
         "js-yaml": "^3.13.1",
-        "source-map-support": "^0.5.16",
+        "source-map-support": "^0.5.19",
         "stat-mode": "^1.0.0",
         "temp-file": "^3.3.7"
       },
@@ -1896,9 +1896,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1920,6 +1920,16 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "source-map-support": {
+          "version": "0.5.19",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+          "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
         "stat-mode": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
@@ -3143,13 +3153,13 @@
       }
     },
     "dmg-builder": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.5.1.tgz",
-      "integrity": "sha512-AwIiyGwgqhA8Ty/YnEU20aSzfrWZns6suOBTqddD+rLDI4jEASKGQadfvcXRSWgaK/VQW0GrhheXrhJpzZzt3g==",
+      "version": "22.6.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.6.0.tgz",
+      "integrity": "sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "22.5.1",
-        "builder-util": "22.5.1",
+        "app-builder-lib": "22.6.0",
+        "builder-util": "22.6.0",
         "fs-extra": "^9.0.0",
         "iconv-lite": "^0.5.1",
         "js-yaml": "^3.13.1",
@@ -3335,9 +3345,9 @@
       }
     },
     "electron": {
-      "version": "9.0.0-beta.18",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.18.tgz",
-      "integrity": "sha512-mOdPB4nPc4kO2uwpvvbNZz0RDrRDIko/C8XFmOZmz7k3JaU7r0h/tLxdeypiqfLwxW/Bu1n+uwqG1X34i3fTEw==",
+      "version": "9.0.0-beta.22",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.22.tgz",
+      "integrity": "sha512-dfqAf+CXXTKcNDj7DU7mYsmx+oZQcXOvJnZ8ZsgAHjrE9Tv8zsYUgCP3JlO4Z8CIazgleKXYmgh6H2stdK7fEA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -3346,18 +3356,18 @@
       }
     },
     "electron-builder": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.5.1.tgz",
-      "integrity": "sha512-7gnHN8Ml5zecDerN8/ljAwUKtE+hhGLuT/X2/zO0FJM2q2hlLx/6ZgzESFILKqnPQFEBRxQ8SL1OxjdIY0HIrw==",
+      "version": "22.6.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.6.0.tgz",
+      "integrity": "sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q==",
       "dev": true,
       "requires": {
         "@types/yargs": "^15.0.4",
-        "app-builder-lib": "22.5.1",
+        "app-builder-lib": "22.6.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.5.1",
+        "builder-util": "22.6.0",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^3.0.0",
-        "dmg-builder": "22.5.1",
+        "chalk": "^4.0.0",
+        "dmg-builder": "22.6.0",
         "fs-extra": "^9.0.0",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
@@ -3378,9 +3388,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -3724,16 +3734,16 @@
       }
     },
     "electron-publish": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.5.1.tgz",
-      "integrity": "sha512-g5bwLAHZT6A++yU1+Et+fncnFAdXXgkRao9rzTFAvhQ0QJBsmLiyOd0Ta2RI/EQcVoy6jyHtxFs7CWIXE5aZOA==",
+      "version": "22.6.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.6.0.tgz",
+      "integrity": "sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^8.1.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "22.5.1",
+        "builder-util": "22.6.0",
         "builder-util-runtime": "8.7.0",
-        "chalk": "^3.0.0",
+        "chalk": "^4.0.0",
         "fs-extra": "^9.0.0",
         "lazy-val": "^1.0.4",
         "mime": "^2.4.4"
@@ -3750,9 +3760,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -4438,9 +4448,9 @@
       }
     },
     "file-type": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-14.2.0.tgz",
-      "integrity": "sha512-CAkX5G5jq8LIgFu++dpM3giMZadYdU+QVQoPLajjNboo8IzaR4cKpBCVEuz+suhd/vHqoAJeSWhEubKjRPQHJg==",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-14.3.0.tgz",
+      "integrity": "sha512-s71v6jMkbfwVdj87csLeNpL5K93mv4lN+lzgzifoICtPHhnXokDwBa3jrzfg+z6FK872iYJ0vS0i74v8XmoFDA==",
       "requires": {
         "readable-web-to-node-stream": "^2.0.0",
         "strtok3": "^6.0.0",
@@ -9715,7 +9725,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -9742,14 +9751,12 @@
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "tunnel-agent": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
           "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-          "dev": true,
           "requires": {
             "safe-buffer": "^5.0.1"
           }
@@ -10341,12 +10348,13 @@
       "integrity": "sha512-1bBO+me3gXRfqwRR3K9aNDoSbTkQ87o6fSjj/BE2gSHHsK3qIDR+LoFZHgZ6kSPdFBoLTsy5/w/+8PBBaK+lvg=="
     },
     "sqlite3": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz",
-      "integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz",
+      "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==",
       "requires": {
         "nan": "^2.12.1",
-        "node-pre-gyp": "^0.11.0"
+        "node-pre-gyp": "^0.11.0",
+        "request": "^2.87.0"
       }
     },
     "squeak": {
diff --git a/package.json b/package.json
index 9f4eb42ac..92c2961ae 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "electron-window-state": "5.0.3",
     "express": "4.17.1",
     "express-session": "1.17.1",
-    "file-type": "14.2.0",
+    "file-type": "14.3.0",
     "fs-extra": "9.0.0",
     "helmet": "3.22.0",
     "html": "1.0.0",
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 1e1f2ca60..5c4cc4ae5 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -877,18 +877,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
             noteIdsToUpdate.add(noteId);
         }
 
-        for (const noteId of noteIdsToReload) {
-            for (const node of this.getNodesByNoteId(noteId)) {
-                await node.load(true);
-
-                this.updateNode(node);
-            }
-        }
-
         await this.batchUpdate(async () => {
-            for (const noteId of noteIdsToUpdate) {
+            for (const noteId of noteIdsToReload) {
                 for (const node of this.getNodesByNoteId(noteId)) {
-                    this.updateNode(node);
+                    await node.load(true);
+
+                    noteIdsToUpdate.add(noteId);
                 }
             }
 
@@ -910,6 +904,13 @@ export default class NoteTreeWidget extends TabAwareWidget {
             }
         });
 
+        // for some reason node update cannot be in the batchUpdate() block (node is not re-rendered)
+        for (const noteId of noteIdsToUpdate) {
+            for (const node of this.getNodesByNoteId(noteId)) {
+                this.updateNode(node);
+            }
+        }
+
         if (activeNotePath) {
             let node = await this.expandToNote(activeNotePath);
 

From c7125d2b50ad33640cc85839604a09ea50e15e56 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Tue, 5 May 2020 19:09:01 +0200
Subject: [PATCH 15/16] createNoteAfter should have saveSelection: false

---
 src/public/app/services/main_tree_executors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/app/services/main_tree_executors.js b/src/public/app/services/main_tree_executors.js
index 61717e64f..c4bab5b28 100644
--- a/src/public/app/services/main_tree_executors.js
+++ b/src/public/app/services/main_tree_executors.js
@@ -59,7 +59,7 @@ export default class MainTreeExecutors extends Component {
             target: 'after',
             targetBranchId: node.data.branchId,
             isProtected: isProtected,
-            saveSelection: true
+            saveSelection: false
         });
 
         await ws.waitForMaxKnownSyncId();

From 6dfe335707c25f0e9a87600a2cbd49d606b5d6ce Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Tue, 5 May 2020 19:30:03 +0200
Subject: [PATCH 16/16] added global menu item to open new empty window + some
 refactoring

---
 src/public/app/services/app_context.js       | 13 -------------
 src/public/app/services/entrypoints.js       | 17 +++++++++++++++++
 src/public/app/services/link.js              |  2 +-
 src/public/app/services/tab_manager.js       |  8 +++++---
 src/public/app/services/tree_context_menu.js |  7 ++-----
 src/public/app/widgets/global_menu.js        |  7 ++++++-
 src/public/app/widgets/tab_row.js            |  6 +++---
 src/services/keyboard_actions.js             |  8 +++++++-
 8 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js
index 75c1c820c..b71224839 100644
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -100,19 +100,6 @@ class AppContext extends Component {
     getComponentByEl(el) {
         return $(el).closest(".component").prop('component');
     }
-
-    async openInNewWindow(notePath) {
-        if (utils.isElectron()) {
-            const {ipcRenderer} = utils.dynamicRequire('electron');
-
-            ipcRenderer.send('create-extra-window', {notePath});
-        }
-        else {
-            const url = window.location.protocol + '//' + window.location.host + window.location.pathname + '?extra=1#' + notePath;
-
-            window.open(url, '', 'width=1000,height=800');
-        }
-    }
 }
 
 const appContext = new AppContext(window.glob.isMainWindow);
diff --git a/src/public/app/services/entrypoints.js b/src/public/app/services/entrypoints.js
index 80d148c7c..262bf6e19 100644
--- a/src/public/app/services/entrypoints.js
+++ b/src/public/app/services/entrypoints.js
@@ -182,4 +182,21 @@ export default class Entrypoints extends Component {
     }
 
     createTopLevelNoteCommand() { noteCreateService.createNewTopLevelNote(); }
+
+    async openInWindowCommand({notePath}) {
+        if (utils.isElectron()) {
+            const {ipcRenderer} = utils.dynamicRequire('electron');
+
+            ipcRenderer.send('create-extra-window', {notePath});
+        }
+        else {
+            const url = window.location.protocol + '//' + window.location.host + window.location.pathname + '?extra=1#' + notePath;
+
+            window.open(url, '', 'width=1000,height=800');
+        }
+    }
+
+    async openNewWindowCommand() {
+        this.openInWindowCommand({notePath: ''});
+    }
 }
diff --git a/src/public/app/services/link.js b/src/public/app/services/link.js
index 97732821d..9a32f3e6c 100644
--- a/src/public/app/services/link.js
+++ b/src/public/app/services/link.js
@@ -114,7 +114,7 @@ function newTabContextMenu(e) {
         y: e.pageY,
         items: [
             {title: "Open note in new tab", command: "openNoteInNewTab", uiIcon: "arrow-up-right"},
-            {title: "Open note in new window", command: "openNoteInNewWindow", uiIcon: "arrow-up-right"}
+            {title: "Open note in new window", command: "openNoteInNewWindow", uiIcon: "window-open"}
         ],
         selectMenuItemHandler: ({command}) => {
             if (command === 'openNoteInNewTab') {
diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js
index 13efc64a7..5463e295c 100644
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -82,7 +82,7 @@ export default class TabManager extends Component {
 
         if (filteredTabs.length === 0) {
             filteredTabs.push({
-                notePath: 'root',
+                notePath: this.isMainWindow ? 'root' : '',
                 active: true
             });
         }
@@ -196,7 +196,9 @@ export default class TabManager extends Component {
     async openTabWithNote(notePath, activate, tabId = null) {
         const tabContext = await this.openEmptyTab(tabId);
 
-        await tabContext.setNote(notePath, !activate); // if activate is false then send normal noteSwitched event
+        if (notePath) {
+            await tabContext.setNote(notePath, !activate); // if activate is false then send normal noteSwitched event
+        }
 
         if (activate) {
             this.activateTab(tabContext.tabId, false);
@@ -330,7 +332,7 @@ export default class TabManager extends Component {
 
         this.removeTab(tabId);
 
-        appContext.openInNewWindow(notePath);
+        this.triggerCommand('openInWindow', {notePath});
     }
 
     async hoistedNoteChangedEvent({hoistedNoteId}) {
diff --git a/src/public/app/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js
index 0478a05ff..002956ebd 100644
--- a/src/public/app/services/tree_context_menu.js
+++ b/src/public/app/services/tree_context_menu.js
@@ -57,7 +57,7 @@ class TreeContextMenu {
 
         return [
             { title: 'Open in a new tab <kbd>Ctrl+Click</kbd>', command: "openInTab", uiIcon: "empty", enabled: noSelectedNotes },
-            { title: 'Open in a new window', command: "openInWindow", uiIcon: "empty", enabled: noSelectedNotes },
+            { title: 'Open in a new window', command: "openInWindow", uiIcon: "window-open", enabled: noSelectedNotes },
             { title: 'Insert note after <kbd data-command="createNoteAfter"></kbd>', command: "insertNoteAfter", uiIcon: "plus",
                 items: insertNoteAfterEnabled ? this.getNoteTypeItems("insertNoteAfter") : null,
                 enabled: insertNoteAfterEnabled && noSelectedNotes },
@@ -113,9 +113,6 @@ class TreeContextMenu {
         if (command === 'openInTab') {
             appContext.tabManager.openTabWithNote(notePath);
         }
-        else if (command === 'openInWindow') {
-            appContext.openInNewWindow(notePath);
-        }
         else if (command === "insertNoteAfter") {
             const parentNoteId = this.node.data.parentNoteId;
             const isProtected = await treeService.getParentProtectedStatus(this.node);
@@ -134,7 +131,7 @@ class TreeContextMenu {
             });
         }
         else {
-            this.treeWidget.triggerCommand(command, {node: this.node});
+            this.treeWidget.triggerCommand(command, {node: this.node, notePath: notePath});
         }
     }
 }
diff --git a/src/public/app/widgets/global_menu.js b/src/public/app/widgets/global_menu.js
index 1cd3a2ec9..1c18b7f5d 100644
--- a/src/public/app/widgets/global_menu.js
+++ b/src/public/app/widgets/global_menu.js
@@ -1,5 +1,4 @@
 import BasicWidget from "./basic_widget.js";
-import keyboardActionService from "../services/keyboard_actions.js";
 import utils from "../services/utils.js";
 import syncService from "../services/sync.js";
 
@@ -39,6 +38,12 @@ const TPL = `
                 Sync (<span id="outstanding-syncs-count">0</span>)
             </a>
 
+            <a class="dropdown-item" data-trigger-command="openNewWindow">
+                <span class="bx bx-window-open"></span>
+                Open new window
+                <kbd data-command="openNewWindow"></kbd>
+            </a>
+
             <a class="dropdown-item open-dev-tools-button" data-trigger-command="openDevTools">
                 <span class="bx bx-terminal"></span>
                 Open Dev Tools
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 7f896560b..fd89cf47a 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -258,9 +258,9 @@ export default class TabRowWidget extends BasicWidget {
                 x: e.pageX,
                 y: e.pageY,
                 items: [
-                    {title: "Move this tab to a new window", command: "moveTabToNewWindow", uiIcon: "empty"},
-                    {title: "Close all tabs", command: "removeAllTabs", uiIcon: "empty"},
-                    {title: "Close all tabs except for this", command: "removeAllTabsExceptForThis", uiIcon: "empty"},
+                    {title: "Move this tab to a new window", command: "moveTabToNewWindow", uiIcon: "window-open"},
+                    {title: "Close all tabs", command: "removeAllTabs", uiIcon: "x"},
+                    {title: "Close all tabs except for this", command: "removeAllTabsExceptForThis", uiIcon: "x"},
                 ],
                 selectMenuItemHandler: ({command}) => {
                     this.triggerCommand(command, {tabId});
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index 44d66586d..425df2f59 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -193,7 +193,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
 
 
     {
-        separator: "Tabs"
+        separator: "Tabs & Windows"
     },
     {
         actionName: "openNewTab",
@@ -219,6 +219,12 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         description: "Activates tab on the left",
         scope: "window"
     },
+    {
+        actionName: "openNewWindow",
+        defaultShortcuts: [],
+        description: "Open new empty window",
+        scope: "window"
+    },
 
 
     {