From c8e4a5c9e7212c9bca0333a44d9cf474383f9b95 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 26 Jun 2019 21:20:30 +0200 Subject: [PATCH 1/4] release 0.33.4 --- package.json | 2 +- src/services/build.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f99367714..2746973cc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.33.3", + "version": "0.33.4", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/services/build.js b/src/services/build.js index ff56c6a5d..c75bfc186 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2019-06-24T20:47:50+02:00", buildRevision: "1b831f94a98dbbb7184048f329ea89175841dec2" }; +module.exports = { buildDate:"2019-06-26T21:20:30+02:00", buildRevision: "a3951f1cce978699d81f312c590d71f6ca4c6771" }; From cf3726289c94c523b1e795874d083f2eec3abbf6 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 27 Jun 2019 21:24:25 +0200 Subject: [PATCH 2/4] attempt to fix the duplicate issue --- package-lock.json | 2 +- src/public/javascripts/services/tree.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 302bc5192..3fd371fc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.33.3", + "version": "0.33.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js index 4a3a236e7..7be6bff10 100644 --- a/src/public/javascripts/services/tree.js +++ b/src/public/javascripts/services/tree.js @@ -630,7 +630,8 @@ async function createNote(node, parentNoteId, target, extraOptions = {}) { extraClasses: await treeBuilder.getExtraClasses(noteEntity), icon: await treeBuilder.getIcon(noteEntity), folder: extraOptions.type === 'search', - lazy: true + lazy: true, + key: utils.randomString(12) // this should prevent some "duplicate key" errors }; if (target === 'after') { From 2a9f36a0279f4ffafc0299e6c0e50ff55ecb9ed5 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 27 Jun 2019 22:58:04 +0200 Subject: [PATCH 3/4] fix activating parent note after delete --- src/public/javascripts/services/branches.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/javascripts/services/branches.js b/src/public/javascripts/services/branches.js index aa4fdffa0..fc2983f9d 100644 --- a/src/public/javascripts/services/branches.js +++ b/src/public/javascripts/services/branches.js @@ -102,7 +102,7 @@ async function deleteNodes(nodes) { next = nodes[0].getPrevSibling(); } - if (!next && !hoistedNoteService.isTopLevelNode(nodes[0])) { + if (!next && !await hoistedNoteService.isTopLevelNode(nodes[0])) { next = nodes[0].getParent(); } From 6e3d8472e196f15887234da73b76fc479d50e8c3 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 28 Jun 2019 21:50:15 +0200 Subject: [PATCH 4/4] avoid duplicate key error --- src/public/javascripts/services/tree_builder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/javascripts/services/tree_builder.js b/src/public/javascripts/services/tree_builder.js index 77f094da7..16a1c4708 100644 --- a/src/public/javascripts/services/tree_builder.js +++ b/src/public/javascripts/services/tree_builder.js @@ -83,7 +83,8 @@ async function prepareNode(branch) { icon: await getIcon(note), refKey: note.noteId, expanded: branch.isExpanded || hoistedNoteId === note.noteId, - lazy: true + lazy: true, + key: utils.randomString(12) // this should prevent some "duplicate key" errors }; if (note.hasChildren() || note.type === 'search') {