diff --git a/src/public/app/entities/note_short.js b/src/public/app/entities/note_short.js index 2b1dbf610..f68547eb7 100644 --- a/src/public/app/entities/note_short.js +++ b/src/public/app/entities/note_short.js @@ -170,6 +170,16 @@ class NoteShort { * @returns {Attribute[]} all note's attributes, including inherited ones */ getAttributes(type, name) { + return this.__filterAttrs(this.__getCachedAttributes([]), type, name); + } + + __getCachedAttributes(path) { + // notes/clones cannot form tree cycles, it is possible to create attribute inheritance cycle via templates + // when template instance is a parent of template itself + if (path.includes(this.noteId)) { + return []; + } + if (!(this.noteId in noteAttributeCache)) { const ownedAttributes = this.getOwnedAttributes(); @@ -177,11 +187,13 @@ class NoteShort { ownedAttributes ]; + const newPath = [...path, this.noteId]; + for (const templateAttr of ownedAttributes.filter(oa => oa.type === 'relation' && oa.name === 'template')) { const templateNote = this.treeCache.notes[templateAttr.value]; - if (templateNote) { - attrArrs.push(templateNote.getAttributes()); + if (templateNote && templateNote.noteId !== this.noteId) { + attrArrs.push(templateNote.__getCachedAttributes(newPath)); } } @@ -189,7 +201,7 @@ class NoteShort { for (const parentNote of this.getParentNotes()) { // these virtual parent-child relationships are also loaded into frontend tree cache if (parentNote.type !== 'search') { - attrArrs.push(parentNote.getInheritableAttributes()); + attrArrs.push(parentNote.__getInheritableAttributes(newPath)); } } } @@ -197,7 +209,7 @@ class NoteShort { noteAttributeCache.attributes[this.noteId] = attrArrs.flat(); } - return this.__filterAttrs(noteAttributeCache.attributes[this.noteId], type, name); + return noteAttributeCache.attributes[this.noteId]; } __filterAttrs(attributes, type, name) { @@ -212,8 +224,8 @@ class NoteShort { } } - getInheritableAttributes() { - const attrs = this.getAttributes(); + __getInheritableAttributes(path) { + const attrs = this.__getCachedAttributes(path); return attrs.filter(attr => attr.isInheritable); } @@ -460,4 +472,4 @@ class NoteShort { } } -export default NoteShort; \ No newline at end of file +export default NoteShort; diff --git a/src/public/app/services/main_tree_executors.js b/src/public/app/services/main_tree_executors.js index a365393f3..9a8306fad 100644 --- a/src/public/app/services/main_tree_executors.js +++ b/src/public/app/services/main_tree_executors.js @@ -34,7 +34,7 @@ export default class MainTreeExecutors extends Component { return; } - const {note} = await noteCreateService.createNote(activeNote.noteId, { + await noteCreateService.createNote(activeNote.noteId, { isProtected: activeNote.isProtected, saveSelection: false }); @@ -56,4 +56,4 @@ export default class MainTreeExecutors extends Component { saveSelection: false }); } -} \ No newline at end of file +} diff --git a/src/public/app/services/tab_context.js b/src/public/app/services/tab_context.js index 9d46e2f6d..920a186f3 100644 --- a/src/public/app/services/tab_context.js +++ b/src/public/app/services/tab_context.js @@ -73,7 +73,7 @@ class TabContext extends Component { protectedSessionHolder.touchProtectedSessionIfNecessary(this.note); if (triggerSwitchEvent) { - this.triggerEvent('tabNoteSwitched', { + await this.triggerEvent('tabNoteSwitched', { tabContext: this, notePath: this.notePath }); @@ -127,4 +127,4 @@ class TabContext extends Component { } } -export default TabContext; \ No newline at end of file +export default TabContext; diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js index da333f5f1..fd29172d4 100644 --- a/src/public/app/services/tab_manager.js +++ b/src/public/app/services/tab_manager.js @@ -203,7 +203,7 @@ export default class TabManager extends Component { if (activate) { this.activateTab(tabContext.tabId, false); - this.triggerEvent('tabNoteSwitchedAndActivated', { + await this.triggerEvent('tabNoteSwitchedAndActivated', { tabContext, notePath: tabContext.notePath // resolved note path }); diff --git a/src/public/app/widgets/collapsible_widgets/note_info.js b/src/public/app/widgets/collapsible_widgets/note_info.js index a22837006..12a613fd8 100644 --- a/src/public/app/widgets/collapsible_widgets/note_info.js +++ b/src/public/app/widgets/collapsible_widgets/note_info.js @@ -34,9 +34,8 @@ const TPL = ` Type: - , + - MIME: @@ -70,9 +69,12 @@ export default class NoteInfoWidget extends CollapsibleWidget { this.$type.text(note.type); - this.$mime - .text(note.mime) - .attr("title", note.mime); + if (note.mime) { + this.$mime.text('(' + note.mime + ')'); + } + else { + this.$mime.empty(); + } } entitiesReloadedEvent({loadResults}) { diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 4bf571d46..7fc87f2a9 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -858,8 +858,11 @@ export default class NoteTreeWidget extends TabAwareWidget { this.toggleInt(this.isEnabled()); const oldActiveNode = this.getActiveNode(); + let oldActiveNodeFocused = false; if (oldActiveNode) { + oldActiveNodeFocused = oldActiveNode.hasFocus(); + oldActiveNode.setActive(false); oldActiveNode.setFocus(false); } @@ -872,8 +875,7 @@ export default class NoteTreeWidget extends TabAwareWidget { await this.expandToNote(this.tabContext.notePath); } - newActiveNode.setActive(true, {noEvents: true}); - + newActiveNode.setActive(true, {noEvents: true, noFocus: !oldActiveNodeFocused}); newActiveNode.makeVisible({scrollIntoView: true}); } } @@ -902,7 +904,7 @@ export default class NoteTreeWidget extends TabAwareWidget { async entitiesReloadedEvent({loadResults}) { const activeNode = this.getActiveNode(); - const activeNodeFocused = activeNode ? activeNode.hasFocus() : false; + const activeNodeFocused = activeNode && activeNode.hasFocus(); const nextNode = activeNode ? (activeNode.getNextSibling() || activeNode.getPrevSibling() || activeNode.getParent()) : null; const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null; const nextNotePath = nextNode ? treeService.getNotePath(nextNode) : null; @@ -1025,7 +1027,7 @@ export default class NoteTreeWidget extends TabAwareWidget { } if (node) { - node.setActive(true, {noEvents: true}); + node.setActive(true, {noEvents: true, noFocus: true}); } else { // this is used when original note has been deleted and we want to move the focus to the note above/below @@ -1040,7 +1042,7 @@ export default class NoteTreeWidget extends TabAwareWidget { // return focus if the previously active node was also focused if (newActiveNode && activeNodeFocused) { - newActiveNode.setFocus(true); + await newActiveNode.setFocus(true); } } } @@ -1068,7 +1070,7 @@ export default class NoteTreeWidget extends TabAwareWidget { if (activeNotePath) { const node = await this.getNodeFromPath(activeNotePath, true); - await node.setActive(true, {noEvents: true}); + await node.setActive(true, {noEvents: true, noFocus: true}); } } diff --git a/src/services/backup.js b/src/services/backup.js index 15f24e648..422406bd7 100644 --- a/src/services/backup.js +++ b/src/services/backup.js @@ -96,9 +96,9 @@ async function anonymize() { await db.run("UPDATE api_tokens SET token = 'API token value'"); await db.run("UPDATE notes SET title = 'title'"); - await db.run("UPDATE note_contents SET content = 'text'"); + await db.run("UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL"); await db.run("UPDATE note_revisions SET title = 'title'"); - await db.run("UPDATE note_revision_contents SET content = 'title'"); + await db.run("UPDATE note_revision_contents SET content = 'title' WHERE content IS NOT NULL"); await db.run("UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label'"); await db.run("UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name != 'template'"); await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");