self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Desktop, Mobile: Fixes #12104: Ensure merges to revisions during cleaning are synced to the target (#12444)

Browse Source
This commit is contained in:
mrjo118
2025-08-06 10:52:28 +01:00
committed by GitHub
parent 1f4b32a241
commit 358134038c
2 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/lib/models/Revision.ts
View File

@@ -4,6 +4,7 @@ import BaseItem from './BaseItem';
const DiffMatchPatch = require('diff-match-patch');
import * as ArrayUtils from '../ArrayUtils';
import JoplinError from '../JoplinError';
import time from '../time';
const { sprintf } = require('sprintf-js');
const dmp = new DiffMatchPatch();
@@ -343,8 +344,8 @@ export default class Revision extends BaseItem {
const bodyDiff = this.createTextPatch('', merged.body);
const metadataDiff = this.createObjectPatch({}, merged.metadata);
queries.push({
sql: 'UPDATE revisions SET title_diff = ?, body_diff = ?, metadata_diff = ? WHERE id = ?',
params: [titleDiff, bodyDiff, metadataDiff, keptRev.id],
sql: 'UPDATE revisions SET title_diff = ?, body_diff = ?, metadata_diff = ?, updated_time = ? WHERE id = ?',
params: [titleDiff, bodyDiff, metadataDiff, time.unixMs(), keptRev.id],
});
}

67
packages/lib/services/synchronizer/Synchronizer.revisions.test.ts
View File

@@ -230,4 +230,71 @@ describe('Synchronizer.revisions', () => {
jest.useRealTimers();
});
it('should sync both deleted and merged revisions to remote, when revision deletion retains some revisions locally', async () => {
// - C1 creates note 1
// - C1 modifies note 1 over a period of time - 2 revisions are created
// - C1 sync
// - C2 sync
// - C2 receives note 1 with the revisions
// - C2 deletes the oldest of the 2 revisions, leaving 1 merged revision
// - C2 sync
// - C1 sync
// - C1 receives 1 merged revision and the older one is deleted
//
// When at least one, but not all revisions are deleted for a note, the new oldest revision must be a merge of all
// previous revisions which were deleted. So in addition to verifying that old revision deletions are synced so that
// other clients will delete those revisions, we also need to verify that a merged revision is synced and is then updated
// when another client receives it
Setting.setValue('revisionService.intervalBetweenRevisions', 100);
jest.useFakeTimers({ advanceTimers: true });
const note = await Note.save({ title: 'note' });
const getNoteRevisions = () => {
return Revision.allByType(BaseModel.TYPE_NOTE, note.id);
};
jest.advanceTimersByTime(200);
await Note.save({ id: note.id, title: 'note REV0' });
jest.advanceTimersByTime(200);
await revisionService().collectRevisions(); // REV0
expect(await getNoteRevisions()).toHaveLength(1);
const interimTime = Date.now();
jest.advanceTimersByTime(200);
await Note.save({ id: note.id, title: 'note REV1' });
await revisionService().collectRevisions(); // REV1
expect(await getNoteRevisions()).toHaveLength(2);
// Should sync the revisions
await synchronizerStart();
await switchClient(2);
await synchronizerStart();
const revisions = await getNoteRevisions();
expect(revisions).toHaveLength(2);
expect(revisions[0].title_diff).toBe('[{"diffs":[[1,"note REV0"]],"start1":0,"start2":0,"length1":0,"length2":9}]');
expect(revisions[1].title_diff).toBe('[{"diffs":[[0," REV"],[-1,"0"],[1,"1"]],"start1":4,"start2":4,"length1":5,"length2":5}]');
await revisionService().deleteOldRevisions(Date.now() - interimTime);
expect(await getNoteRevisions()).toHaveLength(1);
await synchronizerStart();
expect(await getNoteRevisions()).toHaveLength(1);
// After switching back to the original client, syncing should locally delete
// the remotely deleted revisions and update the merged revision.
await switchClient(1);
expect(await getNoteRevisions()).toHaveLength(2);
await synchronizerStart();
const revisionsAfterSync = await getNoteRevisions();
expect(revisionsAfterSync).toHaveLength(1);
expect(revisionsAfterSync[0].title_diff).toBe('[{"diffs":[[1,"note REV1"]],"start1":0,"start2":0,"length1":0,"length2":9}]');
expect(revisionsAfterSync[0].updated_time).toBeGreaterThan(revisions[0].updated_time);
jest.useRealTimers();
});
});