From e3754ba4ccaf8b996ea9137735c42980677a67d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 01:00:16 +0000 Subject: [PATCH 01/33] Bump stylus-loader from 7.1.2 to 7.1.3 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](https://github.com/webpack-contrib/stylus-loader/compare/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] --- package.json | 2 +- yarn.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d19c7173cc..d16912ec71 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "less-loader": "^11.0.0", "npm-run-all": "^4.1.3", "stylus": "^0.59.0", - "stylus-loader": "^7.1.2", + "stylus-loader": "^7.1.3", "workbox-webpack-plugin": "^6.5.4" }, "false": {}, diff --git a/yarn.lock b/yarn.lock index 1d65477512..3be7dc115a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12600,13 +12600,12 @@ stylelint@14.10.0: v8-compile-cache "^2.3.0" write-file-atomic "^4.0.1" -stylus-loader@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.2.tgz#bf9556757344469f857e2edd79d1b9f69e364f69" - integrity sha512-terrqvQV0ie1q2XKHnStfLOztCyKj6CYO7NqFIP2ijIsGGgCX4cbyn49DjaTwpkc91QBnMMSYkK7JAIL5gvmIg== +stylus-loader@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-7.1.3.tgz#1fdfa0d34e8c05a569bc0902e1ecdb857d764964" + integrity sha512-TY0SKwiY7D2kMd3UxaWKSf3xHF0FFN/FAfsSqfrhxRT/koXTwffq2cgEWDkLQz7VojMu7qEEHt5TlMjkPx9UDw== dependencies: fast-glob "^3.2.12" - klona "^2.0.6" normalize-path "^3.0.0" stylus@^0.59.0: From 7b4608cb4d7319bfe5602681ac25c409e178d3f5 Mon Sep 17 00:00:00 2001 From: Manav Aggarwal Date: Mon, 12 Jun 2023 22:42:15 +0530 Subject: [PATCH 02/33] - add jszip yarn package; - implement code to extract .h5p files metadata; --- .../frontend/shared/vuex/file/utils.js | 75 +++++++++++++++---- package.json | 1 + yarn.lock | 10 +++ 3 files changed, 72 insertions(+), 14 deletions(-) diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js index 97970945e1..e650eedc0b 100644 --- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js +++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js @@ -1,4 +1,5 @@ import SparkMD5 from 'spark-md5'; +import JSZip from 'jszip'; import { FormatPresetsList, FormatPresetsNames } from 'shared/leUtils/FormatPresets'; const BLOB_SLICE = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice; @@ -7,8 +8,10 @@ const MEDIA_PRESETS = [ FormatPresetsNames.AUDIO, FormatPresetsNames.HIGH_RES_VIDEO, FormatPresetsNames.LOW_RES_VIDEO, + FormatPresetsNames.H5P, ]; const VIDEO_PRESETS = [FormatPresetsNames.HIGH_RES_VIDEO, FormatPresetsNames.LOW_RES_VIDEO]; +const H5P_PRESETS = [FormatPresetsNames.H5P]; export function getHash(file) { return new Promise((resolve, reject) => { @@ -61,6 +64,42 @@ export function storageUrl(checksum, file_format) { return `/content/storage/${checksum[0]}/${checksum[1]}/${checksum}.${file_format}`; } +export async function getH5PMetadata(fileInput, metadata) { + // const file = fileInput.files[0]; + // console.log(typeof(files), file); + const zip = new JSZip(); + zip + .loadAsync(fileInput) + .then(function(zip) { + const h5pJson = zip.file('h5p.json'); + // console.log(h5pJson); + if (h5pJson) { + return h5pJson.async('text'); + } else { + throw new Error('h5p.json not found in the H5P file.'); + } + }) + .then(function(h5pContent) { + const data = JSON.parse(h5pContent); + if (Object.prototype.hasOwnProperty.call(data, 'title')) { + metadata.Title = data['title']; + } + if (Object.prototype.hasOwnProperty.call(data, 'language') && data['language'] !== 'und') { + metadata.language = data['language']; + } + if (Object.prototype.hasOwnProperty.call(data, 'authors')) { + metadata.author = data['authors']; + } + if (Object.prototype.hasOwnProperty.call(data, 'license')) { + metadata.license = data['license']; + } + }) + .catch(function(error) { + console.error('Error loading or extracting H5P file:', error); + }); + return metadata; +} + /** * @param {{name: String, preset: String}} file * @param {String|null} preset @@ -85,24 +124,32 @@ export function extractMetadata(file, preset = null) { return Promise.resolve(metadata); } + const isH5P = H5P_PRESETS.includes(metadata.preset); + // Extract additional media metadata const isVideo = VIDEO_PRESETS.includes(metadata.preset); return new Promise(resolve => { - const mediaElement = document.createElement(isVideo ? 'video' : 'audio'); - // Add a listener to read the metadata once it has loaded. - mediaElement.addEventListener('loadedmetadata', () => { - metadata.duration = Math.floor(mediaElement.duration); - // Override preset based off video resolution - if (isVideo) { - metadata.preset = - mediaElement.videoHeight >= 720 - ? FormatPresetsNames.HIGH_RES_VIDEO - : FormatPresetsNames.LOW_RES_VIDEO; - } + if (isH5P) { + getH5PMetadata(file, metadata); + console.log(metadata); resolve(metadata); - }); - // Set the src url on the media element - mediaElement.src = URL.createObjectURL(file); + } else { + const mediaElement = document.createElement(isVideo ? 'video' : 'audio'); + // Add a listener to read the metadata once it has loaded. + mediaElement.addEventListener('loadedmetadata', () => { + metadata.duration = Math.floor(mediaElement.duration); + // Override preset based off video resolution + if (isVideo) { + metadata.preset = + mediaElement.videoHeight >= 720 + ? FormatPresetsNames.HIGH_RES_VIDEO + : FormatPresetsNames.LOW_RES_VIDEO; + } + resolve(metadata); + }); + // Set the src url on the media element + mediaElement.src = URL.createObjectURL(file); + } }); } diff --git a/package.json b/package.json index d19c7173cc..cc935f11b9 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "intl": "1.2.5", "jquery": "^2.2.4", "jspdf": "https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e", + "jszip": "^3.10.1", "kolibri-constants": "^0.1.41", "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index 1d65477512..2d19dd5ae9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8967,6 +8967,16 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" +jszip@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" + integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== + dependencies: + lie "~3.3.0" + pako "~1.0.2" + readable-stream "~2.3.6" + setimmediate "^1.0.5" + jszip@^3.7.1: version "3.10.0" resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061" From ccf5f9e1b6b2e195caaee0292d1c762de41c278b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 01:36:59 +0000 Subject: [PATCH 03/33] Bump fonttools from 4.27.1 to 4.40.0 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](https://github.com/fonttools/fonttools/compare/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] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e9c4bd9d4b..bbf36f418d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -90,7 +90,7 @@ flask-basicauth==0.2.0 # via locust flask-cors==3.0.10 # via locust -fonttools==4.27.1 +fonttools==4.40.0 # via -r requirements-dev.in gevent==21.12.0 # via From 3a2b734dcdc59c53ede56f5baf64364a3bbee1fb Mon Sep 17 00:00:00 2001 From: Manav Aggarwal Date: Fri, 23 Jun 2023 00:47:38 +0530 Subject: [PATCH 04/33] - [add] the extracted metadata from .h5p CP to contentNode --- .../frontend/channelEdit/components/edit/EditModal.vue | 10 ++++++++-- .../frontend/shared/vuex/file/actions.js | 1 + .../contentcuration/frontend/shared/vuex/file/utils.js | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue index e3570dbc69..7ba1d017ff 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue @@ -489,13 +489,19 @@ }, createNodesFromUploads(fileUploads) { fileUploads.forEach((file, index) => { - const title = file.original_filename + let title = file.original_filename .split('.') .slice(0, -1) .join('.'); + if (title === undefined) { + title = file.metadata.title; + } + const language = file.metadata.language !== undefined ? file.metadata.language : null; + const author = file.metadata.authors !== undefined ? file.metadata.author : null; + const license = file.metadata.license !== undefined ? file.metadata.license : null; this.createNode( FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id, - { title } + { title, language, author, license } ).then(newNodeId => { if (index === 0) { this.selected = [newNodeId]; diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js b/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js index 3225e58099..778ebec9fa 100644 --- a/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js +++ b/contentcuration/contentcuration/frontend/shared/vuex/file/actions.js @@ -198,6 +198,7 @@ export function uploadFile(context, { file, preset = null } = {}) { }); // End get upload url }) .then(data => { + data.file.metadata = metadata; const fileObject = { ...data.file, loaded: 0, diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js index e650eedc0b..d6e04cfe49 100644 --- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js +++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js @@ -82,7 +82,7 @@ export async function getH5PMetadata(fileInput, metadata) { .then(function(h5pContent) { const data = JSON.parse(h5pContent); if (Object.prototype.hasOwnProperty.call(data, 'title')) { - metadata.Title = data['title']; + metadata.title = data['title']; } if (Object.prototype.hasOwnProperty.call(data, 'language') && data['language'] !== 'und') { metadata.language = data['language']; From 140490f3122a49af2c3fdf058de04efd88102b7c Mon Sep 17 00:00:00 2001 From: Jaspreet-singh-1032 Date: Sun, 2 Jul 2023 14:23:00 +0530 Subject: [PATCH 05/33] removed scroll on adding new question --- .../AssessmentItemEditor/AssessmentItemEditor.vue | 7 ------- 1 file changed, 7 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue index c31c922508..28290e82d6 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue @@ -285,13 +285,6 @@ if (!this.question) { this.openQuestion(); } - // Assessments are nested inside of a scrolling panel. - // Instead of propagating an event all the way back to - // the scrolling panel, just use scrollIntoView - // (supported by most major browsers) - if (this.$el.scrollIntoView) { - this.$el.scrollIntoView({ behaviour: 'smooth' }); - } }, methods: { updateItem(payload) { From e5d1a25555d7895879670e3024954e58296b65d4 Mon Sep 17 00:00:00 2001 From: Jaspreet-singh-1032 Date: Wed, 5 Jul 2023 20:48:54 +0530 Subject: [PATCH 06/33] added text truncate in import channel dropdown --- .../frontend/shared/views/form/MultiSelect.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue index ae6e13eb78..b1f68a8cc1 100644 --- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue +++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue @@ -23,7 +23,9 @@ @@ -112,6 +114,15 @@ /deep/ .v-chip__content, .text-truncate { max-width: 100%; + overflow: hidden; + white-space: nowrap; + } + + .text-truncate-ellipsis { + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } From cef06b0f7bad031d63d92806ffb70af72db1fde7 Mon Sep 17 00:00:00 2001 From: Manav Aggarwal Date: Sat, 8 Jul 2023 00:53:23 +0530 Subject: [PATCH 07/33] - [refactor] code - override file title --- .../channelEdit/components/edit/EditModal.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue index 7ba1d017ff..60a6f7e45b 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue @@ -489,19 +489,19 @@ }, createNodesFromUploads(fileUploads) { fileUploads.forEach((file, index) => { - let title = file.original_filename - .split('.') - .slice(0, -1) - .join('.'); - if (title === undefined) { + let title; + if (file.metadata.title) { title = file.metadata.title; + } else { + title = file.original_filename + .split('.') + .slice(0, -1) + .join('.'); } - const language = file.metadata.language !== undefined ? file.metadata.language : null; - const author = file.metadata.authors !== undefined ? file.metadata.author : null; - const license = file.metadata.license !== undefined ? file.metadata.license : null; + console.log(file.metadata); this.createNode( FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id, - { title, language, author, license } + { title, ...file.metadata } ).then(newNodeId => { if (index === 0) { this.selected = [newNodeId]; From 4442529ebf558dde0436396e7afef1061a52f381 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 23:23:20 +0000 Subject: [PATCH 08/33] Bump semver from 5.7.1 to 5.7.2 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](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1d65477512..04756bd216 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11699,9 +11699,9 @@ selfsigned@^2.1.1: node-forge "^1" "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@7.0.0: version "7.0.0" @@ -11709,21 +11709,14 @@ semver@7.0.0: integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.8: - version "7.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" - integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" From 64a13682adca83dbfc4c536447a77406f83edd87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 21:56:27 +0000 Subject: [PATCH 09/33] Bump google-cloud-kms from 1.4.0 to 2.10.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](https://github.com/googleapis/python-kms/compare/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] --- requirements.in | 2 +- requirements.txt | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/requirements.in b/requirements.in index 6dbd88a554..f64901d7bc 100644 --- a/requirements.in +++ b/requirements.in @@ -25,7 +25,7 @@ google-cloud-core django-db-readonly==0.7.0 oauth2client django-mathfilters -google-cloud-kms==2.0.0 +google-cloud-kms==2.10.0 google-crc32c==1.1.2 backoff backports-abc==0.5 diff --git a/requirements.txt b/requirements.txt index 3f52a3d368..6280b5c6a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -121,7 +121,7 @@ google-cloud-core==1.7.3 # google-cloud-storage google-cloud-error-reporting==1.4.0 # via -r requirements.in -google-cloud-kms==2.0.0 +google-cloud-kms==2.10.0 # via -r requirements.in google-cloud-logging==2.3.1 # via google-cloud-error-reporting @@ -168,10 +168,6 @@ kombu==5.2.4 # via celery le-utils==0.1.42 # via -r requirements.in -libcst==0.4.9 - # via google-cloud-kms -mypy-extensions==1.0.0 - # via typing-inspect newrelic==6.2.0.156 # via -r requirements.in oauth2client==4.1.3 @@ -180,6 +176,7 @@ packaging==20.9 # via # google-api-core # google-cloud-error-reporting + # google-cloud-kms pathlib==1.0.1 # via -r requirements.in pillow==9.4.0 @@ -229,8 +226,6 @@ pytz==2022.1 # django # django-postmark # google-api-core -pyyaml==6.0 - # via libcst redis==4.5.4 # via # -r requirements.in @@ -260,12 +255,6 @@ six==1.16.0 # python-dateutil sqlparse==0.4.1 # via django -typing-extensions==4.5.0 - # via - # libcst - # typing-inspect -typing-inspect==0.8.0 - # via libcst urllib3==1.26.14 # via # botocore From daee90b9a68e9befd5d42a87b767613dc9b86888 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 00:08:31 +0000 Subject: [PATCH 10/33] Bump workbox-precaching from 6.5.4 to 7.0.0 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](https://github.com/googlechrome/workbox/compare/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] --- package.json | 2 +- yarn.lock | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d16912ec71..3921040485 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "vue-router": "3.6.5", "vuetify": "^1.5.24", "vuex": "^3.0.1", - "workbox-precaching": "^6.5.4", + "workbox-precaching": "^7.0.0", "workbox-window": "^6.5.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 1d083bb580..5633182749 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13880,6 +13880,11 @@ workbox-core@6.5.4: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== +workbox-core@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.0.0.tgz#dec114ec923cc2adc967dd9be1b8a0bed50a3545" + integrity sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ== + workbox-expiration@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" @@ -13905,7 +13910,7 @@ workbox-navigation-preload@6.5.4: dependencies: workbox-core "6.5.4" -workbox-precaching@6.5.4, workbox-precaching@^6.5.4: +workbox-precaching@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== @@ -13914,6 +13919,15 @@ workbox-precaching@6.5.4, workbox-precaching@^6.5.4: workbox-routing "6.5.4" workbox-strategies "6.5.4" +workbox-precaching@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-7.0.0.tgz#3979ba8033aadf3144b70e9fe631d870d5fbaa03" + integrity sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA== + dependencies: + workbox-core "7.0.0" + workbox-routing "7.0.0" + workbox-strategies "7.0.0" + workbox-range-requests@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399" @@ -13940,6 +13954,13 @@ workbox-routing@6.5.4: dependencies: workbox-core "6.5.4" +workbox-routing@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302" + integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA== + dependencies: + workbox-core "7.0.0" + workbox-strategies@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" @@ -13947,6 +13968,13 @@ workbox-strategies@6.5.4: dependencies: workbox-core "6.5.4" +workbox-strategies@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.0.0.tgz#dcba32b3f3074476019049cc490fe1a60ea73382" + integrity sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA== + dependencies: + workbox-core "7.0.0" + workbox-streams@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69" From c4fc395ef47141bd084be0267354875c4036197e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 00:38:57 +0000 Subject: [PATCH 11/33] Bump jest-serializer-vue from 2.0.2 to 3.1.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] --- package.json | 2 +- yarn.lock | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package.json b/package.json index 3921040485..3e73b93511 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "jest": "^26.0.1", "jest-each": "^29.0.3", "jest-environment-jsdom-sixteen": "^1.0.3", - "jest-serializer-vue": "^2.0.2", + "jest-serializer-vue": "^3.1.0", "kolibri-tools": "0.16.0-dev.3", "less": "^3.0.1", "less-loader": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 5633182749..e83f6745fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8497,13 +8497,6 @@ jest-runtime@^29.5.0: slash "^3.0.0" strip-bom "^4.0.0" -jest-serializer-vue@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-2.0.2.tgz#b238ef286357ec6b480421bd47145050987d59b3" - integrity sha512-nK/YIFo6qe3i9Ge+hr3h4PpRehuPPGZFt8LDBdTHYldMb7ZWlkanZS8Ls7D8h6qmQP2lBQVDLP0DKn5bJ9QApQ== - dependencies: - pretty "2.0.0" - jest-serializer-vue@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-3.1.0.tgz#af65817aa416d019f837b6cc53f121a3222846f4" From 7b9fa050a2c6e4a354d8e58b6ec12ee570490c9c Mon Sep 17 00:00:00 2001 From: Jaspreet-singh-1032 Date: Tue, 18 Jul 2023 21:33:00 +0530 Subject: [PATCH 12/33] apply ellipsis based on props --- .../ImportFromChannels/SearchFilters.vue | 1 + .../shared/views/form/MultiSelect.vue | 27 +++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue index 4f1d71203c..f7af5a8846 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue @@ -29,6 +29,7 @@ item-value="id" :disabled="loadingChannels" notranslate + useEllipsis />

diff --git a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue index b1f68a8cc1..b572d64fd8 100644 --- a/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue +++ b/contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue @@ -23,7 +23,7 @@