self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-08 13:06:15 +02:00
Code Issues Releases Activity

Desktop: Fixes #11226: Fix reordering notes in custom sort order when some notes are deleted (#11592)

Browse Source
This commit is contained in:
Henry Heino 2025-01-06 09:33:31 -08:00 committed by GitHub
parent e70efcbd60
commit 4d827afccb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/lib/models/Note.ts
View File

@ -1030,6 +1030,7 @@ export default class Note extends BaseItem {
FROM notes
WHERE
is_conflict = 0
AND deleted_time = 0
${showCompletedTodos ? '' : 'AND todo_completed = 0'}
AND parent_id = ?
`;

30
packages/lib/models/Note_CustomSortOrder.test.js
View File

@ -282,4 +282,34 @@ describe('models/Note_CustomSortOrder', () => {
expect(resortedNotes3[5].id).toBe(resortedNotes2[5].id);
}));
it('should account for items in the trash', async () => {
const folder1 = await Folder.save({});
const notes = [];
notes.push(await Note.save({ order: 1003, parent_id: folder1.id, deleted_time: 1 })); await time.msleep(2);
notes.push(await Note.save({ order: 1002, parent_id: folder1.id })); await time.msleep(2);
notes.push(await Note.save({ order: 1001, parent_id: folder1.id })); await time.msleep(2);
notes.push(await Note.save({ order: 1000, parent_id: folder1.id })); await time.msleep(2);
const sortedNoteIds = async () => {
const notes = await Note.previews(folder1.id, {
fields: ['id', 'order', 'user_created_time', 'is_todo', 'todo_completed'],
order: Note.customOrderByColumns(),
});
return notes.map(note => note.id);
};
// Should sort items correctly initially, with deleted items omitted
expect(await sortedNoteIds()).toEqual([
notes[1].id, notes[2].id, notes[3].id,
]);
// Move a note to the end
await Note.insertNotesAt(folder1.id, [notes[1].id], 3, true, true);
// Should correctly reorder notes
expect(await sortedNoteIds()).toEqual([
notes[2].id, notes[3].id, notes[1].id,
]);
});
});