self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-30 23:44:55 +02:00
Code Issues Releases Activity

All: Fixes #5223: Fixed issue with orphaned resource being created in case of a resource conflict

Browse Source
This commit is contained in:
Laurent Cozic
2021-08-05 14:25:25 +01:00
parent d3cd843fc8
commit f08af4d036
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/lib/models/Resource.ts
View File

@ -389,15 +389,31 @@ export default class Resource extends BaseItem {
return newResource; return newResource;
} }
static async createConflictResourceNote(resource: ResourceEntity) { public static async resourceConflictFolderId(): Promise<string> {
const Note = this.getClass('Note'); const folder = await this.resourceConflictFolder();
return folder.id;
}
private static async resourceConflictFolder(): Promise<any> {
const conflictFolderTitle = _('Conflicts (attachments)');
const Folder = this.getClass('Folder');
const folder = await Folder.loadByTitle(conflictFolderTitle);
if (!folder || folder.parent_id) {
return Folder.save({ title: conflictFolderTitle });
}
return folder;
}
public static async createConflictResourceNote(resource: ResourceEntity) {
const Note = this.getClass('Note');
const conflictResource = await Resource.duplicateResource(resource.id); const conflictResource = await Resource.duplicateResource(resource.id);
await Note.save({ await Note.save({
title: _('Attachment conflict: "%s"', resource.title), title: _('Attachment conflict: "%s"', resource.title),
body: _('There was a [conflict](%s) on the attachment below.\n\n%s', 'https://joplinapp.org/conflict/', Resource.markdownTag(conflictResource)), body: _('There was a [conflict](%s) on the attachment below.\n\n%s', 'https://joplinapp.org/conflict/', Resource.markdownTag(conflictResource)),
is_conflict: 1, parent_id: await this.resourceConflictFolderId(),
}, { changeSource: ItemChange.SOURCE_SYNC }); }, { changeSource: ItemChange.SOURCE_SYNC });
} }

9
packages/lib/services/synchronizer/Synchronizer.resources.test.ts
View File

@ -254,14 +254,21 @@ describe('Synchronizer.resources', function() {
// attached to it, and check that it has the original content. // attached to it, and check that it has the original content.
const allNotes = await Note.all(); const allNotes = await Note.all();
expect(allNotes.length).toBe(2); expect(allNotes.length).toBe(2);
const resourceConflictFolderId = await Resource.resourceConflictFolderId();
const conflictNote = allNotes.find((v: NoteEntity) => { const conflictNote = allNotes.find((v: NoteEntity) => {
return !!v.is_conflict; return v.parent_id === resourceConflictFolderId;
}); });
expect(!!conflictNote).toBe(true); expect(!!conflictNote).toBe(true);
const resourceIds = await Note.linkedResourceIds(conflictNote.body); const resourceIds = await Note.linkedResourceIds(conflictNote.body);
expect(resourceIds.length).toBe(1); expect(resourceIds.length).toBe(1);
const conflictContent = await Resource.resourceBlobContent(resourceIds[0], 'utf8'); const conflictContent = await Resource.resourceBlobContent(resourceIds[0], 'utf8');
expect(conflictContent).toBe('1234 MOD 1'); expect(conflictContent).toBe('1234 MOD 1');
// Also check that the conflict folder has been created and that it
// is a top folder.
const resourceConflictFolder = await Folder.load(resourceConflictFolderId);
expect(resourceConflictFolder).toBeTruthy();
expect(resourceConflictFolder.parent_id).toBeFalsy();
} }
})); }));