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.

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
wants to merge 853 commits into
base: websockets
Choose a base branch
from

Conversation

rtibbles
Copy link
Member

Summary

Description of the change(s) you made

Merge mostly straight forward.

# 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

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

  1. Make an edit.
  2. Refresh the page to make sure the sync gets sent.
  3. confirm that the changes get propagated to another browser session by the websockets

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:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

ozer550 and others added 30 commits August 31, 2023 16:03
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
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
…-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]>
dependabot bot and others added 22 commits March 5, 2024 15:26
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
…abot/npm_and_yarn/dexie-3.2.6

Bump dexie from 3.2.4 to 3.2.6
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
# 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
@bjester bjester self-assigned this Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.