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

note list displays correct paging

Browse Source
This commit is contained in:
zadam
2021-01-28 23:29:10 +01:00
parent 5eb9b8fe42
commit 8019e23ee4
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/public/app/services/note_list_renderer.js
View File

@@ -152,10 +152,19 @@ class NoteListRenderer {
this.$noteList = $(TPL); this.$noteList = $(TPL);
// note list must be added to the DOM immediatelly, otherwise some functionality scripting (canvas) won't work // note list must be added to the DOM immediatelly, otherwise some functionality scripting (canvas) won't work
$parent.empty().append(this.$noteList); $parent.empty();
this.parentNote = parentNote; this.parentNote = parentNote;
this.noteIds = noteIds; const includedNoteIds = this.getIncludedNoteIds();
this.noteIds = noteIds.filter(noteId => !includedNoteIds.has(noteId));
if (this.noteIds.length === 0) {
return;
}
$parent.append(this.$noteList);
this.page = 1; this.page = 1;
this.pageSize = parseInt(parentNote.getLabelValue('pageSize')); this.pageSize = parseInt(parentNote.getLabelValue('pageSize'));
@@ -193,6 +202,16 @@ class NoteListRenderer {
}); });
} }
/** @return {Set<string>} list of noteIds included (images, included notes) into a parent note and which
* don't have to be shown in the note list. */
getIncludedNoteIds() {
const includedLinks = this.parentNote
? this.parentNote.getRelations().filter(rel => rel.name === 'imageLink' || rel.name === 'includeNoteLink')
: [];
return new Set(includedLinks.map(rel => rel.value));
}
async toggleViewType(type) { async toggleViewType(type) {
if (type !== 'list' && type !== 'grid') { if (type !== 'list' && type !== 'grid') {
throw new Error(`Invalid view type ${type}`); throw new Error(`Invalid view type ${type}`);
@@ -220,10 +239,6 @@ class NoteListRenderer {
const $container = this.$noteList.find('.note-list-container').empty(); const $container = this.$noteList.find('.note-list-container').empty();
const includedLinks = this.parentNote
? this.parentNote.getRelations().filter(rel => rel.name === 'imageLink' || rel.name === 'includeNoteLink')
: [];
const startIdx = (this.page - 1) * this.pageSize; const startIdx = (this.page - 1) * this.pageSize;
const endIdx = startIdx + this.pageSize; const endIdx = startIdx + this.pageSize;
@@ -231,12 +246,6 @@ class NoteListRenderer {
const pageNotes = await treeCache.getNotes(pageNoteIds); const pageNotes = await treeCache.getNotes(pageNoteIds);
for (const note of pageNotes) { for (const note of pageNotes) {
// note is already visible (either as image or included note) in the parent note
// so no need to display it separately in the book
if (includedLinks.find(rel => rel.value === note.noteId)) {
continue;
}
const $card = await this.renderNote(note, this.parentNote.hasLabel('expanded')); const $card = await this.renderNote(note, this.parentNote.hasLabel('expanded'));
$container.append($card); $container.append($card);