From 397f0d1326813a7a6097cecb548470c12b242be1 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Thu, 4 Feb 2021 23:08:16 +0100
Subject: [PATCH] fix collapse tree

---
 src/public/app/widgets/note_tree.js          | 3 ++-
 src/routes/api/branches.js                   | 6 ++++--
 src/services/note_cache/note_cache_loader.js | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 90458173d..558a50966 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -763,7 +763,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
         const {branchIds} = await server.put(`branches/${node.data.branchId}/expanded-subtree/${isExpanded ? 1 : 0}`);
 
-        treeCache.getBranches(branchIds, true).forEach(branch => branch.isExpanded = isExpanded);
+        treeCache.getBranches(branchIds, true)
+            .forEach(branch => branch.isExpanded = !!isExpanded);
 
         await this.batchUpdate(async () => {
             await node.load(true);
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index 60c05dc83..1b11ad8a3 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -121,7 +121,8 @@ function moveBranchAfterNote(req) {
 }
 
 function setExpanded(req) {
-    const {branchId, expanded} = req.params;
+    const {branchId} = req.params;
+    const expanded = parseInt(req.params.expanded);
 
     if (branchId !== 'root') {
         sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]);
@@ -137,7 +138,8 @@ function setExpanded(req) {
 }
 
 function setExpandedForSubtree(req) {
-    const {branchId, expanded} = req.params;
+    const {branchId} = req.params;
+    const expanded = parseInt(req.params.expanded);
 
     let branchIds = sql.getColumn(`
         WITH RECURSIVE
diff --git a/src/services/note_cache/note_cache_loader.js b/src/services/note_cache/note_cache_loader.js
index 8c01d5d76..0d53ea020 100644
--- a/src/services/note_cache/note_cache_loader.js
+++ b/src/services/note_cache/note_cache_loader.js
@@ -22,7 +22,7 @@ function load() {
     }
 
     for (const row of sql.iterateRows(`SELECT branchId, noteId, parentNoteId, prefix, notePosition, isExpanded FROM branches WHERE isDeleted = 0`, [])) {
-        new Branch(noteCache, row);
+        const branch = new Branch(noteCache, row);
     }
 
     for (const row of sql.iterateRows(`SELECT attributeId, noteId, type, name, value, isInheritable, position FROM attributes WHERE isDeleted = 0`, [])) {