Avoid conflicts with concurrent edit of minutes #6193
Merged
Conversation
This file contains hidden or 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
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
7df2fa8 to
4150d50
Compare
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
2 times, most recently
from
36d46b7 to
dc71835
Compare
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
dc71835 to
c71c149
Compare
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
2 times, most recently
from
1eb92a3 to
8b19929
Compare
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
indico/web/client/js/react/components/notes/NoteConflictModal.jsx
Outdated
Show resolved
Hide resolved
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
8b19929 to
a8aa53f
Compare
GovernmentPlates
changed the title
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
a8aa53f to
c8a134e
Compare
ThiefMaster
reviewed
Mar 15, 2024
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
5 times, most recently
from
52580fb to
92c77ca
Compare
ThiefMaster
reviewed
Mar 18, 2024
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
3 times, most recently
from
bea6db3 to
4b21658
Compare
ThiefMaster
force-pushed
the
master
branch
2 times, most recently
from
552297c to
a46dd5e
Compare
ThiefMaster
reviewed
Mar 27, 2024
GovernmentPlates
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
24ad157 to
a1667fa
Compare
This fixes an edge case where the conflict detection was not correctly triggered during the simultaneous edit of a new note, as well as fixing a case where attempting to create a new note revision after a deletion would raise an error. Unit tests were also re-written to validate this.
Keeping things simple...
Apply changes/suggestions from review, as well as some minor visual improvements
- Hide scrollbar if note content is not large enough - Close both the conflict and note editor modal when the overwrite action is triggered
* Refactor frontend conflict action logic * Convert markdown -> HTML on conflict * Reword conflict message on UI * Show relative last modified timestamp instead
ThiefMaster
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
17e1253 to
b77c6cb
Compare
This fixes a bug where markdown mins were not being correctly rendered in the conflict modal
The `box-shadow` used by SUI to seperate columns seems to be buggy on firefox - this fix overrides this seperator style with a typical `border-left` instead.
ThiefMaster
force-pushed
the
3410-Fix-Notes-Conflicts
branch
from
b77c6cb to
d3ab19b
Compare
ThiefMaster
approved these changes
Apr 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Closes: #3410
This PR shows a dialog to the user when a concurrent edit to the note (that the user is editing) is made which gives the user an option to either:
TODO: