Merge latest unstable into websockets by bjester · Pull Request #3599 · learningequality/studio

bjester · 2022-09-02T14:37:13Z

Summary

Description of the change(s) you made

Merges latest unstable branch changes into the websockets branch

References

Helpfully includes #3591

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

Bumps [core-js](https://github.com/zloirock/core-js) from 3.22.8 to 3.24.1. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](zloirock/core-js@v3.22.8...v3.24.1) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [google-cloud-kms](https://github.com/googleapis/python-kms) from 0.2.1 to 1.1.0. - [Release notes](https://github.com/googleapis/python-kms/releases) - [Changelog](https://github.com/googleapis/python-kms/blob/main/CHANGELOG.md) - [Commits](googleapis/python-kms@v0.2.1...v1.1.0) --- updated-dependencies: - dependency-name: google-cloud-kms dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

… of list

…istformat-constructor Add 'new' to Intl.ListFormat

…abot/npm_and_yarn/core-js-3.24.1 Bump core-js from 3.22.8 to 3.24.1

Bumps [workbox-window](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](GoogleChrome/workbox@v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-window dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…abot/npm_and_yarn/workbox-window-6.5.4 Bump workbox-window from 6.5.3 to 6.5.4

…abot/pip/google-cloud-kms-1.1.0 Bump google-cloud-kms from 0.2.1 to 1.1.0

Bumps [django-prometheus](https://github.com/korfuri/django-prometheus) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/korfuri/django-prometheus/releases) - [Changelog](https://github.com/korfuri/django-prometheus/blob/master/CHANGELOG.md) - [Commits](django-commons/django-prometheus@2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: django-prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [google-cloud-core](https://github.com/googleapis/python-cloud-core) from 1.6.0 to 1.7.3. - [Release notes](https://github.com/googleapis/python-cloud-core/releases) - [Changelog](https://github.com/googleapis/python-cloud-core/blob/v1.7.3/CHANGELOG.md) - [Commits](googleapis/python-cloud-core@v1.6.0...v1.7.3) --- updated-dependencies: - dependency-name: google-cloud-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…abot/pip/django-prometheus-2.2.0 Bump django-prometheus from 2.1.0 to 2.2.0

…abot/pip/google-cloud-core-1.7.3 Bump google-cloud-core from 1.6.0 to 1.7.3

Bumps [backoff](https://github.com/litl/backoff) from 1.10.0 to 2.1.2. - [Release notes](https://github.com/litl/backoff/releases) - [Changelog](https://github.com/litl/backoff/blob/master/CHANGELOG.md) - [Commits](litl/backoff@v1.10.0...v2.1.2) --- updated-dependencies: - dependency-name: backoff dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [django-model-utils](https://github.com/jazzband/django-model-utils) from 4.0.0 to 4.2.0. - [Release notes](https://github.com/jazzband/django-model-utils/releases) - [Changelog](https://github.com/jazzband/django-model-utils/blob/master/CHANGES.rst) - [Commits](jazzband/django-model-utils@4.0.0...4.2.0) --- updated-dependencies: - dependency-name: django-model-utils dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…ython-api Remove unneeded dependency for dead code

Migrate to using the Sentry browser/vue library, Stop relying on Raven.

Update browserslist to exclude IE and other low usage browsers

Bumps [google-cloud-error-reporting](https://github.com/googleapis/python-error-reporting) from 1.1.2 to 1.4.0. - [Release notes](https://github.com/googleapis/python-error-reporting/releases) - [Changelog](https://github.com/googleapis/python-error-reporting/blob/main/CHANGELOG.md) - [Commits](googleapis/python-error-reporting@v1.1.2...v1.4.0) --- updated-dependencies: - dependency-name: google-cloud-error-reporting dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…on_patch Add support for file duration and node suggested duration for ricecooker

Ignore any imports of vuetify src style files to defer to our vendored css

Use Vuetify's lazy attribute to delay mounting of DOM nodes

…(previously test_user.py) for consistency and in response to user.py test case fail.

…for-audio-video Update reference selection for duration for audioVideo resources

…or_old_men Remove unused pycountry dependency.

…_still_is_sitting Remove deprecated Raven pip dependency.

Ensure channel ID is set on move change to trash tree

… higher limit and added DisablePostDeleteSignal context manager

…ing of non-Dexie observable changes.

…anges Add a check for new entries in the changes table to ensure swift syncing of non-Dexie observable changes.

Update sorting of channel items and fix erroneous use of `sortBy`

…stale-files Cleanup stale files

Bumps [uuid](https://github.com/uuidjs/uuid) from 3.4.0 to 8.3.2. - [Release notes](https://github.com/uuidjs/uuid/releases) - [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md) - [Commits](uuidjs/uuid@v3.4.0...v8.3.2) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…abot/npm_and_yarn/uuid-8.3.2 Bump uuid from 3.4.0 to 8.3.2

Bumps [core-js](https://github.com/zloirock/core-js) from 3.24.1 to 3.25.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](zloirock/core-js@v3.24.1...v3.25.0) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…abot/npm_and_yarn/core-js-3.25.0 Bump core-js from 3.24.1 to 3.25.0

rtibbles and others added 30 commits August 5, 2022 08:34

Remove last 2 versions requirement from browserslist and focus on >1%.

4e8000e

Add package.json to checked paths for skip checks for frontend build.

6f4419c

Make tooltips lazy to avoid mounting DOM nodes until we need to

fd142e4

Update menus to be lazy

387337c

Add support for file duration and node suggested duration for ricecooker

c256b32

Add 'new' to Intl.ListFormat to prevent console errors, non-rendering…

1677236

… of list

Merge pull request learningequality#3549 from marcellamaki/fix-intl-l…

739051b

…istformat-constructor Add 'new' to Intl.ListFormat

Merge pull request learningequality#3545 from learningequality/depend…

3aba7c3

…abot/npm_and_yarn/core-js-3.24.1 Bump core-js from 3.22.8 to 3.24.1

Merge pull request learningequality#3552 from learningequality/depend…

83fec98

…abot/npm_and_yarn/workbox-window-6.5.4 Bump workbox-window from 6.5.3 to 6.5.4

WIP: adding stale file clean up

8e09d0f

Merge pull request learningequality#3546 from learningequality/depend…

4db3f67

…abot/pip/google-cloud-kms-1.1.0 Bump google-cloud-kms from 0.2.1 to 1.1.0

Updates to studio documentation on preferred setup

68b1843

Merge pull request learningequality#3553 from learningequality/depend…

ea4118b

…abot/pip/django-prometheus-2.2.0 Bump django-prometheus from 2.1.0 to 2.2.0

Merge pull request learningequality#3554 from learningequality/depend…

67d638e

…abot/pip/google-cloud-core-1.7.3 Bump google-cloud-core from 1.6.0 to 1.7.3

Remove unneeded dependency for dead code

e4f5054

Remove gspread too

f54aaf7

Migrate to using the Sentry browser/vue library, Stop relying on Raven.

39ec19e

Update to 7.11.1

41ec9b8

Merge pull request learningequality#3562 from bjester/remove-google-p…

847fd4c

…ython-api Remove unneeded dependency for dead code

Merge pull request learningequality#3498 from rtibbles/raven_nevermore

fba0707

Migrate to using the Sentry browser/vue library, Stop relying on Raven.

Merge pull request learningequality#3488 from rtibbles/browserslist

5c686c9

Update browserslist to exclude IE and other low usage browsers

Merge pull request learningequality#3430 from learningequality/durati…

e98c642

…on_patch Add support for file duration and node suggested duration for ricecooker

LianaHarris360 and others added 27 commits August 25, 2022 15:35

Merge branch 'clean-up-stale-files' into cleanup-stale-files

16a60ca

Update test

b55eb93

Merge pull request learningequality#3570 from rtibbles/rtl_trever

6c7cb87

Ignore any imports of vuetify src style files to defer to our vendored css

Merge pull request learningequality#3483 from bjester/lazy-tooltips

8006198

Use Vuetify's lazy attribute to delay mounting of DOM nodes

Created and updated file location and imports for test_decorators.py …

4ed66c3

…(previously test_user.py) for consistency and in response to user.py test case fail.

Merge pull request learningequality#3583 from marcellamaki/reference-…

e0e5484

…for-audio-video Update reference selection for duration for audioVideo resources

Merge pull request learningequality#3580 from rtibbles/no_pycountry_f…

2809cf8

…or_old_men Remove unused pycountry dependency.

Merge pull request learningequality#3581 from rtibbles/never_flitting…

269e7e0

…_still_is_sitting Remove deprecated Raven pip dependency.

Ensure channel id on create and for moving to trash

355f352

Update and add tests for channel_id

601b338

Merge pull request learningequality#3590 from bjester/ensure-channel-id

28d993e

Ensure channel ID is set on move change to trash tree

Defined default variable inside function scope, updated function with…

c1c1189

… higher limit and added DisablePostDeleteSignal context manager

Add a check for new entries in the changes table to ensure swift sync…

c6eba7b

…ing of non-Dexie observable changes.

Use orderBy not sortBy to set descending order.

b4de8c0

Correct other instances of using sortBy with incorrect syntax.

ec403dc

Re-sort catalog list items by name.

cd95c73

Add additional check to only try to sync unsynced changes.

56d8784

Merge pull request learningequality#3591 from rtibbles/ch_ch_ch_ch_ch…

aba1e0e

…anges Add a check for new entries in the changes table to ensure swift syncing of non-Dexie observable changes.

Merge pull request learningequality#3592 from rtibbles/ordah_ordah

acbe0b4

Update sorting of channel items and fix erroneous use of `sortBy`

Updated clean up stale files function to include batch deletion

bf5cf4b

Merge pull request learningequality#3584 from LianaHarris360/cleanup-…

c603816

…stale-files Cleanup stale files

Update uuid imports.

527f76b

Merge pull request learningequality#3535 from learningequality/depend…

faeaa4e

…abot/npm_and_yarn/uuid-8.3.2 Bump uuid from 3.4.0 to 8.3.2

Merge pull request learningequality#3597 from learningequality/depend…

75680dd

…abot/npm_and_yarn/core-js-3.25.0 Bump core-js from 3.24.1 to 3.25.0

Resolve merge conflicts in requirements.txt

959ed30

rtibbles approved these changes Sep 2, 2022

View reviewed changes

Resolve makefile conflicts

72e41cd

bjester merged commit 8a04104 into learningequality:websockets Sep 2, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge latest unstable into websockets#3599

Merge latest unstable into websockets#3599
bjester merged 76 commits intolearningequality:websocketsfrom
bjester:websockets-unstable-merge

bjester commented Sep 2, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

bjester commented Sep 2, 2022

Summary

Description of the change(s) you made

References

Comments

Contributor's Checklist

Reviewer's Checklist

This section is for reviewers to fill out.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants