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

[stable28] Keep base version etag during reload #5986

Merged
merged 7 commits into from
Jul 3, 2024
Merged

[stable28] Keep base version etag during reload #5986

merged 7 commits into from
Jul 3, 2024

Commits on Jul 3, 2024

  1. fix(sessionApi): only mark api as closed on success 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    4978b03 View commit details
    Browse the repository at this point in the history

  2. fix(reconnect): keep baseVersionEtag during reconnect 

    `this.$syncService` is cleared during the `close` method.

However we need the `baseVersionEtag` to ensure the editing session
on the server
is still in sync with our local ydoc.

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    b9fa132 View commit details
    Browse the repository at this point in the history

  3. refactor: hide connection in sync service 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    299c8e8 View commit details
    Browse the repository at this point in the history

  4. test(cy): wait longer for initial sync to avoid timeouts 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3f58bab View commit details
    Browse the repository at this point in the history

  5. test(cy): also test failed reconnect attempt 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e993f5f View commit details
    Browse the repository at this point in the history

  6. fix(Editor): separate close and disconnect functions 

    * `close` is for closing the editor.
  It tries to save the document and clean everything up.
* `disconnect` is for cleaning up the current collaboration sessions.
  It will not save the document and asumes the editing will be resumed
  after a reconnect.

Move `sendRemainingSteps` out to the sync service.
Also make close in the websocket polyfill sync.
Just clean up the polyfills state.

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2c03655 View commit details
    Browse the repository at this point in the history

  7. refactor(yjs): move queue handling into helper 

    Signed-off-by: Max <max@nextcloud.com>

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a2b5ef2 View commit details
    Browse the repository at this point in the history