[stable28] Refactor document and session handling #5541
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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
mejo-
changed the title
6 tasks
mejo-
force-pushed
the
backport/5481/stable28
branch
from
51ea17a
to
e7a5a5d
Compare
|
/backport! to stable27 |
mejo-
approved these changes
Mar 21, 2024
|
Let's wait for next months releases with this, so this gets tested a bit on Nextcloud 29 first. |
mejo-
force-pushed
the
backport/5481/stable28
branch
from
e7a5a5d
to
28dd585
Compare
Signed-off-by: Jonas <jonas@freesources.org>
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 <jonas@freesources.org>
…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 <jonas@freesources.org>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
`baseVersionEtag` changes when a new document session got initialized, e.g. after an old document session without session clients got cleaned up, or because the markdown file got changed via webdav. Detect this in the client and ask the user to reload the page for resetting the session. Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
Fixes: #4905 Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: Jonas <jonas@freesources.org>
…eanup Signed-off-by: Jonas <jonas@freesources.org>
Wrap error messages into an array when responding with `JSONResponse`. Signed-off-by: Jonas <jonas@freesources.org>
mejo-
force-pushed
the
backport/5481/stable28
branch
from
28dd585
to
67258a9
Compare
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
mejo-
force-pushed
the
backport/5481/stable28
branch
from
67258a9
to
499a54f
Compare
juliushaertl
approved these changes
Apr 3, 2024
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.
Combined backport of PRs to fix issues with empty session content and duplicated content.
baseVersionEtagchanged, reset frontend #5523