-
Notifications
You must be signed in to change notification settings - Fork 164
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.
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
Websockets merge unstable #4486
Open
rtibbles
wants to merge
853
commits into
learningequality:websockets
Choose a base branch
from
rtibbles:websockets_unstable_merge
base: websockets
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Websockets merge unstable #4486
rtibbles
wants to merge
853
commits into
learningequality:websockets
from
rtibbles:websockets_unstable_merge
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
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…abot/github_actions/actions/checkout-4 Bump actions/checkout from 3 to 4
Allow users to retry copy failures
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1 to 2. - [Release notes](https://github.com/tibdex/github-app-token/releases) - [Commits](tibdex/github-app-token@v1...v2) --- updated-dependencies: - dependency-name: tibdex/github-app-token dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…defined Fix missing attributes from change objects
Super Duper Fast Import Search 🚀
Merge unstable to hotfixes
…anguage' dropdowns
…-truncated-channel-titles Fixes incorrectly truncated channel titles in 'Channel/source' and 'Language' dropdowns
AppNexus - The API Layer for contentcuration
Bumps [gevent](https://github.com/gevent/gevent) from 21.12.0 to 23.9.1. - [Release notes](https://github.com/gevent/gevent/releases) - [Changelog](https://github.com/gevent/gevent/blob/master/docs/changelog_pre.rst) - [Commits](gevent/gevent@21.12.0...23.9.1) --- updated-dependencies: - dependency-name: gevent dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [dexie](https://github.com/dfahlander/Dexie.js) from 3.2.4 to 3.2.6. - [Release notes](https://github.com/dfahlander/Dexie.js/releases) - [Commits](dexie/Dexie.js@v3.2.4...v3.2.6) --- updated-dependencies: - dependency-name: dexie dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Add action to notify us on Slack about GH issues comments from contributors community
… into patch_navbarwidth
…abot/npm_and_yarn/dexie-3.2.6 Bump dexie from 3.2.4 to 3.2.6
…vbarwidth Patch navbarwidth
Bumps [broadcast-channel](https://github.com/pubkey/broadcast-channel) from 5.1.0 to 7.0.0. - [Release notes](https://github.com/pubkey/broadcast-channel/releases) - [Changelog](https://github.com/pubkey/broadcast-channel/blob/master/CHANGELOG.md) - [Commits](https://github.com/pubkey/broadcast-channel/commits) --- updated-dependencies: - dependency-name: broadcast-channel dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…nctionality Add automatic alphabetic sort option to topic tree
…abot/npm_and_yarn/es5-ext-0.10.63 Bump es5-ext from 0.10.61 to 0.10.63
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…abot/npm_and_yarn/follow-redirects-1.15.6 Bump follow-redirects from 1.15.4 to 1.15.6
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.8.8 to 10.4.18. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](postcss/autoprefixer@9.8.8...10.4.18) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…abot/npm_and_yarn/autoprefixer-10.4.18 Bump autoprefixer from 9.8.8 to 10.4.18
…abot/npm_and_yarn/broadcast-channel-7.0.0 Bump broadcast-channel from 5.1.0 to 7.0.0
Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…abot/npm_and_yarn/webpack-dev-middleware-5.3.4 Bump webpack-dev-middleware from 5.3.3 to 5.3.4
upgrade le-utils
ozer550
reviewed
Mar 27, 2024
ozer550
reviewed
Mar 27, 2024
# Conflicts: # Makefile # contentcuration/contentcuration/frontend/shared/data/applyRemoteChanges.js # contentcuration/contentcuration/frontend/shared/data/resources.js # contentcuration/contentcuration/frontend/shared/data/serverSync.js # contentcuration/contentcuration/settings.py # contentcuration/contentcuration/viewsets/base.py # contentcuration/contentcuration/viewsets/channel.py # contentcuration/contentcuration/viewsets/sync/endpoint.py # requirements-dev.txt # requirements.in # requirements.txt
rtibbles
force-pushed
the
websockets_unstable_merge
branch
from
March 29, 2024 16:01
78735b9
to
b0af9fd
Compare
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.
Summary
Description of the change(s) you made
Merge mostly straight forward.
Main complexity was in
serverSync.js
where I opted to conditionalize the syncChanges and debouceSyncChanges functions to do the websocket send or normal endpoint poll. This seemed like the simplest way of adding in the new behaviour while retaining the mutliple changes that have happened in unstable.Caveat: due to a bug with the reactive listening to
changesRev.length
this doesn't currently send any changes via websockets, so this won't work if you test manually.Manual verification steps performed
Does this introduce any tech-debt items?
Still need to work out a way to properly trigger the websocket send.
References
Fixes #4159
Comments
Contributor's Checklist
PR process:
CHANGELOG
label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later timedocs
label has been added if this introduces a change that needs to be updated in the user docs?requirements.txt
files also included in this PRStudio-specifc:
notranslate
class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)pages
,components
, andlayouts
directories as described in the docsTesting:
Reviewer's Checklist
This section is for reviewers to fill out.
yarn
andpip
)