Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix document state issues #3842

Merged
merged 3 commits into from
Feb 27, 2023
Merged

Fix document state issues #3842

merged 3 commits into from
Feb 27, 2023

Conversation

max-nextcloud
Copy link
Collaborator

📝 Summary

  • Use a different naming scheme than the old initial document to not trap over old files
  • Only make use of the version if document state is provided.
  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Tests (unit, integration and/or end-to-end) passing.
  • Documentation is not required

@cypress
Copy link

cypress bot commented Feb 27, 2023 •
edited
Loading

Passing run #8754 ↗︎

0 137 0 0 Flakiness 0

Details:

Fix document state issues
Project: Text Commit: 04677aa70e
Status: Passed Duration: 03:00 💡
Started: Feb 27, 2023 5:26 PM Ended: Feb 27, 2023 5:29 PM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@juliushaertl juliushaertl added bug Something isn't working 3. to review labels Feb 27, 2023
@juliushaertl juliushaertl added this to the Nextcloud 26 milestone Feb 27, 2023
mejo-
mejo- approved these changes Feb 27, 2023
View reviewed changes
Copy link
Member

@mejo- mejo- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me. Just minor comments.

@max-nextcloud
fix: use id.yjs naming scheme for yjs doc state files
27e0c9d 
This will prevent loading content from files,
that remained from the old sessions.

Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud
fix: fetch all steps if no documentState send
c06b1e5 
We initialize the document with documentState.
This way we can start loading the steps from the last save version on.

However if no document state is provided during the create request
we need to load the document steps from the start.

Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud
Copy link
Collaborator Author

/compile

@nextcloud-command
Compile assets
04677aa 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo- mejo- merged commit 28176c0 into main Feb 27, 2023
@delete-merged-branch delete-merged-branch bot deleted the fix/doc-state-filename branch February 27, 2023 17:29
@blizzz blizzz mentioned this pull request Mar 2, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliushaertl juliushaertl juliushaertl approved these changes

@mejo- mejo- mejo- approved these changes

Assignees
No one assigned
Labels
4. to release 26 feedback bug Something isn't working
Projects
📝 Office team
Archived in project
Milestone
Nextcloud 26
Development

Successfully merging this pull request may close these issues.
4 participants
@max-nextcloud @juliushaertl @mejo- @nextcloud-command