zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-23 17:16:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

introducing hidden notes, WIP

Browse source
This commit is contained in:
zadam 2021-06-05 23:35:47 +02:00
parent 882912826f
commit e48609aa68
3 changed files with 71 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/public/app/layouts/desktop_layout.js
View file

@ -139,9 +139,10 @@ export default class DesktopLayout {
.child(new SearchResultWidget())
.child(new SqlResultWidget())
)
.child(...this.customWidgets.get('center-pane'))
.child(...this.customWidgets.get('node-detail-pane'))
)
)
.child(...this.customWidgets.get('center-pane'))
)
.child(new RightPaneContainer()
.child(...this.customWidgets.get('right-pane'))

14
src/public/app/widgets/note_tree.js
View file

@ -550,6 +550,10 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
}
for (const branch of childBranches) {
if (branch.noteId === 'hidden') {
continue;
}
if (hideArchivedNotes) {
const note = branch.getNoteFromCache();
@ -869,7 +873,11 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
oldActiveNode.setFocus(false);
}
if (this.noteContext && this.noteContext.notePath && !this.noteContext.note.isDeleted) {
if (this.noteContext
&& this.noteContext.notePath
&& !this.noteContext.note.isDeleted
&& !this.noteContext.notePath.includes("root/hidden")
) {
const newActiveNode = await this.getNodeFromPath(this.noteContext.notePath);
if (newActiveNode) {
@ -1158,7 +1166,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
if (activeNotePath) {
const node = await this.getNodeFromPath(activeNotePath, true);
await node.setActive(true, {noEvents: true, noFocus: true});
if (node) {
await node.setActive(true, {noEvents: true, noFocus: true});
}
}
}

79
src/routes/api/date_notes.js
View file

@ -6,6 +6,7 @@ const dateUtils = require('../../services/date_utils');
const noteService = require('../../services/notes');
const attributeService = require('../../services/attributes');
const cls = require('../../services/cls');
const becca = require('../../becca/becca');
function getInboxNote(req) {
const hoistedNote = getHoistedNote();
@ -79,6 +80,40 @@ function createSqlConsole() {
return note;
}
function getHiddenRoot() {
let hidden = becca.getNote('hidden');
if (!hidden) {
hidden = noteService.createNewNote({
noteId: 'hidden',
title: 'hidden',
type: 'text',
content: '',
parentNoteId: 'root'
}).note;
hidden.addLabel('archived', "", true);
}
return hidden;
}
function getSearchRoot() {
let searchRoot = becca.getNote('search');
if (!searchRoot) {
searchRoot = noteService.createNewNote({
noteId: 'search',
title: 'search',
type: 'text',
content: '',
parentNoteId: getHiddenRoot().noteId
}).note;
}
return searchRoot;
}
function createSearchNote(req) {
const params = req.body;
const searchString = params.searchString || "";
@ -86,29 +121,29 @@ function createSearchNote(req) {
const hoistedNote = getHoistedNote();
let searchHome;
let searchHome = getSearchRoot();
if (hoistedNote) {
([searchHome] = hoistedNote.getDescendantNotesWithLabel('hoistedSearchHome'));
if (!searchHome) {
([searchHome] = hoistedNote.getDescendantNotesWithLabel('searchHome'));
}
if (!searchHome) {
searchHome = hoistedNote;
}
if (!ancestorNoteId) {
ancestorNoteId = hoistedNote.noteId;
}
}
else {
const today = dateUtils.localNowDate();
searchHome = attributeService.getNoteWithLabel('searchHome')
|| dateNoteService.getDateNote(today);
}
// if (hoistedNote) {
// ([searchHome] = hoistedNote.getDescendantNotesWithLabel('hoistedSearchHome'));
//
// if (!searchHome) {
// ([searchHome] = hoistedNote.getDescendantNotesWithLabel('searchHome'));
// }
//
// if (!searchHome) {
// searchHome = hoistedNote;
// }
//
// if (!ancestorNoteId) {
// ancestorNoteId = hoistedNote.noteId;
// }
// }
// else {
// const today = dateUtils.localNowDate();
//
// searchHome = attributeService.getNoteWithLabel('searchHome')
// || dateNoteService.getDateNote(today);
// }
const {note} = noteService.createNewNote({
parentNoteId: searchHome.noteId,