Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

small fixes for collapse/expand

Browse Source
This commit is contained in:
zadam
2020-05-03 13:52:12 +02:00
parent 2a3091f788
commit 43e12fbea2
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/tree_cache.js
View File

@@ -231,7 +231,7 @@ class TreeCache {
/** @return {Promise<NoteShort>} */ /** @return {Promise<NoteShort>} */
async getNote(noteId, silentNotFoundError = false) { async getNote(noteId, silentNotFoundError = false) {
if (noteId === 'none') { if (noteId === 'none') {
console.log(`No 'none' note.`); console.trace(`No 'none' note.`);
return null; return null;
} }
else if (!noteId) { else if (!noteId) {

2
src/public/app/services/tree_context_menu.js
View File

@@ -40,9 +40,9 @@ class TreeContextMenu {
async getMenuItems() { async getMenuItems() {
const note = await treeCache.getNote(this.node.data.noteId); const note = await treeCache.getNote(this.node.data.noteId);
const branch = treeCache.getBranch(this.node.data.branchId); const branch = treeCache.getBranch(this.node.data.branchId);
const parentNote = await treeCache.getNote(branch.parentNoteId);
const isNotRoot = note.noteId !== 'root'; const isNotRoot = note.noteId !== 'root';
const isHoisted = note.noteId === hoistedNoteService.getHoistedNoteId(); const isHoisted = note.noteId === hoistedNoteService.getHoistedNoteId();
const parentNote = isNotRoot ? await treeCache.getNote(branch.parentNoteId) : null;
// some actions don't support multi-note so they are disabled when notes are selected // some actions don't support multi-note so they are disabled when notes are selected
// the only exception is when the only selected note is the one that was right-clicked, then // the only exception is when the only selected note is the one that was right-clicked, then

2
src/public/app/widgets/note_tree.js
View File

@@ -606,7 +606,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
await this.batchUpdate(async () => { await this.batchUpdate(async () => {
await node.load(true); await node.load(true);
if (node.data.noteId !== 'root') { // root is always expanded
await node.setExpanded(isExpanded, {noEvents: true}); await node.setExpanded(isExpanded, {noEvents: true});
}
}); });
} }

7
src/routes/api/branches.js
View File

@@ -114,14 +114,16 @@ async function moveBranchAfterNote(req) {
async function setExpanded(req) { async function setExpanded(req) {
const {branchId, expanded} = req.params; const {branchId, expanded} = req.params;
if (branchId !== 'root') {
await sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]); await sql.execute("UPDATE branches SET isExpanded = ? WHERE branchId = ?", [expanded, branchId]);
// we don't sync expanded label // we don't sync expanded label
} }
}
async function setExpandedForSubtree(req) { async function setExpandedForSubtree(req) {
const {branchId, expanded} = req.params; const {branchId, expanded} = req.params;
const branchIds = await sql.getColumn(` let branchIds = await sql.getColumn(`
WITH RECURSIVE WITH RECURSIVE
tree(branchId, noteId) AS ( tree(branchId, noteId) AS (
SELECT branchId, noteId FROM branches WHERE branchId = ? SELECT branchId, noteId FROM branches WHERE branchId = ?
@@ -132,6 +134,9 @@ async function setExpandedForSubtree(req) {
) )
SELECT branchId FROM tree`, [branchId]); SELECT branchId FROM tree`, [branchId]);
// root is always expanded
branchIds = branchIds.filter(branchId => branchId !== 'root');
await sql.executeMany(`UPDATE branches SET isExpanded = ${expanded} WHERE branchId IN (???)`, branchIds); await sql.executeMany(`UPDATE branches SET isExpanded = ${expanded} WHERE branchId IN (???)`, branchIds);
return { return {