self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

All: Resolves #483: Add trash folder (#9671)

Browse Source
This commit is contained in:
Laurent Cozic
2024-03-02 14:25:27 +00:00
committed by GitHub
parent 07fbd547dc
commit f19b1c5364
112 changed files with 2322 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/lib/testing/test-utils-synchronizer.ts
View File

@ -3,6 +3,7 @@ import { fileApi } from '../testing/../testing/test-utils';
import Folder from '../models/Folder';
import Note from '../models/Note';
import BaseItem from '../models/BaseItem';
import { FolderEntity, NoteEntity } from '../services/database/types';
export async function allNotesFolders() {
const folders = await Folder.all();
@ -25,7 +26,7 @@ async function remoteItemsByTypes(types: number[]) {
return output;
}
export async function remoteNotesAndFolders() {
export async function remoteNotesAndFolders(): Promise<(NoteEntity | FolderEntity)[]> {
return remoteItemsByTypes([BaseModel.TYPE_NOTE, BaseModel.TYPE_FOLDER]);
}

2
packages/lib/testing/test-utils.ts
View File

@ -850,7 +850,7 @@ async function createNTestNotes(n: number, folder: any, tagIds: string[] = null,
const notes = [];
for (let i = 0; i < n; i++) {
const title_ = n > 1 ? `${title}${i}` : title;
const note = await Note.save({ title: title_, parent_id: folder.id, is_conflict: 0 });
const note = await Note.save({ title: title_, parent_id: folder.id, is_conflict: 0, deleted_time: 0 });
notes.push(note);
await time.msleep(10);
}