Merge unstable to hotfixes #4270

marcellamaki · 2023-08-31T13:13:12Z

Summary

PR	Issue	Category	QA Focus
#4181	#4079	UI: Fixes scroll to display "Question Type" on new question creation	Test adding new questions, and confirm the page doesn't autoscroll and type is now displayed
#4186	#4166	UI: Adds text truncation in import channel dropdown	Manual confirmation that original issue is resolved
#4260	#4215	UI: "Practice quiz" labeling	Ensure Practice Quiz completion criteria label is fixed in the "Details" side panel
#4131	N/A	N/A	N/A
#4255	N/A	UI: Upload H5P files	Upload a range of H5P files and ensure that upload works - preview will not display
#4262	N/A	N/A	N/A
#4245	N/A	Merge down: Hotfixes > Unstable	N/A
#4129	N/A	Dependency Bump	N/A
#4213	N/A	Dependency Bump	N/A
#4132	N/A	Dependency Bump	N/A
#4217	N/A	Dependency Bump	N/A
#4218	N/A	Dependency Bump	N/A
#3887	N/A	Dependency Bump	N/A
#4225	N/A	Dependency Bump	N/A
#4224	N/A	Dependency Bump	N/A
#4223	N/A	Dependency Bump	N/A
#4227	N/A	Dependency Bump	N/A
#4228	N/A	Dependency Bump	N/A
#4230	N/A	Dependency Bump	N/A
#4234	N/A	Dependency Bump	N/A
#4235	N/A	Dependency Bump	N/A
#4252	N/A	Dependency Bump	N/A
#4271	N/A	Dependency Bump	N/A

Reviewer guidance

How can a reviewer test these changes?

Please see the QA descriptions and linked issues/PRs for manual QA details

Note that the two remaining fixes by Vivek were merged directly into hotfixes, which is why they are not listed here. They will be detailed in the hotfixes QA table.

Bumps [stylus-loader](https://github.com/webpack-contrib/stylus-loader) from 7.1.2 to 7.1.3. - [Release notes](https://github.com/webpack-contrib/stylus-loader/releases) - [Changelog](https://github.com/webpack-contrib/stylus-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/stylus-loader@v7.1.2...v7.1.3) --- updated-dependencies: - dependency-name: stylus-loader dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

- implement code to extract .h5p files metadata;

Bumps [fonttools](https://github.com/fonttools/fonttools) from 4.27.1 to 4.40.0. - [Release notes](https://github.com/fonttools/fonttools/releases) - [Changelog](https://github.com/fonttools/fonttools/blob/main/NEWS.rst) - [Commits](fonttools/fonttools@4.27.1...4.40.0) --- updated-dependencies: - dependency-name: fonttools dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

- override file title

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…n/stylus-loader-7.1.3 Bump stylus-loader from 7.1.2 to 7.1.3

…n/semver-5.7.2 Bump semver from 5.7.1 to 5.7.2

…ls-4.40.0 Bump fonttools from 4.27.1 to 4.40.0

Bumps [google-cloud-kms](https://github.com/googleapis/python-kms) from 1.4.0 to 2.10.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@v1.4.0...v2.10.0) --- updated-dependencies: - dependency-name: google-cloud-kms dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.5.4 to 7.0.0. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](GoogleChrome/workbox@v6.5.4...v7.0.0) --- updated-dependencies: - dependency-name: workbox-precaching dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…n/workbox-precaching-7.0.0 Bump workbox-precaching from 6.5.4 to 7.0.0

Bumps [jest-serializer-vue](https://github.com/eddyerburgh/jest-serializer-vue) from 2.0.2 to 3.1.0. - [Release notes](https://github.com/eddyerburgh/jest-serializer-vue/releases) - [Changelog](https://github.com/eddyerburgh/jest-serializer-vue/blob/master/CHANGELOG.md) - [Commits](https://github.com/eddyerburgh/jest-serializer-vue/commits) --- updated-dependencies: - dependency-name: jest-serializer-vue dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…n/jest-serializer-vue-3.1.0 Bump jest-serializer-vue from 2.0.2 to 3.1.0

…cloud-kms-2.10.0 Bump google-cloud-kms from 1.4.0 to 2.10.0

Bumps [django-s3-storage](https://github.com/etianen/django-s3-storage) from 0.13.11 to 0.14.0. - [Release notes](https://github.com/etianen/django-s3-storage/releases) - [Changelog](https://github.com/etianen/django-s3-storage/blob/master/CHANGELOG.rst) - [Commits](etianen/django-s3-storage@0.13.11...0.14.0) --- updated-dependencies: - dependency-name: django-s3-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [locust](https://github.com/locustio/locust) from 2.8.6 to 2.15.1. - [Release notes](https://github.com/locustio/locust/releases) - [Changelog](https://github.com/locustio/locust/blob/master/CHANGELOG.md) - [Commits](locustio/locust@2.8.6...2.15.1) --- updated-dependencies: - dependency-name: locust dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.4 to 7.0.0. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](GoogleChrome/workbox@v6.5.4...v7.0.0) --- updated-dependencies: - dependency-name: workbox-webpack-plugin dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…n/workbox-webpack-plugin-7.0.0 Bump workbox-webpack-plugin from 6.5.4 to 7.0.0

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

…2.15.1 Bump locust from 2.8.6 to 2.15.1

…s3-storage-0.14.0 Bump django-s3-storage from 0.13.11 to 0.14.0

Bumps [attrs](https://github.com/python-attrs/attrs) from 19.3.0 to 23.1.0. - [Release notes](https://github.com/python-attrs/attrs/releases) - [Changelog](https://github.com/python-attrs/attrs/blob/main/CHANGELOG.md) - [Commits](python-attrs/attrs@19.3.0...23.1.0) --- updated-dependencies: - dependency-name: attrs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

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

…n/workbox-window-7.0.0 Bump workbox-window from 6.5.4 to 7.0.0

…n/word-wrap-1.2.4 Bump word-wrap from 1.2.3 to 1.2.4

…n/dexie-3.2.4 Bump dexie from 3.2.2 to 3.2.4

…n/less-loader-11.1.3 Bump less-loader from 11.0.0 to 11.1.3

…ing-text-on-dropdown added text truncate in import channel dropdown

Merge down hotfixes into unstable

…question-should-show-question-type removed scroll on adding new question

Bumps [le-utils](https://github.com/learningequality/le-utils) from 0.1.42 to 0.2.1. - [Release notes](https://github.com/learningequality/le-utils/releases) - [Changelog](https://github.com/learningequality/le-utils/blob/main/CHANGELOG.md) - [Commits](learningequality/le-utils@v0.1.42...v0.2.1) --- updated-dependencies: - dependency-name: le-utils dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

- [lint] fixes

Implementation to extract metadata from H5P Content Package

…s-0.2.1 Bump le-utils from 0.1.42 to 0.2.1

H5p finalization

New django app 'automation' for future AI features

Fixes incorrect value for Practice quiz

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]>

…ons/actions/checkout-4 Bump actions/checkout from 3 to 4

marcellamaki · 2023-09-15T19:22:41Z

@pcenov @radinamatic - the main items for manual QA are listed in the table above. There are also two more issues, where the PR was merged directly into hotfixes. Those two PRs are:

Each of these has Manual Verification steps listed out, but if you have any questions, please let me know. Thank you!

dependabot bot and others added 30 commits June 12, 2023 01:00

- add jszip yarn package;

7b4608c

- implement code to extract .h5p files metadata;

- [add] the extracted metadata from .h5p CP to contentNode

3a2b734

removed scroll on adding new question

140490f

added text truncate in import channel dropdown

e5d1a25

- [refactor] code

cef06b0

- override file title

Merge pull request #4129 from learningequality/dependabot/npm_and_yar…

4ccbf35

…n/stylus-loader-7.1.3 Bump stylus-loader from 7.1.2 to 7.1.3

Merge pull request #4213 from learningequality/dependabot/npm_and_yar…

aaea8e5

…n/semver-5.7.2 Bump semver from 5.7.1 to 5.7.2

Merge pull request #4132 from learningequality/dependabot/pip/fonttoo…

9557200

…ls-4.40.0 Bump fonttools from 4.27.1 to 4.40.0

Merge pull request #4217 from learningequality/dependabot/npm_and_yar…

c9248aa

…n/workbox-precaching-7.0.0 Bump workbox-precaching from 6.5.4 to 7.0.0

apply ellipsis based on props

7b9fa05

Merge pull request #4218 from learningequality/dependabot/npm_and_yar…

abfa1d3

…n/jest-serializer-vue-3.1.0 Bump jest-serializer-vue from 2.0.2 to 3.1.0

Merge pull request #3887 from learningequality/dependabot/pip/google-…

a20e659

…cloud-kms-2.10.0 Bump google-cloud-kms from 1.4.0 to 2.10.0

Merge pull request #4225 from learningequality/dependabot/npm_and_yar…

f63fd2f

…n/workbox-webpack-plugin-7.0.0 Bump workbox-webpack-plugin from 6.5.4 to 7.0.0

Merge pull request #4224 from learningequality/dependabot/pip/locust-…

67c6966

…2.15.1 Bump locust from 2.8.6 to 2.15.1

Merge pull request #4223 from learningequality/dependabot/pip/django-…

36e3dfb

…s3-storage-0.14.0 Bump django-s3-storage from 0.13.11 to 0.14.0

Merge pull request #4227 from learningequality/dependabot/npm_and_yar…

73cb9cf

…n/workbox-window-7.0.0 Bump workbox-window from 6.5.4 to 7.0.0

Merge pull request #4228 from learningequality/dependabot/npm_and_yar…

de70b3f

…n/word-wrap-1.2.4 Bump word-wrap from 1.2.3 to 1.2.4

Remove direct dependency on unused attrs

a9049f2

rtibbles and others added 24 commits July 19, 2023 19:05

Merge pull request #4234 from learningequality/dependabot/npm_and_yar…

ba1c873

…n/dexie-3.2.4 Bump dexie from 3.2.2 to 3.2.4

Merge pull request #4235 from learningequality/dependabot/npm_and_yar…

e157980

…n/less-loader-11.1.3 Bump less-loader from 11.0.0 to 11.1.3

scrollintoview with block end

81283df

Merge pull request #4186 from Jaspreet-singh-1032/fixes-4166-overlapp…

5ab69cb

…ing-text-on-dropdown added text truncate in import channel dropdown

Resolve merge conflicts in package.json

a0d657a

Merge pull request #4245 from bjester/merge-down-abc

212b46b

Merge down hotfixes into unstable

scroll to the question card

e047184

final cleanup

68dbb7f

Merge pull request #4181 from Jaspreet-singh-1032/fixes-4079-add-new-…

d401e85

…question-should-show-question-type removed scroll on adding new question

- [remove] unwanted logs

04c749b

- [add] test case for H5P content file extract metadata

3f68c51

- [lint] fixes

Merge pull request #4131 from manavagr1108/extract-metadata-for-h5p-cp

63041b6

Implementation to extract metadata from H5P Content Package

Merge pull request #4252 from learningequality/dependabot/pip/le-util…

089f088

…s-0.2.1 Bump le-utils from 0.1.42 to 0.2.1

Update JS constants for latest leutils.

36bbe24

Final tweaks and tests for H5P upload.

a82e78b

Add missing mappings for h5p kind.

3625f6f

Merge pull request #4255 from rtibbles/h5p_finalization

d76efcf

H5p finalization

Fixes incorrect value for Practice quiz

dc4608f

Adds new automation django app for future AI features

2a70ad2

Merge pull request #4262 from akash5100/automation-app

2f0ac11

New django app 'automation' for future AI features

Merge pull request #4260 from akolson/quiz-incorrect-completion-value

dc357cc

Fixes incorrect value for Practice quiz

Merge pull request #4271 from learningequality/dependabot/github_acti…

1a62ea9

…ons/actions/checkout-4 Bump actions/checkout from 3 to 4

marcellamaki marked this pull request as ready for review September 14, 2023 14:46

marcellamaki changed the title ~~[DRAFT] Merge unstable to hotfixes~~ Merge unstable to hotfixes Sep 14, 2023

rtibbles approved these changes Sep 14, 2023

View reviewed changes

rtibbles merged commit b24c843 into hotfixes Sep 14, 2023

bjester mentioned this pull request Sep 27, 2023

Release v2023.09.27 #4297

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge unstable to hotfixes #4270

Merge unstable to hotfixes #4270

marcellamaki commented Aug 31, 2023 •

edited

Loading

marcellamaki commented Sep 15, 2023

Merge unstable to hotfixes #4270

Merge unstable to hotfixes #4270

Conversation

marcellamaki commented Aug 31, 2023 • edited Loading

Summary

Reviewer guidance

How can a reviewer test these changes?

marcellamaki commented Sep 15, 2023

marcellamaki commented Aug 31, 2023 •

edited

Loading