Desktop: Fixes #10737: Fix Fix editing notes in "Conflicts" causes them to temporarily vanish #10913
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
+87
to
+115
| it('should preserve value of is_conflict on save', async () => { | ||
| const testNote = await Note.save({ title: 'Test Note!', is_conflict: 1 }); | ||
|
|
||
| const makeFormNoteProps = (): HookDependencies => { | ||
| return { | ||
| ...defaultFormNoteProps, | ||
| noteId: testNote.id, | ||
| }; | ||
| }; | ||
|
|
||
| const formNote = renderHook(props => useFormNote(props), { | ||
| initialProps: makeFormNoteProps(), | ||
| }); | ||
| await formNote.waitFor(() => { | ||
| expect(formNote.result.current.formNote).toMatchObject({ | ||
| is_conflict: 1, | ||
| title: testNote.title, | ||
| }); | ||
| }); | ||
|
|
||
| // Should preserve is_conflict after save. | ||
| expect(await formNoteToNote(formNote.result.current.formNote)).toMatchObject({ | ||
| is_conflict: 1, | ||
| deleted_time: 0, | ||
| title: testNote.title, | ||
| }); | ||
|
|
||
| formNote.unmount(); | ||
| }); |
There was a problem hiding this comment.
I'm not sure how useful this automated test is — the bug is related to the interaction of useFormNote with reducer.ts. As such, an integrated/end-to-end test would make more sense. However, creating conflict notes in Playwright end-to-end tests is more complicated than creating conflicts in Jest tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This pull request fixes an issue where conflict notes would disappear from the note list when edited.
This was caused by
NOTE_UPDATE_ONEbeing dispatched with a note entity missingis_conflict. As a result,oldNote.is_conflict && !newNote.is_conflictwas true. This caused the note to be removed from the conflict note list:joplin/packages/lib/reducer.ts
Lines 972 to 976 in 88cae93
Fixes #10737.
Testing plan
This has been tested successfully on Fedora 40 (Linux).