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

Merge branch 'release-3.1' into dev

Browse Source
This commit is contained in:
Laurent Cozic
2024-11-09 13:41:37 +00:00
parent 5056ac4e61 50b16c6054
commit 551bcc68cf
14 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/models/Note.test.ts
View File

@ -387,7 +387,7 @@ describe('models/Note', () => {
expect(conflictedNote.conflict_original_id).toBe(origNote.id);
expect(conflictedNote.parent_id).toBe(folder.id);
expect(conflictedNote.is_shared).toBeUndefined();
expect(conflictedNote.share_id).toBeUndefined();
expect(conflictedNote.share_id).toBe('');
});
it('should copy conflicted note to target folder and cancel conflict', (async () => {

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

@ -830,9 +830,15 @@ export default class Note extends BaseItem {
});
if (dispatchUpdateAction) {
// The UI requires share_id -- if a new note, it will always be the empty string in the database
// until processed by the share service. At present, loading savedNote from the database in this case
// breaks tests.
if (!('share_id' in savedNote) && isNew) {
savedNote.share_id = '';
}
// Ensures that any note added to the state has all the required
// properties for the UI to work.
if (!('deleted_time' in savedNote)) {
if (!('deleted_time' in savedNote) || !('share_id' in savedNote)) {
const fields = removeElement(unique(this.previewFields().concat(Object.keys(savedNote))), 'type_');
savedNote = await this.load(savedNote.id, {
fields,