From 27be3b4c90978aa2b90acdef96428b1aacf20923 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sun, 12 Aug 2018 12:59:38 +0200
Subject: [PATCH] fixes in tree loading

---
 src/public/javascripts/services/tree_cache.js | 4 ++--
 src/routes/api/tree.js                        | 4 ++--
 src/services/script.js                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/public/javascripts/services/tree_cache.js b/src/public/javascripts/services/tree_cache.js
index 3e7582ca6..557d504e7 100644
--- a/src/public/javascripts/services/tree_cache.js
+++ b/src/public/javascripts/services/tree_cache.js
@@ -51,12 +51,12 @@ class TreeCache {
             if (!this.notes[noteId]) {
                 messagingService.logError(`Can't find note ${noteId}`);
 
-                return `[unknown ${noteId}]`;
+                return null;
             }
             else {
                 return this.notes[noteId];
             }
-        });
+        }).filter(note => note !== null);
     }
 
     /** @return NoteShort */
diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js
index 2696bd65e..76d934542 100644
--- a/src/routes/api/tree.js
+++ b/src/routes/api/tree.js
@@ -35,9 +35,9 @@ async function getTree() {
               JOIN tree ON branches.parentNoteId = tree.noteId
               WHERE tree.isExpanded = 1 AND branches.isDeleted = 0
           )
-        SELECT branches.* FROM tree JOIN branches USING(noteId) ORDER BY branches.notePosition`);
+        SELECT branches.* FROM tree JOIN branches USING(noteId) WHERE branches.isDeleted = 0 ORDER BY branches.notePosition`);
 
-    const noteIds = branches.map(b => b.noteId);
+    const noteIds = Array.from(new Set(branches.map(b => b.noteId)));
 
     const notes = await getNotes(noteIds);
 
diff --git a/src/services/script.js b/src/services/script.js
index 78f69335c..c820e058d 100644
--- a/src/services/script.js
+++ b/src/services/script.js
@@ -29,7 +29,7 @@ async function executeBundle(bundle, startNote, originEntity = null) {
         return await execute(ctx, script, '');
     }
     else {
-        return await sql.transactional(async () => execute(ctx, script, ''));
+        return await sql.transactional(async () => await execute(ctx, script, ''));
     }
 }