Reset document session on filesystem change #5481
Merged
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
Signed-off-by: Jonas <[email protected]>
mejo-
force-pushed
the
fix/reset_document_on_file_change
branch
2 times, most recently
from
dcfc860
to
6260d0a
Compare
juliusknorr
reviewed
Mar 13, 2024
juliusknorr
approved these changes
Mar 13, 2024
mejo-
force-pushed
the
fix/reset_document_on_file_change
branch
from
6260d0a
to
7b29ea6
Compare
When a text file is updated via other means than from the editor (e.g. when uploaded/synced via webdav) and there is no unsaved steps in the document session, reset the document session This will prevent conflict resolution dialogs in this case. Client frontends will have to reload the document afterwards though. Signed-off-by: Jonas <[email protected]>
…ession Instead of just deleting the newest steps, always remove all session data: document, sessions and steps from the database as well as the yjs (document state) file. Without the `--force` option, don't reset document sessions with unsaved steps. Signed-off-by: Jonas <[email protected]>
mejo-
force-pushed
the
fix/reset_document_on_file_change
branch
from
7b29ea6
to
eded54c
Compare
6 tasks
|
/backport to stable28 |
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.
Contributes to #5476
📝 Summary
When a text file is updated via other means than from the editor (e.g. when uploaded/synced via webdav) and there is no unsaved steps in the document session, reset the document session This will prevent conflict resolution dialogs in this case. Client frontends will have to reload the document afterwards though.
Instead of just deleting the newest steps, always remove all session data: document, sessions and steps from the database as well as the yjs (document state) file.
Without the
--forceoption, don't reset document sessions with unsaved steps.🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)