diff --git a/db/demo.zip b/db/demo.zip index 5344f44c2..2d09590cf 100644 Binary files a/db/demo.zip and b/db/demo.zip differ diff --git a/db/migrations/0200__create_hidden_subtree.js b/db/migrations/0200__create_hidden_subtree.js index e074e8ff7..6d283d715 100644 --- a/db/migrations/0200__create_hidden_subtree.js +++ b/db/migrations/0200__create_hidden_subtree.js @@ -7,6 +7,6 @@ module.exports = () => { beccaLoader.load(); // make sure the hidden subtree exists since the subsequent migrations we will move some existing notes into it (share...) // in previous releases hidden subtree was created lazily - hiddenSubtreeService.checkHiddenSubtree(); + hiddenSubtreeService.checkHiddenSubtree(true); }); }; diff --git a/package.json b/package.json index 3f8a9f161..5b5e4dad4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.58.4", + "version": "0.58.7", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.js b/src/public/app/widgets/attribute_widgets/attribute_detail.js index 7ceb9bbcb..dc018836a 100644 --- a/src/public/app/widgets/attribute_widgets/attribute_detail.js +++ b/src/public/app/widgets/attribute_widgets/attribute_detail.js @@ -242,6 +242,7 @@ const ATTR_HELP = { "keepCurrentHoisting": "Opening this link won't change hoisting even if the note is not displayable in the current hoisted subtree.", "executeButton": "Title of the button which will execute the current code note", "executeDescription": "Longer description of the current code note displayed together with the execute button", + "excludeFromNoteMap": "Notes with this label will be hidden from the Note Map" }, "relation": { "runOnNoteCreation": "executes when note is created on backend. Use this relation if you want to run the script for all notes created under a specific subtree. In that case, create it on the subtree root note and make it inheritable. A new note created within the subtree (any depth) will trigger the script.", diff --git a/src/services/build.js b/src/services/build.js index dc5dc5172..10ff19a31 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2023-01-16T22:39:28+01:00", buildRevision: "9fd0b85ff2be264be35ec2052c956b654f0dac9e" }; +module.exports = { buildDate:"2023-01-17T23:14:58+01:00", buildRevision: "a3149aecf41bac3c559ebbd1865e916264985ac3" }; diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js index ba62ab288..b1e86b3e3 100644 --- a/src/services/hidden_subtree.js +++ b/src/services/hidden_subtree.js @@ -240,8 +240,8 @@ const HIDDEN_SUBTREE_DEFINITION = { ] }; -function checkHiddenSubtree() { - if (!migrationService.isDbUpToDate()) { +function checkHiddenSubtree(force = false) { + if (!force && !migrationService.isDbUpToDate()) { // on-delete hook might get triggered during some future migration and cause havoc log.info("Will not check hidden subtree until migration is finished."); return;