𝓢𝓽𝓾𝓭𝓲𝓸 Home
', - status_code=200, - html=True) - - @override_waffle_flag(toggles.LEGACY_STUDIO_HOME, True) - def test_course_explicit_english(self): - """Test viewing the index page with no courses""" - self.client = AjaxEnabledTestClient() # lint-amnesty, pylint: disable=attribute-defined-outside-init - self.client.login(username=self.uname, password=self.password) - - resp = self.client.get_html( - '/home/', - {}, - HTTP_ACCEPT_LANGUAGE='en', - ) - - self.assertContains(resp, - '𝓢𝓽𝓾𝓭𝓲𝓸 Home
', - status_code=200, - html=True) - - # **** - # NOTE: - # **** - # - # This test will break when we replace this fake 'test' language - # with actual Esperanto. This test will need to be updated with - # actual Esperanto at that time. - # Test temporarily disable since it depends on creation of dummy strings - @skip - def test_course_with_accents(self): - """Test viewing the index page with no courses""" - self.client = AjaxEnabledTestClient() # lint-amnesty, pylint: disable=attribute-defined-outside-init - self.client.login(username=self.uname, password=self.password) - - resp = self.client.get_html( - '/home/', - {}, - HTTP_ACCEPT_LANGUAGE='eo' - ) - - TEST_STRING = ( - '' - 'My \xc7\xf6\xfcrs\xe9s L#' - '
' - ) - - self.assertContains(resp, - TEST_STRING, - status_code=200, - html=True) diff --git a/cms/djangoapps/contentstore/tests/test_upstream_downstream_links.py b/cms/djangoapps/contentstore/tests/test_upstream_downstream_links.py index 90fec8471651..5c3ba8386480 100644 --- a/cms/djangoapps/contentstore/tests/test_upstream_downstream_links.py +++ b/cms/djangoapps/contentstore/tests/test_upstream_downstream_links.py @@ -14,7 +14,7 @@ from common.djangoapps.student.tests.factories import UserFactory from openedx.core.djangolib.testing.utils import skip_unless_cms -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, ImmediateOnCommitMixin from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory from ..models import ContainerLink, LearningContextLinksStatus, LearningContextLinksStatusChoices, ComponentLink @@ -265,7 +265,12 @@ def test_call_for_nonexistent_course(self): @skip_unless_cms -class TestUpstreamLinksEvents(ModuleStoreTestCase, OpenEdxEventsTestMixin, BaseUpstreamLinksHelpers): +class TestUpstreamLinksEvents( + ImmediateOnCommitMixin, + ModuleStoreTestCase, + OpenEdxEventsTestMixin, + BaseUpstreamLinksHelpers, +): """ Test signals related to managing upstream->downstream links. """ diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index 40b0f8ad4cbf..d151b1d58526 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -11,7 +11,7 @@ import datetime import time from unittest import mock -from urllib.parse import quote_plus +from urllib.parse import quote_plus, unquote from ddt import data, ddt, unpack from django.conf import settings @@ -24,6 +24,7 @@ from cms.djangoapps.contentstore import toggles from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, parse_json, registration, user +from cms.djangoapps.contentstore.utils import get_studio_home_url from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order @@ -114,12 +115,6 @@ def setUp(self): # clear the cache so ratelimiting won't affect these tests cache.clear() - def check_page_get(self, url, expected): - resp = self.client.get_html(url) - self.assertEqual(resp.status_code, expected) - return resp - - @override_waffle_flag(toggles.LEGACY_STUDIO_HOME, True) def test_private_pages_auth(self): """Make sure pages that do require login work.""" auth_pages = ( @@ -143,7 +138,9 @@ def test_private_pages_auth(self): print('Not logged in') for page in auth_pages: print(f"Checking '{page}'") - self.check_page_get(page, expected=302) + resp = self.client.get_html(page) + assert resp.status_code == 302 + assert resp.url == unquote(reverse("login", query={"next": page})) # Logged in should work. self.login(self.email, self.pw) @@ -151,10 +148,11 @@ def test_private_pages_auth(self): print('Logged in') for page in simple_auth_pages: print(f"Checking '{page}'") - self.check_page_get(page, expected=200) + resp = self.client.get_html(page) + assert resp.status_code == 302 + assert resp.url == get_studio_home_url() @override_settings(SESSION_INACTIVITY_TIMEOUT_IN_SECONDS=1) - @override_waffle_flag(toggles.LEGACY_STUDIO_HOME, True) def test_inactive_session_timeout(self): """ Verify that an inactive session times out and redirects to the @@ -168,7 +166,8 @@ def test_inactive_session_timeout(self): # make sure we can access courseware immediately course_url = '/home/' resp = self.client.get_html(course_url) - self.assertEqual(resp.status_code, 200) + assert resp.status_code == 302 + assert resp.url == get_studio_home_url() # then wait a bit and see if we get timed out time.sleep(2) diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py index c3dba4a6f4a4..7c7b743b1074 100644 --- a/cms/djangoapps/contentstore/toggles.py +++ b/cms/djangoapps/contentstore/toggles.py @@ -86,25 +86,6 @@ def exam_setting_view_enabled(course_key): return not LEGACY_STUDIO_EXAM_SETTINGS.is_enabled(course_key) -# .. toggle_name: legacy_studio.text_editor -# .. toggle_implementation: WaffleFlag -# .. toggle_default: False -# .. toggle_description: Temporarily fall back to the old Text component (a.k.a. html block) editor. -# .. toggle_use_cases: temporary -# .. toggle_creation_date: 2025-03-14 -# .. toggle_target_removal_date: 2025-09-14 -# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275 -# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available. -LEGACY_STUDIO_TEXT_EDITOR = CourseWaffleFlag("legacy_studio.text_editor", __name__) - - -def use_new_text_editor(course_key): - """ - Returns a boolean = true if new text editor is enabled - """ - return not LEGACY_STUDIO_TEXT_EDITOR.is_enabled(course_key) - - # .. toggle_name: legacy_studio.video_editor # .. toggle_implementation: WaffleFlag # .. toggle_default: False @@ -181,25 +162,6 @@ def individualize_anonymous_user_id(course_id): return INDIVIDUALIZE_ANONYMOUS_USER_ID.is_enabled(course_id) -# .. toggle_name: legacy_studio.home -# .. toggle_implementation: WaffleFlag -# .. toggle_default: False -# .. toggle_description: Temporarily fall back to the old Studio logged-in landing page. -# .. toggle_use_cases: temporary -# .. toggle_creation_date: 2025-03-14 -# .. toggle_target_removal_date: 2025-09-14 -# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275 -# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available. -LEGACY_STUDIO_HOME = WaffleFlag('legacy_studio.home', __name__) - - -def use_new_home_page(): - """ - Returns a boolean if new studio home page mfe is enabled - """ - return not LEGACY_STUDIO_HOME.is_enabled() - - # .. toggle_name: legacy_studio.custom_pages # .. toggle_implementation: WaffleFlag # .. toggle_default: False @@ -351,25 +313,6 @@ def use_new_export_page(course_key): return not LEGACY_STUDIO_EXPORT.is_enabled(course_key) -# .. toggle_name: legacy_studio.files_uploads -# .. toggle_implementation: WaffleFlag -# .. toggle_default: False -# .. toggle_description: Temporarily fall back to the old Studio Files & Uploads page. -# .. toggle_use_cases: temporary -# .. toggle_creation_date: 2025-03-14 -# .. toggle_target_removal_date: 2025-09-14 -# .. toggle_tickets: https://github.com/openedx/edx-platform/issues/36275 -# .. toggle_warning: In Ulmo, this toggle will be removed. Only the new (React-based) experience will be available. -LEGACY_STUDIO_FILES_UPLOADS = CourseWaffleFlag('legacy_studio.files_uploads', __name__) - - -def use_new_files_uploads_page(course_key): - """ - Returns a boolean if new studio files and uploads mfe is enabled - """ - return not LEGACY_STUDIO_FILES_UPLOADS.is_enabled(course_key) - - # .. toggle_name: contentstore.new_studio_mfe.use_new_video_uploads_page # .. toggle_implementation: CourseWaffleFlag # .. toggle_default: False @@ -402,13 +345,6 @@ def use_new_video_uploads_page(course_key): LEGACY_STUDIO_COURSE_OUTLINE = CourseWaffleFlag('legacy_studio.course_outline', __name__) -def use_new_course_outline_page(course_key): - """ - Returns a boolean if new studio course outline mfe is enabled - """ - return not LEGACY_STUDIO_COURSE_OUTLINE.is_enabled(course_key) - - # .. toggle_name: legacy_studio.unit_editor # .. toggle_implementation: WaffleFlag # .. toggle_default: False diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 3ca1d20bf564..5506d8c33e41 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -15,7 +15,7 @@ from bs4 import BeautifulSoup from django.conf import settings -from django.core.exceptions import ObjectDoesNotExist, ValidationError +from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, ValidationError from django.urls import reverse from django.utils import translation from django.utils.text import Truncator @@ -43,26 +43,22 @@ split_library_view_on_dashboard, use_new_advanced_settings_page, use_new_certificates_page, - use_new_course_outline_page, use_new_course_team_page, use_new_custom_pages, use_new_export_page, - use_new_files_uploads_page, use_new_grading_page, use_new_group_configurations_page, - use_new_home_page, use_new_import_page, use_new_schedule_details_page, - use_new_text_editor, use_new_textbooks_page, use_new_unit_page, use_new_updates_page, - use_new_video_editor, use_new_video_uploads_page, ) from cms.djangoapps.models.settings.course_grading import CourseGradingModel from cms.djangoapps.models.settings.course_metadata import CourseMetadata -from cms.djangoapps.modulestore_migrator.api import get_migration_info +from cms.djangoapps.modulestore_migrator import api as migrator_api +from cms.djangoapps.modulestore_migrator.data import ModulestoreMigration from common.djangoapps.course_action_state.managers import CourseActionStateItemNotFoundError from common.djangoapps.course_action_state.models import CourseRerunState, CourseRerunUIStateManager from common.djangoapps.course_modes.models import CourseMode @@ -117,6 +113,7 @@ get_all_partitions_for_course, # lint-amnesty, pylint: disable=wrong-import-order ) from xmodule.services import ConfigurationService, SettingsService, TeamsConfigurationService +from xmodule.util.keys import BlockKey from .models import ComponentLink, ContainerLink @@ -288,11 +285,10 @@ def get_editor_page_base_url(course_locator) -> str: Gets course authoring microfrontend URL for links to the new base editors """ editor_url = None - if use_new_text_editor(course_locator) or use_new_video_editor(course_locator): - mfe_base_url = get_course_authoring_url(course_locator) - course_mfe_url = f'{mfe_base_url}/course/{course_locator}/editor' - if mfe_base_url: - editor_url = course_mfe_url + mfe_base_url = get_course_authoring_url(course_locator) + course_mfe_url = f'{mfe_base_url}/course/{course_locator}/editor' + if mfe_base_url: + editor_url = course_mfe_url return editor_url @@ -300,12 +296,15 @@ def get_studio_home_url(): """ Gets course authoring microfrontend URL for Studio Home view. """ - studio_home_url = None - if use_new_home_page(): - mfe_base_url = settings.COURSE_AUTHORING_MICROFRONTEND_URL - if mfe_base_url: - studio_home_url = f'{mfe_base_url}/home' - return studio_home_url + mfe_base_url = settings.COURSE_AUTHORING_MICROFRONTEND_URL + if mfe_base_url: + studio_home_url = f'{mfe_base_url}/home' + return studio_home_url + + raise ImproperlyConfigured( + "The COURSE_AUTHORING_MICROFRONTEND_URL must be configured. " + "Please set it to the base url for your authoring MFE." + ) def get_schedule_details_url(course_locator) -> str: @@ -417,11 +416,10 @@ def get_files_uploads_url(course_locator) -> str: Gets course authoring microfrontend URL for files and uploads page view. """ files_uploads_url = None - if use_new_files_uploads_page(course_locator): - mfe_base_url = get_course_authoring_url(course_locator) - course_mfe_url = f'{mfe_base_url}/course/{course_locator}/assets' - if mfe_base_url: - files_uploads_url = course_mfe_url + mfe_base_url = get_course_authoring_url(course_locator) + course_mfe_url = f'{mfe_base_url}/course/{course_locator}/assets' + if mfe_base_url: + files_uploads_url = course_mfe_url return files_uploads_url @@ -443,13 +441,12 @@ def get_course_outline_url(course_locator, block_to_show=None) -> str: Gets course authoring microfrontend URL for course oultine page view. """ course_outline_url = None - if use_new_course_outline_page(course_locator): - mfe_base_url = get_course_authoring_url(course_locator) - course_mfe_url = f'{mfe_base_url}/course/{course_locator}' - if block_to_show: - course_mfe_url += f'?show={quote_plus(block_to_show)}' - if mfe_base_url: - course_outline_url = course_mfe_url + mfe_base_url = get_course_authoring_url(course_locator) + course_mfe_url = f'{mfe_base_url}/course/{course_locator}' + if block_to_show: + course_mfe_url += f'?show={quote_plus(block_to_show)}' + if mfe_base_url: + course_outline_url = course_mfe_url return course_outline_url @@ -1582,13 +1579,12 @@ def request_response_format_is_json(request, response_format): def get_library_context(request, request_is_json=False): """ - Utils is used to get context of course home library tab. - It is used for both DRF and django views. + Utils is used to get context of course home library tab. Returned in DRF view. """ from cms.djangoapps.contentstore.views.course import ( _accessible_libraries_iter, - _format_library_for_view, _get_course_creator_status, + format_library_for_view, get_allowed_organizations, get_allowed_organizations_for_libraries, user_can_create_organizations, @@ -1600,21 +1596,25 @@ def get_library_context(request, request_is_json=False): user_can_create_library, ) + is_migrated: bool | None # None means: do not filter on is_migrated + if (is_migrated_param := request.GET.get('is_migrated')) is not None: + is_migrated = BooleanField().to_internal_value(is_migrated_param) + else: + is_migrated = None libraries = list(_accessible_libraries_iter(request.user) if libraries_v1_enabled() else []) - library_keys = [lib.location.library_key for lib in libraries] - migration_info = get_migration_info(library_keys) - is_migrated_filter = request.GET.get('is_migrated', None) + migration_info: dict[LibraryLocator, ModulestoreMigration | None] = { + lib.id: migrator_api.get_forwarding(lib.id) + for lib in libraries + } data = { 'libraries': [ - _format_library_for_view( + format_library_for_view( lib, request, - migrated_to=migration_info.get(lib.location.library_key) + migration=migration_info[lib.id], ) for lib in libraries - if is_migrated_filter is None or ( - BooleanField().to_internal_value(is_migrated_filter) == (lib.location.library_key in migration_info) - ) + if is_migrated is None or is_migrated == bool(migration_info[lib.id]) ] } @@ -1723,8 +1723,7 @@ def format_in_process_course_view(uca): def get_home_context(request, no_course=False): """ - Utils is used to get context of course home. - It is used for both DRF and django views. + Utils is used to get context of course home. Returned by DRF view. """ from cms.djangoapps.contentstore.views.course import ( @@ -2411,10 +2410,11 @@ def _create_or_update_component_link(created: datetime | None, xblock): top_level_parent_usage_key = None if xblock.top_level_downstream_parent_key is not None: + block_key = BlockKey.from_string(xblock.top_level_downstream_parent_key) top_level_parent_usage_key = BlockUsageLocator( xblock.usage_key.course_key, - xblock.top_level_downstream_parent_key.get('type'), - xblock.top_level_downstream_parent_key.get('id'), + block_key.type, + block_key.id, ) ComponentLink.update_or_create( @@ -2426,7 +2426,7 @@ def _create_or_update_component_link(created: datetime | None, xblock): top_level_parent_usage_key=top_level_parent_usage_key, version_synced=xblock.upstream_version, version_declined=xblock.upstream_version_declined, - downstream_is_modified=len(getattr(xblock, "downstream_customized", [])) > 0, + downstream_customized=getattr(xblock, "downstream_customized", []), created=created, ) @@ -2444,10 +2444,11 @@ def _create_or_update_container_link(created: datetime | None, xblock): top_level_parent_usage_key = None if xblock.top_level_downstream_parent_key is not None: + block_key = BlockKey.from_string(xblock.top_level_downstream_parent_key) top_level_parent_usage_key = BlockUsageLocator( xblock.usage_key.course_key, - xblock.top_level_downstream_parent_key.get('type'), - xblock.top_level_downstream_parent_key.get('id'), + block_key.type, + block_key.id, ) ContainerLink.update_or_create( @@ -2459,7 +2460,7 @@ def _create_or_update_container_link(created: datetime | None, xblock): version_synced=xblock.upstream_version, top_level_parent_usage_key=top_level_parent_usage_key, version_declined=xblock.upstream_version_declined, - downstream_is_modified=len(getattr(xblock, "downstream_customized", [])) > 0, + downstream_customized=getattr(xblock, "downstream_customized", []), created=created, ) diff --git a/cms/djangoapps/contentstore/views/certificate_manager.py b/cms/djangoapps/contentstore/views/certificate_manager.py index 429950477fdd..081afdcc0dd7 100644 --- a/cms/djangoapps/contentstore/views/certificate_manager.py +++ b/cms/djangoapps/contentstore/views/certificate_manager.py @@ -121,7 +121,7 @@ def is_activated(course): along with the certificates. """ is_active = False - certificates = None + certificates = [] if settings.FEATURES.get('CERTIFICATES_HTML_VIEW', False): certificates = CertificateManager.get_certificates(course) # we are assuming only one certificate in certificates collection. diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index a93a35cf1d3c..681ea5f9fe9b 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -7,14 +7,19 @@ import random import re import string -from typing import Dict, NamedTuple, Optional +from typing import Dict import django.utils from ccx_keys.locator import CCXLocator from django.conf import settings from django.contrib.auth import get_user_model from django.contrib.auth.decorators import login_required -from django.core.exceptions import FieldError, PermissionDenied, ValidationError as DjangoValidationError +from django.core.exceptions import ( + FieldError, + ImproperlyConfigured, + PermissionDenied, + ValidationError as DjangoValidationError, +) from django.db.models import QuerySet from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotFound from django.shortcuts import redirect @@ -39,6 +44,7 @@ from cms.djangoapps.models.settings.course_grading import CourseGradingModel from cms.djangoapps.models.settings.course_metadata import CourseMetadata from cms.djangoapps.models.settings.encoder import CourseSettingsEncoder +from cms.djangoapps.modulestore_migrator.data import ModulestoreMigration from cms.djangoapps.contentstore.api.views.utils import get_bool_param from common.djangoapps.course_action_state.managers import CourseActionStateItemNotFoundError from common.djangoapps.course_action_state.models import CourseRerunState, CourseRerunUIStateManager @@ -86,8 +92,6 @@ from ..tasks import rerun_course as rerun_course_task from ..toggles import ( default_enable_flexible_peer_openassessments, - use_new_course_outline_page, - use_new_home_page, use_new_updates_page, use_new_advanced_settings_page, use_new_grading_page, @@ -99,15 +103,12 @@ add_instructor, get_advanced_settings_url, get_course_grading, - get_course_index_context, get_course_outline_url, get_course_rerun_context, get_course_settings, get_grading_url, get_group_configurations_context, get_group_configurations_url, - get_home_context, - get_library_context, get_lms_link_for_item, get_proctored_exam_settings_url, get_schedule_details_url, @@ -655,11 +656,7 @@ def course_listing(request): """ List all courses and libraries available to the logged in user """ - if use_new_home_page(): - return redirect(get_studio_home_url()) - - home_context = get_home_context(request) - return render_to_response('index.html', home_context) + return redirect(get_studio_home_url()) @login_required @@ -668,15 +665,28 @@ def library_listing(request): """ List all Libraries available to the logged in user """ - data = get_library_context(request) - return render_to_response('index.html', data) + mfe_base_url = settings.COURSE_AUTHORING_MICROFRONTEND_URL + if mfe_base_url: + return redirect(f'{mfe_base_url}/libraries') + raise ImproperlyConfigured( + "The COURSE_AUTHORING_MICROFRONTEND_URL must be configured. " + "Please set it to the base url for your authoring MFE." + ) -def _format_library_for_view(library, request, migrated_to: Optional[NamedTuple]): + +def format_library_for_view(library, request, migration: ModulestoreMigration | None): """ Return a dict of the data which the view requires for each library """ - + migration_info = {} + if migration: + migration_info = { + 'migrated_to_key': migration.target_key, + 'migrated_to_title': migration.target_title, + 'migrated_to_collection_key': migration.target_collection_slug, + 'migrated_to_collection_title': migration.target_collection_title, + } return { 'display_name': library.display_name, 'library_key': str(library.location.library_key), @@ -684,7 +694,8 @@ def _format_library_for_view(library, request, migrated_to: Optional[NamedTuple] 'org': library.display_org_with_default, 'number': library.display_number_with_default, 'can_edit': has_studio_write_access(request.user, library.location.library_key), - **(migrated_to._asdict() if migrated_to is not None else {}), + 'is_migrated': migration is not None, + **migration_info, } @@ -739,18 +750,8 @@ def course_index(request, course_key): org, course, name: Attributes of the Location for the item to edit """ - if use_new_course_outline_page(course_key): - block_to_show = request.GET.get("show") - return redirect(get_course_outline_url(course_key, block_to_show)) - with modulestore().bulk_operations(course_key): - # A depth of None implies the whole course. The course outline needs this in order to compute has_changes. - # A unit may not have a draft version, but one of its components could, and hence the unit itself has changes. - course_block = get_course_and_check_access(course_key, request.user, depth=None) - if not course_block: - raise Http404 - # should be under bulk_operations if course_block is passed - course_index_context = get_course_index_context(request, course_key, course_block) - return render_to_response('course_outline.html', course_index_context) + block_to_show = request.GET.get("show") + return redirect(get_course_outline_url(course_key, block_to_show)) @function_trace('get_courses_accessible_to_user') @@ -1851,12 +1852,20 @@ def get_allowed_organizations_for_libraries(user): """ Helper method for returning the list of organizations for which the user is allowed to create libraries. """ + organizations_set = set() + + # This allows org-level staff to create libraries. We should re-evaluate + # whether this is necessary and try to normalize course and library creation + # authorization behavior. if settings.FEATURES.get('ENABLE_ORGANIZATION_STAFF_ACCESS_FOR_CONTENT_LIBRARIES', False): - return get_organizations_for_non_course_creators(user) - elif settings.FEATURES.get('ENABLE_CREATOR_GROUP', False): - return get_organizations(user) - else: - return [] + organizations_set.update(get_organizations_for_non_course_creators(user)) + + # This allows people in the course creator group for an org to create + # libraries, which mimics course behavior. + if settings.FEATURES.get('ENABLE_CREATOR_GROUP', False): + organizations_set.update(get_organizations(user)) + + return sorted(organizations_set) def user_can_create_organizations(user): diff --git a/cms/djangoapps/contentstore/views/entrance_exam.py b/cms/djangoapps/contentstore/views/entrance_exam.py index bbefb0e9e876..5d914366bd9e 100644 --- a/cms/djangoapps/contentstore/views/entrance_exam.py +++ b/cms/djangoapps/contentstore/views/entrance_exam.py @@ -224,7 +224,7 @@ def _delete_entrance_exam(request, course_key): if course.entrance_exam_id: metadata = { 'entrance_exam_enabled': False, - 'entrance_exam_minimum_score_pct': None, + 'entrance_exam_minimum_score_pct': _get_default_entrance_exam_minimum_pct(), 'entrance_exam_id': None, } CourseMetadata.update_from_dict(metadata, course, request.user) diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py index 2b13338c0dc7..e7dbcfe9f55a 100644 --- a/cms/djangoapps/contentstore/views/tests/test_assets.py +++ b/cms/djangoapps/contentstore/views/tests/test_assets.py @@ -12,13 +12,11 @@ from ddt import data, ddt from django.conf import settings from django.test.utils import override_settings -from edx_toggles.toggles.testutils import override_waffle_flag from opaque_keys.edx.keys import AssetKey from opaque_keys.edx.locator import CourseLocator from PIL import Image from pytz import UTC -from cms.djangoapps.contentstore import toggles from cms.djangoapps.contentstore.tests.utils import CourseTestCase from cms.djangoapps.contentstore.utils import reverse_course_url from cms.djangoapps.contentstore.views import assets @@ -87,10 +85,9 @@ class BasicAssetsTestCase(AssetsTestCase): Test getting assets via html w/o additional args """ - @override_waffle_flag(toggles.LEGACY_STUDIO_FILES_UPLOADS, True) def test_basic(self): resp = self.client.get(self.url, HTTP_ACCEPT='text/html') - self.assertEqual(resp.status_code, 200) + self.assertEqual(resp.status_code, 302) def test_static_url_generation(self): diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py index c94038a508b5..b17c71668a78 100644 --- a/cms/djangoapps/contentstore/views/tests/test_block.py +++ b/cms/djangoapps/contentstore/views/tests/test_block.py @@ -87,6 +87,7 @@ add_container_page_publishing_info, create_xblock_info, ) +from common.test.utils import assert_dict_contains_subset class AsideTest(XBlockAside): @@ -864,7 +865,8 @@ def test_duplicate_event(self): XBLOCK_DUPLICATED.connect(event_receiver) usage_key = self._duplicate_and_verify(self.vert_usage_key, self.seq_usage_key) event_receiver.assert_called() - self.assertDictContainsSubset( + assert_dict_contains_subset( + self, { "signal": XBLOCK_DUPLICATED, "sender": None, @@ -1854,7 +1856,7 @@ def setUp(self): @XBlockAside.register_temp_plugin(AsideTest, "test_aside") @patch( - "xmodule.modulestore.split_mongo.caching_descriptor_system.CachingDescriptorSystem.applicable_aside_types", + "xmodule.modulestore.split_mongo.runtime.SplitModuleStoreRuntime.applicable_aside_types", lambda self, block: ["test_aside"], ) def test_duplicate_equality_with_asides(self): @@ -2699,8 +2701,8 @@ def test_add_groups(self): group_id_to_child = split_test.group_id_to_child.copy() self.assertEqual(2, len(group_id_to_child)) - # CachingDescriptorSystem is used in tests. - # CachingDescriptorSystem doesn't have user service, that's needed for + # SplitModuleStoreRuntime is used in tests. + # SplitModuleStoreRuntime doesn't have user service, that's needed for # SplitTestBlock. So, in this line of code we add this service manually. split_test.runtime._services["user"] = DjangoXBlockUserService( # pylint: disable=protected-access self.user @@ -4455,7 +4457,7 @@ def test_self_paced_item_visibility_state(self): @patch( - "xmodule.modulestore.split_mongo.caching_descriptor_system.CachingDescriptorSystem.applicable_aside_types", + "xmodule.modulestore.split_mongo.runtime.SplitModuleStoreRuntime.applicable_aside_types", lambda self, block: ["test_aside"], ) class TestUpdateFromSource(ModuleStoreTestCase): diff --git a/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py b/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py index 3fae9d996fd2..2ca03ccf892b 100644 --- a/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py +++ b/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py @@ -16,7 +16,7 @@ from openedx_tagging.core.tagging.models import Tag from organizations.models import Organization from xmodule.modulestore.django import contentstore, modulestore -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, upload_file_to_course +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, upload_file_to_course, ImmediateOnCommitMixin from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory, ToyCourseFactory, LibraryFactory from cms.djangoapps.contentstore.utils import reverse_usage_url @@ -400,7 +400,7 @@ def test_paste_with_assets(self): assert source_pic2_hash != dest_pic2_hash # Because there was a conflict, this file was unchanged. -class ClipboardPasteFromV2LibraryTestCase(OpenEdxEventsTestMixin, ModuleStoreTestCase): +class ClipboardPasteFromV2LibraryTestCase(OpenEdxEventsTestMixin, ImmediateOnCommitMixin, ModuleStoreTestCase): """ Test Clipboard Paste functionality with a "new" (as of Sumac) library """ diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py index a22ce637fedd..58c425c601a3 100644 --- a/cms/djangoapps/contentstore/views/tests/test_course_index.py +++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py @@ -8,496 +8,28 @@ from unittest import mock, skip import ddt -import lxml import pytz -from django.conf import settings from django.core.exceptions import PermissionDenied -from django.test.utils import override_settings from django.utils.translation import gettext as _ -from edx_toggles.toggles.testutils import override_waffle_flag -from opaque_keys.edx.locator import CourseLocator from search.api import perform_search -from cms.djangoapps.contentstore import toggles from cms.djangoapps.contentstore.courseware_index import CoursewareSearchIndexer, SearchIndexingError from cms.djangoapps.contentstore.tests.utils import CourseTestCase from cms.djangoapps.contentstore.utils import ( - add_instructor, - get_proctored_exam_settings_url, reverse_course_url, reverse_usage_url ) -from common.djangoapps.course_action_state.managers import CourseRerunUIStateManager -from common.djangoapps.course_action_state.models import CourseRerunState -from common.djangoapps.student.auth import has_course_author_access -from common.djangoapps.student.roles import CourseStaffRole, GlobalStaff, LibraryUserRole from common.djangoapps.student.tests.factories import UserFactory -from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order from xmodule.modulestore.exceptions import ItemNotFoundError # lint-amnesty, pylint: disable=wrong-import-order from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE -from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory, LibraryFactory, check_mongo_calls # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.factories import BlockFactory, check_mongo_calls # lint-amnesty, pylint: disable=wrong-import-order from ..course import _deprecated_blocks_info, course_outline_initial_state, reindex_course_and_check_access from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import VisibilityState, create_xblock_info -@override_waffle_flag(toggles.LEGACY_STUDIO_HOME, True) -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) -class TestCourseIndex(CourseTestCase): - """ - Unit tests for getting the list of courses and the course outline. - """ - - MODULESTORE = TEST_DATA_SPLIT_MODULESTORE - - def setUp(self): - """ - Add a course with odd characters in the fields - """ - super().setUp() - # had a problem where index showed course but has_access failed to retrieve it for non-staff - self.odd_course = CourseFactory.create( - org='test.org_1-2', - number='test-2.3_course', - display_name='dotted.course.name-2', - ) - CourseOverviewFactory.create( - id=self.odd_course.id, - org=self.odd_course.org, - display_name=self.odd_course.display_name, - ) - - def check_courses_on_index(self, authed_client, expected_course_tab_len): - """ - Test that the React course listing is present. - """ - index_url = '/home/' - index_response = authed_client.get(index_url, {}, HTTP_ACCEPT='text/html') - parsed_html = lxml.html.fromstring(index_response.content) - courses_tab = parsed_html.find_class('react-course-listing') - self.assertEqual(len(courses_tab), expected_course_tab_len) - - def test_libraries_on_index(self): - """ - Test that the library tab is present. - """ - def _assert_library_tab_present(response): - """ - Asserts there's a library tab. - """ - parsed_html = lxml.html.fromstring(response.content) - library_tab = parsed_html.find_class('react-library-listing') - self.assertEqual(len(library_tab), 1) - - # Add a library: - lib1 = LibraryFactory.create() # lint-amnesty, pylint: disable=unused-variable - - index_url = '/home/' - index_response = self.client.get(index_url, {}, HTTP_ACCEPT='text/html') - _assert_library_tab_present(index_response) - - # Make sure libraries are visible to non-staff users too - self.client.logout() - non_staff_user, non_staff_userpassword = self.create_non_staff_user() - lib2 = LibraryFactory.create(user_id=non_staff_user.id) - LibraryUserRole(lib2.location.library_key).add_users(non_staff_user) - self.client.login(username=non_staff_user.username, password=non_staff_userpassword) - index_response = self.client.get(index_url, {}, HTTP_ACCEPT='text/html') - _assert_library_tab_present(index_response) - - def test_is_staff_access(self): - """ - Test that people with is_staff see the courses and can navigate into them - """ - self.check_courses_on_index(self.client, 1) - - def test_negative_conditions(self): - """ - Test the error conditions for the access - """ - outline_url = reverse_course_url('course_handler', self.course.id) - # register a non-staff member and try to delete the course branch - non_staff_client, _ = self.create_non_staff_authed_user_client() - response = non_staff_client.delete(outline_url, {}, HTTP_ACCEPT='application/json') - if self.course.id.deprecated: - self.assertEqual(response.status_code, 404) - else: - self.assertEqual(response.status_code, 403) - - def test_course_staff_access(self): - """ - Make and register course_staff and ensure they can access the courses - """ - course_staff_client, course_staff = self.create_non_staff_authed_user_client() - for course in [self.course, self.odd_course]: - permission_url = reverse_course_url('course_team_handler', course.id, kwargs={'email': course_staff.email}) - - self.client.post( - permission_url, - data=json.dumps({"role": "staff"}), - content_type="application/json", - HTTP_ACCEPT="application/json", - ) - - # test access - self.check_courses_on_index(course_staff_client, 1) - - def test_json_responses(self): - - outline_url = reverse_course_url('course_handler', self.course.id) - chapter = BlockFactory.create(parent_location=self.course.location, category='chapter', display_name="Week 1") - lesson = BlockFactory.create(parent_location=chapter.location, category='sequential', display_name="Lesson 1") - subsection = BlockFactory.create( - parent_location=lesson.location, - category='vertical', - display_name='Subsection 1' - ) - BlockFactory.create(parent_location=subsection.location, category="video", display_name="My Video") - - resp = self.client.get(outline_url, HTTP_ACCEPT='application/json') - - if self.course.id.deprecated: - self.assertEqual(resp.status_code, 404) - return - - json_response = json.loads(resp.content.decode('utf-8')) - - # First spot check some values in the root response - self.assertEqual(json_response['category'], 'course') - self.assertEqual(json_response['id'], str(self.course.location)) - self.assertEqual(json_response['display_name'], self.course.display_name) - self.assertTrue(json_response['published']) - self.assertIsNone(json_response['visibility_state']) - - # Now verify the first child - children = json_response['child_info']['children'] - self.assertGreater(len(children), 0) - first_child_response = children[0] - self.assertEqual(first_child_response['category'], 'chapter') - self.assertEqual(first_child_response['id'], str(chapter.location)) - self.assertEqual(first_child_response['display_name'], 'Week 1') - self.assertTrue(json_response['published']) - self.assertEqual(first_child_response['visibility_state'], VisibilityState.unscheduled) - self.assertGreater(len(first_child_response['child_info']['children']), 0) - - # Finally, validate the entire response for consistency - self.assert_correct_json_response(json_response) - - def test_notifications_handler_get(self): - state = CourseRerunUIStateManager.State.FAILED - action = CourseRerunUIStateManager.ACTION - should_display = True - - # try when no notification exists - notification_url = reverse_course_url('course_notifications_handler', self.course.id, kwargs={ - 'action_state_id': 1, - }) - - resp = self.client.get(notification_url, HTTP_ACCEPT='application/json') - - # verify that we get an empty dict out - self.assertEqual(resp.status_code, 400) - - # create a test notification - rerun_state = CourseRerunState.objects.update_state( - course_key=self.course.id, - new_state=state, - allow_not_found=True - ) - CourseRerunState.objects.update_should_display( - entry_id=rerun_state.id, - user=UserFactory(), - should_display=should_display - ) - - # try to get information on this notification - notification_url = reverse_course_url('course_notifications_handler', self.course.id, kwargs={ - 'action_state_id': rerun_state.id, - }) - resp = self.client.get(notification_url, HTTP_ACCEPT='application/json') - - json_response = json.loads(resp.content.decode('utf-8')) - - self.assertEqual(json_response['state'], state) - self.assertEqual(json_response['action'], action) - self.assertEqual(json_response['should_display'], should_display) - - def test_notifications_handler_dismiss(self): - state = CourseRerunUIStateManager.State.FAILED - should_display = True - rerun_course_key = CourseLocator(org='testx', course='test_course', run='test_run') - - # add an instructor to this course - user2 = UserFactory() - add_instructor(rerun_course_key, self.user, user2) - - # create a test notification - rerun_state = CourseRerunState.objects.update_state( - course_key=rerun_course_key, - new_state=state, - allow_not_found=True - ) - CourseRerunState.objects.update_should_display( - entry_id=rerun_state.id, - user=user2, - should_display=should_display - ) - - # try to get information on this notification - notification_dismiss_url = reverse_course_url('course_notifications_handler', self.course.id, kwargs={ - 'action_state_id': rerun_state.id, - }) - resp = self.client.delete(notification_dismiss_url) - self.assertEqual(resp.status_code, 200) - - with self.assertRaises(CourseRerunState.DoesNotExist): - # delete nofications that are dismissed - CourseRerunState.objects.get(id=rerun_state.id) - - self.assertFalse(has_course_author_access(user2, rerun_course_key)) - - def assert_correct_json_response(self, json_response): - """ - Asserts that the JSON response is syntactically consistent - """ - self.assertIsNotNone(json_response['display_name']) - self.assertIsNotNone(json_response['id']) - self.assertIsNotNone(json_response['category']) - self.assertTrue(json_response['published']) - if json_response.get('child_info', None): - for child_response in json_response['child_info']['children']: - self.assert_correct_json_response(child_response) - - def test_course_updates_invalid_url(self): - """ - Tests the error conditions for the invalid course updates URL. - """ - # Testing the response code by passing slash separated course id whose format is valid but no course - # having this id exists. - invalid_course_key = f'{self.course.id}_blah_blah_blah' - course_updates_url = reverse_course_url('course_info_handler', invalid_course_key) - response = self.client.get(course_updates_url) - self.assertEqual(response.status_code, 404) - - # Testing the response code by passing split course id whose format is valid but no course - # having this id exists. - split_course_key = CourseLocator(org='orgASD', course='course_01213', run='Run_0_hhh_hhh_hhh') - course_updates_url_split = reverse_course_url('course_info_handler', split_course_key) - response = self.client.get(course_updates_url_split) - self.assertEqual(response.status_code, 404) - - # Testing the response by passing split course id whose format is invalid. - invalid_course_id = f'invalid.course.key/{split_course_key}' - course_updates_url_split = reverse_course_url('course_info_handler', invalid_course_id) - response = self.client.get(course_updates_url_split) - self.assertEqual(response.status_code, 404) - - def test_course_index_invalid_url(self): - """ - Tests the error conditions for the invalid course index URL. - """ - # Testing the response code by passing slash separated course key, no course - # having this key exists. - invalid_course_key = f'{self.course.id}_some_invalid_run' - course_outline_url = reverse_course_url('course_handler', invalid_course_key) - response = self.client.get_html(course_outline_url) - self.assertEqual(response.status_code, 404) - - # Testing the response code by passing split course key, no course - # having this key exists. - split_course_key = CourseLocator(org='invalid_org', course='course_01111', run='Run_0_invalid') - course_outline_url_split = reverse_course_url('course_handler', split_course_key) - response = self.client.get_html(course_outline_url_split) - self.assertEqual(response.status_code, 404) - - def test_course_outline_with_display_course_number_as_none(self): - """ - Tests course outline when 'display_coursenumber' field is none. - """ - # Change 'display_coursenumber' field to None and update the course. - self.course.display_coursenumber = None - updated_course = self.update_course(self.course, self.user.id) - - # Assert that 'display_coursenumber' field has been changed successfully. - self.assertEqual(updated_course.display_coursenumber, None) - - # Perform GET request on course outline url with the course id. - course_outline_url = reverse_course_url('course_handler', updated_course.id) - response = self.client.get_html(course_outline_url) - - # course_handler raise 404 for old mongo course - if self.course.id.deprecated: - self.assertEqual(response.status_code, 404) - return - - # Assert that response code is 200. - self.assertEqual(response.status_code, 200) - - # Assert that 'display_course_number' is being set to "" (as display_coursenumber was None). - self.assertContains(response, 'display_course_number: ""') - - -@override_waffle_flag(toggles.LEGACY_STUDIO_HOME, True) -@ddt.ddt -class TestCourseIndexArchived(CourseTestCase): - """ - Unit tests for testing the course index list when there are archived courses. - """ - - MODULESTORE = TEST_DATA_SPLIT_MODULESTORE - - NOW = datetime.datetime.now(pytz.utc) - DAY = datetime.timedelta(days=1) - YESTERDAY = NOW - DAY - TOMORROW = NOW + DAY - - ORG = 'MyOrg' - - ENABLE_SEPARATE_ARCHIVED_COURSES = settings.FEATURES.copy() - ENABLE_SEPARATE_ARCHIVED_COURSES['ENABLE_SEPARATE_ARCHIVED_COURSES'] = True - DISABLE_SEPARATE_ARCHIVED_COURSES = settings.FEATURES.copy() - DISABLE_SEPARATE_ARCHIVED_COURSES['ENABLE_SEPARATE_ARCHIVED_COURSES'] = False - - def setUp(self): - """ - Add courses with the end date set to various values - """ - super().setUp() - - # Base course has no end date (so is active) - self.course.end = None - self.course.display_name = 'Active Course 1' - self.ORG = self.course.location.org - self.save_course() - CourseOverviewFactory.create(id=self.course.id, org=self.ORG) - - # Active course has end date set to tomorrow - self.active_course = CourseFactory.create( - display_name='Active Course 2', - org=self.ORG, - end=self.TOMORROW, - ) - CourseOverviewFactory.create( - id=self.active_course.id, - org=self.ORG, - end=self.TOMORROW, - ) - - # Archived course has end date set to yesterday - self.archived_course = CourseFactory.create( - display_name='Archived Course', - org=self.ORG, - end=self.YESTERDAY, - ) - CourseOverviewFactory.create( - id=self.archived_course.id, - org=self.ORG, - end=self.YESTERDAY, - ) - - # Base user has global staff access - self.assertTrue(GlobalStaff().has_user(self.user)) - - # Staff user just has course staff access - self.staff, self.staff_password = self.create_non_staff_user() - for course in (self.course, self.active_course, self.archived_course): - CourseStaffRole(course.id).add_users(self.staff) - - def check_index_page_with_query_count(self, separate_archived_courses, org, mongo_queries, sql_queries): - """ - Checks the index page, and ensures the number of database queries is as expected. - """ - with self.assertNumQueries(sql_queries, table_ignorelist=WAFFLE_TABLES): - with check_mongo_calls(mongo_queries): - self.check_index_page(separate_archived_courses=separate_archived_courses, org=org) - - def check_index_page(self, separate_archived_courses, org): - """ - Ensure that the index page displays the archived courses as expected. - """ - index_url = '/home/' - index_params = {} - if org is not None: - index_params['org'] = org - index_response = self.client.get(index_url, index_params, HTTP_ACCEPT='text/html') - self.assertEqual(index_response.status_code, 200) - - parsed_html = lxml.html.fromstring(index_response.content) - course_tab = parsed_html.find_class('courses') - self.assertEqual(len(course_tab), 1) - archived_course_tab = parsed_html.find_class('archived-courses') - self.assertEqual(len(archived_course_tab), 1 if separate_archived_courses else 0) - - @ddt.data( - # Staff user has course staff access - (True, 'staff', None, 23), - (False, 'staff', None, 23), - # Base user has global staff access - (True, 'user', ORG, 23), - (False, 'user', ORG, 23), - (True, 'user', None, 23), - (False, 'user', None, 23), - ) - @ddt.unpack - def test_separate_archived_courses(self, separate_archived_courses, username, org, sql_queries): - """ - Ensure that archived courses are shown as expected for all user types, when the feature is enabled/disabled. - Also ensure that enabling the feature does not adversely affect the database query count. - """ - # Authenticate the requested user - user = getattr(self, username) - password = getattr(self, username + '_password') - self.client.login(username=user, password=password) - - # Enable/disable the feature before viewing the index page. - features = settings.FEATURES.copy() - features['ENABLE_SEPARATE_ARCHIVED_COURSES'] = separate_archived_courses - with override_settings(FEATURES=features): - self.check_index_page_with_query_count(separate_archived_courses=separate_archived_courses, - org=org, - mongo_queries=0, - sql_queries=sql_queries) - - @ddt.data( - # Staff user has course staff access - (True, 'staff', None, 23), - (False, 'staff', None, 23), - # Base user has global staff access - (True, 'user', ORG, 23), - (False, 'user', ORG, 23), - (True, 'user', None, 23), - (False, 'user', None, 23), - ) - @ddt.unpack - def test_separate_archived_courses_with_home_page_course_v2_api( - self, - separate_archived_courses, - username, - org, - sql_queries - ): - """ - Ensure that archived courses are shown as expected for all user types, when the feature is enabled/disabled. - Also ensure that enabling the feature does not adversely affect the database query count. - """ - # Authenticate the requested user - user = getattr(self, username) - password = getattr(self, username + '_password') - self.client.login(username=user, password=password) - - # Enable/disable the feature before viewing the index page. - features = settings.FEATURES.copy() - features['ENABLE_SEPARATE_ARCHIVED_COURSES'] = separate_archived_courses - with override_settings(FEATURES=features): - self.check_index_page_with_query_count(separate_archived_courses=separate_archived_courses, - org=org, - mongo_queries=0, - sql_queries=sql_queries) - - -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) @ddt.ddt class TestCourseOutline(CourseTestCase): """ @@ -689,38 +221,15 @@ def test_verify_warn_only_on_enabled_blocks(self, enabled_block_types, deprecate expected_block_types ) - @override_settings(FEATURES={'ENABLE_EXAM_SETTINGS_HTML_VIEW': True}) - @mock.patch('cms.djangoapps.models.settings.course_metadata.CourseMetadata.validate_proctoring_settings') - def test_proctoring_link_is_visible(self, mock_validate_proctoring_settings): - """ - Test to check proctored exam settings mfe url is rendering properly - """ - mock_validate_proctoring_settings.return_value = [ - { - 'key': 'proctoring_provider', - 'message': 'error message', - 'model': {'display_name': 'proctoring_provider'} - }, - { - 'key': 'proctoring_provider', - 'message': 'error message', - 'model': {'display_name': 'proctoring_provider'} - } - ] - response = self.client.get_html(reverse_course_url('course_handler', self.course.id)) - proctored_exam_settings_url = get_proctored_exam_settings_url(self.course.id) - self.assertContains(response, proctored_exam_settings_url, 2) - def test_number_of_calls_to_db(self): """ Test to check number of queries made to mysql and mongo """ - with self.assertNumQueries(39, table_ignorelist=WAFFLE_TABLES): + with self.assertNumQueries(21, table_ignorelist=WAFFLE_TABLES): with check_mongo_calls(3): - self.client.get_html(reverse_course_url('course_handler', self.course.id)) + self.client.get(reverse_course_url('course_handler', self.course.id), content_type="application/json") -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) class TestCourseReIndex(CourseTestCase): """ Unit tests for the course outline. diff --git a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py index 9bad2c77fc1a..88c4aa27eb06 100644 --- a/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py +++ b/cms/djangoapps/contentstore/views/tests/test_exam_settings_view.py @@ -24,7 +24,6 @@ "ENABLE_PROCTORED_EXAMS": True, }, ) -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) @override_waffle_flag(toggles.LEGACY_STUDIO_CERTIFICATES, True) @override_waffle_flag(toggles.LEGACY_STUDIO_SCHEDULE_DETAILS, True) @override_waffle_flag(toggles.LEGACY_STUDIO_CONFIGURATIONS, True) @@ -93,7 +92,6 @@ def test_view_with_exam_settings_enabled(self, handler): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_exam_settings_alert_with_exam_settings_enabled(self, page_handler): """ @@ -130,7 +128,6 @@ def test_exam_settings_alert_with_exam_settings_enabled(self, page_handler): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) @override_waffle_flag(toggles.LEGACY_STUDIO_EXAM_SETTINGS, True) def test_exam_settings_alert_with_exam_settings_disabled(self, page_handler): @@ -173,7 +170,6 @@ def test_exam_settings_alert_with_exam_settings_disabled(self, page_handler): ) @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_invalid_provider_alert(self, page_handler): """ @@ -198,7 +194,6 @@ def test_invalid_provider_alert(self, page_handler): @ddt.data( "advanced_settings_handler", - "course_handler", ) def test_exam_settings_alert_not_shown(self, page_handler): """ diff --git a/cms/djangoapps/contentstore/views/tests/test_header_menu.py b/cms/djangoapps/contentstore/views/tests/test_header_menu.py deleted file mode 100644 index fb961cc4fa89..000000000000 --- a/cms/djangoapps/contentstore/views/tests/test_header_menu.py +++ /dev/null @@ -1,93 +0,0 @@ -""" -Course Header Menu Tests. -""" -from unittest import SkipTest - -from django.conf import settings -from django.test.utils import override_settings -from edx_toggles.toggles.testutils import override_waffle_flag - -from cms.djangoapps.contentstore import toggles -from cms.djangoapps.contentstore.tests.utils import CourseTestCase -from cms.djangoapps.contentstore.utils import reverse_course_url -from common.djangoapps.util.testing import UrlResetMixin - -FEATURES_WITH_CERTS_ENABLED = settings.FEATURES.copy() -FEATURES_WITH_CERTS_ENABLED['CERTIFICATES_HTML_VIEW'] = True - -FEATURES_WITH_EXAM_SETTINGS_ENABLED = settings.FEATURES.copy() -FEATURES_WITH_EXAM_SETTINGS_ENABLED['ENABLE_EXAM_SETTINGS_HTML_VIEW'] = True - -FEATURES_WITH_EXAM_SETTINGS_DISABLED = settings.FEATURES.copy() -FEATURES_WITH_EXAM_SETTINGS_DISABLED['ENABLE_EXAM_SETTINGS_HTML_VIEW'] = False - - -@override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED) -@override_waffle_flag(toggles.LEGACY_STUDIO_COURSE_OUTLINE, True) -class TestHeaderMenu(CourseTestCase, UrlResetMixin): - """ - Unit tests for the course header menu. - """ - def setUp(self): - """ - Set up the for the course header menu tests. - """ - super().setUp() - self.reset_urls() - - def test_header_menu_without_web_certs_enabled(self): - """ - Tests course header menu should not have `Certificates` menu item - if course has not web/HTML certificates enabled. - """ - # course_handler raise 404 for old mongo course - if self.course.id.deprecated: - raise SkipTest("course_handler raise 404 for old mongo course") - self.course.cert_html_view_enabled = False - self.save_course() - outline_url = reverse_course_url('course_handler', self.course.id) - resp = self.client.get(outline_url, HTTP_ACCEPT='text/html') - self.assertEqual(resp.status_code, 200) - self.assertNotContains(resp, '')
-
- def test_create(self):
- """
- Test create announcement view
- """
- url = reverse("maintenance:announcement_create")
- self.client.post(url, {"content": "Test Create Announcement", "active": True})
- result = Announcement.objects.filter(content="Test Create Announcement").exists()
- self.assertTrue(result)
-
- def test_edit(self):
- """
- Test edit announcement view
- """
- announcement = Announcement.objects.create(content="test")
- announcement.save()
- url = reverse("maintenance:announcement_edit", kwargs={"pk": announcement.pk})
- response = self.client.get(url)
- self.assertContains(response, '
diff --git a/cms/templates/container_chromeless.html b/cms/templates/container_chromeless.html
index 647a68f32231..3ef229e906e3 100644
--- a/cms/templates/container_chromeless.html
+++ b/cms/templates/container_chromeless.html
@@ -98,13 +98,6 @@
<%static:include path="common/templates/image-modal.underscore" />
- ## The following stylesheets are included for studio-frontend debugging.
- ## Remove this as part of studio frontend deprecation.
- ## https://github.com/openedx/studio-frontend/issues/381
- % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
- % endif
diff --git a/cms/templates/container_editor.html b/cms/templates/container_editor.html
index 900dac80abf9..5f00d0f61338 100644
--- a/cms/templates/container_editor.html
+++ b/cms/templates/container_editor.html
@@ -77,10 +77,6 @@
<%static:include path="common/templates/image-modal.underscore" />
- % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
- % endif
% for _, resource in resources:
% if resource['kind'] == 'url' and resource['mimetype'] == 'text/css':
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
deleted file mode 100644
index 61f524123b48..000000000000
--- a/cms/templates/course_outline.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%def name="online_help_token()"><% return "develop_course" %>
-<%!
-import logging
-from six.moves.urllib.parse import quote
-
-from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklists_quality
-from common.djangoapps.util.date_utils import get_default_time_display
-from django.utils.translation import gettext as _
-from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
-from openedx.core.djangolib.markup import HTML, Text
-from django.urls import reverse
-%>
-<%block name="title">${_("Course Outline")}
-<%block name="bodyclass">is-signedin course view-outline
-
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="requirejs">
- require(["js/factories/outline"], function (OutlineFactory) {
- OutlineFactory(
- ${course_structure | n, dump_js_escaped_json},
- ${initial_state | n, dump_js_escaped_json},
- ${initial_user_clipboard | n, dump_js_escaped_json}
- );
- });
-
-
-<%block name="header_extras">
-
-% for template_name in ['course-outline', 'xblock-string-field-editor', 'basic-modal', 'modal-button', 'course-outline-modal', 'due-date-editor', 'self-paced-due-date-editor', 'release-date-editor', 'grading-editor', 'publish-editor', 'staff-lock-editor', 'unit-access-editor', 'discussion-editor', 'content-visibility-editor', 'verification-access-editor', 'timed-examination-preference-editor', 'access-editor', 'settings-modal-tabs', 'show-correctness-editor', 'highlights-editor', 'highlights-enable-editor', 'course-highlights-enable', 'course-manage-tags', 'course-video-sharing-enable', 'summary-configuration-editor', 'tag-count', 'subsection-share-link-modal-tabs', 'full-page-share-link-editor', 'embed-link-share-link-editor']:
-
-% endfor
-<%static:optional_include_mako file="course_outline_header_extras_post.html" />
-
-% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
-% endif
-
-
-<%block name="page_alert">
- %if notification_dismiss_url is not None:
- ')
- self.client.post(url, {"content": "Test Edit Announcement", "active": True})
- announcement = Announcement.objects.get(pk=announcement.pk)
- self.assertEqual(announcement.content, "Test Edit Announcement")
-
- def test_delete(self):
- """
- Test delete announcement view
- """
- announcement = Announcement.objects.create(content="Test Delete")
- announcement.save()
- url = reverse("maintenance:announcement_delete", kwargs={"pk": announcement.pk})
- self.client.post(url)
- result = Announcement.objects.filter(content="Test Edit Announcement").exists()
- self.assertFalse(result)
-
- def _test_403(self, viewname, kwargs=None):
- url = reverse("maintenance:%s" % viewname, kwargs=kwargs)
- response = self.client.get(url)
- self.assertEqual(response.status_code, 403)
-
- def test_authorization(self):
- self.client.login(username=self.non_staff_user, password=self.TEST_PASSWORD)
- announcement = Announcement.objects.create(content="Test Delete")
- announcement.save()
-
- self._test_403("announcement_index")
- self._test_403("announcement_create")
- self._test_403("announcement_edit", {"pk": announcement.pk})
- self._test_403("announcement_delete", {"pk": announcement.pk})
diff --git a/cms/djangoapps/maintenance/urls.py b/cms/djangoapps/maintenance/urls.py
deleted file mode 100644
index 2937727bfa39..000000000000
--- a/cms/djangoapps/maintenance/urls.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-URLs for the maintenance app.
-"""
-
-from django.urls import path, re_path
-
-from .views import (
- AnnouncementCreateView,
- AnnouncementDeleteView,
- AnnouncementEditView,
- AnnouncementIndexView,
- MaintenanceIndexView
-)
-
-app_name = 'cms.djangoapps.maintenance'
-
-urlpatterns = [
- path('', MaintenanceIndexView.as_view(), name='maintenance_index'),
- re_path(r'^announcements/(?P\d+)?$', AnnouncementIndexView.as_view(), name='announcement_index'),
- path('announcements/create', AnnouncementCreateView.as_view(), name='announcement_create'),
- re_path(r'^announcements/edit/(?P\d+)?$', AnnouncementEditView.as_view(), name='announcement_edit'),
- path('announcements/delete/', AnnouncementDeleteView.as_view(), name='announcement_delete'),
-]
diff --git a/cms/djangoapps/maintenance/views.py b/cms/djangoapps/maintenance/views.py
deleted file mode 100644
index 1ec0f9c5cff2..000000000000
--- a/cms/djangoapps/maintenance/views.py
+++ /dev/null
@@ -1,190 +0,0 @@
-"""
-Views for the maintenance app.
-"""
-
-
-import logging
-
-from django.core.validators import ValidationError
-from django.urls import reverse, reverse_lazy
-from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
-from django.views.generic import View
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
-from django.views.generic.list import ListView
-from opaque_keys.edx.keys import CourseKey
-
-from common.djangoapps.edxmako.shortcuts import render_to_response
-from common.djangoapps.util.json_request import JsonResponse
-from common.djangoapps.util.views import require_global_staff
-from openedx.features.announcements.forms import AnnouncementForm
-from openedx.features.announcements.models import Announcement
-from xmodule.modulestore import ModuleStoreEnum # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.exceptions import ItemNotFoundError # lint-amnesty, pylint: disable=wrong-import-order
-
-log = logging.getLogger(__name__)
-
-# This dict maintains all the views that will be used Maintenance app.
-MAINTENANCE_VIEWS = {
- 'announcement_index': {
- 'url': 'maintenance:announcement_index',
- 'name': _('Edit Announcements'),
- 'slug': 'announcement_index',
- 'description': _(
- 'This view shows the announcement editor to create or alter announcements that are shown on the right'
- 'side of the dashboard.'
- ),
- },
-}
-
-
-COURSE_KEY_ERROR_MESSAGES = {
- 'empty_course_key': _('Please provide course id.'),
- 'invalid_course_key': _('Invalid course key.'),
- 'course_key_not_found': _('No matching course found.')
-}
-
-
-class MaintenanceIndexView(View):
- """
- Index view for maintenance dashboard, used by global staff.
-
- This view lists some commands/tasks that can be used to dry run or execute directly.
- """
-
- @method_decorator(require_global_staff)
- def get(self, request):
- """Render the maintenance index view. """
- return render_to_response('maintenance/index.html', {
- 'views': MAINTENANCE_VIEWS,
- })
-
-
-class MaintenanceBaseView(View):
- """
- Base class for Maintenance views.
- """
-
- template = 'maintenance/container.html'
-
- def __init__(self, view=None):
- super().__init__()
- self.context = {
- 'view': view if view else '',
- 'form_data': {},
- 'error': False,
- 'msg': ''
- }
-
- def render_response(self):
- """
- A short method to render_to_response that renders response.
- """
- if self.request.headers.get('x-requested-with') == 'XMLHttpRequest':
- return JsonResponse(self.context)
- return render_to_response(self.template, self.context)
-
- @method_decorator(require_global_staff)
- def get(self, request):
- """
- Render get view.
- """
- return self.render_response()
-
- def validate_course_key(self, course_key, branch=ModuleStoreEnum.BranchName.draft):
- """
- Validates the course_key that would be used by maintenance app views.
-
- Arguments:
- course_key (string): a course key
- branch: a course locator branch, default value is ModuleStoreEnum.BranchName.draft .
- values can be either ModuleStoreEnum.BranchName.draft or ModuleStoreEnum.BranchName.published.
-
- Returns:
- course_usage_key (CourseLocator): course usage locator
- """
- if not course_key:
- raise ValidationError(COURSE_KEY_ERROR_MESSAGES['empty_course_key'])
-
- course_usage_key = CourseKey.from_string(course_key)
-
- if not modulestore().has_course(course_usage_key):
- raise ItemNotFoundError(COURSE_KEY_ERROR_MESSAGES['course_key_not_found'])
-
- # get branch specific locator
- course_usage_key = course_usage_key.for_branch(branch)
-
- return course_usage_key
-
-
-class AnnouncementBaseView(View):
- """
- Base view for Announcements pages
- """
-
- @method_decorator(require_global_staff)
- def dispatch(self, request, *args, **kwargs):
- return super().dispatch(request, *args, **kwargs)
-
-
-class AnnouncementIndexView(ListView, MaintenanceBaseView):
- """
- View for viewing the announcements shown on the dashboard, used by the global staff.
- """
- model = Announcement
- object_list = Announcement.objects.order_by('-active')
- context_object_name = 'announcement_list'
- paginate_by = 8
-
- def __init__(self):
- super().__init__(MAINTENANCE_VIEWS['announcement_index'])
-
- def get_context_data(self, **kwargs):
- context = super().get_context_data(**kwargs)
- context['view'] = MAINTENANCE_VIEWS['announcement_index']
- return context
-
- @method_decorator(require_global_staff)
- def get(self, request, *args, **kwargs):
- context = self.get_context_data()
- return render_to_response(self.template, context)
-
-
-class AnnouncementEditView(UpdateView, AnnouncementBaseView):
- """
- View for editing an announcement.
- """
- model = Announcement
- form_class = AnnouncementForm
- success_url = reverse_lazy('maintenance:announcement_index')
- template_name = '/maintenance/_announcement_edit.html'
-
- def get_context_data(self, **kwargs):
- context = super().get_context_data(**kwargs)
- context['action_url'] = reverse('maintenance:announcement_edit', kwargs={'pk': context['announcement'].pk})
- return context
-
-
-class AnnouncementCreateView(CreateView, AnnouncementBaseView):
- """
- View for creating an announcement.
- """
- model = Announcement
- form_class = AnnouncementForm
- success_url = reverse_lazy('maintenance:announcement_index')
- template_name = '/maintenance/_announcement_edit.html'
-
- def get_context_data(self, **kwargs):
- context = super().get_context_data(**kwargs)
- context['action_url'] = reverse('maintenance:announcement_create')
- return context
-
-
-class AnnouncementDeleteView(DeleteView, AnnouncementBaseView):
- """
- View for deleting an announcement.
- """
- model = Announcement
- success_url = reverse_lazy('maintenance:announcement_index')
- template_name = '/maintenance/_announcement_delete.html'
diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index 8eef778531ac..c9a5c90256fd 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -147,8 +147,8 @@ def start_migration_task(
source_key=source.key,
target_library_key=target_library_key,
target_collection_slug=target_collection_slug,
- composition_level=form.cleaned_data['composition_level'],
- repeat_handling_strategy=form.cleaned_data['repeat_handling_strategy'],
+ composition_level=CompositionLevel(form.cleaned_data['composition_level']),
+ repeat_handling_strategy=RepeatHandlingStrategy(form.cleaned_data['repeat_handling_strategy']),
preserve_url_slugs=form.cleaned_data['preserve_url_slugs'],
forward_source_to_target=form.cleaned_data['forward_to_target'],
)
@@ -178,6 +178,7 @@ class ModulestoreBlockMigrationInline(admin.TabularInline):
"source",
"target",
"change_log_record",
+ "unsupported_reason",
)
list_display = ("id", *readonly_fields)
diff --git a/cms/djangoapps/modulestore_migrator/api.py b/cms/djangoapps/modulestore_migrator/api.py
deleted file mode 100644
index 25c26b007923..000000000000
--- a/cms/djangoapps/modulestore_migrator/api.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""
-API for migration from modulestore to learning core
-"""
-from celery.result import AsyncResult
-from opaque_keys.edx.keys import CourseKey, LearningContextKey
-from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
-from openedx_learning.api.authoring import get_collection
-from user_tasks.models import UserTaskStatus
-
-from openedx.core.djangoapps.content_libraries.api import get_library
-from openedx.core.types.user import AuthUser
-
-from . import tasks
-from .models import ModulestoreSource
-
-__all__ = (
- "start_migration_to_library",
- "is_successfully_migrated",
- "get_migration_info",
-)
-
-
-def start_migration_to_library(
- *,
- user: AuthUser,
- source_key: LearningContextKey,
- target_library_key: LibraryLocatorV2,
- target_collection_slug: str | None = None,
- composition_level: str,
- repeat_handling_strategy: str,
- preserve_url_slugs: bool,
- forward_source_to_target: bool,
-) -> AsyncResult:
- """
- Import a course or legacy library into a V2 library (or, a collection within a V2 library).
- """
- source, _ = ModulestoreSource.objects.get_or_create(key=source_key)
- target_library = get_library(target_library_key)
- # get_library ensures that the library is connected to a learning package.
- target_package_id: int = target_library.learning_package_id # type: ignore[assignment]
- target_collection_id = None
-
- if target_collection_slug:
- target_collection_id = get_collection(target_package_id, target_collection_slug).id
-
- return tasks.migrate_from_modulestore.delay(
- user_id=user.id,
- source_pk=source.id,
- target_package_pk=target_package_id,
- target_library_key=str(target_library_key),
- target_collection_pk=target_collection_id,
- composition_level=composition_level,
- repeat_handling_strategy=repeat_handling_strategy,
- preserve_url_slugs=preserve_url_slugs,
- forward_source_to_target=forward_source_to_target,
- )
-
-
-def is_successfully_migrated(source_key: CourseKey | LibraryLocator) -> bool:
- """
- Check if the source course/library has been migrated successfully.
- """
- return ModulestoreSource.objects.get_or_create(key=str(source_key))[0].migrations.filter(
- task_status__state=UserTaskStatus.SUCCEEDED
- ).exists()
-
-
-def get_migration_info(source_keys: list[CourseKey | LibraryLocator]) -> dict:
- """
- Check if the source course/library has been migrated successfully and return target info
- """
- return {
- info.key: info
- for info in ModulestoreSource.objects.filter(
- migrations__task_status__state=UserTaskStatus.SUCCEEDED, key__in=source_keys
- )
- .values_list(
- 'migrations__target__key',
- 'migrations__target__title',
- 'migrations__target_collection__key',
- 'migrations__target_collection__title',
- 'key',
- named=True,
- )
- }
diff --git a/cms/djangoapps/modulestore_migrator/api/__init__.py b/cms/djangoapps/modulestore_migrator/api/__init__.py
new file mode 100644
index 000000000000..f480d92bf092
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/api/__init__.py
@@ -0,0 +1,9 @@
+
+"""
+This is the public API for the modulestore_migrator.
+"""
+
+# These wildcard imports are okay because these api modules declare __all__.
+# pylint: disable=wildcard-import
+from .read_api import *
+from .write_api import *
diff --git a/cms/djangoapps/modulestore_migrator/api/read_api.py b/cms/djangoapps/modulestore_migrator/api/read_api.py
new file mode 100644
index 000000000000..893ef416d091
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/api/read_api.py
@@ -0,0 +1,244 @@
+"""
+API for reading information about previous migrations
+"""
+from __future__ import annotations
+
+import typing as t
+from uuid import UUID
+
+from opaque_keys.edx.keys import UsageKey
+from opaque_keys.edx.locator import (
+ LibraryLocatorV2, LibraryUsageLocatorV2, LibraryContainerLocator
+)
+from openedx_learning.api.authoring import get_draft_version
+from openedx_learning.api.authoring_models import (
+ PublishableEntityVersion, PublishableEntity, DraftChangeLogRecord
+)
+
+from openedx.core.djangoapps.content_libraries.api import (
+ library_component_usage_key, library_container_locator
+)
+
+from ..data import (
+ SourceContextKey, ModulestoreMigration, ModulestoreBlockMigrationResult,
+ ModulestoreBlockMigrationSuccess, ModulestoreBlockMigrationFailure
+)
+from .. import models
+
+
+__all__ = (
+ 'get_forwarding',
+ 'is_forwarded',
+ 'get_forwarding_for_blocks',
+ 'get_migrations',
+ 'get_migration_blocks',
+)
+
+
+def get_forwarding_for_blocks(source_keys: t.Iterable[UsageKey]) -> dict[UsageKey, ModulestoreBlockMigrationSuccess]:
+ """
+ Authoritatively determine how some Modulestore blocks have been migrated to Learning Core.
+
+ Returns a mapping from source usage keys to block migration data objects. Each block migration object
+ holds the target usage key and title. If a source key is missing from the mapping, then it has not
+ been authoritatively migrated.
+ """
+ sources = models.ModulestoreBlockSource.objects.filter(
+ key__in=[str(sk) for sk in source_keys]
+ ).select_related(
+ "forwarded__target__learning_package",
+ # For building component key
+ "forwarded__target__component__component_type",
+ # For building container key
+ "forwarded__target__container__section",
+ "forwarded__target__container__subsection",
+ "forwarded__target__container__unit",
+ # For determining title and version
+ "forwarded__change_log_record__new_version",
+ )
+ result = {}
+ for source in sources:
+ if source.forwarded and source.forwarded.target:
+ result[source.key] = _block_migration_success(
+ source_key=source.key,
+ target=source.forwarded.target,
+ change_log_record=source.forwarded.change_log_record,
+ )
+ return result
+
+
+def is_forwarded(source_key: SourceContextKey) -> bool:
+ """
+ Has this course or legacy library been authoratively migrated to Learning Core,
+ such that references to the source course/library should be forwarded to the target library?
+ """
+ return get_forwarding(source_key) is not None
+
+
+def get_forwarding(source_key: SourceContextKey) -> ModulestoreMigration | None:
+ """
+ Authoritatively determine how some Modulestore course or legacy library has been migrated to Learning Core.
+
+ If no such successful migration exists, returns None.
+
+ Note: This function may return None for a course or legacy lib that *has* been migrated 1+ times.
+ This just means that those migrations were non-forwarding. In user parlance, that is,
+ they have been "imported" but not truly "migrated".
+ """
+ try:
+ source = models.ModulestoreSource.objects.select_related(
+ # The following are used in _migration:
+ "forwarded__source",
+ "forwarded__target",
+ "forwarded__task_status",
+ "forwarded__target_collection",
+ ).get(
+ key=str(source_key)
+ )
+ except models.ModulestoreSource.DoesNotExist:
+ return None
+ if not source.forwarded:
+ return None
+ if source.forwarded.is_failed:
+ return None
+ return _migration(source.forwarded)
+
+
+def get_migrations(
+ source_key: SourceContextKey | None = None,
+ *,
+ target_key: LibraryLocatorV2 | None = None,
+ target_collection_slug: str | None = None,
+ task_uuid: UUID | None = None,
+ is_failed: bool | None = None,
+) -> t.Generator[ModulestoreMigration]:
+ """
+ Given some criteria, get all modulestore->LearningCore migrations.
+
+ Returns an iterable, ordered from NEWEST to OLDEST.
+
+ Please note: If you provide no filters, this will return an iterable across the whole
+ ModulestoreMigration table. Please paginate thoughtfully if you do that.
+ """
+ migrations = models.ModulestoreMigration.objects.all().select_related(
+ "source",
+ "target",
+ "target_collection",
+ "task_status",
+ )
+ if source_key:
+ migrations = migrations.filter(source__key=source_key)
+ if target_key:
+ migrations = migrations.filter(target__key=str(target_key))
+ if target_collection_slug:
+ migrations = migrations.filter(target_collection__key=target_collection_slug)
+ if task_uuid:
+ migrations = migrations.filter(task_status__uuid=str(task_uuid))
+ if is_failed is not None:
+ migrations = migrations.filter(is_failed=is_failed)
+ return (
+ _migration(migration)
+ for migration in migrations.order_by("-id") # primary key is a proxy for newness
+ )
+
+
+def get_migration_blocks(migration_pk: int) -> dict[UsageKey, ModulestoreBlockMigrationResult]:
+ """
+ Get details about the migrations of each individual block within a course/lib migration.
+ """
+ return {
+ block_migration.source.key: _block_migration_result(block_migration)
+ for block_migration in models.ModulestoreBlockMigration.objects.filter(
+ overall_migration_id=migration_pk
+ ).select_related(
+ "source",
+ "target__learning_package",
+ # For building component key
+ "target__component__component_type",
+ # For building container key.
+ # (Hard-coding these exact 3 container types here is not a good pattern, but it's what is needed
+ # here in order to avoid additional SELECTs while determining the container type).
+ "target__container__section",
+ "target__container__subsection",
+ "target__container__unit",
+ # For determining title and version
+ "change_log_record__new_version",
+ )
+ }
+
+
+def _migration(m: models.ModulestoreMigration) -> ModulestoreMigration:
+ """
+ Build a migration dataclass from the database row
+ """
+ return ModulestoreMigration(
+ pk=m.id,
+ source_key=m.source.key,
+ target_key=LibraryLocatorV2.from_string(m.target.key),
+ target_title=m.target.title,
+ target_collection_slug=(m.target_collection.key if m.target_collection else None),
+ target_collection_title=(m.target_collection.title if m.target_collection else None),
+ is_failed=m.is_failed,
+ task_uuid=m.task_status.uuid,
+ )
+
+
+def _block_migration_result(m: models.ModulestoreBlockMigration) -> ModulestoreBlockMigrationResult:
+ """
+ Build an instance of the migration result (successs/failure) dataclass from a database row
+ """
+ if m.target:
+ return _block_migration_success(
+ source_key=m.source.key,
+ target=m.target,
+ change_log_record=m.change_log_record,
+ )
+ return ModulestoreBlockMigrationFailure(
+ source_key=m.source.key,
+ unsupported_reason=(m.unsupported_reason or ""),
+ )
+
+
+def _block_migration_success(
+ source_key: UsageKey,
+ target: PublishableEntity,
+ change_log_record: DraftChangeLogRecord | None,
+) -> ModulestoreBlockMigrationSuccess:
+ """
+ Build an instance of the migration success dataclass
+ """
+ target_library_key = LibraryLocatorV2.from_string(target.learning_package.key)
+ target_key: LibraryUsageLocatorV2 | LibraryContainerLocator
+ if hasattr(target, "component"):
+ target_key = library_component_usage_key(target_library_key, target.component)
+ elif hasattr(target, "container"):
+ target_key = library_container_locator(target_library_key, target.container)
+ else:
+ raise ValueError(f"Entity is neither a container nor component: {target}")
+ # We expect that any successful BlockMigration (that is, one where `target is not None`)
+ # will also have a `change_log_record` with a non-None `new_version`. However, the data model
+ # does not guarantee that `change_log_record` nor `change_log_record.new_version` are non-
+ # None. So, just in case some bug in the modulestore_migrator or some manual modification of
+ # the database leads us to a situation where `target` is set but `change_log_record.new_version`
+ # is not, we have fallback behavior:
+ # * For target_title, use the latest draft's title, which is good enough, because the
+ # title is just there to help users.
+ # * For target_version_num, just use None, because we don't want downstream code to make decisions
+ # about syncing, etc based on incorrect version info.
+ target_version: PublishableEntityVersion | None = (
+ change_log_record.new_version if change_log_record else None
+ )
+ if target_version:
+ target_title = target_version.title
+ target_version_num = target_version.version_num
+ else:
+ latest_draft = get_draft_version(target)
+ target_title = latest_draft.title if latest_draft else ""
+ target_version_num = None
+ return ModulestoreBlockMigrationSuccess(
+ source_key=source_key,
+ target_entity_pk=target.id,
+ target_key=target_key,
+ target_title=target_title,
+ target_version_num=target_version_num,
+ )
diff --git a/cms/djangoapps/modulestore_migrator/api/write_api.py b/cms/djangoapps/modulestore_migrator/api/write_api.py
new file mode 100644
index 000000000000..4bef6c952767
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/api/write_api.py
@@ -0,0 +1,94 @@
+"""
+API for kicking off new migrations
+"""
+from __future__ import annotations
+
+from celery.result import AsyncResult
+from opaque_keys.edx.locator import LibraryLocatorV2
+from openedx_learning.api.authoring import get_collection
+
+from openedx.core.types.user import AuthUser
+from openedx.core.djangoapps.content_libraries.api import get_library
+
+from ..data import SourceContextKey, CompositionLevel, RepeatHandlingStrategy
+from .. import tasks, models
+
+
+__all__ = (
+ 'start_migration_to_library',
+ 'start_bulk_migration_to_library'
+)
+
+
+def start_migration_to_library(
+ *,
+ user: AuthUser,
+ source_key: SourceContextKey,
+ target_library_key: LibraryLocatorV2,
+ target_collection_slug: str | None = None,
+ create_collection: bool = False,
+ composition_level: CompositionLevel,
+ repeat_handling_strategy: RepeatHandlingStrategy,
+ preserve_url_slugs: bool,
+ forward_source_to_target: bool | None
+) -> AsyncResult:
+ """
+ Import a course or legacy library into a V2 library (or, a collection within a V2 library).
+ """
+ return start_bulk_migration_to_library(
+ user=user,
+ source_key_list=[source_key],
+ target_library_key=target_library_key,
+ target_collection_slug_list=[target_collection_slug],
+ create_collections=create_collection,
+ composition_level=composition_level,
+ repeat_handling_strategy=repeat_handling_strategy,
+ preserve_url_slugs=preserve_url_slugs,
+ forward_source_to_target=forward_source_to_target,
+ )
+
+
+def start_bulk_migration_to_library(
+ *,
+ user: AuthUser,
+ source_key_list: list[SourceContextKey],
+ target_library_key: LibraryLocatorV2,
+ target_collection_slug_list: list[str | None] | None = None,
+ create_collections: bool = False,
+ composition_level: CompositionLevel,
+ repeat_handling_strategy: RepeatHandlingStrategy,
+ preserve_url_slugs: bool,
+ forward_source_to_target: bool | None,
+) -> AsyncResult:
+ """
+ Import a list of courses or legacy libraries into a V2 library (or, a collections within a V2 library).
+ """
+ target_library = get_library(target_library_key)
+ # get_library ensures that the library is connected to a learning package.
+ target_package_id: int = target_library.learning_package_id # type: ignore[assignment]
+
+ sources_pks: list[int] = []
+ for source_key in source_key_list:
+ source, _ = models.ModulestoreSource.objects.get_or_create(key=str(source_key))
+ sources_pks.append(source.id)
+
+ target_collection_pks: list[int | None] = []
+ if target_collection_slug_list:
+ for target_collection_slug in target_collection_slug_list:
+ if target_collection_slug:
+ target_collection_id = get_collection(target_package_id, target_collection_slug).id
+ target_collection_pks.append(target_collection_id)
+ else:
+ target_collection_pks.append(None)
+
+ return tasks.bulk_migrate_from_modulestore.delay(
+ user_id=user.id,
+ sources_pks=sources_pks,
+ target_library_key=str(target_library_key),
+ target_collection_pks=target_collection_pks,
+ create_collections=create_collections,
+ composition_level=composition_level.value,
+ repeat_handling_strategy=repeat_handling_strategy.value,
+ preserve_url_slugs=preserve_url_slugs,
+ forward_source_to_target=forward_source_to_target,
+ )
diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
index e42649557d67..529d4c78ad40 100644
--- a/cms/djangoapps/modulestore_migrator/data.py
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -1,9 +1,23 @@
"""
Value objects
"""
+
from __future__ import annotations
+import typing as t
+from dataclasses import dataclass
from enum import Enum
+from uuid import UUID
+
+from django.utils.translation import gettext_lazy as _
+from opaque_keys.edx.keys import UsageKey
+from opaque_keys.edx.locator import (
+ CourseLocator,
+ LibraryContainerLocator,
+ LibraryLocator,
+ LibraryLocatorV2,
+ LibraryUsageLocatorV2,
+)
from openedx.core.djangoapps.content_libraries.api import ContainerType
@@ -70,3 +84,51 @@ def default(cls) -> RepeatHandlingStrategy:
Returns the default repeat handling strategy.
"""
return cls.Skip
+
+
+SourceContextKey: t.TypeAlias = CourseLocator | LibraryLocator
+
+
+@dataclass(frozen=True)
+class ModulestoreMigration:
+ """
+ Metadata on a migration of a course or legacy library to a v2 library in learning core.
+ """
+ pk: int
+ source_key: SourceContextKey
+ target_key: LibraryLocatorV2
+ target_title: str
+ target_collection_slug: str | None
+ target_collection_title: str | None
+ is_failed: bool
+ task_uuid: UUID # the UserTask which executed this migration
+
+
+@dataclass(frozen=True)
+class ModulestoreBlockMigrationResult:
+ """
+ Base class for a modulestore block that was part of an attempted migration to learning core.
+ """
+ source_key: UsageKey
+ is_failed: t.ClassVar[bool]
+
+
+@dataclass(frozen=True)
+class ModulestoreBlockMigrationSuccess(ModulestoreBlockMigrationResult):
+ """
+ Info on a modulestore block which has been successfully migrated into an LC entity
+ """
+ target_entity_pk: int
+ target_key: LibraryUsageLocatorV2 | LibraryContainerLocator
+ target_title: str
+ target_version_num: int | None
+ is_failed: t.ClassVar[bool] = False
+
+
+@dataclass(frozen=True)
+class ModulestoreBlockMigrationFailure(ModulestoreBlockMigrationResult):
+ """
+ Info on a modulestore block which failed to be migrated into LC
+ """
+ unsupported_reason: str
+ is_failed: t.ClassVar[bool] = True
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0002_alter_modulestoremigration_task_status.py b/cms/djangoapps/modulestore_migrator/migrations/0002_alter_modulestoremigration_task_status.py
new file mode 100644
index 000000000000..ed3a299c30c0
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0002_alter_modulestoremigration_task_status.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.24 on 2025-09-29 20:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('user_tasks', '0004_url_textfield'),
+ ('modulestore_migrator', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='modulestoremigration',
+ name='task_status',
+ field=models.ForeignKey(help_text='Tracks the status of the task which is executing this migration. In a bulk migration, the same task can be multiple migrations', on_delete=django.db.models.deletion.RESTRICT, related_name='migrations', to='user_tasks.usertaskstatus'),
+ ),
+ ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0003_modulestoremigration_is_failed.py b/cms/djangoapps/modulestore_migrator/migrations/0003_modulestoremigration_is_failed.py
new file mode 100644
index 000000000000..d7202023a94f
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0003_modulestoremigration_is_failed.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-10-21 23:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('modulestore_migrator', '0002_alter_modulestoremigration_task_status'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='modulestoremigration',
+ name='is_failed',
+ field=models.BooleanField(default=False, help_text='is the migration failed?'),
+ ),
+ ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0004_alter_modulestoreblockmigration_target_squashed_0005_modulestoreblockmigration_unsupported_reason.py b/cms/djangoapps/modulestore_migrator/migrations/0004_alter_modulestoreblockmigration_target_squashed_0005_modulestoreblockmigration_unsupported_reason.py
new file mode 100644
index 000000000000..f043e208dc35
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0004_alter_modulestoreblockmigration_target_squashed_0005_modulestoreblockmigration_unsupported_reason.py
@@ -0,0 +1,32 @@
+# Generated by Django 5.2.7 on 2025-11-26 06:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('modulestore_migrator', '0003_modulestoremigration_is_failed'),
+ ('oel_publishing', '0008_alter_draftchangelogrecord_options_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='modulestoreblockmigration',
+ name='target',
+ field=models.ForeignKey(
+ blank=True,
+ help_text='The target entity of this block migration, set to null if it fails to migrate',
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='oel_publishing.publishableentity',
+ ),
+ ),
+ migrations.AddField(
+ model_name='modulestoreblockmigration',
+ name='unsupported_reason',
+ field=models.TextField(
+ blank=True, help_text='Reason if the block is unsupported and target is set to null', null=True
+ ),
+ ),
+ ]
diff --git a/cms/djangoapps/modulestore_migrator/migrations/0006_alter_modulestoreblocksource_forwarded_and_more.py b/cms/djangoapps/modulestore_migrator/migrations/0006_alter_modulestoreblocksource_forwarded_and_more.py
new file mode 100644
index 000000000000..a8ee5a0eb673
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/migrations/0006_alter_modulestoreblocksource_forwarded_and_more.py
@@ -0,0 +1,30 @@
+# Generated by Django 5.2.9 on 2025-12-14 15:33
+
+import django.db.models.deletion
+import opaque_keys.edx.django.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('modulestore_migrator', '0004_alter_modulestoreblockmigration_target_squashed_0005_modulestoreblockmigration_unsupported_reason'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='modulestoreblocksource',
+ name='forwarded',
+ field=models.OneToOneField(help_text='If set, the system will forward references of this block source over to the target of this block migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoreblockmigration'),
+ ),
+ migrations.AlterField(
+ model_name='modulestoreblocksource',
+ name='key',
+ field=opaque_keys.edx.django.models.UsageKeyField(help_text='Original usage key of the XBlock that has been imported.', max_length=255, unique=True),
+ ),
+ migrations.AlterField(
+ model_name='modulestoresource',
+ name='forwarded',
+ field=models.OneToOneField(blank=True, help_text='If set, the system will forward references of this source over to the target of this migration', null=True, on_delete=django.db.models.deletion.SET_NULL, to='modulestore_migrator.modulestoremigration'),
+ ),
+ ]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 05bea5bfe1e9..11f614c2ed03 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -6,16 +6,19 @@
from django.contrib.auth import get_user_model
from django.db import models
from django.utils.translation import gettext_lazy as _
-from user_tasks.models import UserTaskStatus
-
from model_utils.models import TimeStampedModel
from opaque_keys.edx.django.models import (
LearningContextKeyField,
UsageKeyField,
)
from openedx_learning.api.authoring_models import (
- LearningPackage, PublishableEntity, Collection, DraftChangeLog, DraftChangeLogRecord
+ Collection,
+ DraftChangeLog,
+ DraftChangeLogRecord,
+ LearningPackage,
+ PublishableEntity,
)
+from user_tasks.models import UserTaskStatus
from .data import CompositionLevel, RepeatHandlingStrategy
@@ -25,6 +28,23 @@
class ModulestoreSource(models.Model):
"""
A legacy learning context (course or library) which can be a source of a migration.
+
+ One source can be associated with multiple (successful or unsuccessful) ModulestoreMigrations.
+ If a source has been migrated multiple times, then at most one of them can be considered the
+ "official" or "authoritative" migration; this is indicated by setting the `forwarded` field to
+ that ModulestoreMigration object.
+
+ Note that `forwarded` can be NULL even when 1+ migrations have happened for this source. This just
+ means that none of them were authoritative. In other words, they were all "imports"/"copies" rather
+ than true "migrations".
+
+ In practice, as of Ulmo:
+ * The `forwarded` field is used to decide how to update legacy library_content references.
+ * When using the Libraries Migration UI in Studio, `forwarded` is always set to the first
+ successful ModulestoreMigration.
+ * When using the REST API directly, the default is to use the same behavior as the UI, but
+ clients can also explicitly specify the `forward_source_to_target` boolean param in order to
+ control whether `forwarded` is set to any given migration.
"""
key = LearningContextKeyField(
max_length=255,
@@ -37,11 +57,10 @@ class ModulestoreSource(models.Model):
blank=True,
on_delete=models.SET_NULL,
help_text=_('If set, the system will forward references of this source over to the target of this migration'),
- related_name="forwards",
)
def __str__(self):
- return f"{self.__class__.__name__}('{self.key}')"
+ return f"{self.key}"
__repr__ = __str__
@@ -107,10 +126,14 @@ class ModulestoreMigration(models.Model):
)
## MIGRATION ARTIFACTS
- task_status = models.OneToOneField(
+ task_status = models.ForeignKey(
UserTaskStatus,
on_delete=models.RESTRICT,
- help_text=_("Tracks the status of the task which is executing this migration"),
+ help_text=_(
+ "Tracks the status of the task which is executing this migration. "
+ "In a bulk migration, the same task can be multiple migrations"
+ ),
+ related_name="migrations",
)
change_log = models.ForeignKey(
DraftChangeLog,
@@ -127,6 +150,17 @@ class ModulestoreMigration(models.Model):
"We temporarily save the staged content to allow for troubleshooting of failed migrations."
)
)
+ # Mostly used in bulk migrations. The `UserTaskStatus` represents the status of the entire bulk migration;
+ # a `FAILED` status means that the entire bulk-migration has failed.
+ # Each `ModulestoreMigration` saves the data of the migration of each legacy library.
+ # The `is_failed` value is to keep track a failed legacy library in the bulk migration,
+ # but allow continuing with the migration of the rest of the legacy libraries.
+ is_failed = models.BooleanField(
+ default=False,
+ help_text=_(
+ "is the migration failed?"
+ ),
+ )
def __str__(self):
return (
@@ -145,6 +179,9 @@ def __repr__(self):
class ModulestoreBlockSource(TimeStampedModel):
"""
A legacy block usage (in a course or library) which can be a source of a block migration.
+
+ The semantics of `forwarded` directly mirror those of `ModulestoreSource.forwarded`. Please see
+ that class's docstring for details.
"""
overall_source = models.ForeignKey(
ModulestoreSource,
@@ -153,6 +190,7 @@ class ModulestoreBlockSource(TimeStampedModel):
)
key = UsageKeyField(
max_length=255,
+ unique=True,
help_text=_('Original usage key of the XBlock that has been imported.'),
)
forwarded = models.OneToOneField(
@@ -160,11 +198,10 @@ class ModulestoreBlockSource(TimeStampedModel):
null=True,
on_delete=models.SET_NULL,
help_text=_(
- 'If set, the system will forward references of this block source over to the target of this block migration'
+ 'If set, the system will forward references of this block source over to the '
+ 'target of this block migration'
),
- related_name="forwards",
)
- unique_together = [("overall_source", "key")]
def __str__(self):
return f"{self.__class__.__name__}('{self.key}')"
@@ -195,6 +232,9 @@ class ModulestoreBlockMigration(TimeStampedModel):
target = models.ForeignKey(
PublishableEntity,
on_delete=models.CASCADE,
+ help_text=_('The target entity of this block migration, set to null if it fails to migrate'),
+ null=True,
+ blank=True,
)
change_log_record = models.OneToOneField(
DraftChangeLogRecord,
@@ -203,10 +243,16 @@ class ModulestoreBlockMigration(TimeStampedModel):
null=True,
on_delete=models.SET_NULL,
)
+ unsupported_reason = models.TextField(
+ null=True,
+ blank=True,
+ help_text=_('Reason if the block is unsupported and target is set to null'),
+ )
class Meta:
unique_together = [
('overall_migration', 'source'),
+ # By default defining a unique index on a nullable column will only enforce unicity of non-null values.
('overall_migration', 'target'),
]
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
index df981e896176..643d94d2250c 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/serializers.py
@@ -5,16 +5,30 @@
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import LearningContextKey
from opaque_keys.edx.locator import LibraryLocatorV2
+from openedx_learning.api.authoring_models import Collection
from rest_framework import serializers
+from user_tasks.models import UserTaskStatus
from user_tasks.serializers import StatusSerializer
from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
-from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
+from cms.djangoapps.modulestore_migrator.models import (
+ ModulestoreMigration,
+ ModulestoreSource,
+)
-class ModulestoreMigrationSerializer(serializers.ModelSerializer):
+class LibraryMigrationCollectionSerializer(serializers.ModelSerializer):
"""
- Serializer for the course to library import creation API.
+ Serializer for the target collection of a library migration.
+ """
+ class Meta:
+ model = Collection
+ fields = ["key", "title"]
+
+
+class ModulestoreMigrationSerializer(serializers.Serializer):
+ """
+ Serializer for the course or legacylibrary to library V2 import creation API.
"""
source = serializers.CharField( # type: ignore[assignment]
@@ -22,7 +36,7 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
required=True,
)
target = serializers.CharField(
- help_text="The target library key to import into.",
+ help_text="The target content library V2 key to import into.",
required=True,
)
composition_level = serializers.ChoiceField(
@@ -40,7 +54,7 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
preserve_url_slugs = serializers.BooleanField(
help_text="If true, current slugs will be preserved.",
required=False,
- default=True,
+ default=False,
)
target_collection_slug = serializers.CharField(
help_text="The target collection slug within the library to import into. Optional.",
@@ -48,24 +62,27 @@ class ModulestoreMigrationSerializer(serializers.ModelSerializer):
allow_blank=True,
default=None,
)
+ create_collection = serializers.BooleanField(
+ help_text=(
+ "If true and `target_collection_slug` is not set, "
+ "create the collections in the library where the import will be made"
+ ),
+ required=False,
+ default=False,
+ )
+ target_collection = LibraryMigrationCollectionSerializer(required=False)
forward_source_to_target = serializers.BooleanField(
help_text="Forward references of this block source over to the target of this block migration.",
required=False,
+ allow_null=True,
+ default=None, # Note: "None" means "unspecified"
+ )
+ is_failed = serializers.BooleanField(
+ help_text="It is true if this migration is failed",
+ required=False,
default=False,
)
- class Meta:
- model = ModulestoreMigration
- fields = [
- 'source',
- 'target',
- 'target_collection_slug',
- 'composition_level',
- 'repeat_handling_strategy',
- 'preserve_url_slugs',
- 'forward_source_to_target',
- ]
-
def get_fields(self):
fields = super().get_fields()
request = self.context.get('request')
@@ -100,19 +117,74 @@ def get_forward_source_to_target(self, obj: ModulestoreMigration):
def to_representation(self, instance):
"""
- Override to customize the serialized representation."""
+ Override to customize the serialized representation.
+ """
data = super().to_representation(instance)
# Custom logic for forward_source_to_target during serialization
data['forward_source_to_target'] = self.get_forward_source_to_target(instance)
return data
-class StatusWithModulestoreMigrationSerializer(StatusSerializer):
+class BulkModulestoreMigrationSerializer(ModulestoreMigrationSerializer):
+ """
+ Serializer for a bulk migration (of several courses or legacy libraries) to a V2 library.
+ """
+ sources = serializers.ListField(
+ child=serializers.CharField(),
+ help_text="The list of sources course or legacy library keys to import from.",
+ required=True,
+ )
+
+ target_collection_slug_list = serializers.ListField(
+ child=serializers.CharField(),
+ help_text="The list of target collection slugs within the library to import into. Optional.",
+ required=False,
+ allow_empty=True,
+ default=None,
+ )
+
+ create_collections = serializers.BooleanField(
+ help_text=(
+ "If true and `target_collection_slug_list` is not set, "
+ "create the collections in the library where the import will be made"
+ ),
+ required=False,
+ default=False,
+ )
+
+ def get_fields(self):
+ fields = super().get_fields()
+ fields.pop("source", None)
+ fields.pop("target_collection_slug", None)
+ return fields
+
+ def validate_sources(self, value):
+ """
+ Validate all the source key format
+ """
+ validated_sources = []
+ for v in value:
+ try:
+ validated_sources.append(LearningContextKey.from_string(v))
+ except InvalidKeyError as exc:
+ raise serializers.ValidationError(f"Invalid source key: {str(exc)}") from exc
+ return validated_sources
+
+ def to_representation(self, instance):
+ """
+ Override to customize the serialized representation.
+ """
+ if isinstance(instance, list):
+ return [super().to_representation(obj) for obj in instance]
+ return super().to_representation(instance)
+
+
+class StatusWithModulestoreMigrationsSerializer(StatusSerializer):
"""
- Serializer for the import task status.
+ Serializer for the import task status, including 1+ migration objects.
"""
- parameters = ModulestoreMigrationSerializer(source='modulestoremigration')
+ parameters = ModulestoreMigrationSerializer(source='migrations', many=True)
class Meta:
model = StatusSerializer.Meta.model
@@ -125,3 +197,95 @@ def get_fields(self):
fields = super().get_fields()
fields.pop('name', None)
return fields
+
+
+class MigrationInfoSerializer(serializers.Serializer):
+ """
+ Serializer for the migration info
+ """
+
+ source_key = serializers.CharField()
+ target_key = serializers.CharField()
+ target_title = serializers.CharField()
+ target_collection_key = serializers.CharField(
+ source="target_collection_slug",
+ allow_null=True
+ )
+ target_collection_title = serializers.CharField(
+ allow_null=True
+ )
+
+
+class MigrationInfoResponseSerializer(serializers.Serializer):
+ """
+ Serializer for the migrations info view response
+ """
+ def to_representation(self, instance):
+ return {
+ str(key): MigrationInfoSerializer(value, many=True).data
+ for key, value in instance.items()
+ }
+
+
+class LibraryMigrationCourseSourceSerializer(serializers.ModelSerializer):
+ """
+ Serializer for the source course of a library migration.
+ """
+ display_name = serializers.SerializerMethodField()
+
+ class Meta:
+ model = ModulestoreSource
+ fields = ['key', 'display_name']
+
+ def get_display_name(self, obj):
+ """
+ Return the display name of the source course
+ """
+ return self.context["course_names"].get(str(obj.key), None)
+
+
+class LibraryMigrationCourseSerializer(serializers.ModelSerializer):
+ """
+ Serializer for the course or legacylibrary migrations to V2 library.
+ """
+ task_uuid = serializers.UUIDField(source='task_status.uuid', read_only=True)
+ source = LibraryMigrationCourseSourceSerializer() # type: ignore[assignment]
+ target_collection = LibraryMigrationCollectionSerializer(required=False)
+ state = serializers.SerializerMethodField()
+ progress = serializers.SerializerMethodField()
+
+ class Meta:
+ model = ModulestoreMigration
+ fields = [
+ 'task_uuid',
+ 'source',
+ 'target_collection',
+ 'state',
+ 'progress',
+ ]
+
+ def get_state(self, obj: ModulestoreMigration):
+ """
+ Return the state of the migration.
+ """
+ if obj.is_failed or obj.task_status.state in [UserTaskStatus.FAILED, UserTaskStatus.CANCELED]:
+ return UserTaskStatus.FAILED
+ elif obj.task_status.state == UserTaskStatus.SUCCEEDED:
+ return UserTaskStatus.SUCCEEDED
+
+ return UserTaskStatus.IN_PROGRESS
+
+ def get_progress(self, obj: ModulestoreMigration):
+ """
+ Return the progress of the migration.
+ """
+ return obj.task_status.completed_steps / obj.task_status.total_steps
+
+
+class BlockMigrationInfoSerializer(serializers.Serializer):
+ """
+ Serializer for the block migration info.
+ """
+ source_key = serializers.CharField()
+ target_key = serializers.CharField(allow_null=True)
+ unsupported_reason = serializers.CharField(allow_null=True)
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
index 22d509f16910..4d2c92b6af04 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/urls.py
@@ -1,11 +1,15 @@
"""
Course to Library Import API v1 URLs.
"""
-
from rest_framework.routers import SimpleRouter
-from .views import MigrationViewSet
+
+from .views import (
+ BulkMigrationViewSet,
+ MigrationViewSet,
+)
ROUTER = SimpleRouter()
-ROUTER.register(r'migrations', MigrationViewSet)
+ROUTER.register(r'migrations', MigrationViewSet, basename='migrations')
+ROUTER.register(r'bulk_migration', BulkMigrationViewSet, basename='bulk-migration')
urlpatterns = ROUTER.urls
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index feeafb1b40d7..f84f87a23c85 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -3,135 +3,371 @@
"""
import logging
+import edx_api_doc_tools as apidocs
from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
-from rest_framework.permissions import IsAdminUser
-from rest_framework.response import Response
from rest_framework import status
+from rest_framework.decorators import action
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.response import Response
from user_tasks.models import UserTaskStatus
from user_tasks.views import StatusViewSet
-from cms.djangoapps.modulestore_migrator.api import start_migration_to_library
+from cms.djangoapps.modulestore_migrator import api as migrator_api
+from common.djangoapps.student import auth
+from openedx.core.djangoapps.content_libraries import api as lib_api
from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
-from .serializers import ModulestoreMigrationSerializer, StatusWithModulestoreMigrationSerializer
-
+from ...data import (
+ CompositionLevel, RepeatHandlingStrategy,
+)
+from .serializers import (
+ BulkModulestoreMigrationSerializer,
+ ModulestoreMigrationSerializer,
+ StatusWithModulestoreMigrationsSerializer,
+)
log = logging.getLogger(__name__)
+_error_responses = {
+ 400: "Request malformed.",
+ 401: "Requester is not authenticated.",
+ 403: "Permission denied",
+}
+
+
+@apidocs.schema_for(
+ "list",
+ """
+ List all migration and bulk-migration tasks started by the current user.
+
+ The response is a paginated series of migration task status objects, ordered
+ by the time at which the migration was started, newest first.
+ See `POST /api/modulestore_migrator/v1/migrations` for details of each object's schema.
+ """,
+)
+@apidocs.schema_for(
+ "retrieve",
+ """
+ Get the status of particular migration or bulk-migration task by its UUID.
+
+ The response is a migration task status object.
+ See `POST /api/modulestore_migrator/v1/migrations` for details on its schema.
+ """,
+)
class MigrationViewSet(StatusViewSet):
"""
- Import course content from modulestore into a content library.
-
- This viewset handles the import process, including creating the import task and
- retrieving the status of the import task. Meant to be used by admin users only.
-
- API Endpoints
- ------------
- POST /api/modulestore_migrator/v1/migrations/
- Start the import process.
-
- Request body:
- {
- "source": "",
- "target": "",
- "composition_level": "", # Optional, defaults to "component"
- "target_collection_slug": "", # Optional
- "repeat_handling_strategy": "" # Optional, defaults to Skip
- "preserve_url_slugs": "" # Optional, defaults to true
- }
+ JSON HTTP API to create and check on ModuleStore-to-Learning-Core migration tasks.
+ """
+
+ authentication_classes = (
+ BearerAuthenticationAllowInactiveUser,
+ JwtAuthentication,
+ SessionAuthenticationAllowInactiveUser,
+ )
+ serializer_class = StatusWithModulestoreMigrationsSerializer
+
+ # DELETE is not allowed, as we want to preserve all task status objects.
+ # Instead, users can POST to /cancel to cancel running tasks.
+ http_method_names = ["get", "post"]
+
+ lookup_field = "uuid"
+
+ def get_queryset(self):
+ """
+ Override the default queryset to filter by the migration event and user.
+ """
+ return StatusViewSet.queryset.filter(
+ migrations__isnull=False,
+ # The filter for `user` here is essentially the auth strategy for the /list and /retreive
+ # endpoints. Basically: you can view migrations if and only if you started them.
+ # Future devs: If you ever refactor this view to remove the user filter, be sure to enforce
+ # permissions some other way.
+ user=self.request.user
+ ).distinct().order_by("-created")
+
+ @apidocs.schema()
+ @action(detail=True, methods=['post'])
+ def cancel(self, request, *args, **kwargs):
+ """
+ Cancel a particular migration or bulk-migration task.
+
+ The response is a migration task status object.
+ See `POST /api/modulestore_migrator/v1/migrations` for details on its schema.
+
+ This endpoint is currently reserved for site-wide administrators.
+ """
+ # TODO: This should check some sort of "allowed to cancel/migrations" permission
+ # rather than directly looking at the GlobalStaff role.
+ # https://github.com/openedx/edx-platform/issues/37791
+ if not request.user.is_staff:
+ raise PermissionDenied("Only site administrators can cancel migration tasks.")
+ return super().cancel(request, *args, **kwargs)
+
+ @apidocs.schema(
+ body=ModulestoreMigrationSerializer,
+ responses={
+ 201: StatusWithModulestoreMigrationsSerializer,
+ **_error_responses,
+ },
+ )
+ def create(self, request, *args, **kwargs):
+ """
+ Begin a transfer of content from course or legacy library into a content library.
+
+ Required parameters:
+ * A **source** key, which identifies the course or legacy library containing the items be migrated.
+ * A **target** key, which identifies the content library to which items will be migrated.
+
+ Optional parameters:
+
+ * The **target_collection_slug**, which identifies an *existing* collection within the target that
+ should hold the migrated items. If not specified, items will be added to the target library without
+ any collection, unless:
+ * If this source was previously migrated to a collection and the **repeat_handling_strategy** (described
+ below) is not set to *fork*, then that same collection will be re-used.
+ * If **create_collection** is specified as *true*, then the items will be added to a new collection, with
+ a name and slug based on the source's title, but not conflicting with any existing collection.
+ * The **composition_level** (*component*, *unit*, *subsection*, *section*) indicates the highest level of
+ hierarchy to be transferred. Default is *component*. To maximally preserve the source structure,
+ specify *section*.
+ * The **repeat_handling_strategy** specifies how the system should handle source items which have
+ previously been migrated to the target.
+ * Specify *skip* to prefer the existing target item. This is the default.
+ * Specify *update* to update the existing target item with the latest source content.
+ * Specify *fork* to create a new target item with the source content.
+ * Specify **preserve_url_slugs** as *true* in order to use the source-provided block IDs
+ (a.k.a. "URL slugs", "url_names"). Otherwise, the system will use each source item's title
+ to auto-generate an ID in the target context.
+ * Specify **forward_source_to_target** as *true* in order to establish a mapping from the source items to the
+ target items (specifically, the mapping is stored by the *forwarded* field of the
+ *modulestore_migrator_modulestoresource* and *modulestore_migrator_modulestoreblocksource* database tables).
+ * **Example**: Specify *true* if you are permanently migrating legacy library content into a content
+ library, and want course references to the legacy library content to automatically be mapped to new
+ content library.
+ * **Example**: Specify *false* if you are migrating legacy library content into a content
+ library, but do *not* want course references to the legacy library content to be mapped to new
+ content library.
+ * **Example**: Specify *false* if you are copying course content into a content library, but do not
+ want to persist a link between the source source content and destination library contenet.
+ * **Defaults** to *false* if the source has already been mapped to a target by a successful migration,
+ and defaults to *true* if not. In other words, by default, establish the mapping only if it wouldn't
+ override an existing mapping.
Example request:
- {
- "source": "course-v1:edX+DemoX+2014_T1",
- "target": "library-v1:org1+lib_1",
- "composition_level": "unit",
- "repeat_handling_strategy": "update",
- "preserve_url_slugs": true
- }
+ ```json
+ {
+ "source": "course-v1:MyOrganization+MyCourse+MyRun",
+ "target": "lib-collection:MyOrganization:MyUlmoLibrary",
+ "target_collection_slug": "MyCollection",
+ "create_collection": true,
+ "composition_level": "unit",
+ "repeat_handling_strategy": "update",
+ "preserve_url_slugs": true
+ }
+ ```
+
+ The migration task will take anywhere from seconds to minutes, depending on the size of the source
+ content. This API's response will tell the initial status of the migration task, including:
+
+ * The **state**, whose values include:
+ * _Pending_: The migration task is waiting to be picked up by a Studio worker process.
+ * _Succeeded_: The migration task finished without fatal errors.
+ * _Failed_: A fatal error occured during the migration task.
+ * _Canceled_: An administrator canceled the migration task.
+ * Any other **state** value indicates the migration is actively in progress.
+ * The **state_text**, the localized version of **state**.
+ * The **artifacts**, a list of URLs pointing to additional diagnostic information created
+ during that task. In the current version of this API, successful migrations will have zero
+ artifacts and failed migrations will have one artifact.
+ * The **uuid**, which be used to retrieve an updated status on this migration later, via
+ *GET /api/modulestore_migrator/v1/migrations/$uuid*
+ * The **parameters**, a singleton list whose elemenet indicates the parameters which were
+ used to start this migration task.
Example response:
- {
- "state": "Succeeded",
- "state_text": "Succeeded", # Translation into the current language of the current state
- "completed_steps": 11,
- "total_steps": 11,
- "attempts": 1,
- "created": "2025-05-14T22:24:37.048539Z",
- "modified": "2025-05-14T22:24:59.128068Z",
- "artifacts": [],
- "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
- "parameters": {
- "source": "course-v1:OpenedX+DemoX+DemoCourse",
+ ```json
+ {
+ "state": "Parsing staged OLX",
+ "state_text": "Parsing staged OLX",
+ "completed_steps": 4,
+ "total_steps": 12,
+ "attempts": 1,
+ "created": "2025-05-14T22:24:37.048539Z",
+ "modified": "2025-05-14T22:24:59.128068Z",
+ "artifacts": [],
+ "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
+ "parameters": [
+ {
+ "source": "course-v1:MyOrganization+MyCourse+MyRun",
+ "target": "lib:MyOrganization:MyUlmoLibrary",
"composition_level": "unit",
"repeat_handling_strategy": "update",
"preserve_url_slugs": true
}
- }
+ ]
+ }
+ ```
- GET /api/modulestore_migrator/v1/migrations//
- Get the status of the import task.
+ This API requires that the requester have author access on both the source and target.
+ """
+ serializer_data = ModulestoreMigrationSerializer(data=request.data)
+ serializer_data.is_valid(raise_exception=True)
+ validated_data = serializer_data.validated_data
+ if not auth.has_studio_write_access(request.user, validated_data['source']):
+ raise PermissionDenied("Requester is not an author on the source.")
+ lib_api.require_permission_for_library_key(
+ validated_data['target'],
+ request.user,
+ lib_api.permissions.CAN_EDIT_THIS_CONTENT_LIBRARY,
+ )
+ task = migrator_api.start_migration_to_library(
+ user=request.user,
+ source_key=validated_data['source'],
+ target_library_key=validated_data['target'],
+ target_collection_slug=validated_data['target_collection_slug'],
+ composition_level=CompositionLevel(validated_data['composition_level']),
+ create_collection=validated_data['create_collection'],
+ repeat_handling_strategy=RepeatHandlingStrategy(validated_data['repeat_handling_strategy']),
+ preserve_url_slugs=validated_data['preserve_url_slugs'],
+ forward_source_to_target=validated_data['forward_source_to_target'],
+ )
+ task_status = UserTaskStatus.objects.get(task_id=task.id)
+ serializer = self.get_serializer(task_status)
+ return Response(serializer.data, status=status.HTTP_201_CREATED)
- Example response:
- {
- "state": "Importing staged content structure",
- "state_text": "Importing staged content structure",
- "completed_steps": 6,
- "total_steps": 11,
- "attempts": 1,
- "created": "2025-05-14T22:24:37.048539Z",
- "modified": "2025-05-14T22:24:59.128068Z",
- "artifacts": [],
- "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
- "parameters": {
- "source": "course-v1:OpenedX+DemoX+DemoCourse2",
- "composition_level": "component",
- "repeat_handling_strategy": "skip",
- "preserve_url_slugs": false
- }
- }
+
+class BulkMigrationViewSet(StatusViewSet):
+ """
+ JSON HTTP API to bulk-create ModuleStore-to-Learning-Core migration tasks.
"""
- permission_classes = (IsAdminUser,)
authentication_classes = (
BearerAuthenticationAllowInactiveUser,
JwtAuthentication,
SessionAuthenticationAllowInactiveUser,
)
- serializer_class = StatusWithModulestoreMigrationSerializer
+ serializer_class = StatusWithModulestoreMigrationsSerializer
- def get_queryset(self):
- """
- Override the default queryset to filter by the import event and user.
- """
- return StatusViewSet.queryset.filter(modulestoremigration__isnull=False, user=self.request.user)
+ # Because bulk-migration tasks are just special migration tasks, they are listed as part of:
+ # GET .../migrations/
+ # To avoid having 2 APIs that do (mostly) the same thing, we nix this endpoint:
+ # GET .../bulk_migration//cancel
+ # which we inherited from StatusViewSet.
+ # Furthermore, DELETE is not allowed, as we want to preserve all task status objects.
+ # That just leaves us with POST.
+ http_method_names = ["post"]
+ @apidocs.schema(
+ body=BulkModulestoreMigrationSerializer,
+ responses={
+ 201: StatusWithModulestoreMigrationsSerializer,
+ **_error_responses,
+ },
+ )
def create(self, request, *args, **kwargs):
"""
- Handle the import task creation.
- """
+ Transfer content from multiple courses or legacy libraries into a content library.
- serializer_data = ModulestoreMigrationSerializer(data=request.data)
+ Create a migration task to import multiple courses or legacy libraries into a single content library.
+ This is bulk version of `POST /api/modulestore_migrator/v1/migrations`. See that endpoint's documentation
+ for details on the meanings of the request and response values.
+
+ **Request body**:
+ ```json
+ {
+ "sources": ["", ""],
+ "target": "",
+ "composition_level": "", # Optional, defaults to "component"
+ "target_collection_slugs": ["", ""], # Optional
+ "create_collections": "" # Optional, defaults to false
+ "repeat_handling_strategy": "" # Optional, defaults to Skip
+ "preserve_url_slugs": "" # Optional, defaults to true
+ }
+ ```
+
+ **Example request:**
+ ```json
+ {
+ "sources": ["course-v1:edX+DemoX+2014_T1", "course-v1:edX+DemoX+2014_T2"],
+ "target": "library-v1:org1+lib_1",
+ "composition_level": "unit",
+ "repeat_handling_strategy": "update",
+ "preserve_url_slugs": true,
+ "create_collections": true
+ }
+ ```
+
+ **Example response:**
+ ```json
+ {
+ "state": "Succeeded",
+ "state_text": "Succeeded", # Translation into the current language of the current state
+ "completed_steps": 11,
+ "total_steps": 11,
+ "attempts": 1,
+ "created": "2025-05-14T22:24:37.048539Z",
+ "modified": "2025-05-14T22:24:59.128068Z",
+ "artifacts": [],
+ "uuid": "3de23e5d-fd34-4a6f-bf02-b183374120f0",
+ "parameters": [
+ {
+ "source": "course-v1:edX+DemoX+2014_T1",
+ "composition_level": "unit",
+ "repeat_handling_strategy": "update",
+ "preserve_url_slugs": true
+ },
+ {
+ "source": "course-v1:edX+DemoX+2014_T2",
+ "composition_level": "unit",
+ "repeat_handling_strategy": "update",
+ "preserve_url_slugs": true
+ },
+ ]
+ }
+ ```
+
+ This API requires that the requester have author access on both the source and target.
+ """
+ serializer_data = BulkModulestoreMigrationSerializer(data=request.data)
serializer_data.is_valid(raise_exception=True)
validated_data = serializer_data.validated_data
-
- try:
- task = start_migration_to_library(
- user=request.user,
- source_key=validated_data['source'],
- target_library_key=validated_data['target'],
- target_collection_slug=validated_data['target_collection_slug'],
- composition_level=validated_data['composition_level'],
- repeat_handling_strategy=validated_data['repeat_handling_strategy'],
- preserve_url_slugs=validated_data['preserve_url_slugs'],
- forward_source_to_target=validated_data['forward_source_to_target'],
- )
- except NotImplementedError as e:
- log.exception(str(e))
- return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST)
+ for source_key in validated_data['sources']:
+ if not auth.has_studio_write_access(request.user, source_key):
+ raise PermissionDenied(
+ f"Requester is not an author on the source: {source_key}. No migrations performed."
+ )
+ lib_api.require_permission_for_library_key(
+ validated_data['target'],
+ request.user,
+ lib_api.permissions.CAN_EDIT_THIS_CONTENT_LIBRARY,
+ )
+ task = migrator_api.start_bulk_migration_to_library(
+ user=request.user,
+ source_key_list=validated_data['sources'],
+ target_library_key=validated_data['target'],
+ target_collection_slug_list=validated_data['target_collection_slug_list'],
+ create_collections=validated_data['create_collections'],
+ composition_level=CompositionLevel(validated_data['composition_level']),
+ repeat_handling_strategy=RepeatHandlingStrategy(validated_data['repeat_handling_strategy']),
+ preserve_url_slugs=validated_data['preserve_url_slugs'],
+ forward_source_to_target=validated_data['forward_source_to_target'],
+ )
task_status = UserTaskStatus.objects.get(task_id=task.id)
serializer = self.get_serializer(task_status)
return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+ def cancel(self, request, *args, **kwargs):
+ """
+ Remove the `POST .../cancel` endpoint, which was inherited from StatusViewSet.
+
+ Bulk-migration tasks and migration tasks, under the hood, are the same thing.
+ So, bulk-migration tasks can be cancelled with:
+ POST .../migrations//cancel
+
+ We disable this endpoint to avoid confusion.
+ """
+ raise NotImplementedError
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 0c8520988738..e0b0b0fe2ed2 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -9,23 +9,26 @@
from dataclasses import dataclass
from datetime import datetime, timezone
from enum import Enum
-from itertools import groupby
+from gettext import ngettext
from celery import shared_task
from celery.utils.log import get_task_logger
from django.core.exceptions import ObjectDoesNotExist
+from django.db import transaction
from django.utils.text import slugify
+from django.utils.translation import gettext_lazy as _
from edx_django_utils.monitoring import set_code_owner_attribute_from_module
from lxml import etree
from lxml.etree import _ElementTree as XmlTree
from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey, UsageKey
+from opaque_keys.edx.keys import UsageKey
from opaque_keys.edx.locator import (
+ BlockUsageLocator,
CourseLocator,
LibraryContainerLocator,
LibraryLocator,
LibraryLocatorV2,
- LibraryUsageLocatorV2
+ LibraryUsageLocatorV2,
)
from openedx_learning.api import authoring as authoring_api
from openedx_learning.api.authoring_models import (
@@ -34,20 +37,24 @@
ComponentType,
LearningPackage,
PublishableEntity,
- PublishableEntityVersion
+ PublishableEntityVersion,
)
from user_tasks.tasks import UserTask, UserTaskStatus
+from xblock.core import XBlock
+from xblock.plugin import PluginMissingError
from common.djangoapps.split_modulestore_django.models import SplitModulestoreCourseIndex
+from common.djangoapps.util.date_utils import DEFAULT_DATE_TIME_FORMAT, strftime_localized
from openedx.core.djangoapps.content_libraries import api as libraries_api
from openedx.core.djangoapps.content_libraries.api import ContainerType, get_library
from openedx.core.djangoapps.content_staging import api as staging_api
from xmodule.modulestore import exceptions as modulestore_exceptions
from xmodule.modulestore.django import modulestore
+from . import models, data
from .constants import CONTENT_STAGING_PURPOSE_TEMPLATE
-from .data import CompositionLevel, RepeatHandlingStrategy
-from .models import ModulestoreBlockMigration, ModulestoreBlockSource, ModulestoreMigration, ModulestoreSource
+from .data import CompositionLevel, RepeatHandlingStrategy, SourceContextKey
+from .api.read_api import get_migrations, get_migration_blocks
log = get_task_logger(__name__)
@@ -71,19 +78,35 @@ class MigrationStep(Enum):
MAPPING_OLD_TO_NEW = 'Saving map of legacy content to migrated content'
FORWARDING = 'Forwarding legacy content to migrated content'
POPULATING_COLLECTION = 'Assigning imported items to the specified collection'
+ BULK_MIGRATION_PREFIX = 'Migrating legacy content'
-class _MigrationTask(UserTask):
+class _BulkMigrationTask(UserTask):
"""
- Base class for migrate_to_modulestore
+ Base class for bulk_migrate_from_modulestore
"""
@staticmethod
def calculate_total_steps(arguments_dict):
"""
Get number of in-progress steps in importing process, as shown in the UI.
+
+ There are steps that are general for all sources, but there are steps that are repeated in each source.
+ All of this is taken into account to make the sum
"""
- return len(list(MigrationStep))
+ sources_count = len(arguments_dict.get('sources_pks', 1))
+
+ # STAGING, PARSING, IMPORTING_ASSETS, IMPORTING_STRUCTURE, MAPPING_OLD_TO_NEW, UNSTAGING
+ steps_repeated_count = 6
+
+ return (
+ # All migration steps and subtract the BULK_MIGRATION_PREFIX
+ len(list(MigrationStep)) - 1
+ # We don't want to count these steps again, they will be counted in the operation below.
+ - steps_repeated_count
+ # Each source repeats all the `steps_repeated_count`
+ + steps_repeated_count * sources_count
+ )
@dataclass(frozen=True)
@@ -91,12 +114,15 @@ class _MigrationContext:
"""
Context for the migration process.
"""
- existing_source_to_target_keys: dict[ # Note: It's intended to be mutable to reflect changes during migration.
- UsageKey, list[PublishableEntity]
- ]
+ # Fields that get mutated as we migrate blocks
+ used_component_keys: set[LibraryUsageLocatorV2]
+ used_container_slugs: set[str]
+
+ # Fields that remain constant
+ previous_block_migrations: dict[UsageKey, data.ModulestoreBlockMigrationResult]
target_package_id: int
target_library_key: LibraryLocatorV2
- source_context_key: CourseKey # Note: This includes legacy LibraryLocators, which are sneakily CourseKeys.
+ source_context_key: SourceContextKey
content_by_filename: dict[str, int]
composition_level: CompositionLevel
repeat_handling_strategy: RepeatHandlingStrategy
@@ -104,37 +130,6 @@ class _MigrationContext:
created_by: int
created_at: datetime
- def is_already_migrated(self, source_key: UsageKey) -> bool:
- return source_key in self.existing_source_to_target_keys
-
- def get_existing_target(self, source_key: UsageKey) -> PublishableEntity:
- """
- Get the target entity for a given source key.
-
- If the source key is already migrated, return the FIRST target entity.
- If the source key is not found, raise a KeyError.
- """
- if source_key not in self.existing_source_to_target_keys:
- raise KeyError(f"Source key {source_key} not found in existing source to target keys")
-
- # NOTE: This is a list of PublishableEntities, but we always return the first one.
- return self.existing_source_to_target_keys[source_key][0]
-
- def add_migration(self, source_key: UsageKey, target: PublishableEntity) -> None:
- """Update the context with a new migration (keeps it current)"""
- if source_key not in self.existing_source_to_target_keys:
- self.existing_source_to_target_keys[source_key] = [target]
- else:
- self.existing_source_to_target_keys[source_key].append(target)
-
- def get_existing_target_entity_keys(self, base_key: str) -> set[str]:
- return set(
- publishable_entity.key
- for publishable_entity_list in self.existing_source_to_target_keys.values()
- for publishable_entity in publishable_entity_list
- if publishable_entity.key.startswith(base_key)
- )
-
@property
def should_skip_strategy(self) -> bool:
"""
@@ -157,44 +152,36 @@ def should_fork_strategy(self) -> bool:
return self.repeat_handling_strategy is RepeatHandlingStrategy.Fork
-@shared_task(base=_MigrationTask, bind=True)
-# Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
-# does stack inspection and can't handle additional decorators.
-def migrate_from_modulestore(
- self: _MigrationTask,
- *,
- user_id: int,
+@dataclass()
+class _MigrationSourceData:
+ """
+ Data related to a ModulestoreSource
+ """
+ source: models.ModulestoreSource
+ source_root_usage_key: BlockUsageLocator
+ source_version: str | None
+ migration: models.ModulestoreMigration
+ previous_migration: data.ModulestoreMigration | None
+
+
+def _validate_input(
+ status: UserTaskStatus,
source_pk: int,
- target_package_pk: int,
- target_library_key: str,
- target_collection_pk: int,
repeat_handling_strategy: str,
preserve_url_slugs: bool,
composition_level: str,
- forward_source_to_target: bool,
-) -> None:
+ target_library_key: LibraryLocatorV2,
+ target_package: LearningPackage,
+ target_collection: Collection | None,
+) -> _MigrationSourceData | None:
"""
- Import a course or legacy library into a learning package.
-
- Currently, the target learning package must be associated with a V2 content library, but that
- restriction may be loosened in the future as more types of learning packages are developed.
+ Validates and build the source data related to `source_pk`
"""
- # pylint: disable=too-many-statements
- # This is a large function, but breaking it up futher would probably not
- # make it any easier to understand.
-
- set_code_owner_attribute_from_module(__name__)
-
- status: UserTaskStatus = self.status
- status.set_state(MigrationStep.VALIDATING_INPUT.value)
try:
- source = ModulestoreSource.objects.get(pk=source_pk)
- target_package = LearningPackage.objects.get(pk=target_package_pk)
- target_library = get_library(LibraryLocatorV2.from_string(target_library_key))
- target_collection = Collection.objects.get(pk=target_collection_pk) if target_collection_pk else None
- except (ObjectDoesNotExist, InvalidKeyError) as exc:
+ source = models.ModulestoreSource.objects.get(pk=source_pk)
+ except (ObjectDoesNotExist) as exc:
status.fail(str(exc))
- return
+ return None
# The Model is used for Course and Legacy Library
course_index = SplitModulestoreCourseIndex.objects.filter(course_id=source.key).first()
@@ -209,9 +196,19 @@ def migrate_from_modulestore(
f"Not a valid source context key: {source.key}. "
"Source key must reference a course or a legacy library."
)
- return
-
- migration = ModulestoreMigration.objects.create(
+ return None
+
+ # Find the latest successful migration that occurred, if any.
+ # We're careful to do this before creating the new ModulestoreMigration object,
+ # otherwise we would just end up grabbing that by one accident.
+ # ( mypy gets confused by how use next(...) here )
+ previous_migration = next( # type: ignore[call-overload]
+ get_migrations(
+ source.key, target_key=target_library_key, is_failed=False
+ ),
+ None, # default
+ )
+ migration = models.ModulestoreMigration.objects.create(
source=source,
source_version=source_version,
composition_level=composition_level,
@@ -221,21 +218,36 @@ def migrate_from_modulestore(
target_collection=target_collection,
task_status=status,
)
- status.increment_completed_steps()
+ return _MigrationSourceData(
+ source=source,
+ source_root_usage_key=source_root_usage_key,
+ source_version=source_version,
+ migration=migration,
+ previous_migration=previous_migration,
+ )
+
- status.set_state(MigrationStep.CANCELLING_OLD.value)
+def _cancel_old_tasks(
+ source_list: list[models.ModulestoreSource],
+ status: UserTaskStatus,
+ target_package: LearningPackage,
+ migration_ids_to_exclude: list[int],
+) -> None:
+ """
+ Cancel all migration tasks related to the user and the source list
+ """
# In order to prevent a user from accidentally starting a bunch of identical import tasks...
- migrations_to_cancel = ModulestoreMigration.objects.filter(
- # get all Migration tasks by this user with the same source and target
+ migrations_to_cancel = models.ModulestoreMigration.objects.filter(
+ # get all Migration tasks by this user with the same sources and target
task_status__user=status.user,
- source=source,
+ source__in=source_list,
target=target_package,
).select_related('task_status').exclude(
# (excluding that aren't running)
task_status__state__in=(UserTaskStatus.CANCELED, UserTaskStatus.FAILED, UserTaskStatus.SUCCEEDED)
).exclude(
- # (excluding this migration itself)
- id=migration.id
+ # (excluding these migrations themselves)
+ id__in=migration_ids_to_exclude
)
# ... and cancel their tasks and clean away their staged content.
for migration_to_cancel in migrations_to_cancel:
@@ -243,45 +255,41 @@ def migrate_from_modulestore(
migration_to_cancel.task_status.cancel()
if migration_to_cancel.staged_content:
migration_to_cancel.staged_content.delete()
- status.increment_completed_steps()
- status.set_state(MigrationStep.LOADING)
+
+def _load_xblock(
+ status: UserTaskStatus,
+ usage_key: UsageKey,
+) -> XBlock | None:
+ """
+ Loads the Xblock for the given usage_key
+ """
try:
- legacy_root = modulestore().get_item(source_root_usage_key)
+ xblock = modulestore().get_item(usage_key)
except modulestore_exceptions.ItemNotFoundError as exc:
- status.fail(f"Failed to load source item '{source_root_usage_key}' from ModuleStore: {exc}")
- return
- if not legacy_root:
- status.fail(f"Could not find source item '{source_root_usage_key}' in ModuleStore")
- return
- status.increment_completed_steps()
+ status.fail(f"Failed to load source item '{usage_key}' from ModuleStore: {exc}")
+ return None
+ if not xblock:
+ status.fail(f"Could not find source item '{usage_key}' in ModuleStore")
+ return None
+ return xblock
- status.set_state(MigrationStep.STAGING.value)
- staged_content = staging_api.stage_xblock_temporarily(
- block=legacy_root,
- user_id=status.user.pk,
- purpose=CONTENT_STAGING_PURPOSE_TEMPLATE.format(source_key=source.key),
- )
- migration.staged_content = staged_content
- status.increment_completed_steps()
- status.set_state(MigrationStep.PARSING.value)
- parser = etree.XMLParser(strip_cdata=False)
- try:
- root_node = etree.fromstring(staged_content.olx, parser=parser)
- except etree.ParseError as exc:
- status.fail(f"Failed to parse source OLX (from staged content with id = {staged_content.id}): {exc}")
- status.increment_completed_steps()
+def _import_assets(migration: models.ModulestoreMigration) -> dict[str, int]:
+ """
+ Import the assets of the staged content to the migration target
+ """
+ if migration.staged_content is None:
+ return {}
- status.set_state(MigrationStep.IMPORTING_ASSETS.value)
content_by_filename: dict[str, int] = {}
now = datetime.now(tz=timezone.utc)
- for staged_content_file_data in staging_api.get_staged_content_static_files(staged_content.id):
+ for staged_content_file_data in staging_api.get_staged_content_static_files(migration.staged_content.id):
old_path = staged_content_file_data.filename
- file_data = staging_api.get_staged_content_static_file_data(staged_content.id, old_path)
+ file_data = staging_api.get_staged_content_static_file_data(migration.staged_content.id, old_path)
if not file_data:
log.error(
- f"Staged content {staged_content.id} included referenced file {old_path}, "
+ f"Staged content {migration.staged_content.id} included referenced file {old_path}, "
"but no file data was found."
)
continue
@@ -294,90 +302,414 @@ def migrate_from_modulestore(
data=file_data,
created=now,
).id
- status.increment_completed_steps()
+ return content_by_filename
- status.set_state(MigrationStep.IMPORTING_STRUCTURE.value)
- # "key" is locally unique across all PublishableEntities within
- # a given LearningPackage.
- # We use this mapping to ensure that we don't create duplicate
- # PublishableEntities during the migration process for a given LearningPackage.
- existing_source_to_target_keys: dict[UsageKey, list[PublishableEntity]] = {}
- modulestore_blocks = (
- ModulestoreBlockMigration.objects.filter(overall_migration__target=migration.target.id).order_by("source__key")
- )
- existing_source_to_target_keys = {
- source_key: list(block.target for block in group) for source_key, group in groupby(
- modulestore_blocks, key=lambda x: x.source.key)
- }
+def _import_structure(
+ source_data: _MigrationSourceData,
+ target_library: libraries_api.ContentLibraryMetadata,
+ content_by_filename: dict[str, int],
+ root_node: XmlTree,
+ status: UserTaskStatus,
+) -> tuple[t.Any, _MigratedNode]:
+ """
+ Import the staged content structure into the target Learning Core library.
+
+ Args:
+ migration (ModulestoreMigration):
+ The migration record representing the ongoing modulestore-to-learning-core migration.
+ source_data (_MigrationSourceData):
+ Data extracted from the legacy modulestore, including the source root usage key.
+ Use `_validate_input()` to generate this data.
+ target_library (libraries_api.ContentLibraryMetadata):
+ The target library where the new Learning Core content will be created.
+ content_by_filename (dict[str, int]):
+ A mapping between OLX file names and their associated file IDs in the staging area.
+ Use `_import_assets` to generate this content.
+ root_node (XmlTree):
+ The parsed XML tree representing the root of the staged OLX content.
+ status (UserTaskStatus):
+ The user task used to record progress and state updates throughout the import.
+ Returns:
+ tuple[Any, _MigratedNode]:
+ A tuple containing:
+ - The first element (`change_log`): the bulk draft change log generated by
+ `authoring_api.bulk_draft_changes_for`, containing all the imported changes.
+ - The second element (`root_migrated_node`): a `_MigratedNode` object that
+ represents the mapping between the legacy root node and its newly created
+ Learning Core equivalent.
+ """
+ migration = source_data.migration
migration_context = _MigrationContext(
- existing_source_to_target_keys=existing_source_to_target_keys,
- target_package_id=target_package_pk,
+ used_component_keys=set(
+ LibraryUsageLocatorV2(target_library.key, block_type, block_id) # type: ignore[abstract]
+ for block_type, block_id
+ in authoring_api.get_components(migration.target.pk).values_list(
+ "component_type__name", "local_key"
+ )
+ ),
+ used_container_slugs=set(
+ authoring_api.get_containers(
+ migration.target.pk
+ ).values_list("publishable_entity__key", flat=True)
+ ),
+ previous_block_migrations=(
+ get_migration_blocks(source_data.previous_migration.pk)
+ if source_data.previous_migration
+ else {}
+ ),
+ target_package_id=migration.target.pk,
target_library_key=target_library.key,
- source_context_key=source_root_usage_key.course_key,
+ source_context_key=source_data.source_root_usage_key.course_key,
content_by_filename=content_by_filename,
- composition_level=CompositionLevel(composition_level),
- repeat_handling_strategy=RepeatHandlingStrategy(repeat_handling_strategy),
- preserve_url_slugs=preserve_url_slugs,
+ composition_level=CompositionLevel(migration.composition_level),
+ repeat_handling_strategy=RepeatHandlingStrategy(migration.repeat_handling_strategy),
+ preserve_url_slugs=migration.preserve_url_slugs,
created_by=status.user_id,
created_at=datetime.now(timezone.utc),
)
-
with authoring_api.bulk_draft_changes_for(migration.target.id) as change_log:
root_migrated_node = _migrate_node(
context=migration_context,
source_node=root_node,
)
change_log.save()
- migration.change_log = change_log
- status.increment_completed_steps()
+ return change_log, root_migrated_node
- status.set_state(MigrationStep.UNSTAGING.value)
- staged_content.delete()
- status.increment_completed_steps()
- _create_migration_artifacts_incrementally(
- root_migrated_node=root_migrated_node,
- source=source,
- migration=migration,
- status=status,
+def _forward_content(source_data: _MigrationSourceData) -> None:
+ """
+ Forwarding legacy content to migrated content
+ """
+ block_migrations = models.ModulestoreBlockMigration.objects.filter(overall_migration=source_data.migration)
+ block_sources_to_block_migrations = {
+ block_migration.source: block_migration for block_migration in block_migrations
+ }
+ for block_source, block_migration in block_sources_to_block_migrations.items():
+ block_source.forwarded = block_migration
+ block_source.save()
+
+ source_data.source.forwarded = source_data.migration
+ source_data.source.save()
+
+
+def _populate_collection(user_id: int, migration: models.ModulestoreMigration) -> None:
+ """
+ Assigning imported items to the specified collection in the migration
+ """
+ if migration.target_collection is None:
+ return
+
+ block_target_pks: list[int] = list(
+ models.ModulestoreBlockMigration.objects.filter(
+ overall_migration=migration
+ ).values_list('target_id', flat=True)
)
+ if block_target_pks:
+ authoring_api.add_to_collection(
+ learning_package_id=migration.target.pk,
+ key=migration.target_collection.key,
+ entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
+ created_by=user_id,
+ )
+ else:
+ log.warning("No target entities found to add to collection")
- block_migrations = ModulestoreBlockMigration.objects.filter(overall_migration=migration)
- status.increment_completed_steps()
- status.set_state(MigrationStep.FORWARDING.value)
- if forward_source_to_target:
- block_sources_to_block_migrations = {
- block_migration.source: block_migration for block_migration in block_migrations
- }
- for block_source, block_migration in block_sources_to_block_migrations.items():
- block_source.forwarded = block_migration
- block_source.save()
-
- source.forwarded = migration
- source.save()
- status.increment_completed_steps()
+def _create_collection(library_key: LibraryLocatorV2, title: str) -> Collection:
+ """
+ Creates a collection in the given library
+
+ If there's a collection with the same key, try again, adding the attempt number at the end.
+ The same is true for the title.
+ """
+ key = slugify(title)
+ collection: Collection | None = None
+ attempt = 0
+ created_at = strftime_localized(datetime.now(timezone.utc), DEFAULT_DATE_TIME_FORMAT)
+ description = f"{_('This collection contains content migrated from a legacy library on')}: {created_at}"
+ while not collection:
+ modified_key = key if attempt == 0 else key + '-' + str(attempt)
+ try:
+ # Add transaction here to avoid TransactionManagementError on retry
+ with transaction.atomic():
+ collection = libraries_api.create_library_collection(
+ library_key=library_key,
+ collection_key=modified_key,
+ title=f"{title}{f'_{attempt}' if attempt > 0 else ''}",
+ description=description,
+ )
+ except libraries_api.LibraryCollectionAlreadyExists:
+ attempt += 1
+ return collection
+
+
+def _set_migrations_to_fail(source_data_list: list[_MigrationSourceData]):
+ """
+ Set and save all migrations in `source_data_list` as failed
+ """
+ for source_data in source_data_list:
+ source_data.migration.is_failed = True
- status.set_state(MigrationStep.POPULATING_COLLECTION.value)
- if target_collection:
- block_target_pks: list[int] = list(
- ModulestoreBlockMigration.objects.filter(
- overall_migration=migration
- ).values_list('target_id', flat=True)
+ models.ModulestoreMigration.objects.bulk_update(
+ [x.migration for x in source_data_list],
+ ["is_failed"],
+ )
+
+
+@shared_task(base=_BulkMigrationTask, bind=True)
+# Note: The decorator @set_code_owner_attribute cannot be used here because the UserTaskMixin
+# does stack inspection and can't handle additional decorators.
+def bulk_migrate_from_modulestore(
+ self: _BulkMigrationTask,
+ *,
+ user_id: int,
+ sources_pks: list[int],
+ target_library_key: str,
+ target_collection_pks: list[int | None],
+ create_collections: bool = False,
+ repeat_handling_strategy: str,
+ preserve_url_slugs: bool,
+ composition_level: str,
+ forward_source_to_target: bool | None,
+) -> None:
+ """
+ Import multiple legacy courses or libraries into a single V2 library.
+
+ The bulk migration maintains **one unified status record** that tracks progress across
+ all included sources. This simplifies monitoring, since the client only needs to observe
+ one task state.
+ Each source item (course or library) still creates its own `ModulestoreMigration`
+ database record, but all of them share the same parent task (`UserTaskStatus`).
+ If any sub-migration fails (for example, due to invalid OLX or missing assets),
+ the bulk migration **marks the entire task as failed** — there is no partial success.
+
+ Args:
+ self (_BulkMigrationTask):
+ The Celery task instance that wraps the user task logic.
+ user_id (int):
+ The ID of the user initiating the migration.
+ sources_pks (list[int]):
+ Primary keys of the legacy modulestore sources to migrate.
+ target_library_key (str):
+ Key of the V2 library that will receive the imported content.
+ target_collection_pks (list[int | None]):
+ Optional list of target collection IDs corresponding to each source.
+ create_collections (bool):
+ Whether to automatically create new collections when none exist.
+ repeat_handling_strategy (str):
+ Strategy to handle repeated imports of the same content.
+ preserve_url_slugs (bool):
+ Whether to preserve existing XBlock URL slugs during import.
+ composition_level (str):
+ Composition level at which content should be imported (e.g. course, section).
+ forward_source_to_target (bool | None)
+ Whether to forward legacy content to its migrated equivalent after import.
+ If unspecified (None), then forward legacy content for a source if and only
+ if it's that source's first migration.
+
+ See Also:
+ - `migrate_from_modulestore`: Single-source migration equivalent.
+ - API docs: `/api/cms/v1/migrations/bulk/` for REST behavior and responses.
+ """
+ # pylint: disable=too-many-statements
+ # This is a large function, but breaking it up futher would probably not
+ # make it any easier to understand.
+
+ set_code_owner_attribute_from_module(__name__)
+ status: UserTaskStatus = self.status
+
+ # Validating input
+ status.set_state(MigrationStep.VALIDATING_INPUT.value)
+ target_collection_list: list[Collection | None] = []
+
+ try:
+ target_library_locator = LibraryLocatorV2.from_string(target_library_key)
+ target_library = get_library(target_library_locator)
+ if target_library.learning_package_id is None:
+ raise ValueError("Target library has no associated learning package.")
+
+ target_package = LearningPackage.objects.get(pk=target_library.learning_package_id)
+
+ if target_collection_pks:
+ for target_collection_pk in target_collection_pks:
+ target_collection_list.append(
+ Collection.objects.get(pk=target_collection_pk) if target_collection_pk else None
+ )
+ except (ObjectDoesNotExist, InvalidKeyError, ValueError) as exc:
+ status.fail(str(exc))
+ return
+
+ source_data_list: list[_MigrationSourceData] = []
+
+ for i in range(len(sources_pks)):
+ source_data = _validate_input(
+ status,
+ sources_pks[i],
+ repeat_handling_strategy,
+ preserve_url_slugs,
+ composition_level,
+ target_library_locator,
+ target_package,
+ target_collection_list[i] if target_collection_list else None,
)
- if block_target_pks:
- authoring_api.add_to_collection(
- learning_package_id=target_package_pk,
- key=target_collection.key,
- entities_qset=PublishableEntity.objects.filter(id__in=block_target_pks),
- created_by=user_id,
- )
- else:
- log.warning("No target entities found to add to collection")
+ if source_data is None:
+ # Fail
+ return
+ source_data_list.append(source_data)
+
status.increment_completed_steps()
+ try: # pylint: disable=too-many-nested-blocks
+ # Cancelling old tasks
+ status.set_state(MigrationStep.CANCELLING_OLD.value)
+ _cancel_old_tasks(
+ [x.source for x in source_data_list],
+ status,
+ target_package,
+ [migration.id for migration in [x.migration for x in source_data_list]],
+ )
+ status.increment_completed_steps()
+
+ # Loading legacy blocks
+ status.set_state(MigrationStep.LOADING)
+ legacy_root_list: list[XBlock] = []
+ for source_data in source_data_list:
+ legacy_root = _load_xblock(status, source_data.source_root_usage_key)
+ if legacy_root is None:
+ # Fail
+ _set_migrations_to_fail(source_data_list)
+ return
+ legacy_root_list.append(legacy_root)
+ status.increment_completed_steps()
+
+ for i, source_pk in enumerate(sources_pks):
+ source_data = source_data_list[i]
+ try:
+ with transaction.atomic():
+ # Start migration for `source_pk`
+ # Staging legacy blocks
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): {MigrationStep.STAGING.value}"
+ )
+ staged_content = staging_api.stage_xblock_temporarily(
+ block=legacy_root_list[i],
+ user_id=status.user.pk,
+ purpose=CONTENT_STAGING_PURPOSE_TEMPLATE.format(source_key=source_pk),
+ )
+ source_data.migration.staged_content = staged_content
+ status.increment_completed_steps()
+
+ # Parsing OLX
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): {MigrationStep.PARSING.value}"
+ )
+ parser = etree.XMLParser(strip_cdata=False)
+ root_node = etree.fromstring(staged_content.olx, parser=parser)
+ status.increment_completed_steps()
+
+ # Importing assets
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): "
+ f"{MigrationStep.IMPORTING_ASSETS.value}"
+ )
+ content_by_filename = _import_assets(source_data.migration)
+ status.increment_completed_steps()
+
+ # Importing structure of the legacy block
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): "
+ f"{MigrationStep.IMPORTING_STRUCTURE.value}"
+ )
+ change_log, root_migrated_node = _import_structure(
+ source_data=source_data,
+ target_library=target_library,
+ content_by_filename=content_by_filename,
+ root_node=root_node,
+ status=status,
+ )
+ source_data.migration.change_log = change_log
+ source_data.migration.save() # @@TODO keep or nah?
+ status.increment_completed_steps()
+
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): {MigrationStep.UNSTAGING.value}"
+ )
+ staged_content.delete()
+ status.increment_completed_steps()
+
+ _create_migration_artifacts_incrementally(
+ root_migrated_node=root_migrated_node,
+ source=source_data.source,
+ migration=source_data.migration,
+ status=status,
+ source_pk=source_pk,
+ )
+ status.increment_completed_steps()
+ except Exception as _exc: # pylint: disable=broad-exception-caught
+ log.exception("Failed: {source_data.migration}")
+ # Mark this library as failed, migration of other libraries can continue
+ # If this case occurs and the migration ends without any further issues,
+ # the bulk migration status is success,
+ # TODO: add an intermediate status such as 'partially satisfactory'
+ source_data.migration.is_failed = True
+
+ # Forwarding legacy content to migrated content
+ status.set_state(MigrationStep.FORWARDING.value)
+ for source_data in source_data_list:
+ if forward_source_to_target is False:
+ continue # Explicitly requested not to forward.
+ if forward_source_to_target is None and source_data.source.forwarded:
+ # Unspecified whether or not to forward.
+ # So, forward iff there was no previous existing successful migration with forwarding.
+ continue
+ if source_data.migration.is_failed:
+ # Don't forward failed migrations.
+ continue
+ _forward_content(source_data)
+ status.increment_completed_steps()
+
+ # Populating collections
+ status.set_state(MigrationStep.POPULATING_COLLECTION.value)
+ for i, source_data in enumerate(source_data_list):
+ migration = source_data.migration
+ if migration.is_failed:
+ continue
+ if migration.target_collection is None and not create_collections:
+ continue
+ if migration.target_collection is None:
+ existing_collection_to_use: Collection | None = None
+ # For Fork strategy: Create an new collection every time.
+ # For Update and Skip strategies: Update an existing collection if possible.
+ if migration.repeat_handling_strategy != RepeatHandlingStrategy.Fork.value:
+ if source_data.previous_migration:
+ if previous_collection_slug := source_data.previous_migration.target_collection_slug:
+ try:
+ existing_collection_to_use = authoring_api.get_collection(
+ target_package.id, previous_collection_slug
+ )
+ except Collection.DoesNotExist:
+ # Collection no longer exists.
+ pass
+ migration.target_collection = (
+ existing_collection_to_use or
+ _create_collection(library_key=target_library_locator, title=legacy_root_list[i].display_name)
+ )
+ _populate_collection(user_id, migration)
+ models.ModulestoreMigration.objects.bulk_update(
+ [x.migration for x in source_data_list],
+ ["target_collection", "is_failed"],
+ )
+ status.increment_completed_steps()
+ except Exception as exc: # pylint: disable=broad-exception-caught
+ # If there is an exception in this block, all migrations fail.
+ log.exception("Modulestore migrations failed")
+ status.fail(str(exc))
+
+
+SourceToTarget = tuple[UsageKey, PublishableEntityVersion | None, str | None]
+
@dataclass(frozen=True)
class _MigratedNode:
@@ -388,10 +720,10 @@ class _MigratedNode:
This happens, particularly, if the node is above the requested composition level
but has descendents which are at or below that level.
"""
- source_to_target: tuple[UsageKey, PublishableEntityVersion] | None
+ source_to_target: SourceToTarget | None
children: list[_MigratedNode]
- def all_source_to_target_pairs(self) -> t.Iterable[tuple[UsageKey, PublishableEntityVersion]]:
+ def all_source_to_target_pairs(self) -> t.Iterable[SourceToTarget]:
"""
Get all source_key->target_ver pairs via a pre-order traversal.
"""
@@ -449,13 +781,13 @@ def _migrate_node(
)
for source_node_child in source_node.getchildren()
]
- source_to_target: tuple[UsageKey, PublishableEntityVersion] | None = None
+ source_to_target: SourceToTarget | None = None
if should_migrate_node:
source_olx = etree.tostring(source_node).decode('utf-8')
if source_block_id := source_node.get('url_name'):
source_key: UsageKey = context.source_context_key.make_usage_key(source_node.tag, source_block_id)
title = source_node.get('display_name', source_block_id)
- target_entity_version = (
+ target_entity_version, reason = (
_migrate_container(
context=context,
source_key=source_key,
@@ -464,7 +796,7 @@ def _migrate_node(
children=[
migrated_child.source_to_target[1]
for migrated_child in migrated_children if
- migrated_child.source_to_target
+ migrated_child.source_to_target and migrated_child.source_to_target[1]
],
)
if container_type else
@@ -475,9 +807,18 @@ def _migrate_node(
title=title,
)
)
- if target_entity_version:
- source_to_target = (source_key, target_entity_version)
- context.add_migration(source_key, target_entity_version.entity)
+ if container_type is None and target_entity_version is None and reason is not None:
+ # Currently, components with children are not supported
+ children_length = len(source_node.getchildren())
+ if children_length:
+ reason += (
+ ngettext(
+ ' It has {count} children block.',
+ ' It has {count} children blocks.',
+ children_length,
+ )
+ ).format(count=children_length)
+ source_to_target = (source_key, target_entity_version, reason)
else:
log.warning(
f"Cannot migrate node from {context.source_context_key} to {context.target_library_key} "
@@ -493,12 +834,14 @@ def _migrate_container(
container_type: ContainerType,
title: str,
children: list[PublishableEntityVersion],
-) -> PublishableEntityVersion:
+) -> tuple[PublishableEntityVersion, str | None]:
"""
Create, update, or replace a container in a library based on a source key and children.
(We assume that the destination is a library rather than some other future kind of learning
- package, but let's keep than an internal assumption.)
+ package, but let's keep than an internal assumption.)
+ For now this returns None value for unsupported_reason as second value of tuple as we
+ don't have any concrete condition where a container cannot be imported/migrated.
"""
target_key = _get_distinct_target_container_key(
context,
@@ -530,8 +873,9 @@ def _migrate_container(
return PublishableEntityVersion.objects.get(
entity_id=container.container_pk,
version_num=container.draft_version_num,
- )
- return authoring_api.create_next_container_version(
+ ), None
+
+ container_publishable_entity_version = authoring_api.create_next_container_version(
container.container_pk,
title=title,
entity_rows=[
@@ -543,6 +887,18 @@ def _migrate_container(
container_version_cls=container_type.container_model_classes[1],
).publishable_entity_version
+ # Publish the container
+ # Call post publish events synchronously to avoid
+ # an error when calling `wait_for_post_publish_events`
+ # inside a celery task.
+ libraries_api.publish_container_changes(
+ container.container_key,
+ context.created_by,
+ call_post_publish_events_sync=True,
+ )
+ context.used_container_slugs.add(container.container_key.container_id)
+ return container_publishable_entity_version, None
+
def _migrate_component(
*,
@@ -550,7 +906,7 @@ def _migrate_component(
source_key: UsageKey,
olx: str,
title: str,
-) -> PublishableEntityVersion | None:
+) -> tuple[PublishableEntityVersion | None, str | None]:
"""
Create, update, or replace a component in a library based on a source key and OLX.
@@ -583,7 +939,10 @@ def _migrate_component(
)
except libraries_api.IncompatibleTypesError as e:
log.error(f"Error validating block for library {context.target_library_key}: {e}")
- return None
+ return None, str(e)
+ except PluginMissingError as e:
+ log.error(f"Block type not supported in {context.target_library_key}: {e}")
+ return None, f"Invalid block type: {e}"
component = authoring_api.create_component(
context.target_package_id,
component_type=component_type,
@@ -594,7 +953,7 @@ def _migrate_component(
# Component existed and we do not replace it and it is not deleted previously
if component_existed and not component_deleted and context.should_skip_strategy:
- return component.versioning.draft.publishable_entity_version
+ return component.versioning.draft.publishable_entity_version, None
# If component existed and was deleted or we have to replace the current version
# Create the new component version for it
@@ -607,7 +966,14 @@ def _migrate_component(
authoring_api.create_component_version_content(
component_version.pk, content_pk, key=new_path
)
- return component_version.publishable_entity_version
+
+ # Publish the component
+ libraries_api.publish_component_changes(target_key, context.created_by)
+ context.used_component_keys.add(target_key)
+ return component_version.publishable_entity_version, None
+
+
+_MAX_UNIQUE_SLUG_ATTEMPTS = 1000
def _get_distinct_target_container_key(
@@ -617,39 +983,36 @@ def _get_distinct_target_container_key(
title: str,
) -> LibraryContainerLocator:
"""
- Find a unique key for block_id by appending a unique identifier if necessary.
-
- Args:
- context (_MigrationContext): The migration context.
- source_key (UsageKey): The source key.
- container_type (ContainerType): The container type.
- title (str): The title.
-
- Returns:
- LibraryContainerLocator: The target container key.
+ Figure out the appropriate target container for this structural block.
"""
- # Check if we already processed this block and we are not forking. If we are forking, we will
- # want a new target key.
- if context.is_already_migrated(source_key) and not context.should_fork_strategy:
- existing_version = context.get_existing_target(source_key)
-
- return LibraryContainerLocator(
- context.target_library_key,
- container_type.value,
- existing_version.key
- )
+ # If we're not forking, then check if this block was part of our past migration.
+ # (If we are forking, we will always want a new target key).
+ if not context.should_fork_strategy:
+ if previous_block_migration := context.previous_block_migrations.get(source_key):
+ if isinstance(previous_block_migration, data.ModulestoreBlockMigrationSuccess):
+ if isinstance(previous_block_migration.target_key, LibraryContainerLocator):
+ return previous_block_migration.target_key
# Generate new unique block ID
base_slug = (
source_key.block_id
if context.preserve_url_slugs
else (slugify(title) or source_key.block_id)
)
- unique_slug = _find_unique_slug(context, base_slug)
-
- return LibraryContainerLocator(
- context.target_library_key,
- container_type.value,
- unique_slug
+ # Use base base slug if available
+ if base_slug not in context.used_container_slugs:
+ return LibraryContainerLocator(
+ context.target_library_key, container_type.value, base_slug
+ )
+ # Try numbered variations until we find one that doesn't exist
+ for i in range(1, _MAX_UNIQUE_SLUG_ATTEMPTS + 1):
+ candidate_slug = f"{base_slug}_{i}"
+ if candidate_slug not in context.used_container_slugs:
+ return LibraryContainerLocator(
+ context.target_library_key, container_type.value, candidate_slug
+ )
+ # It would be extremely unlikely for us to run out of attempts
+ raise RuntimeError(
+ f"Unable to find unique slug after {_MAX_UNIQUE_SLUG_ATTEMPTS} attempts for base: {base_slug}"
)
@@ -660,98 +1023,45 @@ def _get_distinct_target_usage_key(
title: str,
) -> LibraryUsageLocatorV2:
"""
- Find a unique key for block_id by appending a unique identifier if necessary.
-
- Args:
- context: The migration context
- source_key: The original usage key from the source
- component_type: The component type string
- olx: The OLX content of the component
-
- Returns:
- A unique LibraryUsageLocatorV2 for the target
-
- Raises:
- ValueError: If source_key is invalid
- """
- # Check if we already processed this block and we are not forking. If we are forking, we will
- # want a new target key.
- if context.is_already_migrated(source_key) and not context.should_fork_strategy:
- log.debug(f"Block {source_key} already exists, reusing first existing target")
- existing_target = context.get_existing_target(source_key)
- block_id = existing_target.component.local_key
-
- # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
- return LibraryUsageLocatorV2( # type: ignore[abstract]
- context.target_library_key,
- source_key.block_type,
- block_id
- )
-
+ Figure out the appropriate target component for this block.
+ """
+ # If we're not forking, then check if this block was part of our past migration.
+ # (If we are forking, we will always want a new target key).
+ if not context.should_fork_strategy:
+ if previous_block_migration := context.previous_block_migrations.get(source_key):
+ if isinstance(previous_block_migration, data.ModulestoreBlockMigrationSuccess):
+ if isinstance(previous_block_migration.target_key, LibraryUsageLocatorV2):
+ return previous_block_migration.target_key
# Generate new unique block ID
base_slug = (
source_key.block_id
if context.preserve_url_slugs
else (slugify(title) or source_key.block_id)
)
- unique_slug = _find_unique_slug(context, base_slug, component_type)
-
- # mypy thinks LibraryUsageLocatorV2 is abstract. It's not.
- return LibraryUsageLocatorV2( # type: ignore[abstract]
- context.target_library_key,
- source_key.block_type,
- unique_slug
+ # Use base base slug if available
+ base_key = LibraryUsageLocatorV2( # type: ignore[abstract]
+ context.target_library_key, component_type.name, base_slug
)
-
-
-def _find_unique_slug(
- context: _MigrationContext,
- base_slug: str,
- component_type: ComponentType | None = None,
- max_attempts: int = 1000
-) -> str:
- """
- Find a unique slug by appending incrementing numbers if necessary.
- Using batch querying to avoid multiple database roundtrips.
-
- Args:
- component_type: The component type to check against
- base_slug: The base slug to make unique
- max_attempts: Maximum number of attempts to prevent infinite loops
-
- Returns:
- A unique slug string
-
- Raises:
- RuntimeError: If unable to find unique slug within max_attempts
- """
- if not component_type:
- base_key = base_slug
- else:
- base_key = f"{component_type}:{base_slug}"
-
- existing_publishable_entity_keys = context.get_existing_target_entity_keys(base_key)
-
- # Check if base slug is available
- if base_key not in existing_publishable_entity_keys:
- return base_slug
-
+ if base_key not in context.used_component_keys:
+ return base_key
# Try numbered variations until we find one that doesn't exist
- for i in range(1, max_attempts + 1):
+ for i in range(1, _MAX_UNIQUE_SLUG_ATTEMPTS + 1):
candidate_slug = f"{base_slug}_{i}"
- candidate_key = f"{component_type}:{candidate_slug}" if component_type else candidate_slug
-
- if candidate_key not in existing_publishable_entity_keys:
- return candidate_slug
-
- raise RuntimeError(f"Unable to find unique slug after {max_attempts} attempts for base: {base_slug}")
+ candidate_key = LibraryUsageLocatorV2( # type: ignore[abstract]
+ context.target_library_key, component_type.name, candidate_slug
+ )
+ if candidate_key not in context.used_component_keys:
+ return candidate_key
+ # It would be extremely unlikely for us to run out of attempts
+ raise RuntimeError(f"Unable to find unique slug after {_MAX_UNIQUE_SLUG_ATTEMPTS} attempts for base: {base_slug}")
def _create_migration_artifacts_incrementally(
root_migrated_node: _MigratedNode,
- source: ModulestoreSource,
- migration: ModulestoreMigration,
- status: UserTaskStatus
+ source: models.ModulestoreSource,
+ migration: models.ModulestoreMigration,
+ status: UserTaskStatus,
+ source_pk: int | None = None,
) -> None:
"""
Create ModulestoreBlockSource and ModulestoreBlockMigration objects incrementally.
@@ -760,20 +1070,43 @@ def _create_migration_artifacts_incrementally(
total_nodes = len(nodes)
processed = 0
- for source_usage_key, target_version in root_migrated_node.all_source_to_target_pairs():
- block_source, _ = ModulestoreBlockSource.objects.get_or_create(
+ # Load a mapping from each modified entity's primary key
+ # to the primary key of the changelog record that captures its modification.
+ # This will not include any blocks whose migration failed to create a target entity.
+ entity_pks_to_change_log_record_pks: dict[int, int] = dict(
+ migration.change_log.records.values_list("entity_id", "id")
+ ) if migration.change_log else {}
+
+ for source_usage_key, target_version, unsupported_reason in root_migrated_node.all_source_to_target_pairs():
+ block_source, _ = models.ModulestoreBlockSource.objects.get_or_create(
overall_source=source,
key=source_usage_key
)
-
- ModulestoreBlockMigration.objects.create(
- overall_migration=migration,
- source=block_source,
- target_id=target_version.entity_id,
- )
+ # target_entity_pk should be None iff the block migration failed
+ target_entity_pk: int | None = target_version.entity_id if target_version else None
+
+ change_log_record_pk = entity_pks_to_change_log_record_pks.get(target_entity_pk) if target_entity_pk else None
+ # Only create a migration artifact for this source block if:
+ # (a) we have a record of a change occuring, or
+ # (b) it failed.
+ # If neither a nor b are true, then this source block was skipped.
+ if change_log_record_pk or unsupported_reason:
+ models.ModulestoreBlockMigration.objects.create(
+ overall_migration=migration,
+ source=block_source,
+ target_id=target_entity_pk,
+ change_log_record_id=change_log_record_pk,
+ unsupported_reason=unsupported_reason,
+ )
processed += 1
if processed % 10 == 0 or processed == total_nodes:
- status.set_state(
- f"{MigrationStep.MAPPING_OLD_TO_NEW.value} ({processed}/{total_nodes})"
- )
+ if source_pk:
+ status.set_state(
+ f"{MigrationStep.STAGING.BULK_MIGRATION_PREFIX} ({source_pk}): "
+ f"{MigrationStep.MAPPING_OLD_TO_NEW.value} ({processed}/{total_nodes})"
+ )
+ else:
+ status.set_state(
+ f"{MigrationStep.MAPPING_OLD_TO_NEW.value} ({processed}/{total_nodes})"
+ )
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_api.py b/cms/djangoapps/modulestore_migrator/tests/test_api.py
index 13e7e7685d9c..c9e2fc3b587b 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_api.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_api.py
@@ -3,11 +3,10 @@
"""
import pytest
-from opaque_keys.edx.locator import LibraryLocatorV2
+from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
from openedx_learning.api import authoring as authoring_api
from organizations.tests.factories import OrganizationFactory
-from cms.djangoapps.contentstore.tests.test_libraries import LibraryTestCase
from cms.djangoapps.modulestore_migrator import api
from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
from cms.djangoapps.modulestore_migrator.models import ModulestoreMigration
@@ -15,29 +14,50 @@
from common.djangoapps.student.tests.factories import UserFactory
from openedx.core.djangoapps.content_libraries import api as lib_api
+from xmodule.modulestore.tests.utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import BlockFactory, LibraryFactory
@pytest.mark.django_db
-class TestModulestoreMigratorAPI(LibraryTestCase):
+class TestModulestoreMigratorAPI(ModuleStoreTestCase):
"""
Test cases for the modulestore migrator API.
"""
def setUp(self):
super().setUp()
-
- self.organization = OrganizationFactory()
- self.lib_key_v2 = LibraryLocatorV2.from_string(
- f"lib:{self.organization.short_name}:test-key"
- )
- lib_api.create_library(
- org=self.organization,
- slug=self.lib_key_v2.slug,
- title="Test Library",
- )
- self.library_v2 = lib_api.ContentLibrary.objects.get(slug=self.lib_key_v2.slug)
- self.learning_package = self.library_v2.learning_package
+ self.user = UserFactory(password=self.user_password, is_staff=True)
+ self.organization = OrganizationFactory(name="My Org", short_name="myorg")
+ self.lib_key_v1 = LibraryLocator.from_string("library-v1:myorg+old")
+ LibraryFactory.create(org="myorg", library="old", display_name="Old Library", modulestore=self.store)
+ self.lib_key_v2_1 = LibraryLocatorV2.from_string("lib:myorg:1")
+ self.lib_key_v2_2 = LibraryLocatorV2.from_string("lib:myorg:2")
+ lib_api.create_library(org=self.organization, slug="1", title="Test Library 1")
+ lib_api.create_library(org=self.organization, slug="2", title="Test Library 2")
+ self.library_v2_1 = lib_api.ContentLibrary.objects.get(slug="1")
+ self.library_v2_2 = lib_api.ContentLibrary.objects.get(slug="2")
+ self.learning_package = self.library_v2_1.learning_package
+ self.learning_package_2 = self.library_v2_2.learning_package
+ self.source_unit_keys = [
+ BlockFactory.create(
+ display_name=f"Unit {c}",
+ category="vertical",
+ location=self.lib_key_v1.make_usage_key("vertical", c),
+ parent_location=self.lib_key_v1.make_usage_key("library", "library"),
+ user_id=self.user.id, publish_item=False,
+ ).usage_key for c in ["X", "Y", "Z"]
+ ]
+ self.source_html_keys = [
+ BlockFactory.create(
+ display_name=f"HTML {c}",
+ category="html",
+ location=self.lib_key_v1.make_usage_key("html", c),
+ parent_location=self.lib_key_v1.make_usage_key("vertical", c),
+ user_id=self.user.id, publish_item=False,
+ ).usage_key for c in ["X", "Y", "Z"]
+ ]
+ # We load this last so that it has an updated list of children.
+ self.lib_v1 = self.store.get_library(self.lib_key_v1)
def test_start_migration_to_library(self):
"""
@@ -49,10 +69,10 @@ def test_start_migration_to_library(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
+ target_library_key=self.library_v2_1.library_key,
target_collection_slug=None,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -67,6 +87,45 @@ def test_start_migration_to_library(self):
assert modulestoremigration.task_status is not None
assert modulestoremigration.task_status.user == user
+ def test_start_bulk_migration_to_library(self):
+ """
+ Test that the API can start a bulk migration to a library.
+ """
+ source = ModulestoreSourceFactory()
+ source_2 = ModulestoreSourceFactory()
+ user = UserFactory()
+
+ api.start_bulk_migration_to_library(
+ user=user,
+ source_key_list=[source.key, source_2.key],
+ target_library_key=self.library_v2_1.library_key,
+ target_collection_slug_list=None,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
+ preserve_url_slugs=True,
+ forward_source_to_target=False,
+ )
+
+ modulestoremigration = ModulestoreMigration.objects.get(source=source)
+ assert modulestoremigration.source.key == source.key
+ assert (
+ modulestoremigration.composition_level == CompositionLevel.Component.value
+ )
+ assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
+ assert modulestoremigration.preserve_url_slugs is True
+ assert modulestoremigration.task_status is not None
+ assert modulestoremigration.task_status.user == user
+
+ modulestoremigration_2 = ModulestoreMigration.objects.get(source=source_2)
+ assert modulestoremigration_2.source.key == source_2.key
+ assert (
+ modulestoremigration_2.composition_level == CompositionLevel.Component.value
+ )
+ assert modulestoremigration_2.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
+ assert modulestoremigration_2.preserve_url_slugs is True
+ assert modulestoremigration_2.task_status is not None
+ assert modulestoremigration_2.task_status.user == user
+
def test_start_migration_to_library_with_collection(self):
"""
Test that the API can start a migration to a library with a target collection.
@@ -86,10 +145,10 @@ def test_start_migration_to_library_with_collection(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
+ target_library_key=self.library_v2_1.library_key,
target_collection_slug=collection_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -115,9 +174,9 @@ def test_start_migration_to_library_with_strategy_skip(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -125,7 +184,7 @@ def test_start_migration_to_library_with_strategy_skip(self):
modulestoremigration = ModulestoreMigration.objects.get()
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
- migrated_components = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components) == 1
# Update the block, changing its name
@@ -136,9 +195,9 @@ def test_start_migration_to_library_with_strategy_skip(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -147,11 +206,11 @@ def test_start_migration_to_library_with_strategy_skip(self):
assert modulestoremigration is not None
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
- migrated_components_fork = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components_fork = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components_fork) == 1
component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[0]
+ self.library_v2_1.library_key, migrated_components_fork[0]
)
assert component.display_name == "Original Block"
@@ -173,9 +232,9 @@ def test_start_migration_to_library_with_strategy_update(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -183,7 +242,7 @@ def test_start_migration_to_library_with_strategy_update(self):
modulestoremigration = ModulestoreMigration.objects.get()
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
- migrated_components = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components) == 1
# Update the block, changing its name
@@ -194,9 +253,9 @@ def test_start_migration_to_library_with_strategy_update(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Update.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Update,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -205,11 +264,11 @@ def test_start_migration_to_library_with_strategy_update(self):
assert modulestoremigration is not None
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Update.value
- migrated_components_fork = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components_fork = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components_fork) == 1
component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[0]
+ self.library_v2_1.library_key, migrated_components_fork[0]
)
assert component.display_name == "Updated Block"
@@ -231,9 +290,9 @@ def test_start_migration_to_library_with_strategy_forking(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -241,7 +300,7 @@ def test_start_migration_to_library_with_strategy_forking(self):
modulestoremigration = ModulestoreMigration.objects.get()
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Skip.value
- migrated_components = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components) == 1
# Update the block, changing its name
@@ -252,9 +311,9 @@ def test_start_migration_to_library_with_strategy_forking(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Fork.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Fork,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -263,16 +322,16 @@ def test_start_migration_to_library_with_strategy_forking(self):
assert modulestoremigration is not None
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Fork.value
- migrated_components_fork = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components_fork = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components_fork) == 2
first_component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[0]
+ self.library_v2_1.library_key, migrated_components_fork[0]
)
assert first_component.display_name == "Original Block"
second_component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[1]
+ self.library_v2_1.library_key, migrated_components_fork[1]
)
assert second_component.display_name == "Updated Block"
@@ -284,9 +343,9 @@ def test_start_migration_to_library_with_strategy_forking(self):
api.start_migration_to_library(
user=user,
source_key=source.key,
- target_library_key=self.library_v2.library_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Fork.value,
+ target_library_key=self.library_v2_1.library_key,
+ composition_level=CompositionLevel.Component,
+ repeat_handling_strategy=RepeatHandlingStrategy.Fork,
preserve_url_slugs=True,
forward_source_to_target=False,
)
@@ -295,53 +354,215 @@ def test_start_migration_to_library_with_strategy_forking(self):
assert modulestoremigration is not None
assert modulestoremigration.repeat_handling_strategy == RepeatHandlingStrategy.Fork.value
- migrated_components_fork = lib_api.get_library_components(self.library_v2.library_key)
+ migrated_components_fork = lib_api.get_library_components(self.library_v2_1.library_key)
assert len(migrated_components_fork) == 3
first_component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[0]
+ self.library_v2_1.library_key, migrated_components_fork[0]
)
assert first_component.display_name == "Original Block"
second_component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[1]
+ self.library_v2_1.library_key, migrated_components_fork[1]
)
assert second_component.display_name == "Updated Block"
third_component = lib_api.LibraryXBlockMetadata.from_component(
- self.library_v2.library_key, migrated_components_fork[2]
+ self.library_v2_1.library_key, migrated_components_fork[2]
)
assert third_component.display_name == "Updated Block Again"
- def test_get_migration_info(self):
+ def test_migration_api_for_various_scenarios(self):
"""
- Test that the API can retrieve migration info.
+ Test that get_migrations, get_block_migrations, forward_context, and forward_block
+ behave as expected throughout a convoluted series of intertwined migrations.
+
+ Also, ensure that each of the aforementioned api functions only performs 1 query each.
"""
+ # pylint: disable=too-many-statements
user = UserFactory()
- collection_key = "test-collection"
+ all_source_usage_keys = {*self.source_html_keys, *self.source_unit_keys}
+ all_source_usage_key_strs = {str(sk) for sk in all_source_usage_keys}
+
+ # In this test, we will be migrating self.lib_v1 a total of 6 times.
+ # We will migrate it to each collection (A, B, and C) twice.
+
+ # Lib 1 has Collection A and Collection B
+ # Lib 2 has Collection C
authoring_api.create_collection(
learning_package_id=self.learning_package.id,
- key=collection_key,
- title="Test Collection",
+ key="test-collection-1a",
+ title="Test Collection A in Lib 1",
+ created_by=user.id,
+ )
+ authoring_api.create_collection(
+ learning_package_id=self.learning_package.id,
+ key="test-collection-1b",
+ title="Test Collection B in Lib 1",
+ created_by=user.id,
+ )
+ authoring_api.create_collection(
+ learning_package_id=self.learning_package_2.id,
+ key="test-collection-2c",
+ title="Test Collection C in Lib 2",
created_by=user.id,
)
+ # No migrations have happened.
+ # Everything should return None / empty.
+ assert not list(api.get_migrations(self.lib_key_v1))
+ assert not api.get_forwarding(source_key=self.lib_key_v1)
+ assert not api.get_forwarding_for_blocks(all_source_usage_keys)
+
+ # FOUR MIGRATIONS!
+ # * Migrate to Lib1.CollA
+ # * Migrate to Lib1.CollB using FORK strategy
+ # * Migrate to Lib1.CollA using UPDATE strategy
+ # * Migrate to Lib2.CollC
+ # Note: None of these are forwarding migrations!
api.start_migration_to_library(
user=user,
- source_key=self.lib_key,
- target_library_key=self.library_v2.library_key,
- target_collection_slug=collection_key,
- composition_level=CompositionLevel.Component.value,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip.value,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_1,
+ target_collection_slug="test-collection-1a",
+ composition_level=CompositionLevel.Unit,
+ # repeat_handling_strategy here is arbitrary, as there will be no repeats.
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
+ preserve_url_slugs=True,
+ forward_source_to_target=False,
+ )
+ api.start_migration_to_library(
+ user=user,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_1,
+ target_collection_slug="test-collection-1b",
+ composition_level=CompositionLevel.Unit,
+ # this will create a 2nd copy of every block
+ repeat_handling_strategy=RepeatHandlingStrategy.Fork,
+ preserve_url_slugs=True,
+ forward_source_to_target=False,
+ )
+ api.start_migration_to_library(
+ user=user,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_1,
+ target_collection_slug="test-collection-1a",
+ composition_level=CompositionLevel.Unit,
+ # this will update the 2nd copies, but put them in the same collection as the first copies
+ repeat_handling_strategy=RepeatHandlingStrategy.Update,
+ preserve_url_slugs=True,
+ forward_source_to_target=False,
+ )
+ api.start_migration_to_library(
+ user=user,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_2,
+ target_collection_slug="test-collection-2c",
+ composition_level=CompositionLevel.Unit,
+ # repeat_handling_strategy here is arbitrary, as there will be no repeats.
+ repeat_handling_strategy=RepeatHandlingStrategy.Skip,
+ preserve_url_slugs=True,
+ forward_source_to_target=False,
+ )
+ # get_migrations returns in reverse chronological order
+ with self.assertNumQueries(1):
+ migration_2c_i, migration_1a_ii, migration_1b_i, migration_1a_i = api.get_migrations(self.lib_key_v1)
+ assert not migration_1a_i.is_failed
+ assert not migration_1b_i.is_failed
+ assert not migration_1a_ii.is_failed
+ assert not migration_2c_i.is_failed
+ # Confirm that the metadata came back correctly.
+ assert migration_1a_i.target_key == self.lib_key_v2_1
+ assert migration_1a_i.target_title == "Test Library 1"
+ assert migration_1a_i.target_collection_slug == "test-collection-1a"
+ assert migration_1a_i.target_collection_title == "Test Collection A in Lib 1"
+ assert migration_2c_i.target_key == self.lib_key_v2_2
+ assert migration_2c_i.target_title == "Test Library 2"
+ assert migration_2c_i.target_collection_slug == "test-collection-2c"
+ assert migration_2c_i.target_collection_title == "Test Collection C in Lib 2"
+ # Call get_migration_blocks on each of the four migrations. Convert the mapping
+ # from UsageKey->BlockMigrationResult into str->str just so we can assert things more easily.
+ with self.assertNumQueries(1):
+ mappings_1a_i = {
+ str(sk): str(bm.target_key) for sk, bm in api.get_migration_blocks(migration_1a_i.pk).items()
+ }
+ mappings_1b_i = {
+ str(sk): str(bm.target_key) for sk, bm in api.get_migration_blocks(migration_1b_i.pk).items()
+ }
+ mappings_1a_ii = {
+ str(sk): str(bm.target_key) for sk, bm in api.get_migration_blocks(migration_1a_ii.pk).items()
+ }
+ mappings_2c_i = {
+ str(sk): str(bm.target_key) for sk, bm in api.get_migration_blocks(migration_2c_i.pk).items()
+ }
+ # Each migration should have migrated every source block.
+ assert set(mappings_1a_i.keys()) == all_source_usage_key_strs
+ assert set(mappings_1b_i.keys()) == all_source_usage_key_strs
+ assert set(mappings_1a_ii.keys()) == all_source_usage_key_strs
+ assert set(mappings_2c_i.keys()) == all_source_usage_key_strs
+ # Because the migration to Lib1.CollB used FORK, we expect that there is nothing in
+ # common between it and the prior migration to Lib1.CollA.
+ assert not (set(mappings_1a_i.values()) & set(mappings_1b_i.values()))
+ # Because the second migration to Lib1.CollA used UPDATE, we expect that it
+ # will have all the same mappings as the prior migration to Lib1.CollB.
+ # This is a little countertuitive, since the migrations targeted different collections,
+ # but the rule that the migrator follows is "UPDATE uses the block from the most recent migration".
+ assert mappings_1b_i == mappings_1a_ii
+ # Since forward_source_to_target=False, we have had no authoritative migration yet.
+ assert api.get_forwarding(self.lib_key_v1) is None
+ assert not api.get_forwarding_for_blocks(all_source_usage_keys)
+
+ # ANOTHER MIGRATION!
+ # * Migrate to Lib2.CollC using UPDATE strategy
+ # Note: This *is* a forwarding migration
+ api.start_migration_to_library(
+ user=user,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_2,
+ target_collection_slug="test-collection-2c",
+ composition_level=CompositionLevel.Unit,
+ repeat_handling_strategy=RepeatHandlingStrategy.Update,
preserve_url_slugs=True,
forward_source_to_target=True,
)
+ migration_2c_ii, _2c_i, _1a_ii, _1b_i, migration_1a_i_reloaded = api.get_migrations(self.lib_key_v1)
+ assert migration_1a_i_reloaded.pk == migration_1a_i.pk
+ assert not migration_2c_ii.is_failed
+ # Our source lib should now forward to Lib2.
with self.assertNumQueries(1):
- result = api.get_migration_info([self.lib_key])
- row = result.get(self.lib_key)
- assert row is not None
- assert row.migrations__target__key == str(self.lib_key_v2)
- assert row.migrations__target__title == "Test Library"
- assert row.migrations__target_collection__key == collection_key
- assert row.migrations__target_collection__title == "Test Collection"
+ forwarded = api.get_forwarding(self.lib_key_v1)
+ assert forwarded.target_key == self.lib_key_v2_2
+ assert forwarded.target_collection_slug == "test-collection-2c"
+ assert forwarded.pk == migration_2c_ii.pk
+ # Our source lib's blocks should now forward to ones in Lib2.
+ with self.assertNumQueries(1):
+ forwarded_blocks = api.get_forwarding_for_blocks(all_source_usage_keys)
+ assert forwarded_blocks[self.source_html_keys[1]].target_key.context_key == self.lib_key_v2_2
+ assert forwarded_blocks[self.source_unit_keys[1]].target_key.context_key == self.lib_key_v2_2
+
+ # FINAL MIGRATION!
+ # * Migrate to Lib1.CollB using UPDATE strategy
+ # Note: This *is* a forwarding migration, and should supplant the previous
+ # migration for forwarding purposes.
+ api.start_migration_to_library(
+ user=user,
+ source_key=self.lib_key_v1,
+ target_library_key=self.lib_key_v2_1,
+ target_collection_slug="test-collection-1b",
+ composition_level=CompositionLevel.Unit,
+ repeat_handling_strategy=RepeatHandlingStrategy.Update,
+ preserve_url_slugs=True,
+ forward_source_to_target=True,
+ )
+ migration_1b_ii, _2c_ii, _2c_i, _1a_ii, _1b_i, _1a_i = api.get_migrations(self.lib_key_v1)
+ assert not migration_1b_ii.is_failed
+ # Our source lib should now forward to Lib1.
+ forwarded = api.get_forwarding(self.lib_key_v1)
+ assert forwarded.target_key == self.lib_key_v2_1
+ assert forwarded.target_collection_slug == "test-collection-1b"
+ assert forwarded.pk == migration_1b_ii.pk
+ # Our source lib should now forward to Lib1.
+ forwarded_blocks = api.get_forwarding_for_blocks(all_source_usage_keys)
+ assert forwarded_blocks[self.source_html_keys[1]].target_key.context_key == self.lib_key_v2_1
+ assert forwarded_blocks[self.source_unit_keys[1]].target_key.context_key == self.lib_key_v2_1
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_rest_api.py b/cms/djangoapps/modulestore_migrator/tests/test_rest_api.py
new file mode 100644
index 000000000000..4a7f842902db
--- /dev/null
+++ b/cms/djangoapps/modulestore_migrator/tests/test_rest_api.py
@@ -0,0 +1,822 @@
+"""
+Unit tests for the modulestore_migrator REST API v1 views.
+
+These tests focus on validation, HTTP status codes, and serialization/deserialization.
+Business logic is mocked out.
+"""
+from unittest.mock import MagicMock, patch
+from uuid import uuid4
+
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+from opaque_keys.edx.locator import CourseLocator
+from organizations.tests.factories import OrganizationFactory
+from rest_framework import status
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.test import APIRequestFactory, force_authenticate
+from user_tasks.models import UserTaskStatus
+
+from cms.djangoapps.modulestore_migrator.models import (
+ ModulestoreMigration as ModulestoreMigrationModel,
+ ModulestoreSource,
+)
+from cms.djangoapps.modulestore_migrator.rest_api.v1.views import (
+ BulkMigrationViewSet,
+ MigrationViewSet,
+)
+from openedx.core.djangoapps.content_libraries import api as lib_api
+
+
+User = get_user_model()
+
+
+class TestMigrationViewSetCreate(TestCase):
+ """
+ Test the MigrationViewSet.create() endpoint.
+
+ Focus: validation, return codes, serialization/deserialization.
+ """
+
+ def setUp(self):
+ """Set up test fixtures."""
+ self.factory = APIRequestFactory()
+ self.view = MigrationViewSet.as_view({'post': 'create'})
+
+ # Create test user
+ self.user = User.objects.create_user(
+ username='testuser',
+ email='testuser@test.com',
+ password='password'
+ )
+
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.migrator_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.lib_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.auth')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.UserTaskStatus')
+ def test_create_migration_success_with_minimal_data(
+ self, mock_user_task_status, mock_auth, mock_lib_api, mock_migrator_api
+ ):
+ """
+ Test successful migration creation with minimal required fields.
+
+ Validates:
+ - 201 status code is returned
+ - Response contains expected serialized fields
+ - Request data is properly deserialized
+ - Permission checks are performed for both source and target
+ """
+ mock_auth.has_studio_write_access.return_value = True
+ mock_lib_api.require_permission_for_library_key.return_value = None
+
+ mock_task = MagicMock(autospec=True)
+ mock_task.id = 'test-task-id'
+ mock_migrator_api.start_migration_to_library.return_value = mock_task
+
+ mock_task_status = MagicMock(autospec=True)
+ mock_task_status.uuid = uuid4()
+ mock_task_status.state = 'Pending'
+ mock_task_status.state_text = 'Pending'
+ mock_task_status.completed_steps = 0
+ mock_task_status.total_steps = 10
+ mock_task_status.attempts = 1
+ mock_task_status.created = '2025-01-01T00:00:00Z'
+ mock_task_status.modified = '2025-01-01T00:00:00Z'
+ mock_task_status.artifacts = []
+ mock_task_status.migrations.all.return_value = []
+
+ mock_user_task_status.objects.get.return_value = mock_task_status
+
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_201_CREATED
+
+ assert 'uuid' in response.data
+ assert 'state' in response.data
+ assert 'state_text' in response.data
+ assert 'completed_steps' in response.data
+ assert 'total_steps' in response.data
+ assert 'parameters' in response.data
+
+ mock_auth.has_studio_write_access.assert_called_once()
+ mock_lib_api.require_permission_for_library_key.assert_called_once()
+
+ mock_migrator_api.start_migration_to_library.assert_called_once()
+ call_kwargs = mock_migrator_api.start_migration_to_library.call_args[1]
+ assert call_kwargs['user'] == self.user
+ assert str(call_kwargs['source_key']) == 'course-v1:TestOrg+TestCourse+TestRun'
+ assert str(call_kwargs['target_library_key']) == 'lib:TestOrg:TestLibrary'
+
+ def test_create_migration_invalid_source_key(self):
+ """
+ Test that invalid source key returns 400 Bad Request.
+
+ Validates:
+ - 400 status code is returned
+ - Error message mentions validation failure
+ """
+ request_data = {
+ 'source': 'not-a-valid-key',
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'source' in response.data
+
+ def test_create_migration_invalid_target_key(self):
+ """
+ Test that invalid target library key returns 400 Bad Request.
+
+ Validates:
+ - 400 status code is returned
+ - Error message mentions target validation failure
+ """
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'not-a-valid-library-key',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'target' in response.data
+
+ def test_create_migration_missing_required_fields(self):
+ """
+ Test that missing required fields returns 400 Bad Request.
+
+ Validates:
+ - 400 status code is returned when source is missing
+ - 400 status code is returned when target is missing
+ """
+ request_data = {
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'source' in response.data
+
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'target' in response.data
+
+ def test_create_migration_unauthenticated_user(self):
+ """
+ Test that unauthenticated requests return 401 Unauthorized.
+
+ Validates:
+ - 401 status code for unauthenticated requests
+ """
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ # Note: No force_authenticate call
+
+ response = self.view(request)
+
+ assert response.status_code in [status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN]
+
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.auth')
+ def test_create_migration_without_source_author_access(self, mock_auth):
+ """
+ Test that users without author access to source cannot create migrations.
+
+ Validates:
+ - 403 Forbidden status code when user lacks author access to source
+ """
+ mock_auth.has_studio_write_access.return_value = False
+
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_403_FORBIDDEN
+
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.lib_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.auth')
+ def test_create_migration_without_target_write_access(self, mock_auth, mock_lib_api):
+ """
+ Test that users without write access to target cannot create migrations.
+
+ Validates:
+ - 403 Forbidden status code when user lacks write access to target library
+ """
+ mock_auth.has_studio_write_access.return_value = True
+ mock_lib_api.require_permission_for_library_key.side_effect = PermissionDenied(
+ "User lacks permission to manage content in this library"
+ )
+
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_403_FORBIDDEN
+
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.migrator_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.lib_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.auth')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.UserTaskStatus')
+ def test_create_migration_with_optional_fields(
+ self, mock_user_task_status, mock_auth, mock_lib_api, mock_migrator_api
+ ):
+ """
+ Test migration creation with all optional fields provided.
+
+ Validates:
+ - Optional fields are properly deserialized
+ - Default values are not used when explicit values provided
+ """
+ mock_auth.has_studio_write_access.return_value = True
+ mock_lib_api.require_permission_for_library_key.return_value = None
+
+ mock_task = MagicMock(autospec=True)
+ mock_task.id = 'test-task-id'
+ mock_migrator_api.start_migration_to_library.return_value = mock_task
+
+ mock_task_status = MagicMock(autospec=True)
+ mock_task_status.uuid = uuid4()
+ mock_task_status.state = 'Pending'
+ mock_task_status.state_text = 'Pending'
+ mock_task_status.completed_steps = 0
+ mock_task_status.total_steps = 10
+ mock_task_status.attempts = 1
+ mock_task_status.created = '2025-01-01T00:00:00Z'
+ mock_task_status.modified = '2025-01-01T00:00:00Z'
+ mock_task_status.artifacts = []
+ mock_task_status.migrations.all.return_value = []
+
+ mock_user_task_status.objects.get.return_value = mock_task_status
+
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ 'target_collection_slug': 'my-collection',
+ 'composition_level': 'unit',
+ 'repeat_handling_strategy': 'update',
+ 'preserve_url_slugs': False,
+ 'forward_source_to_target': True,
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_201_CREATED
+
+ mock_migrator_api.start_migration_to_library.assert_called_once()
+ call_kwargs = mock_migrator_api.start_migration_to_library.call_args[1]
+ assert call_kwargs['target_collection_slug'] == 'my-collection'
+ # CompositionLevel and RepeatHandlingStrategy are enums
+ assert call_kwargs['composition_level'].value == 'unit'
+ assert call_kwargs['repeat_handling_strategy'].value == 'update'
+ assert call_kwargs['preserve_url_slugs'] is False
+ assert call_kwargs['forward_source_to_target'] is True
+
+ def test_create_migration_invalid_composition_level(self):
+ """
+ Test that invalid composition_level returns 400 Bad Request.
+
+ Validates:
+ - 400 status code for invalid enum value
+ """
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ 'composition_level': 'invalid_level',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'composition_level' in response.data
+
+ def test_create_migration_invalid_repeat_handling_strategy(self):
+ """
+ Test that invalid repeat_handling_strategy returns 400 Bad Request.
+
+ Validates:
+ - 400 status code for invalid enum value
+ """
+ request_data = {
+ 'source': 'course-v1:TestOrg+TestCourse+TestRun',
+ 'target': 'lib:TestOrg:TestLibrary',
+ 'repeat_handling_strategy': 'invalid_strategy',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/migrations/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'repeat_handling_strategy' in response.data
+
+
+class TestMigrationViewSetList(TestCase):
+ """
+ Test the MigrationViewSet.list() endpoint.
+
+ Focus: validation, return codes, serialization/deserialization.
+ """
+
+ def setUp(self):
+ """Set up test fixtures."""
+ self.factory = APIRequestFactory()
+ self.view = MigrationViewSet.as_view({'get': 'list'})
+
+ self.user = User.objects.create_user(
+ username='testuser',
+ email='testuser@test.com',
+ password='password'
+ )
+ self.other_user = User.objects.create_user(
+ username='otheruser',
+ email='otheruser@test.com',
+ password='password'
+ )
+
+ def test_list_migrations_success(self):
+ """
+ Test successful listing of migrations for the authenticated user.
+
+ Validates:
+ - 200 status code is returned
+ - Response contains list of migrations
+ - Only user's own migrations are returned (other users' migrations filtered out)
+ """
+ org = OrganizationFactory(short_name="TestOrg", name="Test Org")
+ source_key = CourseLocator.from_string('course-v1:TestOrg+TestCourse+TestRun')
+ source = ModulestoreSource.objects.create(key=str(source_key))
+ target = lib_api.create_library(org=org, slug="TestLib", title="Test Target Lib")
+ user_task_status = UserTaskStatus.objects.create(
+ user=self.user,
+ task_id='user-task-id',
+ task_class='test.Task',
+ name='User Migration',
+ total_steps=10,
+ completed_steps=10,
+ )
+ other_task_status = UserTaskStatus.objects.create(
+ user=self.other_user,
+ task_id='other-task-id',
+ task_class='test.Task',
+ name='Other Migration',
+ total_steps=5,
+ completed_steps=5,
+ )
+ ModulestoreMigrationModel.objects.create(
+ task_status=user_task_status,
+ source=source,
+ target_id=target.learning_package_id,
+ )
+ ModulestoreMigrationModel.objects.create(
+ task_status=other_task_status,
+ source=source,
+ target_id=target.learning_package_id,
+ )
+
+ request = self.factory.get('/api/modulestore_migrator/v1/migrations/')
+ force_authenticate(request, user=self.user)
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_200_OK
+ results = response.data['results']
+ assert len(results) == 1
+ assert results[0]['uuid'] == str(user_task_status.uuid)
+
+ def test_list_migrations_unauthenticated(self):
+ """
+ Test that unauthenticated requests return 401 Unauthorized.
+
+ Validates:
+ - 401 status code for unauthenticated requests
+ """
+ request = self.factory.get('/api/modulestore_migrator/v1/migrations/')
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+class TestMigrationViewSetRetrieve(TestCase):
+ """
+ Test the MigrationViewSet.retrieve() endpoint.
+
+ Focus: validation, return codes, serialization/deserialization.
+ """
+
+ def setUp(self):
+ """Set up test fixtures."""
+ self.factory = APIRequestFactory()
+ self.view = MigrationViewSet.as_view({'get': 'retrieve'})
+
+ self.user = User.objects.create_user(
+ username='testuser',
+ email='testuser@test.com',
+ password='password'
+ )
+
+ def test_retrieve_migration_success(self):
+ """
+ Test successful retrieval of a specific migration by UUID.
+
+ Validates:
+ - 200 status code is returned
+ - Response contains migration details
+ """
+ org = OrganizationFactory(short_name="TestOrg", name="Test Org")
+ source_key = CourseLocator.from_string('course-v1:TestOrg+TestCourse+TestRun')
+ source = ModulestoreSource.objects.create(key=str(source_key))
+ target = lib_api.create_library(org=org, slug="TestLib", title="Test Target Lib")
+ user_task_status = UserTaskStatus.objects.create(
+ user=self.user,
+ task_id='user-task-id',
+ task_class='test.Task',
+ name='User Migration',
+ total_steps=10,
+ completed_steps=10,
+ )
+ ModulestoreMigrationModel.objects.create(
+ task_status=user_task_status,
+ source=source,
+ target_id=target.learning_package_id,
+ )
+
+ request = self.factory.get(f'/api/modulestore_migrator/v1/migrations/{user_task_status.uuid}/')
+ force_authenticate(request, user=self.user)
+ response = self.view(request, uuid=str(user_task_status.uuid))
+
+ assert response.status_code == status.HTTP_200_OK
+ assert response.data['uuid'] == str(user_task_status.uuid)
+ assert 'parameters' in response.data
+
+ def test_retrieve_migration_other_user(self):
+ """
+ Test that users cannot retrieve migrations created by other users.
+
+ Validates:
+ - 404 status code when attempting to retrieve another user's migration
+ - Users are isolated to their own migrations
+ """
+ other_user = User.objects.create_user(
+ username='otheruser',
+ email='other@test.com',
+ password='password'
+ )
+ org = OrganizationFactory(short_name="TestOrg", name="Test Org")
+ source_key = CourseLocator.from_string('course-v1:TestOrg+TestCourse+TestRun')
+ source = ModulestoreSource.objects.create(key=str(source_key))
+ target = lib_api.create_library(org=org, slug="TestLib", title="Test Target Lib")
+ other_task_status = UserTaskStatus.objects.create(
+ user=other_user,
+ task_id='other-task-id',
+ task_class='test.Task',
+ name='Other Migration',
+ total_steps=10,
+ completed_steps=10,
+ )
+ ModulestoreMigrationModel.objects.create(
+ task_status=other_task_status,
+ source=source,
+ target_id=target.learning_package_id,
+ )
+
+ request = self.factory.get(f'/api/modulestore_migrator/v1/migrations/{other_task_status.uuid}/')
+ force_authenticate(request, user=self.user)
+ response = self.view(request, uuid=str(other_task_status.uuid))
+
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+
+ def test_retrieve_migration_unauthenticated(self):
+ """
+ Test that unauthenticated requests return 401 Unauthorized.
+
+ Validates:
+ - 401 status code for unauthenticated requests
+ """
+ task_uuid = uuid4()
+ request = self.factory.get(f'/api/modulestore_migrator/v1/migrations/{task_uuid}/')
+
+ response = self.view(request, uuid=str(task_uuid))
+
+ assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+class TestMigrationViewSetCancel(TestCase):
+ """
+ Test the MigrationViewSet.cancel() endpoint.
+
+ Focus: validation, return codes, authorization.
+ """
+
+ def setUp(self):
+ """Set up test fixtures."""
+ self.factory = APIRequestFactory()
+ self.view = MigrationViewSet.as_view({'post': 'cancel'})
+
+ self.staff_user = User.objects.create_user(
+ username='staffuser',
+ email='staff@test.com',
+ password='password',
+ is_staff=True
+ )
+ self.regular_user = User.objects.create_user(
+ username='regularuser',
+ email='regular@test.com',
+ password='password',
+ is_staff=False
+ )
+
+ def test_cancel_migration_as_staff(self):
+ """
+ Test that staff users can cancel migrations.
+
+ Validates:
+ - Staff users can successfully cancel migrations
+ - UserTaskStatus.cancel is called
+ """
+ org = OrganizationFactory(short_name="TestOrg", name="Test Org")
+ source_key = CourseLocator.from_string('course-v1:TestOrg+TestCourse+TestRun')
+ source = ModulestoreSource.objects.create(key=str(source_key))
+ target = lib_api.create_library(org=org, slug="TestLib", title="Test Target Lib")
+ user_task_status = UserTaskStatus.objects.create(
+ user=self.staff_user,
+ task_id='staff-task-id',
+ task_class='test.Task',
+ name='Staff Migration',
+ total_steps=10,
+ completed_steps=5,
+ )
+ ModulestoreMigrationModel.objects.create(
+ task_status=user_task_status,
+ source=source,
+ target_id=target.learning_package_id,
+ )
+
+ with patch.object(UserTaskStatus, 'cancel') as mock_cancel:
+ request = self.factory.post(
+ f'/api/modulestore_migrator/v1/migrations/{user_task_status.uuid}/cancel/'
+ )
+ force_authenticate(request, user=self.staff_user)
+ response = self.view(request, uuid=str(user_task_status.uuid))
+
+ assert response.status_code == status.HTTP_200_OK
+ mock_cancel.assert_called_once()
+
+ def test_cancel_migration_not_found(self):
+ """
+ Test that attempting to cancel a non-existent migration returns 404.
+
+ Validates:
+ - 404 status code when migration UUID does not exist
+ """
+ nonexistent_uuid = uuid4()
+ request = self.factory.post(
+ f'/api/modulestore_migrator/v1/migrations/{nonexistent_uuid}/cancel/'
+ )
+ force_authenticate(request, user=self.staff_user)
+
+ response = self.view(request, uuid=str(nonexistent_uuid))
+
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+
+ def test_cancel_migration_as_non_staff(self):
+ """
+ Test that non-staff users cannot cancel migrations.
+
+ Validates:
+ - 403 Forbidden status code for non-staff users
+ """
+ task_uuid = uuid4()
+ request = self.factory.post(
+ f'/api/modulestore_migrator/v1/migrations/{task_uuid}/cancel/'
+ )
+ force_authenticate(request, user=self.regular_user)
+
+ response = self.view(request, uuid=str(task_uuid))
+
+ assert response.status_code == status.HTTP_403_FORBIDDEN
+
+ def test_cancel_migration_unauthenticated(self):
+ """
+ Test that unauthenticated users cannot cancel migrations.
+ """
+ task_uuid = uuid4()
+ request = self.factory.post(
+ f'/api/modulestore_migrator/v1/migrations/{task_uuid}/cancel/'
+ )
+
+ response = self.view(request, uuid=str(task_uuid))
+
+ assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+class TestBulkMigrationViewSetCreate(TestCase):
+ """
+ Test the BulkMigrationViewSet.create() endpoint.
+
+ Focus: validation, return codes, serialization/deserialization.
+ """
+
+ def setUp(self):
+ """Set up test fixtures."""
+ self.factory = APIRequestFactory()
+ self.view = BulkMigrationViewSet.as_view({'post': 'create'})
+
+ self.user = User.objects.create_user(
+ username='testuser',
+ email='testuser@test.com',
+ password='password'
+ )
+
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.migrator_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.lib_api')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.auth')
+ @patch('cms.djangoapps.modulestore_migrator.rest_api.v1.views.UserTaskStatus')
+ def test_create_bulk_migration_success(
+ self, mock_user_task_status, mock_auth, mock_lib_api, mock_migrator_api
+ ):
+ """
+ Test successful bulk migration creation with multiple sources.
+
+ Validates:
+ - 201 status code is returned
+ - Response contains expected serialized fields
+ - Multiple sources are properly deserialized
+ """
+ mock_auth.has_studio_write_access.return_value = True
+ mock_lib_api.require_permission_for_library_key.return_value = None
+
+ mock_task = MagicMock(autospec=True)
+ mock_task.id = 'test-task-id'
+ mock_migrator_api.start_bulk_migration_to_library.return_value = mock_task
+
+ mock_task_status = MagicMock(autospec=True)
+ mock_task_status.uuid = uuid4()
+ mock_task_status.state = 'Pending'
+ mock_task_status.state_text = 'Pending'
+ mock_task_status.completed_steps = 0
+ mock_task_status.total_steps = 10
+ mock_task_status.attempts = 1
+ mock_task_status.created = '2025-01-01T00:00:00Z'
+ mock_task_status.modified = '2025-01-01T00:00:00Z'
+ mock_task_status.artifacts = []
+ mock_task_status.migrations.all.return_value = []
+
+ mock_user_task_status.objects.get.return_value = mock_task_status
+
+ request_data = {
+ 'sources': [
+ 'course-v1:TestOrg+TestCourse1+Run1',
+ 'course-v1:TestOrg+TestCourse2+Run2'
+ ],
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/bulk_migration/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_201_CREATED
+ assert 'uuid' in response.data
+ assert 'parameters' in response.data
+
+ mock_migrator_api.start_bulk_migration_to_library.assert_called_once()
+ call_kwargs = mock_migrator_api.start_bulk_migration_to_library.call_args[1]
+ assert call_kwargs['source_key_list'] == [
+ CourseLocator.from_string('course-v1:TestOrg+TestCourse1+Run1'),
+ CourseLocator.from_string('course-v1:TestOrg+TestCourse2+Run2'),
+ ]
+ assert call_kwargs['target_collection_slug_list'] is None
+ assert call_kwargs['create_collections'] is False
+ # CompositionLevel and RepeatHandlingStrategy are enums
+ assert call_kwargs['composition_level'].value == 'component'
+ assert call_kwargs['repeat_handling_strategy'].value == 'skip'
+ assert call_kwargs['preserve_url_slugs'] is False
+ assert call_kwargs['forward_source_to_target'] is None
+
+ def test_create_bulk_migration_invalid_source_key(self):
+ """
+ Test that invalid source key in list returns 400 Bad Request.
+
+ Validates:
+ - 400 status code when one or more sources are invalid
+ """
+ request_data = {
+ 'sources': ['not-a-valid-key', 'course-v1:TestOrg+TestCourse+TestRun'],
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/bulk_migration/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'sources' in response.data
+
+ def test_create_bulk_migration_missing_sources(self):
+ """
+ Test that missing sources field returns 400 Bad Request.
+
+ Validates:
+ - 400 status code when sources is missing
+ """
+ request_data = {
+ 'target': 'lib:TestOrg:TestLibrary',
+ }
+ request = self.factory.post(
+ '/api/modulestore_migrator/v1/bulk_migration/',
+ data=request_data,
+ format='json'
+ )
+ force_authenticate(request, user=self.user)
+ response = self.view(request)
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert 'sources' in response.data
diff --git a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
index 309877ae0d0b..02ac7c6f2bbc 100644
--- a/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tests/test_tasks.py
@@ -2,43 +2,46 @@
Tests for the modulestore_migrator tasks
"""
-from unittest.mock import Mock
+from unittest.mock import Mock, patch
+
import ddt
from django.utils import timezone
from lxml import etree
from opaque_keys.edx.keys import CourseKey
from opaque_keys.edx.locator import LibraryLocator, LibraryLocatorV2
-from openedx_learning.api.authoring_models import Collection, PublishableEntityVersion
from openedx_learning.api import authoring as authoring_api
+from openedx_learning.api.authoring_models import Collection, PublishableEntityVersion
from organizations.tests.factories import OrganizationFactory
from user_tasks.models import UserTaskArtifact
from user_tasks.tasks import UserTaskStatus
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory
-from common.djangoapps.student.tests.factories import UserFactory
from cms.djangoapps.modulestore_migrator.data import CompositionLevel, RepeatHandlingStrategy
from cms.djangoapps.modulestore_migrator.models import (
ModulestoreMigration,
ModulestoreSource,
)
from cms.djangoapps.modulestore_migrator.tasks import (
+ MigrationStep,
+ _BulkMigrationTask,
_migrate_component,
_migrate_container,
_migrate_node,
_MigratedNode,
_MigrationContext,
- _MigrationTask,
- migrate_from_modulestore,
- MigrationStep,
+ bulk_migrate_from_modulestore,
)
+from common.djangoapps.student.tests.factories import UserFactory
from openedx.core.djangoapps.content_libraries import api as lib_api
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory, LibraryFactory, BlockFactory
+
+from .. import api as migrator_api
@ddt.ddt
class TestMigrateFromModulestore(ModuleStoreTestCase):
"""
- Test the migrate_from_modulestore task
+ Test the bulk_migrate_from_modulestore task
"""
def setUp(self):
@@ -48,24 +51,77 @@ def setUp(self):
self.lib_key = LibraryLocatorV2.from_string(
f"lib:{self.organization.short_name}:test-key"
)
+ self.lib_key_2 = LibraryLocatorV2.from_string(
+ f"lib:{self.organization.short_name}:test-key-2"
+ )
lib_api.create_library(
org=self.organization,
slug=self.lib_key.slug,
title="Test Library",
)
+ lib_api.create_library(
+ org=self.organization,
+ slug=self.lib_key_2.slug,
+ title="Test Library 2",
+ )
self.library = lib_api.ContentLibrary.objects.get(slug=self.lib_key.slug)
+ self.library_2 = lib_api.ContentLibrary.objects.get(slug=self.lib_key_2.slug)
self.learning_package = self.library.learning_package
+ self.learning_package_2 = self.library_2.learning_package
self.course = CourseFactory(
org=self.organization.short_name,
course="TestCourse",
run="TestRun",
display_name="Test Course",
)
+ self.course_2 = CourseFactory(
+ org=self.organization.short_name,
+ course="TestCourse2",
+ run="TestRun2",
+ display_name="Test Course 2",
+ )
+ self.legacy_library = LibraryFactory(
+ org=self.organization.short_name,
+ library="LegacyLibrary",
+ display_name="Legacy Library",
+ )
+ self.legacy_library_2 = LibraryFactory(
+ org=self.organization.short_name,
+ library="LegacyLibrary2",
+ display_name="Legacy Library 2",
+ )
self.collection = Collection.objects.create(
learning_package=self.learning_package,
key="test_collection",
title="Test Collection",
)
+ self.collection2 = Collection.objects.create(
+ learning_package=self.learning_package,
+ key="test_collection2",
+ title="Test Collection 2",
+ )
+
+ def _make_migration_context(self, **kwargs) -> _MigrationContext:
+ """
+ Builds a _MigrationContext object with default values, overridable with kwargs
+ """
+ return _MigrationContext(
+ **{
+ "used_component_keys": set(),
+ "used_container_slugs": set(),
+ "previous_block_migrations": {},
+ "target_package_id": self.learning_package.id,
+ "target_library_key": self.library.library_key,
+ "source_context_key": self.course.id,
+ "content_by_filename": {},
+ "composition_level": CompositionLevel.Unit,
+ "repeat_handling_strategy": RepeatHandlingStrategy.Skip,
+ "preserve_url_slugs": True,
+ "created_at": timezone.now(),
+ "created_by": self.user.id,
+ **kwargs,
+ },
+ )
def _get_task_status_fail_message(self, status):
"""
@@ -80,18 +136,7 @@ def test_migrate_node_wiki_tag(self):
Test _migrate_node ignores wiki tags
"""
wiki_node = etree.fromstring("
+
+ ''')
+ context = self._make_migration_context()
result = _migrate_node(
context=context,
source_node=node_without_url_name,
)
- self.assertIsNone(result.source_to_target)
+ self.assertEqual(
+ result.source_to_target,
+ (
+ self.course.id.make_usage_key('library_content', 'test_library_content'),
+ None,
+ 'The "library_content" XBlock (ID: "test_library_content") has children, '
+ 'so it not supported in content libraries. It has 2 children blocks.',
+ ),
+ )
self.assertEqual(len(result.children), 0)
def test_migrated_node_all_source_to_target_pairs(self):
@@ -248,11 +274,11 @@ def test_migrated_node_all_source_to_target_pairs(self):
key2 = self.course.id.make_usage_key("problem", "problem2")
key3 = self.course.id.make_usage_key("problem", "problem3")
- child_node = _MigratedNode(source_to_target=(key3, mock_version3), children=[])
+ child_node = _MigratedNode(source_to_target=(key3, mock_version3, None), children=[])
parent_node = _MigratedNode(
- source_to_target=(key1, mock_version1),
+ source_to_target=(key1, mock_version1, None),
children=[
- _MigratedNode(source_to_target=(key2, mock_version2), children=[]),
+ _MigratedNode(source_to_target=(key2, mock_version2, None), children=[]),
child_node,
],
)
@@ -264,17 +290,16 @@ def test_migrated_node_all_source_to_target_pairs(self):
self.assertEqual(pairs[1][0], key2)
self.assertEqual(pairs[2][0], key3)
- def test_migrate_from_modulestore_invalid_source(self):
+ def test_bulk_migrate_invalid_sources(self):
"""
- Test migrate_from_modulestore with invalid source
+ Test bulk_migrate_from_modulestore with invalid source
"""
- task = migrate_from_modulestore.apply_async(
+ task = bulk_migrate_from_modulestore.apply_async(
kwargs={
"user_id": self.user.id,
- "source_pk": 999999, # Non-existent source
- "target_package_pk": self.learning_package.id,
+ "sources_pks": [999999], # Non-existent source
"target_library_key": str(self.lib_key),
- "target_collection_pk": self.collection.id,
+ "target_collection_pks": [self.collection.id],
"repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
"preserve_url_slugs": True,
"composition_level": CompositionLevel.Unit.value,
@@ -286,47 +311,20 @@ def test_migrate_from_modulestore_invalid_source(self):
self.assertEqual(status.state, UserTaskStatus.FAILED)
self.assertEqual(self._get_task_status_fail_message(status), "ModulestoreSource matching query does not exist.")
- def test_migrate_from_modulestore_invalid_target_package(self):
- """
- Test migrate_from_modulestore with invalid target package
- """
- source = ModulestoreSource.objects.create(
- key=self.course.id,
- )
-
- task = migrate_from_modulestore.apply_async(
- kwargs={
- "user_id": self.user.id,
- "source_pk": source.id,
- "target_package_pk": 999999, # Non-existent package
- "target_library_key": str(self.lib_key),
- "target_collection_pk": self.collection.id,
- "repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
- "preserve_url_slugs": True,
- "composition_level": CompositionLevel.Unit.value,
- "forward_source_to_target": False,
- }
- )
-
- status = UserTaskStatus.objects.get(task_id=task.id)
- self.assertEqual(status.state, UserTaskStatus.FAILED)
- self.assertEqual(self._get_task_status_fail_message(status), "LearningPackage matching query does not exist.")
-
- def test_migrate_from_modulestore_invalid_collection(self):
+ def test_bulk_migrate_invalid_collection(self):
"""
- Test migrate_from_modulestore with invalid collection
+ Test bulk_migrate_from_modulestore with invalid collection
"""
source = ModulestoreSource.objects.create(
key=self.course.id,
)
- task = migrate_from_modulestore.apply_async(
+ task = bulk_migrate_from_modulestore.apply_async(
kwargs={
"user_id": self.user.id,
- "source_pk": source.id,
- "target_package_pk": self.learning_package.id,
+ "sources_pks": [source.id],
"target_library_key": str(self.lib_key),
- "target_collection_pk": 999999, # Non-existent collection
+ "target_collection_pks": [999999], # Non-existent collection
"repeat_handling_strategy": RepeatHandlingStrategy.Skip.value,
"preserve_url_slugs": True,
"composition_level": CompositionLevel.Unit.value,
@@ -338,12 +336,14 @@ def test_migrate_from_modulestore_invalid_collection(self):
self.assertEqual(status.state, UserTaskStatus.FAILED)
self.assertEqual(self._get_task_status_fail_message(status), "Collection matching query does not exist.")
- def test_migration_task_calculate_total_steps(self):
+ def test_bulk_migration_task_calculate_total_steps(self):
"""
- Test _MigrationTask.calculate_total_steps returns correct count
+ Test _BulkMigrationTask.calculate_total_steps returns correct count
"""
- total_steps = _MigrationTask.calculate_total_steps({})
- expected_steps = len(list(MigrationStep))
+ total_steps = _BulkMigrationTask.calculate_total_steps({
+ "sources_pks": [1, 2, 3, 4],
+ })
+ expected_steps = len(list(MigrationStep)) - 1 + 6 * 3
self.assertEqual(total_steps, expected_steps)
def test_migrate_component_success(self):
@@ -352,26 +352,15 @@ def test_migrate_component_success(self):
"""
source_key = self.course.id.make_usage_key("problem", "test_problem")
olx = '
+
+ '''
+ context = self._make_migration_context()
+ result, reason = _migrate_component(
+ context=context,
+ source_key=source_key,
+ olx=olx,
+ title="test_library content"
+ )
+
+ self.assertIsNone(result)
+ self.assertEqual(
+ reason,
+ 'The "library_content" XBlock (ID: "test_library_content") has children,'
+ ' so it not supported in content libraries.',
+ )
+
def test_migrate_component_with_static_content(self):
"""
Test _migrate_component with static file content
@@ -394,19 +412,8 @@ def test_migrate_component_with_static_content(self):
created=timezone.now(),
)
content_by_filename = {"test_image.png": test_content.id}
- context = _MigrationContext(
- existing_source_to_target_keys={},
- target_package_id=self.learning_package.id,
- target_library_key=self.library.library_key,
- source_context_key=self.course.id,
- content_by_filename=content_by_filename,
- composition_level=CompositionLevel.Unit,
- repeat_handling_strategy=RepeatHandlingStrategy.Skip,
- preserve_url_slugs=True,
- created_at=timezone.now(),
- created_by=self.user.id,
- )
- result = _migrate_component(
+ context = self._make_migration_context(content_by_filename=content_by_filename)
+ result, reason = _migrate_component(
context=context,
source_key=source_key,
olx=olx,
@@ -414,6 +421,7 @@ def test_migrate_component_with_static_content(self):
)
self.assertIsNotNone(result)
+ self.assertIsNone(reason)
component_content = result.componentversion.componentversioncontent_set.filter(
key="static/test_image.png"
@@ -421,208 +429,245 @@ def test_migrate_component_with_static_content(self):
self.assertIsNotNone(component_content)
self.assertEqual(component_content.content_id, test_content.id)
- def test_migrate_component_replace_existing_false(self):
+ def test_migrate_skip_repeats(self):
"""
- Test _migrate_component with replace_existing=False returns existing component
+ Test that, when requested, the migration will Skip blocks that have previously been migrated
+
+ Tests with both a container and a component
"""
- source_key = self.course.id.make_usage_key("problem", "existing_problem")
- olx = '
See image: referenced.png
See image: referenced.png
See image: duplicate.png
-
-
-
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
deleted file mode 100644
index fc7d92173b0c..000000000000
--- a/cms/templates/asset_index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%def name="online_help_token()"><% return "files" %>
-<%!
- from django.urls import reverse
- from django.utils.translation import gettext as _
- from openedx.core.djangolib.markup import HTML, Text
- from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
-%>
-<%block name="title">${_("Files")}
-<%block name="bodyclass">is-signedin course uploads view-uploads
-
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="header_extras">
- % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
- % endif
-
-
-<%block name="content">
-
-
-
-
-
- <%static:studiofrontend entry="accessibilityPolicy">
- {
- "lang": "${language_code | n, js_escaped_string}"
- }
-
-
-
-
-
-
-
-- ${_("Content")} - - ${_("Files")} -
-
-
-
-
diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html
deleted file mode 100644
index e1859f38f70b..000000000000
--- a/cms/templates/checklists.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%def name="online_help_token()"><% return "files" %>
-<%!
- from cms.djangoapps.contentstore import utils
- from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklists_quality
- from django.urls import reverse
- from django.utils.translation import gettext as _
- from openedx.core.djangolib.markup import HTML, Text
- from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
- from common.djangoapps.util.course import has_certificates_enabled
-%>
-<%block name="title">${_("Checklists")}
-<%block name="bodyclass">is-signedin course view-checklists
-
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="header_extras">
- % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
- % endif
-
-
-<%block name="content">
-
-
- <%static:optional_include_mako file="asset_index_content_header.html" />
- <%static:studiofrontend entry="assets">
- {
- "lang": "${language_code | n, js_escaped_string}",
- "course": {
- "id": "${context_course.id | n, js_escaped_string}",
- "name": "${context_course.display_name_with_default | n, js_escaped_string}",
- "url_name": "${context_course.location.block_id | n, js_escaped_string}",
- "org": "${context_course.location.org | n, js_escaped_string}",
- "num": "${context_course.location.course | n, js_escaped_string}",
- "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}",
- "revision": "${context_course.location.branch | n, js_escaped_string}"
- },
- "help_tokens": {
- "files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}"
- },
- "upload_settings": {
- "max_file_size_in_mbs": ${max_file_size_in_mbs|n, dump_js_escaped_json}
- }
- }
-
-
-
-
-
-
-
-- ${_("Tools")} - - ${_("Checklists")} -
-
-
-
-
diff --git a/cms/templates/container.html b/cms/templates/container.html
index 1c56740ca9e3..61e52f617ab0 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -13,7 +13,7 @@
from django.utils.translation import gettext as _
from cms.djangoapps.contentstore.helpers import xblock_studio_url, xblock_type_display_name
-from cms.djangoapps.contentstore.toggles import use_new_text_editor, use_new_problem_editor, use_new_video_editor, use_video_gallery_flow
+from cms.djangoapps.contentstore.toggles import use_new_problem_editor, use_new_video_editor, use_video_gallery_flow
from cms.djangoapps.contentstore.utils import get_editor_page_base_url
from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
@@ -36,10 +36,6 @@
<%static:include path="common/templates/image-modal.underscore" />
-% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
-% endif
<%block name="page_bundle">
@@ -115,7 +111,6 @@
<%block name="content">
<%
-use_new_editor_text = use_new_text_editor(xblock_locator.course_key)
use_new_editor_video = use_new_video_editor(xblock_locator.course_key)
use_new_editor_problem = use_new_problem_editor(xblock_locator.course_key)
use_new_video_gallery_flow = use_video_gallery_flow()
@@ -172,7 +167,6 @@
- <%static:studiofrontend entry="courseHealthCheck">
-
- <%
- course_key = str(context_course.id)
- certificates_url = ''
- if has_certificates_enabled(context_course):
- certificates_url = utils.reverse_course_url('certificates_list_handler', course_key)
- %>
- {
- "lang": "${language_code | n, js_escaped_string}",
- "course": {
- "id": "${context_course.id | n, js_escaped_string}",
- "name": "${context_course.display_name_with_default | n, js_escaped_string}",
- "is_course_self_paced": ${context_course.self_paced | n, dump_js_escaped_json},
- "url_name": "${context_course.location.block_id | n, js_escaped_string}",
- "org": "${context_course.location.org | n, js_escaped_string}",
- "num": "${context_course.location.course | n, js_escaped_string}",
- "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}",
- "revision": "${context_course.location.revision | n, js_escaped_string}"
- },
- "help_tokens": {
- "files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}"
- },
- "enable_quality": ${should_show_checklists_quality(context_course.id) | n, dump_js_escaped_json},
- "links": {
- "certificates": ${certificates_url | n, dump_js_escaped_json},
- "course_outline": ${utils.reverse_course_url('course_handler', course_key) | n, dump_js_escaped_json},
- "course_updates": ${utils.reverse_course_url('course_info_handler', course_key) | n, dump_js_escaped_json},
- "grading_policy": ${utils.reverse_course_url('grading_handler', course_key) | n, dump_js_escaped_json},
- "settings": ${utils.reverse_course_url('settings_handler', course_key) | n, dump_js_escaped_json},
- "proctored_exam_settings": ${mfe_proctored_exam_settings_url | n, dump_js_escaped_json}
- }
- }
-
-
-
-
- %endif
-
- %if context_course.discussions_settings.get('provider_type') == "openedx":
-
-
-
-
-
-
-
-
- ${_("This course was created as a re-run. Some manual configuration is needed.")}
- -${_("No course content is currently visible, and no learners are enrolled. Be sure to review and reset all dates, including the Course Start Date; set up the course team; review course updates and other assets for dated material; and seed the discussions and wiki.")}
-
-
- %endif
-
-
- %if deprecated_blocks_info.get('blocks') or deprecated_blocks_info.get('deprecated_enabled_block_types'):
-
-
-
-
-
-
-
-
-
-
- ${_("This course run is using an upgraded version of edx discussion forum. In order to display the discussions sidebar, discussions xBlocks will no longer be visible to learners.")}
-
-
- %if settings.DISCUSSIONS_INCONTEXT_LEARNMORE_URL:
-
- ${_(" Learn more")}
-
-
- %endif
- %if settings.DISCUSSIONS_INCONTEXT_FEEDBACK_URL:
-
- ${_("Share feedback")}
-
-
- %endif
-
-
-
- %endif
-
- %if proctoring_errors:
-
- ${_("Warning")}
-
-
-
-
- ${_("This course uses features that are no longer supported.")}
- - %if deprecated_blocks_info.get('blocks'): -
-
- %endif
-
- % if deprecated_blocks_info.get('deprecated_enabled_block_types'):
- ${_("You must delete or replace the following components.")}
- -
-
- % endif
- - ${Text(_("To avoid errors, {platform_name} strongly recommends that you remove unsupported features from the course advanced settings. To do this, go to the {link_start}Advanced Settings page{link_end}, locate the \"Advanced Module List\" setting, and then delete the following modules from the list.")).format( - platform_name=static.get_platform_name(), - link_start=HTML('').format(advance_settings_url=deprecated_blocks_info['advance_settings_url']), - link_end=HTML("") - )} -
- -
-
- %endif
-
-
-
-<%block name="content">
-
-
-
-
-
-
- ${_("This course has proctored exam settings that are incomplete or invalid.")}
-- % if mfe_proctored_exam_settings_url: - <% url_encoded_course_id = quote(str(context_course.id).encode('utf-8'), safe='') %> - ${Text(_("To update these settings go to the {link_start}Proctored Exam Settings page{link_end}.")).format( - link_start=HTML('').format( - mfe_proctored_exam_settings_url=mfe_proctored_exam_settings_url - ), - link_end=HTML("") - )} - % else: - ${Text(_("To update these settings go to the {link_start}Advanced Settings page{link_end}.")).format( - link_start=HTML('').format(advance_settings_url=advance_settings_url), - link_end=HTML("") - )} - % endif -
-
-
-
-
-
-
-
-
-- ${_("Content")} - > ${_("Course Outline")} -
- - -
-
-
-
-
-
diff --git a/cms/templates/maintenance/_announcement_edit.html b/cms/templates/maintenance/_announcement_edit.html
deleted file mode 100644
index a9bee1c6fce2..000000000000
--- a/cms/templates/maintenance/_announcement_edit.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from openedx.core.djangolib.markup import HTML, Text
-%>
-<%block name="title">${_('Edit Announcement')}
-<%block name="viewtitle">
-
-
-
-
-<%block name="header_extras">
-
-
-
diff --git a/cms/templates/maintenance/_announcement_index.html b/cms/templates/maintenance/_announcement_index.html
deleted file mode 100644
index 68713c9986cc..000000000000
--- a/cms/templates/maintenance/_announcement_index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<%page expression_filter="h"/>
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
-from openedx.core.djangolib.markup import HTML, Text
-
-%>
-
- ## set width dynamically depending upon whether course has a start date to ensure spacing looks good
- % if course_release_date == 'Set Date':
-
-
-
-
-
diff --git a/cms/templates/index.html b/cms/templates/index.html
deleted file mode 100644
index e55859730729..000000000000
--- a/cms/templates/index.html
+++ /dev/null
@@ -1,629 +0,0 @@
-<%page expression_filter="h"/>
-<%!
-from django.utils.translation import gettext as _
-from django.urls import reverse
-
-from openedx.core.djangolib.markup import HTML, Text
-from openedx.core.djangolib.js_utils import (
- dump_js_escaped_json
- )
-%>
-
-<%inherit file="base.html" />
-<%namespace name='static' file='static_content.html'/>
-<%def name="online_help_token()"><% return "home" %>
-<%block name="title">${_("{studio_name} Home").format(studio_name=settings.STUDIO_SHORT_NAME)}
-<%block name="bodyclass">is-signedin index view-dashboard
-
-<%block name="requirejs">
- require(["js/factories/index"], function (IndexFactory) {
- IndexFactory();
- });
-
-
-<%block name="content">
-
- % else:
-
-
- % endif
- <%static:studiofrontend entry="courseOutlineHealthCheck">
- <%
- course_key = context_course.id
- %>
- {
- "lang": "${language_code | n, js_escaped_string}",
- "course": {
- "id": "${context_course.id | n, js_escaped_string}",
- "name": "${context_course.display_name_with_default | n, js_escaped_string}",
- "course_release_date": "${course_release_date | n, js_escaped_string}",
- "is_course_self_paced": ${context_course.self_paced | n, dump_js_escaped_json},
- "url_name": "${context_course.location.block_id | n, js_escaped_string}",
- "org": "${context_course.location.org | n, js_escaped_string}",
- "num": "${context_course.location.course | n, js_escaped_string}",
- "display_course_number": "${context_course.display_coursenumber | n, js_escaped_string}",
- "revision": "${context_course.location.branch | n, js_escaped_string}"
- },
- "help_tokens": {
- "files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}"
- },
- "enable_quality": ${should_show_checklists_quality(context_course.id) | n, dump_js_escaped_json},
- "links": {
- "settings": ${reverse('settings_handler', kwargs={'course_key_string': str(course_key)})| n, dump_js_escaped_json}
- }
- }
-
-
-
-
-
-
- <%
- course_locator = context_course.location
- assets_url = reverse('assets_handler', kwargs={'course_key_string': str(course_locator.course_key)})
- %>
-
-
-
- ${_("Course Outline")}
-
-
-
-
-
-${_("Loading")}
-
-
-
-
-
-${_("{studio_name} Home").format(studio_name=settings.STUDIO_SHORT_NAME)}
- - % if user.is_active: - - % endif -
- % if user.is_active:
-
-
-
- % if course_creator_status=='granted':
-
-
-
-
-
- % else:
-
-
-
-
-
-
-
- %endif
-
-
diff --git a/cms/templates/maintenance/_announcement_delete.html b/cms/templates/maintenance/_announcement_delete.html
deleted file mode 100644
index 0397ef5a0bf8..000000000000
--- a/cms/templates/maintenance/_announcement_delete.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from openedx.core.djangolib.markup import HTML, Text
-%>
-<%block name="title">${_('Delete Announcement')}
-<%block name="viewtitle">
-
-
-
-
- % endif
-
- %if libraries_enabled and show_new_library_button:
-
-
-
- % endif
-
- %if optimization_enabled:
-
-
- %endif
-
-
- %if allow_course_reruns and rerun_creator_status and len(in_process_course_actions) > 0:
- ${_("Organization and Library Settings")}
- -
-
- %endif
-
- % if libraries_enabled or archived_courses:
- ${_("Courses Being Processed")}
- --
- %for course_info in sorted(in_process_course_actions, key=lambda s: s['display_name'].lower() if s['display_name'] is not None else ''):
-
- %if course_info['is_in_progress']:
-
-
- -- --- -
${course_info['display_name']}
- - --
-
- ${_("This course run is currently being created.")} -
- - - ## Translators: This is a status message, used to inform the user of - ## what the system is doing. This status means that the user has - ## requested to re-run an existing course, and the system is currently - ## in the process of duplicating and configuring the existing course - ## so that it can be re-run. - ${_("Configuring as re-run")} - -
--${Text(_('The new course will be added to your course list in 5-10 minutes. Return to this page or {link_start}refresh it{link_end} to update the course list. The new course will need some manual configuration.')).format( - link_start=HTML(''), - link_end=HTML(''), - )}
-
- %endif
-
-
-
-
- %if course_info['is_failed']:
- -
- -- --- -
${course_info['display_name']}
- - --
- ## Translators: This is a status message for the course re-runs feature.
- ## When a course admin indicates that a course should be re-run, the system
- ## needs to process the request and prepare the new course. The status of
- ## the process will follow this text.
-
- ${_("This re-run processing status:")} -
- - - ${_("Configuration Error")} - -
--${_("A system error occurred while your course was being processed. Please go to the original course to try the re-run again, or contact your PM for assistance.")}
- --
-
- - - - - - -
- %endif
- %endfor
-
-
-
- - % if split_studio_home and active_tab == 'libraries': - ${_("Courses")} - % else: - ${_("Courses")} - % endif - - % if archived_courses: -
- - % if split_studio_home and active_tab == 'libraries': - ${_("Archived Courses")} - % else: - ${_("Archived Courses")} - % endif - - % endif - - % if libraries_enabled: -
- - % if split_studio_home: - ${_("Libraries")} - % else: - ${_("Libraries")} - % endif - - % endif - % if taxonomies_enabled: -
- ${_("Taxonomies")} - % endif -
- ${static.renderReact(
- component="CourseOrLibraryListing",
- id="react-course-listing",
- props={
- 'items': sorted(courses, key=lambda s: s['display_name'].lower() if s['display_name'] is not None else ''),
- 'linkClass': 'course-link',
- 'idBase': 'course',
- 'allowReruns': allow_course_reruns and rerun_creator_status and course_creator_status=='granted'
- }
- )}
-
-
- %else:
-
-
- % endif
-
-
- %if course_creator_status == "unrequested":
-
-
-
- %if course_creator_status == "granted":
-
-
- ${_("Are you staff on an existing {studio_name} course?").format(studio_name=settings.STUDIO_SHORT_NAME)}
-
-
- ${_('The course creator must give you access to the course. Contact the course creator or administrator for the course you are helping to author.')}
-
-
- % endif
-
-
-
-
- ${_('Create Your First Course')}
-
-
- ${_('Your new course is just a click away!')}
--
-
- - ${_('Create Your First Course')} - -
-
-
- %elif course_creator_status == "denied":
- - ${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)} -
- -
-
-
-
-
- ${_('{studio_name} is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by {platform_name}. Our team will evaluate your request and provide you feedback within 24 hours during the work week.').format( - studio_name=settings.STUDIO_NAME, platform_name=settings.PLATFORM_NAME)}
-
-
- ${_('Your Course Creator Request Status:')}
- - -
-
-
- %elif course_creator_status == "pending":
- - ${_('Your Course Creator Request Status')} -
- -
-
-
-
-
- ${_('{studio_name} is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by {platform_name}. Our team is has completed evaluating your request.').format( - studio_name=settings.STUDIO_NAME, platform_name=settings.PLATFORM_NAME, - )}
-
-
- ${_('Your Course Creator Request Status:')}
- --
-
- ${_('Your Course Creator request is:')} -
- - - ${_('Denied')} - ${_('Your request did not meet the criteria/guidelines specified by {platform_name} Staff.').format(platform_name=settings.PLATFORM_NAME)} - -
-
- % endif
-
- %if archived_courses:
- - ${_('Your Course Creator Request Status')} -
- -
-
-
-
-
- ${_('{studio_name} is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by {platform_name}. Our team is currently evaluating your request.').format( - studio_name=settings.STUDIO_NAME, platform_name=settings.PLATFORM_NAME, - )}
-
-
- ${_('Your Course Creator Request Status:')}
- --
-
- ${_('Your Course Creator request is:')} -
- - - ${_('Pending')} - - ${_('Your request is currently being reviewed by {platform_name} staff and should be updated shortly.').format(platform_name=settings.PLATFORM_NAME)} - - -
- % if type(archived_courses) is list:
- ${static.renderReact(
- component="CourseOrLibraryListing",
- id="react-archived-course-listing",
- props={
- 'items': sorted(archived_courses, key=lambda s: s['display_name'].lower() if s['display_name'] is not None else ''),
- 'linkClass': 'course-link',
- 'idBase': 'archived',
- 'allowReruns': allow_course_reruns and rerun_creator_status and course_creator_status=='granted'
- }
- )}
- % endif
-
- %endif
-
- %if len(libraries) > 0 or optimization_enabled:
-
- ${static.renderReact(
- component="CourseOrLibraryListing",
- id="react-library-listing",
- props={
- 'items': sorted(libraries, key=lambda s: s['display_name'].lower() if s['display_name'] is not None else ''),
- 'linkClass': 'library-link',
- 'idBase': 'library',
- 'allowReruns': allow_course_reruns and rerun_creator_status and course_creator_status=='granted'
- }
- )}
-
-
- %else:
-
-
- %endif
-
-
-
- % if show_new_library_button:
-
-
- ${_("Were you expecting to see a particular library here?")}
-
-
- ${_('The library creator must give you access to the library. Contact the library creator or administrator for the library you are helping to author.')}
-
-
- % endif
-
-
-
-
- ${_('Create Your First Library')}
-
-
- ${_('Libraries hold a pool of components that can be re-used across multiple courses. Create your first library with the click of a button!')}
-
-
-
- ${_("Thanks for signing up, {name}!").format(name=user.username)}
-
-
-
-
- ${_("We need to verify your email address")}
-
-
- ${_('Almost there! In order to complete your sign up we need you to verify your email address ({email}). An activation message and next steps should be waiting for you there.').format(email=user.email)}
-- ${_('Delete Announcement')} -
- - -<%block name="viewcontent"> -
-
-
-
-
-
- - ${_('Edit Announcement')} -
- - -<%block name="viewcontent"> -
-
-
-
-
diff --git a/cms/templates/maintenance/base.html b/cms/templates/maintenance/base.html
deleted file mode 100644
index 6979797a629c..000000000000
--- a/cms/templates/maintenance/base.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="../base.html" />
-<%def name='online_help_token()'><% return 'maintenance' %>
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from django.utils.translation import gettext as _
-%>
-<%block name="content">
-
-
-
- % for announcement in announcement_list:
-
- % endfor
-
-
-
-
- <%include file="_${view['slug']}.html"/>
-
-
-
-<%block name="requirejs">
- require(["js/maintenance/${view['slug'] | n, js_escaped_string}"], function(MaintenanceFactory) {
- MaintenanceFactory("${reverse(view['url']) | n, js_escaped_string}");
- });
-
diff --git a/cms/templates/maintenance/index.html b/cms/templates/maintenance/index.html
deleted file mode 100644
index 293cb90b4a9c..000000000000
--- a/cms/templates/maintenance/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import gettext as _
-from django.urls import reverse
-%>
-<%block name="title">${_('Maintenance Dashboard')}
-<%block name="viewcontent">
-
-
-<%block name="viewcontent">
-
diff --git a/cms/templates/maintenance/container.html b/cms/templates/maintenance/container.html
deleted file mode 100644
index 319a57bfe995..000000000000
--- a/cms/templates/maintenance/container.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.urls import reverse
-from openedx.core.djangolib.js_utils import js_escaped_string
-%>
-<%block name="title">${view['name']}
-<%block name="viewtitle">
-- - ${_('Maintenance Dashboard')} - -
- <%block name="viewtitle"> - -- ${view['name']} -
- - -<%block name="viewcontent"> -
-
-
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index 4fb3c71803cb..8929b225cc91 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -7,12 +7,11 @@
from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
)
-from cms.djangoapps.contentstore.toggles import use_new_text_editor, use_new_problem_editor, use_new_video_editor, use_video_gallery_flow
+from cms.djangoapps.contentstore.toggles import use_new_problem_editor, use_new_video_editor, use_video_gallery_flow
from cms.lib.xblock.upstream_sync import UpstreamLink
from openedx.core.djangoapps.content_tagging.toggles import is_tagging_feature_disabled
%>
<%
-use_new_editor_text = use_new_text_editor(xblock.context_key)
use_new_editor_video = use_new_video_editor(xblock.context_key)
use_new_editor_problem = use_new_problem_editor(xblock.context_key)
use_new_video_gallery_flow = use_video_gallery_flow()
@@ -83,7 +82,6 @@
is-collapsed
% endif
"
- use-new-editor-text = ${use_new_editor_text}
use-new-editor-video = ${use_new_editor_video}
use-new-editor-problem = ${use_new_editor_problem}
use-video-gallery-flow = ${use_new_video_gallery_flow}
@@ -93,7 +91,7 @@
% if upstream_info.upstream_ref:
data-upstream-ref = ${upstream_info.upstream_ref}
data-version-synced = ${upstream_info.version_synced}
- data-is-modified = ${upstream_info.is_modified}
+ data-is-modified = ${len(upstream_info.downstream_customized) > 0}
%endif
>
-
- % for view in views.values():
-
- - ${view['name']} - ${view['description']} - - % endfor -
@@ -121,10 +119,10 @@
${_("Sourced from a library - but the upstream link is broken/invalid.")}
% else:
-
'
with override_waffle_switch(ENABLE_COURSE_ABOUT_SIDEBAR_HTML, active=waffle_enabled):
meta = self.create_courseware_meta()
if waffle_enabled:
assert meta.about_sidebar_html == 'About Course
'
else:
assert meta.about_sidebar_html is None
+ assert meta.overview == 'About Course
'
@ddt.ddt
diff --git a/openedx/core/djangoapps/courseware_api/views.py b/openedx/core/djangoapps/courseware_api/views.py
index ee37835b4841..a5940d8a132e 100644
--- a/openedx/core/djangoapps/courseware_api/views.py
+++ b/openedx/core/djangoapps/courseware_api/views.py
@@ -63,6 +63,7 @@
from openedx.core.djangoapps.courseware_api.utils import get_celebrations_dict
from openedx.core.djangoapps.enrollments.permissions import ENROLL_IN_COURSE
from openedx.core.djangoapps.programs.utils import ProgramProgressMeter
+from openedx.core.djangolib.markup import clean_dangerous_html
from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin
from openedx.core.lib.courses import get_course_by_id
@@ -288,7 +289,7 @@ def linkedin_add_to_profile_url(self):
get_certificate_url(course_id=self.course_key, uuid=user_certificate.verify_uuid)
)
return linkedin_config.add_to_profile_url(
- self.course_overview.display_name, user_certificate.mode, cert_url, certificate=user_certificate,
+ self.course_overview, user_certificate.mode, cert_url, certificate=user_certificate,
)
@property
@@ -516,7 +517,9 @@ def about_sidebar_html(self):
Returns the HTML content for the course about section.
"""
if ENABLE_COURSE_ABOUT_SIDEBAR_HTML.is_enabled():
- return get_course_about_section(self.request, self.course, "about_sidebar_html")
+ return clean_dangerous_html(
+ get_course_about_section(self.request, self.course, "about_sidebar_html")
+ )
return None
@property
@@ -524,7 +527,9 @@ def overview(self):
"""
Returns the overview HTML content for the course.
"""
- return get_course_about_section(self.request, self.course, "overview")
+ return clean_dangerous_html(
+ get_course_about_section(self.request, self.course, "overview")
+ )
@method_decorator(transaction.non_atomic_requests, name='dispatch')
diff --git a/openedx/core/djangoapps/credentials/management/commands/notify_credentials.py b/openedx/core/djangoapps/credentials/management/commands/notify_credentials.py
index 7d28ca5197c1..374975cf3ae7 100644
--- a/openedx/core/djangoapps/credentials/management/commands/notify_credentials.py
+++ b/openedx/core/djangoapps/credentials/management/commands/notify_credentials.py
@@ -12,12 +12,13 @@
import shlex
from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
+
import dateutil.parser
from django.conf import settings
from django.core.management.base import BaseCommand, CommandError
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey
-from pytz import UTC
from openedx.core.djangoapps.credentials.models import NotifyCredentialsConfig
from openedx.core.djangoapps.credentials.tasks.v1.tasks import handle_notify_credentials
@@ -32,7 +33,7 @@
def parsetime(timestr):
dt = dateutil.parser.parse(timestr)
if dt.tzinfo is None:
- dt = dt.replace(tzinfo=UTC)
+ dt = dt.replace(tzinfo=ZoneInfo("UTC"))
return dt
diff --git a/openedx/core/djangoapps/credit/api/provider.py b/openedx/core/djangoapps/credit/api/provider.py
index 9875a7d0f515..5628130b37be 100644
--- a/openedx/core/djangoapps/credit/api/provider.py
+++ b/openedx/core/djangoapps/credit/api/provider.py
@@ -7,7 +7,7 @@
import logging
import uuid
-import pytz
+from zoneinfo import ZoneInfo
from django.db import transaction
from edx_proctoring.api import get_last_exam_completion_date
@@ -296,7 +296,7 @@ def create_credit_request(course_key, provider_id, username):
parameters = {
"request_uuid": credit_request.uuid,
- "timestamp": to_timestamp(datetime.datetime.now(pytz.UTC)),
+ "timestamp": to_timestamp(datetime.datetime.now(ZoneInfo("UTC"))),
"course_org": course_key.org,
"course_num": course_key.course,
"course_run": course_key.run,
diff --git a/openedx/core/djangoapps/credit/models.py b/openedx/core/djangoapps/credit/models.py
index 9c14a15104b9..d6be33828117 100644
--- a/openedx/core/djangoapps/credit/models.py
+++ b/openedx/core/djangoapps/credit/models.py
@@ -10,7 +10,7 @@
import logging
from collections import defaultdict
-import pytz
+from zoneinfo import ZoneInfo
from config_models.models import ConfigurationModel
from django.conf import settings
from django.core.cache import cache
@@ -536,7 +536,7 @@ def default_deadline_for_credit_eligibility():
"""
The default deadline to use when creating a new CreditEligibility model.
"""
- return datetime.datetime.now(pytz.UTC) + datetime.timedelta(
+ return datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(
days=getattr(settings, "CREDIT_ELIGIBILITY_EXPIRATION_DAYS", 365)
)
@@ -617,7 +617,7 @@ def get_user_eligibilities(cls, username):
return cls.objects.filter(
username=username,
course__enabled=True,
- deadline__gt=datetime.datetime.now(pytz.UTC)
+ deadline__gt=datetime.datetime.now(ZoneInfo("UTC"))
).select_related('course')
@classmethod
@@ -636,7 +636,7 @@ def is_user_eligible_for_credit(cls, course_key, username):
course__course_key=course_key,
course__enabled=True,
username=username,
- deadline__gt=datetime.datetime.now(pytz.UTC),
+ deadline__gt=datetime.datetime.now(ZoneInfo("UTC")),
).exists()
def __str__(self):
diff --git a/openedx/core/djangoapps/credit/serializers.py b/openedx/core/djangoapps/credit/serializers.py
index 85e8fed44e57..56ffe7a960b2 100644
--- a/openedx/core/djangoapps/credit/serializers.py
+++ b/openedx/core/djangoapps/credit/serializers.py
@@ -4,7 +4,7 @@
import datetime
import logging
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from rest_framework import serializers
from rest_framework.exceptions import PermissionDenied
@@ -78,7 +78,7 @@ def validate_timestamp(self, value):
log.warning(msg)
raise serializers.ValidationError(msg)
- elapsed = (datetime.datetime.now(pytz.UTC) - date_time).total_seconds()
+ elapsed = (datetime.datetime.now(ZoneInfo("UTC")) - date_time).total_seconds()
if elapsed > settings.CREDIT_PROVIDER_TIMESTAMP_EXPIRATION:
msg = f'[{value}] is too far in the past (over [{elapsed}] seconds).'
log.warning(msg)
diff --git a/openedx/core/djangoapps/credit/tests/factories.py b/openedx/core/djangoapps/credit/tests/factories.py
index cd777bdfe93b..5489b7bb0668 100644
--- a/openedx/core/djangoapps/credit/tests/factories.py
+++ b/openedx/core/djangoapps/credit/tests/factories.py
@@ -7,7 +7,7 @@
import factory
from factory.fuzzy import FuzzyText
-import pytz
+from zoneinfo import ZoneInfo
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from openedx.core.djangoapps.credit.models import (
@@ -80,7 +80,7 @@ def post(obj, create, extracted, **kwargs):
obj.parameters = json.dumps({
"request_uuid": obj.uuid,
- "timestamp": to_timestamp(datetime.datetime.now(pytz.UTC)),
+ "timestamp": to_timestamp(datetime.datetime.now(ZoneInfo("UTC"))),
"course_org": course_key.org,
"course_num": course_key.course,
"course_run": course_key.run,
diff --git a/openedx/core/djangoapps/credit/tests/test_api.py b/openedx/core/djangoapps/credit/tests/test_api.py
index 7dc644dc097a..2ec31641dd1d 100644
--- a/openedx/core/djangoapps/credit/tests/test_api.py
+++ b/openedx/core/djangoapps/credit/tests/test_api.py
@@ -9,7 +9,7 @@
import pytest
import ddt
import httpretty
-import pytz
+from zoneinfo import ZoneInfo
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from django.core import mail
from django.db import connection
@@ -400,7 +400,7 @@ def test_eligibility_expired(self):
CreditEligibility.objects.create(
course=credit_course,
username="staff",
- deadline=datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=1)
+ deadline=datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=1)
)
# The user should NOT be eligible for credit
@@ -960,7 +960,7 @@ def test_credit_request(self):
# Validate the timestamp
assert 'timestamp' in parameters
parsed_date = from_timestamp(parameters['timestamp'])
- assert parsed_date < datetime.datetime.now(pytz.UTC)
+ assert parsed_date < datetime.datetime.now(ZoneInfo("UTC"))
# Validate course information
assert parameters['course_org'] == self.course_key.org
diff --git a/openedx/core/djangoapps/credit/tests/test_signals.py b/openedx/core/djangoapps/credit/tests/test_signals.py
index c3331c0ecfc6..592c042a05b9 100644
--- a/openedx/core/djangoapps/credit/tests/test_signals.py
+++ b/openedx/core/djangoapps/credit/tests/test_signals.py
@@ -7,7 +7,7 @@
from uuid import uuid4
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.test.client import RequestFactory
from opaque_keys.edx.keys import UsageKey
from openedx_events.data import EventsMetadata
@@ -47,8 +47,8 @@ class TestMinGradedRequirementStatus(ModuleStoreTestCase):
satisfied. But if student grade is less than and deadline is passed then
user will be marked as failed.
"""
- VALID_DUE_DATE = datetime.now(pytz.UTC) + timedelta(days=20)
- EXPIRED_DUE_DATE = datetime.now(pytz.UTC) - timedelta(days=20)
+ VALID_DUE_DATE = datetime.now(ZoneInfo("UTC")) + timedelta(days=20)
+ EXPIRED_DUE_DATE = datetime.now(ZoneInfo("UTC")) - timedelta(days=20)
DATES = {
'valid': VALID_DUE_DATE,
diff --git a/openedx/core/djangoapps/credit/tests/test_views.py b/openedx/core/djangoapps/credit/tests/test_views.py
index deb3c8726aeb..02428557ded0 100644
--- a/openedx/core/djangoapps/credit/tests/test_views.py
+++ b/openedx/core/djangoapps/credit/tests/test_views.py
@@ -7,7 +7,7 @@
import json
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.test import Client, TestCase
from django.test.utils import override_settings
@@ -523,7 +523,7 @@ def _credit_provider_callback(self, request_uuid, status, **kwargs):
"""
provider_id = kwargs.get('provider_id', self.provider.provider_id)
secret_key = kwargs.get('secret_key', '931433d583c84ca7ba41784bad3232e6')
- timestamp = kwargs.get('timestamp', to_timestamp(datetime.datetime.now(pytz.UTC)))
+ timestamp = kwargs.get('timestamp', to_timestamp(datetime.datetime.now(ZoneInfo("UTC"))))
keys = kwargs.get('keys', {self.provider.provider_id: secret_key})
url = reverse('credit:provider_callback', args=[provider_id])
@@ -577,7 +577,7 @@ def test_post_with_invalid_timestamp(self, timedelta):
if timedelta == 'invalid':
timestamp = timedelta
else:
- timestamp = to_timestamp(datetime.datetime.now(pytz.UTC) + timedelta)
+ timestamp = to_timestamp(datetime.datetime.now(ZoneInfo("UTC")) + timedelta)
request_uuid = self._create_credit_request_and_get_uuid()
response = self._credit_provider_callback(request_uuid, 'approved', timestamp=timestamp)
assert response.status_code == 400
@@ -585,7 +585,7 @@ def test_post_with_invalid_timestamp(self, timedelta):
def test_post_with_string_timestamp(self):
""" Verify the endpoint supports timestamps transmitted as strings instead of integers. """
request_uuid = self._create_credit_request_and_get_uuid()
- timestamp = str(to_timestamp(datetime.datetime.now(pytz.UTC)))
+ timestamp = str(to_timestamp(datetime.datetime.now(ZoneInfo("UTC"))))
response = self._credit_provider_callback(request_uuid, 'approved', timestamp=timestamp)
assert response.status_code == 200
diff --git a/openedx/core/djangoapps/credit/views.py b/openedx/core/djangoapps/credit/views.py
index 2a06f85a321a..d61316b49c26 100644
--- a/openedx/core/djangoapps/credit/views.py
+++ b/openedx/core/djangoapps/credit/views.py
@@ -6,7 +6,7 @@
import datetime
import logging
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
@@ -166,7 +166,7 @@ def filter_queryset(self, queryset):
return queryset.filter(
username=username,
course__course_key=course_key,
- deadline__gt=datetime.datetime.now(pytz.UTC)
+ deadline__gt=datetime.datetime.now(ZoneInfo("UTC"))
)
diff --git a/openedx/core/djangoapps/discussions/README.rst b/openedx/core/djangoapps/discussions/README.rst
index 5c1127d324cc..d8a937a07ecc 100644
--- a/openedx/core/djangoapps/discussions/README.rst
+++ b/openedx/core/djangoapps/discussions/README.rst
@@ -3,7 +3,7 @@ Discussions
This Discussions app is responsible for providing support for configuring
discussion tools in the Open edX platform. This includes the in-built forum
-tool that uses the `cs_comments_service`, but also other LTI-based tools.
+tool, but also other LTI-based tools.
Technical Overview
@@ -44,10 +44,9 @@ discussion configuration information such as the course key, the provider type,
whether in-context discussions are enabled, whether graded units are enabled,
when unit level visibility is enabled. Other plugin configuration and a list
of discussion contexts for which discussions are enabled. Each discussion
-context has a usage key, a title (the units name) an external id
-(the cs_comments_service id), it's ordering in the course, and additional
-context. It then sends its own signal that has the discussion configuration
-object attached.
+context has a usage key, a title (the units name) an external id,
+its ordering in the course, and additional context. It then sends its own
+signal that has the discussion configuration object attached.
Finally, the handler for this discussion change signal, takes the information
from the discussion change signal and compares it to the topics in the
diff --git a/openedx/core/djangoapps/discussions/config/waffle.py b/openedx/core/djangoapps/discussions/config/waffle.py
index eca6fc970856..1d4c67e9e17b 100644
--- a/openedx/core/djangoapps/discussions/config/waffle.py
+++ b/openedx/core/djangoapps/discussions/config/waffle.py
@@ -2,8 +2,6 @@
This module contains various configuration settings via
waffle switches for the discussions app.
"""
-from django.conf import settings
-
from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
WAFFLE_FLAG_NAMESPACE = "discussions"
@@ -45,31 +43,3 @@
ENABLE_NEW_STRUCTURE_DISCUSSIONS = CourseWaffleFlag(
f"{WAFFLE_FLAG_NAMESPACE}.enable_new_structure_discussions", __name__
)
-
-# .. toggle_name: discussions.enable_forum_v2
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Waffle flag to use the forum v2 instead of v1(cs_comment_service)
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2024-9-26
-# .. toggle_target_removal_date: 2025-12-05
-ENABLE_FORUM_V2 = CourseWaffleFlag(f"{WAFFLE_FLAG_NAMESPACE}.enable_forum_v2", __name__)
-
-
-def is_forum_v2_enabled(course_key):
- """
- Returns whether forum V2 is enabled on the course. This is a 2-step check:
-
- 1. Check value of settings.DISABLE_FORUM_V2: if it exists and is true, this setting overrides any course flag.
- 2. Else, check the value of the corresponding course waffle flag.
- """
- if is_forum_v2_disabled_globally():
- return False
- return ENABLE_FORUM_V2.is_enabled(course_key)
-
-
-def is_forum_v2_disabled_globally() -> bool:
- """
- Return True if DISABLE_FORUM_V2 is defined and true-ish.
- """
- return getattr(settings, "DISABLE_FORUM_V2", False)
diff --git a/openedx/core/djangoapps/django_comment_common/admin.py b/openedx/core/djangoapps/django_comment_common/admin.py
deleted file mode 100644
index 6d2d7a34d46d..000000000000
--- a/openedx/core/djangoapps/django_comment_common/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-Admin for managing the connection to the Forums backend service.
-"""
-
-
-from django.contrib import admin
-
-from .models import ForumsConfig
-
-admin.site.register(ForumsConfig)
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/comment.py b/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
index dae2088594ae..72bb19da981b 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/comment.py
@@ -139,6 +139,32 @@ def body_text(self):
soup = BeautifulSoup(self.body, "html.parser")
return soup.get_text()
+ @classmethod
+ def retrieve_all(cls, params=None):
+ """
+ Retrieve all comments for a user in a course using Forum v2 API.
+
+ Arguments:
+ params: Dictionary with keys:
+ - user_id: The ID of the user
+ - course_id: The ID of the course
+ - flagged: Boolean for flagged comments
+ - page: Page number
+ - per_page: Items per page
+
+ Returns:
+ Dictionary with collection, comment_count, num_pages, page
+ """
+ if params is None:
+ params = {}
+ return forum_api.get_user_comments(
+ user_id=params.get('user_id'),
+ course_id=params.get('course_id'),
+ flagged=params.get('flagged', False),
+ page=params.get('page', 1),
+ per_page=params.get('per_page', 10),
+ )
+
@classmethod
def get_user_comment_count(cls, user_id, course_ids):
"""
@@ -232,11 +258,3 @@ def _url_for_thread_comments(thread_id):
def _url_for_comment(comment_id):
return f"{settings.PREFIX}/comments/{comment_id}"
-
-
-def _url_for_flag_abuse_comment(comment_id):
- return f"{settings.PREFIX}/comments/{comment_id}/abuse_flag"
-
-
-def _url_for_unflag_abuse_comment(comment_id):
- return f"{settings.PREFIX}/comments/{comment_id}/abuse_unflag"
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/course.py b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
index 8cbb580e7831..1dad0ca159aa 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/course.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/course.py
@@ -8,9 +8,6 @@
from opaque_keys.edx.keys import CourseKey
from forum import api as forum_api
-from openedx.core.djangoapps.django_comment_common.comment_client import settings
-from openedx.core.djangoapps.django_comment_common.comment_client.utils import perform_request
-from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
def get_course_commentable_counts(course_key: CourseKey) -> Dict[str, Dict[str, int]]:
@@ -31,19 +28,7 @@ def get_course_commentable_counts(course_key: CourseKey) -> Dict[str, Dict[str,
}
"""
- if is_forum_v2_enabled(course_key):
- commentable_stats = forum_api.get_commentables_stats(str(course_key))
- else:
- url = f"{settings.PREFIX}/commentables/{course_key}/counts"
- commentable_stats = perform_request(
- 'get',
- url,
- metric_tags=[
- f"course_key:{course_key}",
- "function:get_course_commentable_counts",
- ],
- metric_action='commentable_stats.retrieve',
- )
+ commentable_stats = forum_api.get_commentables_stats(str(course_key))
return commentable_stats
@@ -81,20 +66,7 @@ def get_course_user_stats(course_key: CourseKey, params: Optional[Dict] = None)
"""
if params is None:
params = {}
- if is_forum_v2_enabled(course_key):
- course_stats = forum_api.get_user_course_stats(str(course_key), **params)
- else:
- url = f"{settings.PREFIX}/users/{course_key}/stats"
- course_stats = perform_request(
- 'get',
- url,
- params,
- metric_action='user.course_stats',
- metric_tags=[
- f"course_key:{course_key}",
- "function:get_course_user_stats",
- ],
- )
+ course_stats = forum_api.get_user_course_stats(str(course_key), **params)
return course_stats
@@ -109,17 +81,5 @@ def update_course_users_stats(course_key: CourseKey) -> Dict:
Returns:
dict: data returned by API. Contains count of users updated.
"""
- if is_forum_v2_enabled(course_key):
- course_stats = forum_api.update_users_in_course(str(course_key))
- else:
- url = f"{settings.PREFIX}/users/{course_key}/update_stats"
- course_stats = perform_request(
- 'post',
- url,
- metric_action='user.update_course_stats',
- metric_tags=[
- f"course_key:{course_key}",
- "function:update_course_users_stats",
- ],
- )
+ course_stats = forum_api.update_users_in_course(str(course_key))
return course_stats
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/models.py b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
index ddfcc37cc524..ed1ed3f920bb 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/models.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/models.py
@@ -2,15 +2,10 @@
import logging
-import typing as t
from forum import api as forum_api
-from openedx.core.djangoapps.discussions.config.waffle import (
- is_forum_v2_disabled_globally,
- is_forum_v2_enabled,
-)
-from .utils import CommentClientRequestError, extract, get_course_key, perform_request
+from .utils import CommentClientRequestError, extract, get_course_key
log = logging.getLogger(__name__)
@@ -81,12 +76,11 @@ def retrieve(self, *args, **kwargs):
def _retrieve(self, *args, **kwargs):
course_id = self.attributes.get("course_id") or kwargs.get("course_key")
if not course_id:
- _, course_id = is_forum_v2_enabled_for_comment(self.id)
+ course_id = forum_api.get_course_id_by_comment(self.id)
+ response = None
if self.type == "comment":
- response = forum_api.get_parent_comment(
- comment_id=self.attributes["id"], course_id=course_id
- )
- else:
+ response = forum_api.get_parent_comment(comment_id=self.attributes["id"], course_id=course_id)
+ if response is None:
raise CommentClientRequestError("Forum v2 API call is missing")
self._update_from_response(response)
@@ -111,25 +105,6 @@ def _metric_tags(self):
def find(cls, id): # pylint: disable=redefined-builtin
return cls(id=id)
- @classmethod
- def retrieve_all(cls, params=None):
- """
- Performs a GET request against the resource's listing endpoint.
-
- Arguments:
- params: A dictionary of parameters to be passed as the request's query string.
-
- Returns:
- The parsed JSON response from the backend.
- """
- return perform_request(
- "get",
- cls.url(action="get_all"),
- params,
- metric_tags=[f"model_class:{cls.__name__}"],
- metric_action="model.retrieve_all",
- )
-
def _update_from_response(self, response_data):
for k, v in response_data.items():
if k in self.accessible_fields:
@@ -230,18 +205,15 @@ def handle_update(self, params=None):
request_params.update(params)
course_id = self.attributes.get("course_id") or request_params.get("course_id")
course_key = get_course_key(course_id)
- if is_forum_v2_enabled(course_key):
- response = None
- if self.type == "comment":
- response = self.handle_update_comment(request_params, str(course_key))
- elif self.type == "thread":
- response = self.handle_update_thread(request_params, str(course_key))
- elif self.type == "user":
- response = self.handle_update_user(request_params, str(course_key))
- if response is None:
- raise CommentClientRequestError("Forum v2 API call is missing")
- else:
- response = self.perform_http_put_request(request_params)
+ response = None
+ if self.type == "comment":
+ response = self.handle_update_comment(request_params, str(course_key))
+ elif self.type == "thread":
+ response = self.handle_update_thread(request_params, str(course_key))
+ elif self.type == "user":
+ response = self.handle_update_user(request_params, str(course_key))
+ if response is None:
+ raise CommentClientRequestError("Forum v2 API call is missing")
return response
def handle_update_user(self, request_params, course_id):
@@ -298,28 +270,6 @@ def handle_update_thread(self, request_params, course_id):
response = forum_api.update_thread(**request_data)
return response
- def perform_http_put_request(self, request_params):
- url = self.url(action="put", params=self.attributes)
- response = perform_request(
- "put",
- url,
- request_params,
- metric_tags=self._metric_tags,
- metric_action="model.update",
- )
- return response
-
- def perform_http_post_request(self):
- url = self.url(action="post", params=self.attributes)
- response = perform_request(
- "post",
- url,
- self.initializable_attributes(),
- metric_tags=self._metric_tags,
- metric_action="model.insert",
- )
- return response
-
def handle_create(self, params=None):
course_id = self.attributes.get("course_id") or params.get("course_id")
course_key = str(get_course_key(course_id))
@@ -372,22 +322,3 @@ def handle_create_thread(self, course_id):
response = forum_api.create_thread(**params)
return response
-
-
-def is_forum_v2_enabled_for_comment(comment_id: str) -> tuple[bool, t.Optional[str]]:
- """
- Figure out whether we use forum v2 for a given comment.
-
- See is_forum_v2_enabled_for_thread.
-
- Return:
-
- enabled (bool)
- course_id (str or None)
- """
- if is_forum_v2_disabled_globally():
- return False, None
-
- course_id = forum_api.get_course_id_by_comment(comment_id)
- course_key = get_course_key(course_id)
- return is_forum_v2_enabled(course_key), course_id
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
index 754fe0065f00..8bdf2482e738 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/thread.py
@@ -3,7 +3,6 @@
import logging
import time
-import typing as t
from django.core.exceptions import ObjectDoesNotExist
from eventtracking import tracker
@@ -16,10 +15,6 @@
from forum.backend import get_backend # pylint: disable=import-error
from forum.backends.mongodb.threads import CommentThread # pylint: disable=import-error
from forum.utils import ForumV2RequestError # pylint: disable=import-error
-from openedx.core.djangoapps.discussions.config.waffle import (
- is_forum_v2_disabled_globally,
- is_forum_v2_enabled,
-)
from . import models, settings, utils
@@ -227,7 +222,7 @@ def _retrieve(self, *args, **kwargs):
request_params = utils.clean_forum_params(request_params)
course_id = kwargs.get("course_id")
if not course_id:
- _, course_id = is_forum_v2_enabled_for_thread(self.id)
+ course_id = forum_api.get_course_id_by_thread(self.id)
if user_id := request_params.get("user_id"):
request_params["user_id"] = str(user_id)
response = forum_api.get_thread(
@@ -282,7 +277,7 @@ def un_pin(self, user, thread_id, course_id=None):
@classmethod
def get_user_threads_count(cls, user_id, course_ids):
"""
- Returns threads and responses count of user in the given course_ids.
+ Returns threads count of user in the given course_ids.
TODO: Add support for MySQL backend as well
"""
query_params = {
@@ -428,42 +423,18 @@ def restore_thread(cls, thread_id, course_id=None, restored_by=None):
)
-def _url_for_flag_abuse_thread(thread_id):
- return f"{settings.PREFIX}/threads/{thread_id}/abuse_flag"
-
-
-def _url_for_unflag_abuse_thread(thread_id):
- return f"{settings.PREFIX}/threads/{thread_id}/abuse_unflag"
-
-
-def _url_for_pin_thread(thread_id):
- return f"{settings.PREFIX}/threads/{thread_id}/pin"
-
-
-def _url_for_un_pin_thread(thread_id):
- return f"{settings.PREFIX}/threads/{thread_id}/unpin"
-
-
-def is_forum_v2_enabled_for_thread(thread_id: str) -> tuple[bool, t.Optional[str]]:
- """
- Figure out whether we use forum v2 for a given thread.
-
- This is a complex affair... First, we check the value of the DISABLE_FORUM_V2
- setting, which overrides everything. If this setting does not exist, then we need to
- find the course ID that corresponds to the thread ID. Then, we return the value of
- the course waffle flag for this course ID.
-
- Note that to fetch the course ID associated to a thread ID, we need to connect both
- to mongodb and mysql. As a consequence, when forum v2 needs adequate connection
- strings for both backends.
-
- Return:
-
- enabled (bool)
- course_id (str or None)
- """
- if is_forum_v2_disabled_globally():
- return False, None
- course_id = forum_api.get_course_id_by_thread(thread_id)
- course_key = utils.get_course_key(course_id)
- return is_forum_v2_enabled(course_key), course_id
+def _clean_forum_params(params):
+ """Convert string booleans to actual booleans and remove None values from forum parameters."""
+ result = {}
+ for k, v in params.items():
+ if v is not None:
+ if isinstance(v, str):
+ if v.lower() == 'true':
+ result[k] = True
+ elif v.lower() == 'false':
+ result[k] = False
+ else:
+ result[k] = v
+ else:
+ result[k] = v
+ return result
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/user.py b/openedx/core/djangoapps/django_comment_common/comment_client/user.py
index 187593e70717..bd208545ce56 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/user.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/user.py
@@ -4,7 +4,6 @@
from . import models, settings, utils
from forum import api as forum_api
from forum.utils import ForumV2RequestError, str_to_bool
-from openedx.core.djangoapps.discussions.config.waffle import is_forum_v2_enabled
class User(models.Model):
@@ -34,21 +33,11 @@ def from_django_user(cls, user):
def read(self, source):
"""
- Calls cs_comments_service to mark thread as read for the user
+ Calls forum service to mark thread as read for the user
"""
course_id = self.attributes.get("course_id")
course_key = utils.get_course_key(course_id)
- if is_forum_v2_enabled(course_key):
- forum_api.mark_thread_as_read(self.id, source.id, course_id=str(course_id))
- else:
- params = {'source_type': source.type, 'source_id': source.id}
- utils.perform_request(
- 'post',
- _url_for_read(self.id),
- params,
- metric_action='user.read',
- metric_tags=self._metric_tags + [f'target.type:{source.type}'],
- )
+ forum_api.mark_thread_as_read(self.id, source.id, course_id=str(course_id))
def follow(self, source, course_id=None):
course_key = utils.get_course_key(self.attributes.get("course_id") or course_id)
@@ -110,31 +99,21 @@ def active_threads(self, query_params=None):
query_params = {}
if not self.course_id:
raise utils.CommentClientRequestError("Must provide course_id when retrieving active threads for the user")
- url = _url_for_user_active_threads(self.id)
params = {'course_id': str(self.course_id)}
params.update(query_params)
course_key = utils.get_course_key(self.attributes.get("course_id"))
- if is_forum_v2_enabled(course_key):
- if user_id := params.get("user_id"):
- params["user_id"] = str(user_id)
- if page := params.get("page"):
- params["page"] = int(page)
- if per_page := params.get("per_page"):
- params["per_page"] = int(per_page)
- if count_flagged := params.get("count_flagged", False):
- params["count_flagged"] = str_to_bool(count_flagged)
- if not params.get("course_id"):
- params["course_id"] = str(course_key)
- response = forum_api.get_user_active_threads(**params)
- else:
- response = utils.perform_request(
- 'get',
- url,
- params,
- metric_action='user.active_threads',
- metric_tags=self._metric_tags,
- paged_results=True,
- )
+ if user_id := params.get("user_id"):
+ params["user_id"] = str(user_id)
+ if page := params.get("page"):
+ params["page"] = int(page)
+ if per_page := params.get("per_page"):
+ params["per_page"] = int(per_page)
+ if count_flagged := params.get("count_flagged", False):
+ params["count_flagged"] = str_to_bool(count_flagged)
+ if not params.get("course_id"):
+ params["course_id"] = str(course_key)
+ params = _clean_forum_params(params)
+ response = forum_api.get_user_active_threads(**params)
return response.get('collection', []), response.get('page', 1), response.get('num_pages', 1)
def subscribed_threads(self, query_params=None):
@@ -157,9 +136,7 @@ def subscribed_threads(self, query_params=None):
params["count_flagged"] = str_to_bool(count_flagged)
if not params.get("course_id"):
params["course_id"] = str(course_key)
- if 'text' in params:
- params.pop('text')
- params = utils.clean_forum_params(params)
+ params = _clean_forum_params(params)
response = forum_api.get_user_subscriptions(**params)
return utils.CommentClientPaginatedResult(
collection=response.get('collection', []),
@@ -169,7 +146,6 @@ def subscribed_threads(self, query_params=None):
)
def _retrieve(self, *args, **kwargs):
- url = self.url(action='get', params=self.attributes)
retrieve_params = self.default_retrieve_params.copy()
retrieve_params.update(kwargs)
@@ -183,116 +159,43 @@ def _retrieve(self, *args, **kwargs):
if course_id:
course_id = str(course_id)
retrieve_params['course_id'] = course_id
- course_key = utils.get_course_key(course_id) or utils.get_course_key(kwargs.get("course_key"))
- if is_forum_v2_enabled(course_key):
- group_ids = [retrieve_params['group_id']] if 'group_id' in retrieve_params else []
- is_complete = retrieve_params['complete']
- params = utils.clean_forum_params({
- "user_id": self.attributes["id"],
- "group_ids": group_ids,
- "course_id": course_id,
- "complete": is_complete
- })
- try:
- response = forum_api.get_user(**params)
- except ForumV2RequestError as e:
- course_id = str(course_key)
- self.save({"course_id": course_id})
- response = forum_api.get_user(**params)
- else:
- try:
- response = utils.perform_request(
- 'get',
- url,
- retrieve_params,
- metric_action='model.retrieve',
- metric_tags=self._metric_tags,
- )
- except utils.CommentClientRequestError as e:
- if e.status_code == 404:
- # attempt to gracefully recover from a previous failure
- # to sync this user to the comments service.
- self.save()
- response = utils.perform_request(
- 'get',
- url,
- retrieve_params,
- metric_action='model.retrieve',
- metric_tags=self._metric_tags,
- )
- else:
- raise
+ group_ids = [retrieve_params['group_id']] if 'group_id' in retrieve_params else None
+ is_complete = retrieve_params['complete']
+ params = _clean_forum_params({
+ "user_id": self.attributes["id"],
+ "group_ids": group_ids,
+ "course_id": course_id,
+ "complete": is_complete
+ })
+ try:
+ response = forum_api.get_user(**params)
+ except ForumV2RequestError as e:
+ self.save({"course_id": course_id})
+ response = forum_api.get_user(**params)
self._update_from_response(response)
def retire(self, retired_username):
course_key = utils.get_course_key(self.attributes.get("course_id"))
- if is_forum_v2_enabled(course_key):
- forum_api.retire_user(user_id=self.id, retired_username=retired_username, course_id=str(course_key))
- else:
- url = _url_for_retire(self.id)
- params = {'retired_username': retired_username}
- utils.perform_request(
- 'post',
- url,
- params,
- raw=True,
- metric_action='user.retire',
- metric_tags=self._metric_tags
- )
+ forum_api.retire_user(user_id=self.id, retired_username=retired_username, course_id=str(course_key))
def replace_username(self, new_username):
course_key = utils.get_course_key(self.attributes.get("course_id"))
- if is_forum_v2_enabled(course_key):
- forum_api.update_username(user_id=self.id, new_username=new_username, course_id=str(course_key))
- else:
- url = _url_for_username_replacement(self.id)
- params = {"new_username": new_username}
-
- utils.perform_request(
- 'post',
- url,
- params,
- raw=True,
- )
-
-
-def _url_for_vote_comment(comment_id):
- return f"{settings.PREFIX}/comments/{comment_id}/votes"
-
-
-def _url_for_vote_thread(thread_id):
- return f"{settings.PREFIX}/threads/{thread_id}/votes"
-
-
-def _url_for_subscription(user_id):
- return f"{settings.PREFIX}/users/{user_id}/subscriptions"
-
-
-def _url_for_user_active_threads(user_id):
- return f"{settings.PREFIX}/users/{user_id}/active_threads"
-
-
-def _url_for_user_subscribed_threads(user_id):
- return f"{settings.PREFIX}/users/{user_id}/subscribed_threads"
-
-
-def _url_for_read(user_id):
- """
- Returns cs_comments_service url endpoint to mark thread as read for given user_id
- """
- return f"{settings.PREFIX}/users/{user_id}/read"
-
-
-def _url_for_retire(user_id):
- """
- Returns cs_comments_service url endpoint to retire a user (remove all post content, etc.)
- """
- return f"{settings.PREFIX}/users/{user_id}/retire"
-
-
-def _url_for_username_replacement(user_id):
- """
- Returns cs_comments_servuce url endpoint to replace the username of a user
- """
- return f"{settings.PREFIX}/users/{user_id}/replace_username"
+ forum_api.update_username(user_id=self.id, new_username=new_username, course_id=str(course_key))
+
+
+def _clean_forum_params(params):
+ """Convert string booleans to actual booleans and remove None values from forum parameters."""
+ result = {}
+ for k, v in params.items():
+ if v is not None:
+ if isinstance(v, str):
+ if v.lower() == 'true':
+ result[k] = True
+ elif v.lower() == 'false':
+ result[k] = False
+ else:
+ result[k] = v
+ else:
+ result[k] = v
+ return result
diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
index 26625ed3a732..ccdced767e00 100644
--- a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
+++ b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py
@@ -3,14 +3,10 @@
import logging
-from uuid import uuid4
-import requests
-from django.utils.translation import get_language
+import requests # pylint: disable=unused-import
from opaque_keys.edx.keys import CourseKey
-from .settings import SERVICE_HOST as COMMENTS_SERVICE
-
log = logging.getLogger(__name__)
@@ -31,78 +27,6 @@ def extract(dic, keys):
return strip_none({k: dic.get(k) for k in keys})
-def perform_request(method, url, data_or_params=None, raw=False,
- metric_action=None, metric_tags=None, paged_results=False):
- # To avoid dependency conflict
- from openedx.core.djangoapps.django_comment_common.models import ForumsConfig
- config = ForumsConfig.current()
-
- if not config.enabled:
- raise CommentClientMaintenanceError('service disabled')
-
- if metric_tags is None:
- metric_tags = []
-
- metric_tags.append(f'method:{method}')
- if metric_action:
- metric_tags.append(f'action:{metric_action}')
-
- if data_or_params is None:
- data_or_params = {}
- headers = {
- 'X-Edx-Api-Key': config.api_key,
- 'Accept-Language': get_language(),
- }
- request_id = uuid4()
- request_id_dict = {'request_id': request_id}
-
- if method in ['post', 'put', 'patch']:
- data = data_or_params
- params = request_id_dict
- else:
- data = None
- params = data_or_params.copy()
- params.update(request_id_dict)
- response = requests.request(
- method,
- url,
- data=data,
- params=params,
- headers=headers,
- timeout=config.connection_timeout
- )
-
- metric_tags.append(f'status_code:{response.status_code}')
- status_code = int(response.status_code)
- if status_code > 200:
- metric_tags.append('result:failure')
- else:
- metric_tags.append('result:success')
-
- if 200 < status_code < 500: # lint-amnesty, pylint: disable=no-else-raise
- log.info(f'Investigation Log: CommentClientRequestError for request with {method} and params {params}')
- raise CommentClientRequestError(response.text, response.status_code)
- # Heroku returns a 503 when an application is in maintenance mode
- elif status_code == 503:
- raise CommentClientMaintenanceError(response.text)
- elif status_code == 500:
- raise CommentClient500Error(response.text)
- else:
- if raw:
- return response.text
- else:
- try:
- data = response.json()
- except ValueError:
- raise CommentClientError( # lint-amnesty, pylint: disable=raise-missing-from
- "Invalid JSON response for request {request_id}; first 100 characters: '{content}'".format(
- request_id=request_id,
- content=response.text[:100]
- )
- )
- return data
-
-
def clean_forum_params(params):
"""Convert string booleans to actual booleans and remove None values and empty lists from forum parameters."""
result = {}
@@ -160,33 +84,6 @@ def __init__(self, collection, page, num_pages, subscriptions_count=0, corrected
self.corrected_text = corrected_text
-def check_forum_heartbeat():
- """
- Check the forum connection via its built-in heartbeat service and create an answer which can be used in the LMS
- heartbeat django application.
- This function can be connected to the LMS heartbeat checker through the HEARTBEAT_CHECKS variable.
- """
- # To avoid dependency conflict
- from openedx.core.djangoapps.django_comment_common.models import ForumsConfig
- config = ForumsConfig.current()
-
- if not config.enabled:
- # If this check is enabled but forums disabled, don't connect, just report no error
- return 'forum', True, 'OK'
-
- try:
- res = requests.get(
- '%s/heartbeat' % COMMENTS_SERVICE,
- timeout=config.connection_timeout
- ).json()
- if res['OK']:
- return 'forum', True, 'OK'
- else:
- return 'forum', False, res.get('check', 'Forum heartbeat failed')
- except Exception as fail:
- return 'forum', False, str(fail)
-
-
def get_course_key(course_id: CourseKey | str | None) -> CourseKey | None:
"""
Returns a CourseKey if the provided course_id is a valid string representation of a CourseKey.
diff --git a/openedx/core/djangoapps/enrollments/tests/test_data.py b/openedx/core/djangoapps/enrollments/tests/test_data.py
index 93b299d75a3c..491be2cc8cdc 100644
--- a/openedx/core/djangoapps/enrollments/tests/test_data.py
+++ b/openedx/core/djangoapps/enrollments/tests/test_data.py
@@ -8,7 +8,7 @@
import ddt
import pytest
-from pytz import UTC
+from zoneinfo import ZoneInfo
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
@@ -369,7 +369,7 @@ def test_get_course_without_expired_mode_included(self):
def _update_verified_mode_as_expired(self, course_id):
"""Dry method to change verified mode expiration."""
mode = CourseMode.objects.get(course_id=course_id, mode_slug=CourseMode.VERIFIED)
- mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=UTC)
+ mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=ZoneInfo("UTC"))
mode.save()
def assert_enrollment_modes(self, expected_modes, include_expired):
diff --git a/openedx/core/djangoapps/enrollments/tests/test_views.py b/openedx/core/djangoapps/enrollments/tests/test_views.py
index a6b34cbfc60b..31510c3b933f 100644
--- a/openedx/core/djangoapps/enrollments/tests/test_views.py
+++ b/openedx/core/djangoapps/enrollments/tests/test_views.py
@@ -12,7 +12,7 @@
import ddt
import httpretty
import pytest
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.core.cache import cache
from django.core.exceptions import ImproperlyConfigured
@@ -356,8 +356,8 @@ def test_enroll_without_user(self):
@ddt.unpack
def test_force_enrollment(self, course_modes, enrollment_mode, force_enrollment):
# Create the course modes (if any) required for this test case
- start_date = datetime.datetime(2021, 12, 1, 5, 0, 0, tzinfo=pytz.UTC)
- end_date = datetime.datetime(2022, 12, 1, 5, 0, 0, tzinfo=pytz.UTC)
+ start_date = datetime.datetime(2021, 12, 1, 5, 0, 0, tzinfo=ZoneInfo("UTC"))
+ end_date = datetime.datetime(2022, 12, 1, 5, 0, 0, tzinfo=ZoneInfo("UTC"))
self.course = CourseFactory.create(
emit_signals=True,
start=start_date,
@@ -658,11 +658,11 @@ def test_get_course_details_with_credit_course(self):
# enforced at the data layer, so we need to handle the case
# in which no dates are specified.
(None, None, None, None),
- (datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=pytz.UTC), None, "2015-01-02T03:04:05Z", None),
- (None, datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=pytz.UTC), None, "2015-01-02T03:04:05Z"),
+ (datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=ZoneInfo("UTC")), None, "2015-01-02T03:04:05Z", None),
+ (None, datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=ZoneInfo("UTC")), None, "2015-01-02T03:04:05Z"),
(
- datetime.datetime(2014, 6, 7, 8, 9, 10, tzinfo=pytz.UTC),
- datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=pytz.UTC),
+ datetime.datetime(2014, 6, 7, 8, 9, 10, tzinfo=ZoneInfo("UTC")),
+ datetime.datetime(2015, 1, 2, 3, 4, 5, tzinfo=ZoneInfo("UTC")),
"2014-06-07T08:09:10Z",
"2015-01-02T03:04:05Z",
),
@@ -1078,7 +1078,7 @@ def test_deactivate_enrollment_expired_mode(self):
# Change verified mode expiration.
mode = CourseMode.objects.get(course_id=self.course.id, mode_slug=CourseMode.VERIFIED)
- mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=pytz.utc)
+ mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=ZoneInfo("UTC"))
mode.save()
# Deactivate enrollment.
@@ -1198,7 +1198,7 @@ def test_update_enrollment_with_expired_mode(self, using_api_key, updated_mode):
# Change verified mode expiration.
mode = CourseMode.objects.get(course_id=self.course.id, mode_slug=CourseMode.VERIFIED)
- mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=pytz.utc)
+ mode.expiration_datetime = datetime.datetime(year=1970, month=1, day=1, tzinfo=ZoneInfo("UTC"))
mode.save()
self.assert_enrollment_status(
as_server=using_api_key,
@@ -1784,7 +1784,7 @@ class CourseEnrollmentsApiListTest(APITestCase, ModuleStoreTestCase):
"""
Test the course enrollments list API.
"""
- CREATED_DATA = datetime.datetime(2018, 1, 1, 0, 0, 1, tzinfo=pytz.UTC)
+ CREATED_DATA = datetime.datetime(2018, 1, 1, 0, 0, 1, tzinfo=ZoneInfo("UTC"))
def setUp(self):
super().setUp()
diff --git a/openedx/core/djangoapps/external_user_ids/migrations/0009_mariadb_uuid_conversion.py b/openedx/core/djangoapps/external_user_ids/migrations/0009_mariadb_uuid_conversion.py
new file mode 100644
index 000000000000..eddb1608856e
--- /dev/null
+++ b/openedx/core/djangoapps/external_user_ids/migrations/0009_mariadb_uuid_conversion.py
@@ -0,0 +1,86 @@
+# Generated migration for MariaDB UUID field conversion (Django 5.2)
+"""
+Migration to convert UUIDField from char(32) to uuid type for MariaDB compatibility.
+
+This migration is necessary because Django 5 changed the behavior of UUIDField for MariaDB
+databases from using CharField(32) to using a proper UUID type. This change isn't managed
+automatically, so we need to generate migrations to safely convert the columns.
+
+This migration only executes for MariaDB databases and is a no-op for other backends.
+
+See: https://www.albertyw.com/note/django-5-mariadb-uuidfield
+"""
+
+from django.db import migrations
+
+
+def apply_mariadb_migration(apps, schema_editor):
+ """Apply the migration only for MariaDB databases."""
+ connection = schema_editor.connection
+
+ # Check if this is a MariaDB database
+ if connection.vendor != 'mysql':
+ return
+
+ # Additional check for MariaDB specifically (vs MySQL)
+ with connection.cursor() as cursor:
+ cursor.execute("SELECT VERSION()")
+ version = cursor.fetchone()[0]
+ if 'mariadb' not in version.lower():
+ return
+
+ # Apply the field changes for MariaDB
+ with connection.cursor() as cursor:
+ # Convert external_user_id in externalid table
+ cursor.execute(
+ "ALTER TABLE external_user_ids_externalid "
+ "MODIFY external_user_id uuid NOT NULL"
+ )
+ # Convert external_user_id in historicalexternalid table
+ cursor.execute(
+ "ALTER TABLE external_user_ids_historicalexternalid "
+ "MODIFY external_user_id uuid NOT NULL"
+ )
+
+
+def reverse_mariadb_migration(apps, schema_editor):
+ """Reverse the migration only for MariaDB databases."""
+ connection = schema_editor.connection
+
+ # Check if this is a MariaDB database
+ if connection.vendor != 'mysql':
+ return
+
+ # Additional check for MariaDB specifically (vs MySQL)
+ with connection.cursor() as cursor:
+ cursor.execute("SELECT VERSION()")
+ version = cursor.fetchone()[0]
+ if 'mariadb' not in version.lower():
+ return
+
+ # Reverse the field changes for MariaDB
+ with connection.cursor() as cursor:
+ # Revert external_user_id in externalid table
+ cursor.execute(
+ "ALTER TABLE external_user_ids_externalid "
+ "MODIFY external_user_id char(32) NOT NULL"
+ )
+ # Revert external_user_id in historicalexternalid table
+ cursor.execute(
+ "ALTER TABLE external_user_ids_historicalexternalid "
+ "MODIFY external_user_id char(32) NOT NULL"
+ )
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('external_user_ids', '0008_remove_mbcoaching_extid_type'),
+ ]
+
+ operations = [
+ migrations.RunPython(
+ code=apply_mariadb_migration,
+ reverse_code=reverse_mariadb_migration,
+ ),
+ ]
diff --git a/openedx/core/djangoapps/models/tests/test_course_details.py b/openedx/core/djangoapps/models/tests/test_course_details.py
index 41e739ecb4c8..b23b56c88aa3 100644
--- a/openedx/core/djangoapps/models/tests/test_course_details.py
+++ b/openedx/core/djangoapps/models/tests/test_course_details.py
@@ -7,7 +7,7 @@
from django.test import override_settings
import pytest
import ddt
-from pytz import UTC
+from zoneinfo import ZoneInfo
from django.conf import settings
from xmodule.modulestore import ModuleStoreEnum
@@ -86,13 +86,13 @@ def test_update_and_fetch(self):
jsondetails.self_paced = True
assert CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user).self_paced ==\
jsondetails.self_paced
- jsondetails.start_date = datetime.datetime(2010, 10, 1, 0, tzinfo=UTC)
+ jsondetails.start_date = datetime.datetime(2010, 10, 1, 0, tzinfo=ZoneInfo("UTC"))
assert CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user).start_date ==\
jsondetails.start_date
- jsondetails.end_date = datetime.datetime(2011, 10, 1, 0, tzinfo=UTC)
+ jsondetails.end_date = datetime.datetime(2011, 10, 1, 0, tzinfo=ZoneInfo("UTC"))
assert CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user).end_date ==\
jsondetails.end_date
- jsondetails.certificate_available_date = datetime.datetime(2010, 10, 1, 0, tzinfo=UTC)
+ jsondetails.certificate_available_date = datetime.datetime(2010, 10, 1, 0, tzinfo=ZoneInfo("UTC"))
assert CourseDetails.update_from_json(self.course.id, jsondetails.__dict__, self.user)\
.certificate_available_date == jsondetails.certificate_available_date
jsondetails.course_image_name = "an_image.jpg"
@@ -126,7 +126,7 @@ def test_update_and_fetch(self):
jsondetails.instructor_info
def test_toggle_pacing_during_course_run(self):
- self.course.start = datetime.datetime.now(UTC)
+ self.course.start = datetime.datetime.now(ZoneInfo("UTC"))
self.store.update_item(self.course, self.user.id)
details = CourseDetails.fetch(self.course.id)
diff --git a/openedx/core/djangoapps/notifications/base_notification.py b/openedx/core/djangoapps/notifications/base_notification.py
index 5264053ace5a..4b9393830eb9 100644
--- a/openedx/core/djangoapps/notifications/base_notification.py
+++ b/openedx/core/djangoapps/notifications/base_notification.py
@@ -178,7 +178,7 @@
'is_core': False,
'info': '',
'web': True,
- 'email': False,
+ 'email': True,
'push': False,
'email_cadence': EmailCadence.DAILY,
'non_editable': ['push'],
@@ -236,7 +236,7 @@
'is_core': False,
'info': '',
'web': True,
- 'email': False,
+ 'email': True,
'email_cadence': EmailCadence.DAILY,
'push': False,
'non_editable': ['push'],
diff --git a/openedx/core/djangoapps/notifications/tasks.py b/openedx/core/djangoapps/notifications/tasks.py
index fb9f95990d3a..290a7c02b350 100644
--- a/openedx/core/djangoapps/notifications/tasks.py
+++ b/openedx/core/djangoapps/notifications/tasks.py
@@ -10,7 +10,7 @@
from django.core.exceptions import ValidationError
from edx_django_utils.monitoring import set_code_owner_attribute
from opaque_keys.edx.keys import CourseKey
-from pytz import UTC
+from zoneinfo import ZoneInfo
from openedx.core.djangoapps.notifications.audience_filters import NotificationFilter
from openedx.core.djangoapps.notifications.base_notification import (
@@ -75,7 +75,7 @@ def delete_expired_notifications():
This task deletes all expired notifications
"""
batch_size = settings.EXPIRED_NOTIFICATIONS_DELETE_BATCH_SIZE
- expiry_date = datetime.now(UTC) - timedelta(days=settings.NOTIFICATIONS_EXPIRY)
+ expiry_date = datetime.now(ZoneInfo("UTC")) - timedelta(days=settings.NOTIFICATIONS_EXPIRY)
start_time = datetime.now()
total_deleted = 0
delete_count = None
diff --git a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
index debd72d9011f..fd28bb999e9d 100644
--- a/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
+++ b/openedx/core/djangoapps/notifications/tests/test_notification_grouping.py
@@ -6,7 +6,7 @@
import unittest
from unittest.mock import MagicMock, patch
from datetime import datetime
-from pytz import utc
+from zoneinfo import ZoneInfo
from common.djangoapps.student.tests.factories import UserFactory
from openedx.core.djangoapps.notifications.grouping_notifications import (
@@ -128,7 +128,7 @@ def test_group_user_notifications_no_grouper(self):
self.assertFalse(old_notification.save.called)
- @ddt.data(datetime(2023, 1, 1, tzinfo=utc), None)
+ @ddt.data(datetime(2023, 1, 1, tzinfo=ZoneInfo("UTC")), None)
def test_not_grouped_when_notification_is_seen(self, last_seen):
"""
Notification is not grouped if the notification is marked as seen
@@ -172,11 +172,11 @@ def test_get_user_existing_notifications(self, mock_filter):
# Mock the notification objects returned by the filter
mock_notification1 = MagicMock(spec=Notification)
mock_notification1.user_id = 1
- mock_notification1.created = datetime(2023, 9, 1, tzinfo=utc)
+ mock_notification1.created = datetime(2023, 9, 1, tzinfo=ZoneInfo("UTC"))
mock_notification2 = MagicMock(spec=Notification)
mock_notification2.user_id = 1
- mock_notification2.created = datetime(2023, 9, 2, tzinfo=utc)
+ mock_notification2.created = datetime(2023, 9, 2, tzinfo=ZoneInfo("UTC"))
mock_filter.return_value = [mock_notification1, mock_notification2]
diff --git a/openedx/core/djangoapps/notifications/tests/test_views.py b/openedx/core/djangoapps/notifications/tests/test_views.py
index 06d615f07d7b..5e09a86c5914 100644
--- a/openedx/core/djangoapps/notifications/tests/test_views.py
+++ b/openedx/core/djangoapps/notifications/tests/test_views.py
@@ -11,7 +11,7 @@
from django.test.utils import override_settings
from django.urls import reverse
from edx_toggles.toggles.testutils import override_waffle_flag
-from pytz import UTC
+from zoneinfo import ZoneInfo
from rest_framework import status
from rest_framework.test import APIClient, APITestCase
@@ -192,7 +192,7 @@ def test_list_notifications_with_expiry_date(self):
"""
Test that the view can filter notifications by expiry date.
"""
- today = datetime.now(UTC)
+ today = datetime.now(ZoneInfo("UTC"))
# Create two notifications for the user, one with current date and other with expiry date.
Notification.objects.create(
@@ -604,7 +604,7 @@ def setUp(self):
},
"new_instructor_all_learners_post": {
"web": True,
- "email": False,
+ "email": True,
"push": False,
"email_cadence": "Daily"
},
@@ -628,7 +628,7 @@ def setUp(self):
"notification_types": {
"course_updates": {
"web": True,
- "email": False,
+ "email": True,
"push": False,
"email_cadence": "Daily"
},
diff --git a/openedx/core/djangoapps/notifications/views.py b/openedx/core/djangoapps/notifications/views.py
index 091be365d45f..041f68f95648 100644
--- a/openedx/core/djangoapps/notifications/views.py
+++ b/openedx/core/djangoapps/notifications/views.py
@@ -8,7 +8,7 @@
from django_ratelimit.core import is_ratelimited
from django.shortcuts import get_object_or_404
from django.utils.translation import gettext as _
-from pytz import UTC
+from zoneinfo import ZoneInfo
from rest_framework import generics, status
from rest_framework.decorators import api_view
from rest_framework.generics import UpdateAPIView
@@ -80,7 +80,7 @@ def get_queryset(self):
"""
Override the get_queryset method to filter the queryset by app name, request.user and created
"""
- expiry_date = datetime.now(UTC) - timedelta(days=settings.NOTIFICATIONS_EXPIRY)
+ expiry_date = datetime.now(ZoneInfo("UTC")) - timedelta(days=settings.NOTIFICATIONS_EXPIRY)
app_name = self.request.query_params.get('app_name')
if self.request.query_params.get('tray_opened'):
@@ -212,7 +212,7 @@ def patch(self, request, *args, **kwargs):
- 404: Not Found status code if the notification was not found.
"""
notification_id = request.data.get('notification_id', None)
- read_at = datetime.now(UTC)
+ read_at = datetime.now(ZoneInfo("UTC"))
if notification_id:
notification = get_object_or_404(Notification, pk=notification_id, user=request.user)
diff --git a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py
index f8cf0538140d..773c344db0af 100644
--- a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py
+++ b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py
@@ -11,7 +11,7 @@
from oauth2_provider.models import AccessToken
from oauth2_provider.oauth2_validators import OAuth2Validator
from oauth2_provider.scopes import get_scopes_backend
-from pytz import utc
+from zoneinfo import ZoneInfo
from ..models import RestrictedApplication
# pylint: disable=W0223
@@ -23,7 +23,7 @@ def on_access_token_presave(sender, instance, *args, **kwargs): # pylint: disab
Mark AccessTokens as expired for 'restricted applications' if required.
"""
if RestrictedApplication.should_expire_access_token(instance.application):
- instance.expires = datetime(1970, 1, 1, tzinfo=utc)
+ instance.expires = datetime(1970, 1, 1, tzinfo=ZoneInfo("UTC"))
class EdxOAuth2Validator(OAuth2Validator):
@@ -152,4 +152,4 @@ def _get_utc_now():
"""
Return current time in UTC.
"""
- return datetime.utcnow().replace(tzinfo=utc)
+ return datetime.utcnow().replace(tzinfo=ZoneInfo("UTC"))
diff --git a/openedx/core/djangoapps/oauth_dispatch/models.py b/openedx/core/djangoapps/oauth_dispatch/models.py
index 2e635167e4c7..3869698af4cb 100644
--- a/openedx/core/djangoapps/oauth_dispatch/models.py
+++ b/openedx/core/djangoapps/oauth_dispatch/models.py
@@ -11,7 +11,7 @@
from django_mysql.models import ListCharField
from oauth2_provider.settings import oauth2_settings
from organizations.models import Organization
-from pytz import utc
+from zoneinfo import ZoneInfo
from openedx.core.djangolib.markup import HTML
from openedx.core.lib.request_utils import get_request_or_stub
@@ -53,7 +53,7 @@ def verify_access_token_as_expired(cls, access_token):
For access_tokens for RestrictedApplications, make sure that the expiry date
is set at the beginning of the epoch which is Jan. 1, 1970
"""
- return access_token.expires == datetime(1970, 1, 1, tzinfo=utc)
+ return access_token.expires == datetime(1970, 1, 1, tzinfo=ZoneInfo("UTC"))
class ApplicationAccess(models.Model):
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/factories.py b/openedx/core/djangoapps/oauth_dispatch/tests/factories.py
index 473bcd4ced9d..7d7be8dd7fa6 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/factories.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/factories.py
@@ -4,7 +4,7 @@
from datetime import datetime, timedelta
import factory
-import pytz
+from zoneinfo import ZoneInfo
from factory.django import DjangoModelFactory
from factory.fuzzy import FuzzyText
from oauth2_provider.models import AccessToken, Application, RefreshToken
@@ -39,7 +39,7 @@ class Meta:
django_get_or_create = ('user', 'application')
token = FuzzyText(length=32)
- expires = datetime.now(pytz.UTC) + timedelta(days=1)
+ expires = datetime.now(ZoneInfo("UTC")) + timedelta(days=1)
class RefreshTokenFactory(DjangoModelFactory):
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py b/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
index d99ac4883b18..407a9aac2b84 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
@@ -11,6 +11,7 @@
from jwt.exceptions import ExpiredSignatureError
from common.djangoapps.student.models import UserProfile, anonymous_id_for_user
+from common.test.utils import assert_dict_contains_subset
class AccessTokenMixin:
@@ -88,7 +89,7 @@ def _decode_jwt(verify_expiration):
expected['grant_type'] = grant_type or ''
- self.assertDictContainsSubset(expected, payload)
+ assert_dict_contains_subset(self, expected, payload)
if expires_in:
assert payload['exp'] == payload['iat'] + expires_in
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_api.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_api.py
index 3c064cc63c55..5bf1f524bce6 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_api.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_api.py
@@ -9,6 +9,7 @@
from oauth2_provider.models import AccessToken
from common.djangoapps.student.tests.factories import UserFactory
+from common.test.utils import assert_dict_contains_subset
OAUTH_PROVIDER_ENABLED = settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER')
if OAUTH_PROVIDER_ENABLED:
@@ -43,7 +44,8 @@ def test_create_token_success(self):
token = api.create_dot_access_token(HttpRequest(), self.user, self.client)
assert token['access_token']
assert token['refresh_token']
- self.assertDictContainsSubset(
+ assert_dict_contains_subset(
+ self,
{
'token_type': 'Bearer',
'expires_in': EXPECTED_DEFAULT_EXPIRES_IN,
@@ -63,5 +65,5 @@ def test_create_token_overrides(self):
token = api.create_dot_access_token(
HttpRequest(), self.user, self.client, expires_in=expires_in, scopes=['profile'],
)
- self.assertDictContainsSubset({'scope': 'profile'}, token)
- self.assertDictContainsSubset({'expires_in': expires_in}, token)
+ assert_dict_contains_subset(self, {'scope': 'profile'}, token)
+ assert_dict_contains_subset(self, {'expires_in': expires_in}, token)
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
index da95fd072ded..647da14f6edd 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
@@ -12,6 +12,7 @@
from openedx.core.djangoapps.oauth_dispatch.models import RestrictedApplication
from openedx.core.djangoapps.oauth_dispatch.tests.mixins import AccessTokenMixin
from common.djangoapps.student.tests.factories import UserFactory
+from common.test.utils import assert_dict_contains_subset
@ddt.ddt
@@ -171,7 +172,7 @@ def test_create_jwt_for_user(self, user_email_verified, mock_create_roles):
token_payload = self.assert_valid_jwt_access_token(
jwt_token, self.user, self.default_scopes, aud=aud, secret=secret,
)
- self.assertDictContainsSubset(additional_claims, token_payload)
+ assert_dict_contains_subset(self, additional_claims, token_payload)
assert user_email_verified == token_payload['email_verified']
assert token_payload['roles'] == mock_create_roles.return_value
diff --git a/openedx/core/djangoapps/password_policy/compliance.py b/openedx/core/djangoapps/password_policy/compliance.py
index fdd103d2437d..8601a55d658f 100644
--- a/openedx/core/djangoapps/password_policy/compliance.py
+++ b/openedx/core/djangoapps/password_policy/compliance.py
@@ -4,7 +4,7 @@
from datetime import datetime
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.utils.translation import gettext as _
@@ -69,7 +69,7 @@ def enforce_compliance_on_login(user, password):
if deadline is None:
return
- now = datetime.now(pytz.UTC)
+ now = datetime.now(ZoneInfo("UTC"))
if now >= deadline: # lint-amnesty, pylint: disable=no-else-raise
raise NonCompliantPasswordException(
HTML(_(
diff --git a/openedx/core/djangoapps/password_policy/tests/test_compliance.py b/openedx/core/djangoapps/password_policy/tests/test_compliance.py
index cb803bed99a9..5d8a56d60c80 100644
--- a/openedx/core/djangoapps/password_policy/tests/test_compliance.py
+++ b/openedx/core/djangoapps/password_policy/tests/test_compliance.py
@@ -6,7 +6,7 @@
from unittest.mock import patch
import pytest
-import pytz
+from zoneinfo import ZoneInfo
from dateutil.parser import parse as parse_date
from django.test import TestCase, override_settings
@@ -75,7 +75,7 @@ def test_enforce_compliance_on_login(self):
mock_check_user_compliance.return_value = False
with patch('openedx.core.djangoapps.password_policy.compliance._get_compliance_deadline_for_user') as \
mock_get_compliance_deadline_for_user:
- mock_get_compliance_deadline_for_user.return_value = datetime.now(pytz.UTC) - timedelta(1)
+ mock_get_compliance_deadline_for_user.return_value = datetime.now(ZoneInfo("UTC")) - timedelta(1)
pytest.raises(NonCompliantPasswordException, enforce_compliance_on_login, user, password)
# Test deadline is in the future
@@ -84,7 +84,7 @@ def test_enforce_compliance_on_login(self):
mock_check_user_compliance.return_value = False
with patch('openedx.core.djangoapps.password_policy.compliance._get_compliance_deadline_for_user') as \
mock_get_compliance_deadline_for_user:
- mock_get_compliance_deadline_for_user.return_value = datetime.now(pytz.UTC) + timedelta(1)
+ mock_get_compliance_deadline_for_user.return_value = datetime.now(ZoneInfo("UTC")) + timedelta(1)
assert pytest.raises(NonCompliantPasswordWarning, enforce_compliance_on_login, user, password)
def test_check_user_compliance(self):
diff --git a/openedx/core/djangoapps/profile_images/tests/test_views.py b/openedx/core/djangoapps/profile_images/tests/test_views.py
index 0a276377589b..963c0956c28a 100644
--- a/openedx/core/djangoapps/profile_images/tests/test_views.py
+++ b/openedx/core/djangoapps/profile_images/tests/test_views.py
@@ -7,7 +7,7 @@
import pytest
import datetime # lint-amnesty, pylint: disable=wrong-import-order
-from pytz import UTC
+from zoneinfo import ZoneInfo
from django.urls import reverse
from django.http import HttpResponse
@@ -30,8 +30,8 @@
from .helpers import make_image_file
TEST_PASSWORD = "test"
-TEST_UPLOAD_DT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=UTC)
-TEST_UPLOAD_DT2 = datetime.datetime(2003, 1, 9, 15, 43, 1, tzinfo=UTC)
+TEST_UPLOAD_DT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=ZoneInfo("UTC"))
+TEST_UPLOAD_DT2 = datetime.datetime(2003, 1, 9, 15, 43, 1, tzinfo=ZoneInfo("UTC"))
class ProfileImageEndpointMixin(UserSettingsEventTestMixin):
diff --git a/openedx/core/djangoapps/profile_images/views.py b/openedx/core/djangoapps/profile_images/views.py
index b88b3ad32bdb..1c9d4fcf3bf7 100644
--- a/openedx/core/djangoapps/profile_images/views.py
+++ b/openedx/core/djangoapps/profile_images/views.py
@@ -11,7 +11,7 @@
from django.utils.translation import gettext as _
from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
-from pytz import UTC
+from zoneinfo import ZoneInfo
from rest_framework import permissions, status
from rest_framework.parsers import FormParser, MultiPartParser
from rest_framework.response import Response
@@ -38,7 +38,7 @@ def _make_upload_dt():
Generate a server-side timestamp for the upload. This is in a separate
function so its behavior can be overridden in tests.
"""
- return datetime.datetime.utcnow().replace(tzinfo=UTC)
+ return datetime.datetime.utcnow().replace(tzinfo=ZoneInfo("UTC"))
class ProfileImageView(DeveloperErrorViewMixin, APIView):
diff --git a/openedx/core/djangoapps/programs/tests/test_tasks.py b/openedx/core/djangoapps/programs/tests/test_tasks.py
index e2b1c554c840..943c8c0dd444 100644
--- a/openedx/core/djangoapps/programs/tests/test_tasks.py
+++ b/openedx/core/djangoapps/programs/tests/test_tasks.py
@@ -10,7 +10,7 @@
import ddt
import httpretty
import pytest
-import pytz
+from zoneinfo import ZoneInfo
import requests
from celery.exceptions import MaxRetriesExceededError
from django.conf import settings
@@ -520,7 +520,7 @@ class AwardCourseCertificatesTestCase(CredentialsApiConfigMixin, TestCase):
def setUp(self):
super().setUp()
- self.available_date = datetime.now(pytz.UTC) + timedelta(days=1)
+ self.available_date = datetime.now(ZoneInfo("UTC")) + timedelta(days=1)
self.course = CourseOverviewFactory.create(
self_paced=True, # Any option to allow the certificate to be viewable for the course
certificate_available_date=self.available_date,
@@ -1023,7 +1023,7 @@ class UpdateCertificateAvailableDateOnCourseUpdateTestCase(CredentialsApiConfigM
def setUp(self):
super().setUp()
- self.end_date = datetime.now(pytz.UTC) + timedelta(days=90)
+ self.end_date = datetime.now(ZoneInfo("UTC")) + timedelta(days=90)
self.credentials_api_config = self.create_credentials_config(enabled=False)
def tearDown(self):
@@ -1135,7 +1135,7 @@ def test_update_certificate_available_date_instructor_paced_cdb_end_with_date(se
explicitly set as part of the course overview.
"""
self._update_credentials_api_config(True)
- certificate_available_date = datetime.now(pytz.UTC) + timedelta(days=120)
+ certificate_available_date = datetime.now(ZoneInfo("UTC")) + timedelta(days=120)
course_overview = self._create_course_overview(
False,
@@ -1168,7 +1168,7 @@ def test_update_certificate_available_date_self_paced(self, mock_update):
invalid data is set in a course overview, we don't pass it to Credentials.
"""
self._update_credentials_api_config(True)
- certificate_available_date = datetime.now(pytz.UTC) + timedelta(days=120)
+ certificate_available_date = datetime.now(ZoneInfo("UTC")) + timedelta(days=120)
course_overview = self._create_course_overview(
True,
diff --git a/openedx/core/djangoapps/programs/tests/test_utils.py b/openedx/core/djangoapps/programs/tests/test_utils.py
index 264f1a6aeebd..18058c827a52 100644
--- a/openedx/core/djangoapps/programs/tests/test_utils.py
+++ b/openedx/core/djangoapps/programs/tests/test_utils.py
@@ -15,7 +15,7 @@
from django.urls import reverse
from edx_toggles.toggles.testutils import override_waffle_switch
from opaque_keys.edx.keys import CourseKey # lint-amnesty, pylint: disable=wrong-import-order
-from pytz import utc
+from zoneinfo import ZoneInfo
from testfixtures import LogCapture
from common.djangoapps.course_modes.models import CourseMode
@@ -209,7 +209,7 @@ def test_single_program_multiple_entitlements(self, mock_get_programs):
CourseEntitlementFactory.create(
user=self.user,
course_uuid=course_uuid,
- expired_at=datetime.datetime.now(utc),
+ expired_at=datetime.datetime.now(ZoneInfo("UTC")),
mode=CourseMode.VERIFIED,
enrollment_course_run=enrollment
@@ -308,7 +308,7 @@ def test_in_progress_course_upgrade_deadline_check(self, offset, mock_get_progra
the right type for which the upgrade deadline has not passed.
"""
course_run_key = generate_course_run_key()
- now = datetime.datetime.now(utc)
+ now = datetime.datetime.now(ZoneInfo("UTC"))
upgrade_deadline = None if not offset else str(now + datetime.timedelta(days=offset))
required_seat = SeatFactory(type=CourseMode.VERIFIED, upgrade_deadline=upgrade_deadline)
enrolled_seat = SeatFactory(type=CourseMode.AUDIT)
@@ -488,7 +488,7 @@ def test_shared_entitlement_engagement(self, mock_get_programs):
def test_simulate_progress(self, mock_get_programs): # lint-amnesty, pylint: disable=too-many-statements
"""Simulate the entirety of a user's progress through a program."""
- today = datetime.datetime.now(utc)
+ today = datetime.datetime.now(ZoneInfo("UTC"))
two_days_ago = today - datetime.timedelta(days=2)
three_days_ago = today - datetime.timedelta(days=3)
yesterday = today - datetime.timedelta(days=1)
@@ -862,8 +862,8 @@ def _create_course(self, course_price, course_run_count=1, make_entitlement=Fals
course_runs = []
for x in range(course_run_count):
course = ModuleStoreCourseFactory.create(run='Run_' + str(x))
- course.start = datetime.datetime.now(utc) - datetime.timedelta(days=1)
- course.end = datetime.datetime.now(utc) + datetime.timedelta(days=1)
+ course.start = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=1)
+ course.end = datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(days=1)
course.instructor_info = self.instructors
course = self.update_course(course, self.user.id)
@@ -899,8 +899,8 @@ def setUp(self):
super().setUp()
self.course = ModuleStoreCourseFactory()
- self.course.start = datetime.datetime.now(utc) - datetime.timedelta(days=1)
- self.course.end = datetime.datetime.now(utc) + datetime.timedelta(days=1)
+ self.course.start = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=1)
+ self.course.end = datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(days=1)
self.course = self.update_course(self.course, self.user.id)
self.course_run = CourseRunFactory(key=str(self.course.id))
@@ -941,7 +941,7 @@ def test_is_enrollment_open(self, days_offset):
Verify that changes to the course run end date do not affect our
assessment of the course run being open for enrollment.
"""
- self.course.end = datetime.datetime.now(utc) + datetime.timedelta(days=days_offset)
+ self.course.end = datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(days=days_offset)
self.course = self.update_course(self.course, self.user.id)
data = ProgramDataExtender(self.program, self.user).extend()
@@ -1022,8 +1022,8 @@ def test_course_run_enrollment_status(self, start_offset, end_offset, is_enrollm
"""
Verify that course run enrollment status is reflected correctly.
"""
- self.course.enrollment_start = datetime.datetime.now(utc) - datetime.timedelta(days=start_offset)
- self.course.enrollment_end = datetime.datetime.now(utc) - datetime.timedelta(days=end_offset)
+ self.course.enrollment_start = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=start_offset)
+ self.course.enrollment_end = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=end_offset)
self.course = self.update_course(self.course, self.user.id)
@@ -1040,7 +1040,7 @@ def test_no_enrollment_start_date(self):
Verify that a closed course run with no explicit enrollment start date
doesn't cause an error. Regression test for ECOM-4973.
"""
- self.course.enrollment_end = datetime.datetime.now(utc) - datetime.timedelta(days=1)
+ self.course.enrollment_end = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=1)
self.course = self.update_course(self.course, self.user.id)
data = ProgramDataExtender(self.program, self.user).extend()
diff --git a/openedx/core/djangoapps/programs/utils.py b/openedx/core/djangoapps/programs/utils.py
index 76263c4b405c..49fb054b9b52 100644
--- a/openedx/core/djangoapps/programs/utils.py
+++ b/openedx/core/djangoapps/programs/utils.py
@@ -14,7 +14,7 @@
from django.urls import reverse
from django.utils.functional import cached_property
from opaque_keys.edx.keys import CourseKey
-from pytz import utc
+from zoneinfo import ZoneInfo
from requests.exceptions import RequestException
from common.djangoapps.course_modes.api import get_paid_modes_for_course
@@ -43,7 +43,7 @@
from xmodule.modulestore.django import modulestore
# The datetime module's strftime() methods require a year >= 1900.
-DEFAULT_ENROLLMENT_START_DATE = datetime.datetime(1900, 1, 1, tzinfo=utc)
+DEFAULT_ENROLLMENT_START_DATE = datetime.datetime(1900, 1, 1, tzinfo=ZoneInfo("UTC"))
log = logging.getLogger(__name__)
@@ -286,7 +286,7 @@ def progress(self, programs: list[dict | None] | None = None, count_only: bool =
list of dict, each containing information about a user's progress
towards completing a program.
"""
- now = datetime.datetime.now(utc)
+ now = datetime.datetime.now(ZoneInfo("UTC"))
progress = []
programs = programs or self.engaged_programs
@@ -598,15 +598,17 @@ def _attach_course_run_enrollment_open_date(self, run_mode):
run_mode["enrollment_open_date"] = strftime_localized(self.enrollment_start, "SHORT_DATE")
def _attach_course_run_is_course_ended(self, run_mode):
- end_date = self.course_overview.end or datetime.datetime.max.replace(tzinfo=utc)
- run_mode["is_course_ended"] = end_date < datetime.datetime.now(utc)
+ end_date = self.course_overview.end or datetime.datetime.max.replace(tzinfo=ZoneInfo("UTC"))
+ run_mode["is_course_ended"] = end_date < datetime.datetime.now(ZoneInfo("UTC"))
def _attach_course_run_is_enrolled(self, run_mode):
run_mode["is_enrolled"] = CourseEnrollment.is_enrolled(self.user, self.course_run_key)
def _attach_course_run_is_enrollment_open(self, run_mode):
- enrollment_end = self.course_overview.enrollment_end or datetime.datetime.max.replace(tzinfo=utc)
- run_mode["is_enrollment_open"] = self.enrollment_start <= datetime.datetime.now(utc) < enrollment_end
+ enrollment_end = self.course_overview.enrollment_end or datetime.datetime.max.replace(tzinfo=ZoneInfo("UTC"))
+ run_mode["is_enrollment_open"] = (
+ self.enrollment_start <= datetime.datetime.now(ZoneInfo("UTC")) < enrollment_end
+ )
def _attach_course_run_advertised_start(self, run_mode):
"""
diff --git a/openedx/core/djangoapps/schedules/management/commands/__init__.py b/openedx/core/djangoapps/schedules/management/commands/__init__.py
index 0b7255976563..16484ef367ea 100644
--- a/openedx/core/djangoapps/schedules/management/commands/__init__.py
+++ b/openedx/core/djangoapps/schedules/management/commands/__init__.py
@@ -5,7 +5,7 @@
import datetime
-import pytz
+from zoneinfo import ZoneInfo
from django.contrib.sites.models import Site
from django.core.management.base import BaseCommand
@@ -62,7 +62,7 @@ def handle(self, *args, **options):
current_date = datetime.datetime(
*[int(x) for x in options['date'].split('-')],
- tzinfo=pytz.UTC
+ tzinfo=ZoneInfo("UTC")
)
self.log_debug('Current date = %s', current_date.isoformat())
override_recipient_email = options.get('override_recipient_email')
diff --git a/openedx/core/djangoapps/schedules/management/commands/send_course_next_section_update.py b/openedx/core/djangoapps/schedules/management/commands/send_course_next_section_update.py
index 53e2100649a1..6faa92308840 100644
--- a/openedx/core/djangoapps/schedules/management/commands/send_course_next_section_update.py
+++ b/openedx/core/djangoapps/schedules/management/commands/send_course_next_section_update.py
@@ -3,7 +3,7 @@
"""
import datetime
-import pytz
+from zoneinfo import ZoneInfo
from textwrap import dedent # lint-amnesty, pylint: disable=wrong-import-order
from django.contrib.sites.models import Site
@@ -23,7 +23,7 @@ class Command(SendEmailBaseCommand):
def handle(self, *args, ** options):
current_date = datetime.datetime(
*[int(x) for x in options['date'].split('-')],
- tzinfo=pytz.UTC
+ tzinfo=ZoneInfo("UTC")
)
site = Site.objects.get(domain__iexact=options['site_domain_name'])
diff --git a/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py b/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
index 976f1aa16fd9..587271fc599c 100644
--- a/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
+++ b/openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py
@@ -7,7 +7,7 @@
from textwrap import dedent
import factory
-import pytz
+from zoneinfo import ZoneInfo
from django.contrib.sites.models import Site
from django.core.management.base import BaseCommand
@@ -26,29 +26,29 @@ class ThreeDayNudgeSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 3-day nudge email.
"""
- start_date = factory.Faker('date_time_between', start_date='-3d', end_date='-3d', tzinfo=pytz.UTC)
+ start_date = factory.Faker('date_time_between', start_date='-3d', end_date='-3d', tzinfo=ZoneInfo("UTC"))
class TenDayNudgeSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 10-day nudge email.
"""
- start_date = factory.Faker('date_time_between', start_date='-10d', end_date='-10d', tzinfo=pytz.UTC)
+ start_date = factory.Faker('date_time_between', start_date='-10d', end_date='-10d', tzinfo=ZoneInfo("UTC"))
class UpgradeReminderSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a 2-days-remaining upgrade reminder.
"""
- start_date = factory.Faker('past_datetime', tzinfo=pytz.UTC)
- upgrade_deadline = factory.Faker('date_time_between', start_date='+2d', end_date='+2d', tzinfo=pytz.UTC)
+ start_date = factory.Faker('past_datetime', tzinfo=ZoneInfo("UTC"))
+ upgrade_deadline = factory.Faker('date_time_between', start_date='+2d', end_date='+2d', tzinfo=ZoneInfo("UTC"))
class ContentHighlightSchedule(ScheduleFactory):
"""
A ScheduleFactory that creates a Schedule set up for a course highlights email.
"""
- start_date = factory.Faker('date_time_between', start_date='-7d', end_date='-7d', tzinfo=pytz.UTC)
+ start_date = factory.Faker('date_time_between', start_date='-7d', end_date='-7d', tzinfo=ZoneInfo("UTC"))
experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule', experience_type=ScheduleExperience.EXPERIENCES.course_updates) # lint-amnesty, pylint: disable=line-too-long
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
index 774f1f418124..c0a63954644d 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
@@ -11,7 +11,7 @@
import attr
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from django.db.models import Max
@@ -119,7 +119,7 @@ def _next_user_id(self):
return max_user_id + num_bins - (max_user_id % num_bins)
def _get_dates(self, offset=None): # lint-amnesty, pylint: disable=missing-function-docstring
- current_day = _get_datetime_beginning_of_day(datetime.datetime.now(pytz.UTC))
+ current_day = _get_datetime_beginning_of_day(datetime.datetime.now(ZoneInfo("UTC")))
offset = offset or self.expected_offsets[0]
target_day = current_day + datetime.timedelta(days=offset)
if self.resolver.schedule_date_field == 'upgrade_deadline':
@@ -148,7 +148,7 @@ def _schedule_factory(self, offset=None, **factory_kwargs): # lint-amnesty, pyl
CourseModeFactory(
course_id=course_id,
mode_slug=CourseMode.VERIFIED,
- expiration_datetime=datetime.datetime.now(pytz.UTC) + datetime.timedelta(days=30),
+ expiration_datetime=datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(days=30),
)
self._courses_with_verified_modes.add(course_id)
return schedule
@@ -158,7 +158,7 @@ def _update_schedule_config(self, schedule_config_kwargs):
Updates the schedule config model by making sure the new entry
has a later timestamp.
"""
- later_time = datetime.datetime.now(pytz.UTC) + datetime.timedelta(minutes=1)
+ later_time = datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(minutes=1)
with freeze_time(later_time):
ScheduleConfigFactory.create(**schedule_config_kwargs)
@@ -167,7 +167,7 @@ def test_command_task_binding(self):
def test_handle(self):
with patch.object(self.command, 'async_send_task') as mock_send:
- test_day = datetime.datetime(2017, 8, 1, tzinfo=pytz.UTC)
+ test_day = datetime.datetime(2017, 8, 1, tzinfo=ZoneInfo("UTC"))
self.command().handle(date='2017-08-01', site_domain_name=self.site_config.site.domain)
for offset in self.expected_offsets:
@@ -287,7 +287,7 @@ def test_enqueue_config(self, is_enabled):
}
self._update_schedule_config(schedule_config_kwargs)
- current_datetime = datetime.datetime(2017, 8, 1, tzinfo=pytz.UTC)
+ current_datetime = datetime.datetime(2017, 8, 1, tzinfo=ZoneInfo("UTC"))
with patch.object(self.task, 'apply_async') as mock_apply_async:
self.task.enqueue(self.site_config.site, current_datetime, 3)
diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
index 11b33d585195..eb1f7fe40f71 100644
--- a/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
+++ b/openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py
@@ -8,7 +8,7 @@
from unittest.mock import DEFAULT, Mock, patch
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.contrib.sites.models import Site
@@ -33,7 +33,7 @@ def test_handle(self):
self.command.handle(site_domain_name=self.site.domain, date='2017-09-29')
send_emails.assert_called_once_with(
self.site,
- datetime.datetime(2017, 9, 29, tzinfo=pytz.UTC),
+ datetime.datetime(2017, 9, 29, tzinfo=ZoneInfo("UTC")),
None,
None
)
@@ -45,7 +45,7 @@ def test_handle_all_sites(self):
for expected_site in expected_sites:
send_emails.assert_any_call(
expected_site,
- datetime.datetime(2017, 9, 29, tzinfo=pytz.UTC),
+ datetime.datetime(2017, 9, 29, tzinfo=ZoneInfo("UTC")),
None,
None
)
diff --git a/openedx/core/djangoapps/schedules/tests/factories.py b/openedx/core/djangoapps/schedules/tests/factories.py
index 882b62fb8b78..c3ffcad246ed 100644
--- a/openedx/core/djangoapps/schedules/tests/factories.py
+++ b/openedx/core/djangoapps/schedules/tests/factories.py
@@ -4,7 +4,7 @@
import factory
-import pytz
+from zoneinfo import ZoneInfo
from openedx.core.djangoapps.schedules import models
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
@@ -22,8 +22,8 @@ class ScheduleFactory(factory.django.DjangoModelFactory): # lint-amnesty, pylin
class Meta:
model = models.Schedule
- start_date = factory.Faker('future_datetime', tzinfo=pytz.UTC)
- upgrade_deadline = factory.Faker('future_datetime', tzinfo=pytz.UTC)
+ start_date = factory.Faker('future_datetime', tzinfo=ZoneInfo("UTC"))
+ upgrade_deadline = factory.Faker('future_datetime', tzinfo=ZoneInfo("UTC"))
enrollment = factory.SubFactory(CourseEnrollmentFactory)
experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule')
diff --git a/openedx/core/djangoapps/schedules/tests/test_resolvers.py b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
index 2c37608e5cff..20536abcbd6f 100644
--- a/openedx/core/djangoapps/schedules/tests/test_resolvers.py
+++ b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
@@ -8,7 +8,7 @@
import crum
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.test import TestCase
from django.test.client import RequestFactory
from django.test.utils import override_settings
@@ -123,7 +123,7 @@ def test_external_course_updates(self, bucket):
# experiment. Note that the experiment waffle is currently inactive, but they should still be excluded because
# they were bucketed at enrollment time.
bin_num = BinnedSchedulesBaseResolver.bin_num_for_user_id(user.id)
- resolver = BinnedSchedulesBaseResolver(None, self.site, datetime.datetime.now(pytz.UTC), 0, bin_num)
+ resolver = BinnedSchedulesBaseResolver(None, self.site, datetime.datetime.now(ZoneInfo("UTC")), 0, bin_num)
resolver.schedule_date_field = 'created'
schedules = resolver.get_schedules_with_target_date_by_bin_and_orgs()
@@ -235,7 +235,7 @@ class TestCourseNextSectionUpdateResolver(SchedulesResolverTestMixin, ModuleStor
def setUp(self):
super().setUp()
- self.today = datetime.datetime.utcnow()
+ self.today = datetime.datetime.now(ZoneInfo("UTC"))
self.yesterday = self.today - datetime.timedelta(days=1)
self.course = CourseFactory.create(
highlights_enabled_for_messaging=True, self_paced=True,
diff --git a/openedx/core/djangoapps/schedules/tests/test_signals.py b/openedx/core/djangoapps/schedules/tests/test_signals.py
index 023fbbdbafcc..b862f8e00e26 100644
--- a/openedx/core/djangoapps/schedules/tests/test_signals.py
+++ b/openedx/core/djangoapps/schedules/tests/test_signals.py
@@ -8,7 +8,7 @@
import ddt
import pytest
-from pytz import utc
+from zoneinfo import ZoneInfo
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
@@ -188,7 +188,7 @@ def _create_course_run(self_paced=True, start_day_offset=-1):
Both audit and verified `CourseMode` objects will be created for the course run.
"""
- now = datetime.datetime.now(utc)
+ now = datetime.datetime.now(ZoneInfo("UTC"))
start = now + datetime.timedelta(days=start_day_offset)
course = CourseFactory.create(start=start, self_paced=self_paced)
diff --git a/openedx/core/djangoapps/schedules/tests/test_utils.py b/openedx/core/djangoapps/schedules/tests/test_utils.py
index f1d0cd9fcba0..2b48550b421d 100644
--- a/openedx/core/djangoapps/schedules/tests/test_utils.py
+++ b/openedx/core/djangoapps/schedules/tests/test_utils.py
@@ -5,7 +5,7 @@
import datetime
import ddt
-from pytz import utc
+from zoneinfo import ZoneInfo
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory
@@ -26,7 +26,7 @@ def create_schedule(self, enrollment_offset=0, course_start_offset=-100):
# pylint: disable=attribute-defined-outside-init
self.config = ScheduleConfigFactory()
- start = datetime.datetime.now(utc) + datetime.timedelta(days=course_start_offset)
+ start = datetime.datetime.now(ZoneInfo("UTC")) + datetime.timedelta(days=course_start_offset)
self.course = CourseFactory.create(start=start, self_paced=True)
self.enrollment = CourseEnrollmentFactory(
diff --git a/openedx/core/djangoapps/schedules/utils.py b/openedx/core/djangoapps/schedules/utils.py
index c2565a1c87a3..344e7566b1e3 100644
--- a/openedx/core/djangoapps/schedules/utils.py
+++ b/openedx/core/djangoapps/schedules/utils.py
@@ -3,7 +3,7 @@
import datetime
import logging
-import pytz
+from zoneinfo import ZoneInfo
from django.db import transaction
from openedx.core.djangoapps.schedules.models import Schedule
@@ -59,7 +59,7 @@ def reset_self_paced_schedule(user, course_key, use_enrollment_date=False):
if use_enrollment_date:
new_start_date = schedule.enrollment.created
else:
- new_start_date = datetime.datetime.now(pytz.utc)
+ new_start_date = datetime.datetime.now(ZoneInfo("UTC"))
# Make sure we don't start the clock on the learner's schedule before the course even starts
new_start_date = max(new_start_date, schedule.enrollment.course.start)
diff --git a/openedx/core/djangoapps/user_api/accounts/api.py b/openedx/core/djangoapps/user_api/accounts/api.py
index 6970ea6f852f..c3fd805a3166 100644
--- a/openedx/core/djangoapps/user_api/accounts/api.py
+++ b/openedx/core/djangoapps/user_api/accounts/api.py
@@ -12,7 +12,7 @@
from django.utils.translation import gettext as _
from django.utils.translation import override as override_language
from eventtracking import tracker
-from pytz import UTC
+from zoneinfo import ZoneInfo
from common.djangoapps.student import views as student_views
from common.djangoapps.student.models import (
@@ -375,7 +375,7 @@ def _store_old_name_if_needed(old_name, user_profile, requesting_user):
meta['old_names'].append([
old_name,
f"Name change requested through account API by {requesting_user.username}",
- datetime.datetime.now(UTC).isoformat()
+ datetime.datetime.now(ZoneInfo("UTC")).isoformat()
])
user_profile.set_meta(meta)
user_profile.save()
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/retirement_helpers.py b/openedx/core/djangoapps/user_api/accounts/tests/retirement_helpers.py
index a3c40002f61c..d91ba37399d4 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/retirement_helpers.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/retirement_helpers.py
@@ -6,7 +6,7 @@
import datetime
import pytest
-import pytz
+from zoneinfo import ZoneInfo
from django.test import TestCase
from social_django.models import UserSocialAuth
@@ -67,7 +67,7 @@ def create_retirement_status(user, state=None, create_datetime=None):
Assumes that retirement states have been setup before calling.
"""
if create_datetime is None:
- create_datetime = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=8)
+ create_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=8)
retirement = UserRetirementStatus.create_retirement(user)
if state:
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
index f9071c06a5c2..8cdb7a634118 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -17,7 +17,7 @@
from django.test import TestCase
from django.test.client import RequestFactory
from django.urls import reverse
-from pytz import UTC
+from zoneinfo import ZoneInfo
from social_django.models import UserSocialAuth
from common.djangoapps.student.models import (
@@ -381,7 +381,7 @@ def test_validate_name_change_same_name(self):
meta['old_names'] = []
for num in range(3):
meta['old_names'].append(
- [f'old_name_{num}', 'test', datetime.datetime.now(UTC).isoformat()]
+ [f'old_name_{num}', 'test', datetime.datetime.now(ZoneInfo("UTC")).isoformat()]
)
user_profile.set_meta(meta)
user_profile.save()
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_image_helpers.py b/openedx/core/djangoapps/user_api/accounts/tests/test_image_helpers.py
index 3608073a5217..c02069ab7b16 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_image_helpers.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_image_helpers.py
@@ -8,7 +8,7 @@
from unittest.mock import patch
from django.test import TestCase
-from pytz import UTC
+from zoneinfo import ZoneInfo
from openedx.core.djangolib.testing.utils import skip_unless_lms
from common.djangoapps.student.tests.factories import UserFactory
@@ -16,7 +16,7 @@
from ..image_helpers import get_profile_image_urls_for_user
TEST_SIZES = {'full': 50, 'small': 10}
-TEST_PROFILE_IMAGE_UPLOAD_DT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=UTC)
+TEST_PROFILE_IMAGE_UPLOAD_DT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=ZoneInfo("UTC"))
@patch.dict('django.conf.settings.PROFILE_IMAGE_SIZES_MAP', TEST_SIZES, clear=True)
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
index b892eaa067e4..e93a118e649f 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
@@ -7,7 +7,7 @@
from unittest import mock
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from consent.models import DataSharingConsent
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from django.contrib.sites.models import Site
@@ -524,7 +524,7 @@ def setUp(self):
self.headers = build_jwt_headers(self.test_superuser)
self.url = reverse('accounts_retirement_partner_report')
self.maxDiff = None
- self.test_created_datetime = datetime.datetime(2018, 1, 1, tzinfo=pytz.UTC)
+ self.test_created_datetime = datetime.datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
ExternalIdType.objects.get_or_create(name=ExternalIdType.CALIPER)
def get_user_dict(self, user, enrollments):
@@ -777,7 +777,7 @@ def test_date_filter(self):
# retirements = [2018-04-10..., 2018-04-09..., 2018-04-08...]
pending_state = RetirementState.objects.get(state_name='PENDING')
for days_back in range(1, days_back_to_test, -1):
- create_datetime = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=days_back)
+ create_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=days_back)
retirements.append(create_retirement_status(
UserFactory(),
state=pending_state,
@@ -935,12 +935,12 @@ def test_date_filter(self):
# Create retirements for the last 10 days
for days_back in range(0, 10): # lint-amnesty, pylint: disable=simplifiable-range
- create_datetime = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=days_back)
+ create_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=days_back)
ret = create_retirement_status(UserFactory(), state=complete_state, create_datetime=create_datetime)
retirements.append(self._retirement_to_dict(ret))
# Go back in time adding days to the query, assert the correct retirements are present
- end_date = datetime.datetime.now(pytz.UTC)
+ end_date = datetime.datetime.now(ZoneInfo("UTC"))
for days_back in range(1, 11):
retirement_dicts = retirements[:days_back]
start_date = end_date - datetime.timedelta(days=days_back - 1)
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
index 46d6b5232b43..45b1773e4f02 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
@@ -10,7 +10,7 @@
from urllib.parse import quote
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.core.files.storage import FileSystemStorage
from django.test.testcases import TransactionTestCase
@@ -44,7 +44,7 @@
from .. import ALL_USERS_VISIBILITY, CUSTOM_VISIBILITY, PRIVATE_VISIBILITY
-TEST_PROFILE_IMAGE_UPLOADED_AT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=pytz.UTC)
+TEST_PROFILE_IMAGE_UPLOADED_AT = datetime.datetime(2002, 1, 9, 15, 43, 1, tzinfo=ZoneInfo("UTC"))
# this is used in one test to check the behavior of profile image url
# generation with a relative url in the config.
@@ -304,7 +304,7 @@ def test_cancel_retirement_not_pending(self):
current_state=retirement_state,
last_state=retirement_state,
original_email=self.user.email,
- created=datetime.datetime.now(pytz.UTC)
+ created=datetime.datetime.now(ZoneInfo("UTC"))
)
url = reverse("cancel_account_retirement")
response = client.post(url, data={'retirement_id': user_retirement_status.id})
@@ -329,7 +329,7 @@ def test_cancel_retirement_successful(self):
current_state=retirement_state,
last_state=retirement_state,
original_email=self.user.email,
- created=datetime.datetime.now(pytz.UTC)
+ created=datetime.datetime.now(ZoneInfo("UTC"))
)
user_retirement_status.user.set_unusable_password()
assert UserRetirementStatus.objects.count() == 1
@@ -585,8 +585,8 @@ def test_get_account_by_user_id_non_integer(self, non_integer_id):
@mock.patch('openedx.core.djangoapps.user_api.accounts.views.is_email_retired')
@ddt.data(
- (datetime.datetime.now(pytz.UTC), True),
- (datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=15), False)
+ (datetime.datetime.now(ZoneInfo("UTC")), True),
+ (datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=15), False)
)
@ddt.unpack
def test_search_emails_retired_before_cooloff_period(self, created_date, can_cancel, mock_is_email_retired):
diff --git a/openedx/core/djangoapps/user_api/accounts/views.py b/openedx/core/djangoapps/user_api/accounts/views.py
index c0809811aa72..b44f47cc8304 100644
--- a/openedx/core/djangoapps/user_api/accounts/views.py
+++ b/openedx/core/djangoapps/user_api/accounts/views.py
@@ -9,7 +9,7 @@
import logging
from functools import wraps
-import pytz
+from zoneinfo import ZoneInfo
from consent.models import DataSharingConsent
from django.apps import apps
from django.conf import settings
@@ -206,11 +206,11 @@ def list(self, request):
if is_email_retired(user_email):
can_cancel_retirement = True
retirement_id = None
- earliest_datetime = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=settings.COOL_OFF_DAYS)
+ earliest_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=settings.COOL_OFF_DAYS)
try:
retirement_status = UserRetirementStatus.objects.get(
created__gt=earliest_datetime,
- created__lt=datetime.datetime.now(pytz.UTC),
+ created__lt=datetime.datetime.now(ZoneInfo("UTC")),
original_email=user_email,
)
retirement_id = retirement_status.id
@@ -899,7 +899,7 @@ def retirement_queue(self, request):
status=status.HTTP_400_BAD_REQUEST,
)
- earliest_datetime = datetime.datetime.now(pytz.UTC) - datetime.timedelta(days=cool_off_days)
+ earliest_datetime = datetime.datetime.now(ZoneInfo("UTC")) - datetime.timedelta(days=cool_off_days)
retirements = (
UserRetirementStatus.objects.select_related("user", "current_state", "last_state")
@@ -929,9 +929,12 @@ def retirements_by_status_and_date(self, request):
so to get one day you would set both dates to that day.
"""
try:
- start_date = datetime.datetime.strptime(request.GET["start_date"], "%Y-%m-%d").replace(tzinfo=pytz.UTC)
- end_date = datetime.datetime.strptime(request.GET["end_date"], "%Y-%m-%d").replace(tzinfo=pytz.UTC)
- now = datetime.datetime.now(pytz.UTC)
+ start_date = (
+ datetime.datetime.strptime(request.GET["start_date"], "%Y-%m-%d")
+ .replace(tzinfo=ZoneInfo("UTC"))
+ )
+ end_date = datetime.datetime.strptime(request.GET["end_date"], "%Y-%m-%d").replace(tzinfo=ZoneInfo("UTC"))
+ now = datetime.datetime.now(ZoneInfo("UTC"))
if start_date > now or end_date > now or start_date > end_date:
raise RetirementStateError("Dates must be today or earlier, and start must be earlier than end.")
diff --git a/openedx/core/djangoapps/user_api/management/commands/create_user_gdpr_testing.py b/openedx/core/djangoapps/user_api/management/commands/create_user_gdpr_testing.py
index e744baa6c7a3..c1f16c9c3fa1 100644
--- a/openedx/core/djangoapps/user_api/management/commands/create_user_gdpr_testing.py
+++ b/openedx/core/djangoapps/user_api/management/commands/create_user_gdpr_testing.py
@@ -20,7 +20,7 @@
PendingEnterpriseCustomerUser
)
from opaque_keys.edx.keys import CourseKey
-from pytz import UTC
+from zoneinfo import ZoneInfo
from common.djangoapps.entitlements.models import CourseEntitlement, CourseEntitlementSupportDetail
from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
@@ -88,7 +88,7 @@ def handle(self, *args, **options):
user.save()
# UserProfile
- profile_image_uploaded_date = datetime(2018, 5, 3, tzinfo=UTC)
+ profile_image_uploaded_date = datetime(2018, 5, 3, tzinfo=ZoneInfo("UTC"))
user_profile, __ = UserProfile.objects.get_or_create(
user=user
)
diff --git a/openedx/core/djangoapps/user_authn/tests/utils.py b/openedx/core/djangoapps/user_authn/tests/utils.py
index 09ca85145f35..31b4be7c400a 100644
--- a/openedx/core/djangoapps/user_authn/tests/utils.py
+++ b/openedx/core/djangoapps/user_authn/tests/utils.py
@@ -6,7 +6,7 @@
from unittest.mock import patch
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from oauth2_provider import models as dot_models
from rest_framework import status
@@ -42,7 +42,7 @@ def utcnow():
"""
Helper function to return the current UTC time localized to the UTC timezone.
"""
- return datetime.now(pytz.UTC)
+ return datetime.now(ZoneInfo("UTC"))
@ddt.ddt
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index aff210e7b26d..2fc0818a3ab9 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -26,7 +26,7 @@
from openedx_events.learning.data import UserData, UserPersonalData
from openedx_events.learning.signals import STUDENT_REGISTRATION_COMPLETED
from openedx_filters.learning.filters import StudentRegistrationRequested
-from pytz import UTC
+from zoneinfo import ZoneInfo
from django_ratelimit.decorators import ratelimit
from requests import HTTPError
from rest_framework.response import Response
@@ -371,7 +371,7 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
'name': profile.name,
# Mailchimp requires the age & yearOfBirth to be integers, we send a sane integer default if falsey.
'age': profile.age or -1,
- 'yearOfBirth': profile.year_of_birth or datetime.datetime.now(UTC).year,
+ 'yearOfBirth': profile.year_of_birth or datetime.datetime.now(ZoneInfo("UTC")).year,
'education': profile.level_of_education_display,
'address': profile.mailing_address,
'gender': profile.gender_display,
@@ -530,7 +530,9 @@ def _record_utm_registration_attribution(request, user):
# We divide by 1000 here because the javascript timestamp generated is in milliseconds not seconds.
# PYTHON: time.time() => 1475590280.823698
# JS: new Date().getTime() => 1475590280823
- created_at_datetime = datetime.datetime.fromtimestamp(int(created_at_unixtime) / float(1000), tz=UTC)
+ created_at_datetime = datetime.datetime.fromtimestamp(
+ int(created_at_unixtime) / float(1000), tz=ZoneInfo("UTC")
+ )
UserAttribute.set_user_attribute(
user,
REGISTRATION_UTM_CREATED_AT,
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_auto_auth.py b/openedx/core/djangoapps/user_authn/views/tests/test_auto_auth.py
index 0346aee25ae6..b68774903092 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_auto_auth.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_auto_auth.py
@@ -21,6 +21,7 @@
)
from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order
+from common.test.utils import assert_dict_contains_subset
class AutoAuthTestCase(UrlResetMixin, TestCase):
@@ -182,12 +183,13 @@ def test_json_response(self):
for key in ['created_status', 'username', 'email', 'password', 'user_id', 'anonymous_id']:
assert key in response_data
user = User.objects.get(username=response_data['username'])
- self.assertDictContainsSubset(
+ assert_dict_contains_subset(
+ self,
{
'created_status': 'Logged in',
'anonymous_id': anonymous_id_for_user(user, None),
},
- response_data
+ response_data,
)
@ddt.data(*COURSE_IDS_DDT)
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_events.py b/openedx/core/djangoapps/user_authn/views/tests/test_events.py
index acec4a935d60..7efd4e4cf5c0 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_events.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_events.py
@@ -18,6 +18,7 @@
from common.djangoapps.student.tests.factories import UserFactory, UserProfileFactory
from openedx.core.djangoapps.user_api.tests.test_views import UserAPITestCase
from openedx.core.djangolib.testing.utils import skip_unless_lms
+from common.test.utils import assert_dict_contains_subset
@skip_unless_lms
@@ -83,7 +84,8 @@ def test_send_registration_event(self):
user = User.objects.get(username=self.user_info.get("username"))
self.assertTrue(self.receiver_called)
- self.assertDictContainsSubset(
+ assert_dict_contains_subset(
+ self,
{
"signal": STUDENT_REGISTRATION_COMPLETED,
"sender": None,
@@ -97,7 +99,7 @@ def test_send_registration_event(self):
is_active=user.is_active,
),
},
- event_receiver.call_args.kwargs
+ event_receiver.call_args.kwargs,
)
@@ -165,7 +167,8 @@ def test_send_login_event(self):
user = User.objects.get(username=self.user.username)
self.assertTrue(self.receiver_called)
- self.assertDictContainsSubset(
+ assert_dict_contains_subset(
+ self,
{
"signal": SESSION_LOGIN_COMPLETED,
"sender": None,
@@ -179,5 +182,5 @@ def test_send_login_event(self):
is_active=user.is_active,
),
},
- event_receiver.call_args.kwargs
+ event_receiver.call_args.kwargs,
)
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_login.py b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
index b00702ee25da..c8bfa082900b 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_login.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_login.py
@@ -44,6 +44,7 @@
from openedx.features.enterprise_support.tests.factories import EnterpriseCustomerUserFactory
from common.djangoapps.student.models import LoginFailures
from common.djangoapps.util.password_policy_validators import DEFAULT_MAX_PASSWORD_LENGTH
+from common.test.utils import assert_dict_contains_subset
@ddt.ddt
@@ -544,7 +545,7 @@ def test_unicode_mktg_cookie_names(self):
expected = {
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@patch.dict("django.conf.settings.FEATURES", {'SQUELCH_PII_IN_LOGS': True})
def test_logout_logging_no_pii(self):
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_logout.py b/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
index 77c21c86e1b1..a81d11c42cf4 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_logout.py
@@ -14,6 +14,7 @@
from openedx.core.djangoapps.oauth_dispatch.tests.factories import ApplicationFactory
from openedx.core.djangolib.testing.utils import skip_unless_lms
from common.djangoapps.student.tests.factories import UserFactory
+from common.test.utils import assert_dict_contains_subset
@skip_unless_lms
@@ -76,14 +77,14 @@ def test_logout_redirect_success(self, redirect_url, host):
expected = {
'target': urllib.parse.unquote(redirect_url),
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
def test_no_redirect_supplied(self):
response = self.client.get(reverse('logout'), HTTP_HOST='testserver')
expected = {
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@ddt.data(
('https://www.amazon.org', 'edx.org'),
@@ -100,7 +101,7 @@ def test_logout_redirect_failure(self, redirect_url, host):
expected = {
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
def test_client_logout(self):
""" Verify the context includes a list of the logout URIs of the authenticated OpenID Connect clients.
@@ -113,7 +114,7 @@ def test_client_logout(self):
'logout_uris': [],
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@mock.patch(
'django.conf.settings.IDA_LOGOUT_URI_LIST',
@@ -138,7 +139,7 @@ def test_client_logout_with_dot_idas(self):
'logout_uris': expected_logout_uris,
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@mock.patch(
'django.conf.settings.IDA_LOGOUT_URI_LIST',
@@ -161,7 +162,7 @@ def test_client_logout_with_dot_idas_and_no_oidc_idas(self):
'logout_uris': expected_logout_uris,
'target': '/',
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
def test_filter_referring_service(self):
""" Verify that, if the user is directed to the logout page from a service, that service's logout URL
@@ -174,7 +175,7 @@ def test_filter_referring_service(self):
'target': '/',
'show_tpa_logout_link': False,
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
def test_learner_portal_logout_having_idp_logout_url(self):
"""
@@ -194,7 +195,7 @@ def test_learner_portal_logout_having_idp_logout_url(self):
'tpa_logout_url': idp_logout_url,
'show_tpa_logout_link': True,
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@mock.patch('django.conf.settings.TPA_AUTOMATIC_LOGOUT_ENABLED', True)
def test_automatic_tpa_logout_url_redirect(self):
@@ -214,7 +215,7 @@ def test_automatic_tpa_logout_url_redirect(self):
expected = {
'target': idp_logout_url,
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
@mock.patch('django.conf.settings.TPA_AUTOMATIC_LOGOUT_ENABLED', True)
def test_no_automatic_tpa_logout_without_logout_url(self):
@@ -241,4 +242,4 @@ def test_logout_redirect_failure_with_xss_vulnerability(self, redirect_url, host
expected = {
'target': nh3.clean(urllib.parse.unquote(redirect_url)),
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_password.py b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
index a403298a6e78..57a988c0b354 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_password.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
@@ -19,7 +19,7 @@
from freezegun import freeze_time
from oauth2_provider.models import AccessToken as dot_access_token
from oauth2_provider.models import RefreshToken as dot_refresh_token
-from pytz import UTC
+from zoneinfo import ZoneInfo
from testfixtures import LogCapture
from openedx.core.djangoapps.oauth_dispatch.tests import factories as dot_factories
@@ -319,7 +319,7 @@ def test_password_change_rate_limited(self):
# now reset the time to 1 min from now in future and change the email and
# verify that it will allow another request from same IP
- reset_time = datetime.now(UTC) + timedelta(seconds=61)
+ reset_time = datetime.now(ZoneInfo("UTC")) + timedelta(seconds=61)
with freeze_time(reset_time):
response = self._change_password(email=self.OLD_EMAIL)
assert response.status_code == 200
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_register.py b/openedx/core/djangoapps/user_authn/views/tests/test_register.py
index 54d42efa55c0..e79b8ae6daa2 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_register.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_register.py
@@ -16,7 +16,7 @@
from django.test.utils import override_settings
from django.urls import reverse
from openedx_events.tests.utils import OpenEdxEventsTestMixin
-from pytz import UTC
+from zoneinfo import ZoneInfo
from social_django.models import Partial, UserSocialAuth
from testfixtures import LogCapture
@@ -949,7 +949,7 @@ def test_register_form_gender_translations(self, fake_gettext):
)
def test_register_form_year_of_birth(self):
- this_year = datetime.now(UTC).year
+ this_year = datetime.now(ZoneInfo("UTC")).year
year_options = (
[
{
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py b/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
index b89b458ed1ae..aed040a8a21c 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py
@@ -24,7 +24,7 @@
from django.utils.http import int_to_base36
from freezegun import freeze_time
from oauth2_provider import models as dot_models
-from pytz import UTC
+from zoneinfo import ZoneInfo
from openedx.core.djangoapps.oauth_dispatch.tests import factories as dot_factories
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
@@ -267,7 +267,7 @@ def test_ratelimited_from_different_ips_with_same_email(self):
self.request_password_reset(200)
# now reset the time to 1 min from now in future and change the email and
# verify that it will allow another request from same IP
- reset_time = datetime.now(UTC) + timedelta(seconds=61)
+ reset_time = datetime.now(ZoneInfo("UTC")) + timedelta(seconds=61)
with freeze_time(reset_time):
for status in [200, 403]:
self.request_password_reset(status)
diff --git a/openedx/core/djangoapps/util/testing.py b/openedx/core/djangoapps/util/testing.py
index 040a2b5af180..4686bdc6e75d 100644
--- a/openedx/core/djangoapps/util/testing.py
+++ b/openedx/core/djangoapps/util/testing.py
@@ -3,7 +3,7 @@
from datetime import datetime
-from pytz import UTC
+from zoneinfo import ZoneInfo
from openedx.core.djangoapps.course_groups.models import CourseUserGroupPartitionGroup
from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
@@ -32,7 +32,7 @@ def setUp(self):
# This test needs to use a course that has already started --
# discussion topics only show up if the course has already started,
# and the default start date for courses is Jan 1, 2030.
- start=datetime(2012, 2, 3, tzinfo=UTC),
+ start=datetime(2012, 2, 3, tzinfo=ZoneInfo("UTC")),
user_partitions=[
UserPartition(
0,
diff --git a/openedx/core/djangoapps/verified_track_content/tests/test_partition_scheme.py b/openedx/core/djangoapps/verified_track_content/tests/test_partition_scheme.py
index a2667bfa1c0b..f7de6042ef19 100644
--- a/openedx/core/djangoapps/verified_track_content/tests/test_partition_scheme.py
+++ b/openedx/core/djangoapps/verified_track_content/tests/test_partition_scheme.py
@@ -5,7 +5,7 @@
from datetime import datetime, timedelta
-import pytz
+from zoneinfo import ZoneInfo
import pytest
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.student.models import CourseEnrollment
@@ -38,7 +38,7 @@ def test_multiple_groups(self):
# Note that the verified mode is expired-- this is intentional.
create_mode(
self.course, CourseMode.VERIFIED, "Verified Enrollment Track", min_price=1,
- expiration_datetime=datetime.now(pytz.UTC) + timedelta(days=-1)
+ expiration_datetime=datetime.now(ZoneInfo("UTC")) + timedelta(days=-1)
)
# Note that the credit mode is not selectable-- this is intentional so we
# can test that it is filtered out.
@@ -128,7 +128,7 @@ def test_enrolled_in_verified(self):
def test_enrolled_in_expired(self):
create_mode(
self.course, CourseMode.VERIFIED, "Verified Enrollment Track",
- min_price=1, expiration_datetime=datetime.now(pytz.UTC) + timedelta(days=-1)
+ min_price=1, expiration_datetime=datetime.now(ZoneInfo("UTC")) + timedelta(days=-1)
)
CourseEnrollment.enroll(self.student, self.course.id, mode=CourseMode.VERIFIED)
assert 'Verified Enrollment Track' == self._get_user_group().name
@@ -153,7 +153,7 @@ def test_credit_after_upgrade_deadline(self):
# the upgrade deadline has passed (see EDUCATOR-1511 for why this matters).
create_mode(
self.course, CourseMode.VERIFIED, "Verified Enrollment Track", min_price=1,
- expiration_datetime=datetime.now(pytz.UTC) + timedelta(days=-1)
+ expiration_datetime=datetime.now(ZoneInfo("UTC")) + timedelta(days=-1)
)
assert 'Verified Enrollment Track' == self._get_user_group().name
diff --git a/xmodule/video_block/sharing_sites.py b/openedx/core/djangoapps/video_config/sharing_sites.py
similarity index 100%
rename from xmodule/video_block/sharing_sites.py
rename to openedx/core/djangoapps/video_config/sharing_sites.py
diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py
index c306b82bdc8b..578db22a5250 100644
--- a/openedx/core/djangoapps/xblock/runtime/shims.py
+++ b/openedx/core/djangoapps/xblock/runtime/shims.py
@@ -157,7 +157,7 @@ def process_xml(self, xml):
"""
# We can't parse XML in a vacuum - we need to know the parent block and/or the
# OLX file that holds this XML in order to generate useful definition keys etc.
- # The older ImportSystem runtime could do this because it stored the course_id
+ # The older XMLImportingModuleStoreRuntime runtime could do this because it stored the course_id
# as part of the runtime.
raise NotImplementedError("This newer runtime does not support process_xml()")
@@ -244,7 +244,7 @@ def xqueue(self):
def get_field_provenance(self, xblock, field):
"""
- A Studio-specific method that was implemented on DescriptorSystem.
+ A Studio-specific method that was implemented on ModuleStoreRuntime.
Used by the problem block.
For the given xblock, return a dict for the field's current state:
diff --git a/openedx/core/lib/tests/test_xblock_utils.py b/openedx/core/lib/tests/test_xblock_utils.py
index 8a10e0220dfb..7b817f3fe6fd 100644
--- a/openedx/core/lib/tests/test_xblock_utils.py
+++ b/openedx/core/lib/tests/test_xblock_utils.py
@@ -177,7 +177,10 @@ def test_is_not_xblock_aside(self):
"""test if xblock is not aside"""
assert is_xblock_aside(self.block.scope_ids.usage_id) is False
- @patch('xmodule.modulestore.xml.ImportSystem.applicable_aside_types', lambda self, block: ['test_aside'])
+ @patch(
+ 'xmodule.modulestore.xml.XMLImportingModuleStoreRuntime.applicable_aside_types',
+ lambda self, block: ['test_aside'],
+ )
@XBlockAside.register_temp_plugin(AsideTestType, 'test_aside')
def test_get_aside(self):
"""test get aside success"""
diff --git a/openedx/core/lib/xblock_utils/__init__.py b/openedx/core/lib/xblock_utils/__init__.py
index a8b76541b6e5..d398a159f998 100644
--- a/openedx/core/lib/xblock_utils/__init__.py
+++ b/openedx/core/lib/xblock_utils/__init__.py
@@ -19,7 +19,7 @@
from edx_django_utils.plugins import pluggable_override
from lxml import etree, html
from opaque_keys.edx.asides import AsideUsageKeyV1, AsideUsageKeyV2
-from pytz import UTC
+from zoneinfo import ZoneInfo
from web_fragments.fragment import Fragment
from xblock.core import XBlock
from xblock.exceptions import InvalidScopeError
@@ -310,7 +310,7 @@ def add_staff_markup(user, disable_staff_debug_info, block, view, frag, context)
# Useful to indicate to staff if problem has been released or not.
# TODO (ichuang): use _has_access_block.can_load in lms.courseware.access,
# instead of now>mstart comparison here.
- now = datetime.datetime.now(UTC)
+ now = datetime.datetime.now(ZoneInfo("UTC"))
is_released = "unknown"
mstart = block.start
diff --git a/openedx/core/release.py b/openedx/core/release.py
index ce30df8cc543..dda3add782a0 100644
--- a/openedx/core/release.py
+++ b/openedx/core/release.py
@@ -8,7 +8,7 @@
# The release line: an Open edX release name ("ficus"), or "master".
# This should always be "master" on the master branch, and will be changed
# manually when we start release-line branches, like open-release/ficus.master.
-RELEASE_LINE = "master"
+RELEASE_LINE = "ulmo"
def doc_version():
diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index ada6fd3f0be2..c00a89cf4f69 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -37,6 +37,8 @@ def center_with_hashes(text: str, width: int = 76):
get_theme_base_dirs_from_settings
)
+# We have legacy components that reference these constants via the settings module.
+# New code should import them directly from `openedx.core.constants` instead.
from openedx.core.constants import ( # pylint: disable=unused-import
ASSET_KEY_PATTERN,
COURSE_KEY_REGEX,
diff --git a/openedx/features/announcements/__init__.py b/openedx/features/announcements/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/apps.py b/openedx/features/announcements/apps.py
deleted file mode 100644
index 4bf964cae51b..000000000000
--- a/openedx/features/announcements/apps.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Announcements Application Configuration
-"""
-
-
-from django.apps import AppConfig
-from edx_django_utils.plugins import PluginURLs, PluginSettings
-
-from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
-
-
-class AnnouncementsConfig(AppConfig):
- """
- Application Configuration for Announcements
- """
- name = 'openedx.features.announcements'
-
- plugin_app = {
- PluginURLs.CONFIG: {
- ProjectType.LMS: {
- PluginURLs.NAMESPACE: 'announcements',
- PluginURLs.REGEX: '^announcements/',
- PluginURLs.RELATIVE_PATH: 'urls',
- }
- },
- PluginSettings.CONFIG: {
- ProjectType.LMS: {
- SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: 'settings.common'},
- SettingsType.TEST: {PluginSettings.RELATIVE_PATH: 'settings.test'},
- }
- }
- }
diff --git a/openedx/features/announcements/forms.py b/openedx/features/announcements/forms.py
deleted file mode 100644
index 879101ca37d0..000000000000
--- a/openedx/features/announcements/forms.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Forms for the Announcement Editor
-"""
-
-
-from django import forms
-
-from .models import Announcement
-
-
-class AnnouncementForm(forms.ModelForm):
- """
- Form for editing Announcements
- """
- content = forms.CharField(widget=forms.Textarea, label='', required=False)
- active = forms.BooleanField(initial=True, required=False)
-
- class Meta:
- model = Announcement
- fields = ['content', 'active']
diff --git a/openedx/features/announcements/migrations/0001_initial.py b/openedx/features/announcements/migrations/0001_initial.py
deleted file mode 100644
index c959b634905e..000000000000
--- a/openedx/features/announcements/migrations/0001_initial.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ]
-
- operations = [
- migrations.CreateModel(
- name='Announcement',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('content', models.CharField(default='lorem ipsum', max_length=1000)),
- ('active', models.BooleanField(default=True)),
- ],
- ),
- ]
diff --git a/openedx/features/announcements/migrations/__init__.py b/openedx/features/announcements/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/models.py b/openedx/features/announcements/models.py
deleted file mode 100644
index f58f61165db6..000000000000
--- a/openedx/features/announcements/models.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Models for Announcements
-"""
-
-
-from django.db import models
-
-
-class Announcement(models.Model):
- """
- Site-wide announcements to be displayed on the dashboard
-
- .. no_pii:
- """
- class Meta:
- app_label = 'announcements'
-
- content = models.CharField(max_length=1000, null=False, default="lorem ipsum")
- active = models.BooleanField(default=True)
-
- def __str__(self):
- return self.content
diff --git a/openedx/features/announcements/settings/__init__.py b/openedx/features/announcements/settings/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/settings/common.py b/openedx/features/announcements/settings/common.py
deleted file mode 100644
index 4de3740d2d27..000000000000
--- a/openedx/features/announcements/settings/common.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Common settings for Announcements"""
-
-
-def plugin_settings(settings):
- """
- Common settings for Announcements
- .. toggle_name: FEATURES['ENABLE_ANNOUNCEMENTS']
- .. toggle_implementation: SettingDictToggle
- .. toggle_default: False
- .. toggle_description: This feature can be enabled to show system wide announcements
- on the sidebar of the learner dashboard. Announcements can be created by Global Staff
- users on maintenance dashboard of studio. Maintenance dashboard can accessed at
- https://{studio.domain}/maintenance
- .. toggle_warning: TinyMCE is needed to show an editor in the studio.
- .. toggle_use_cases: open_edx
- .. toggle_creation_date: 2017-11-08
- .. toggle_tickets: https://github.com/openedx/edx-platform/pull/16496
- """
- settings.ENABLE_ANNOUNCEMENTS = False
- # Configure number of announcements to show per page
- settings.ANNOUNCEMENTS_PER_PAGE = 5
diff --git a/openedx/features/announcements/settings/test.py b/openedx/features/announcements/settings/test.py
deleted file mode 100644
index 8c8406d23f4b..000000000000
--- a/openedx/features/announcements/settings/test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Test settings for Announcements"""
-
-
-def plugin_settings(settings):
- """
- Test settings for Announcements
- """
- settings.ENABLE_ANNOUNCEMENTS = True
diff --git a/openedx/features/announcements/static/announcements/jsx/Announcements.jsx b/openedx/features/announcements/static/announcements/jsx/Announcements.jsx
deleted file mode 100644
index 9d370883352c..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/Announcements.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-// eslint-disable-next-line max-classes-per-file
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import {Button} from '@edx/paragon';
-import $ from 'jquery';
-
-class AnnouncementSkipLink extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- count: 0
- };
- $.get('/announcements/page/1')
- .then(data => {
- this.setState({
- count: data.count
- });
- });
- }
-
- render() {
- return ({'Skip to list of ' + this.state.count + ' announcements'}
);
- }
-}
-
-// eslint-disable-next-line react/prefer-stateless-function
-class Announcement extends React.Component {
- render() {
- return (
-
- );
- }
-}
-
-Announcement.propTypes = {
- content: PropTypes.string.isRequired,
-};
-
-class AnnouncementList extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- page: 1,
- announcements: [],
- // eslint-disable-next-line react/no-unused-state
- num_pages: 0,
- has_prev: false,
- has_next: false,
- start_index: 0,
- end_index: 0,
- };
- }
-
- retrievePage(page) {
- $.get('/announcements/page/' + page)
- .then(data => {
- this.setState({
- announcements: data.announcements,
- has_next: data.next,
- has_prev: data.prev,
- // eslint-disable-next-line react/no-unused-state
- num_pages: data.num_pages,
- count: data.count,
- start_index: data.start_index,
- end_index: data.end_index,
- page: page
- });
- });
- }
-
- renderPrevPage() {
- this.retrievePage(this.state.page - 1);
- }
-
- renderNextPage() {
- this.retrievePage(this.state.page + 1);
- }
-
- // eslint-disable-next-line react/no-deprecated, react/sort-comp
- componentWillMount() {
- this.retrievePage(this.state.page);
- }
-
- render() {
- var children = this.state.announcements.map(
- // eslint-disable-next-line react/no-array-index-key
- (announcement, index) =>
-
- );
- }
- if (this.state.has_next) {
- var next_button = (
-
-
- );
- }
- return (
-
- {children}
- {prev_button}
- {next_button}
-
- );
- }
-}
-
-export default class AnnouncementsView {
- constructor() {
- ReactDOM.render(
-
- Skip to list of 10 announcements
-
-`;
-
-exports[`Announcements component render test announcements 1`] = `
-
-
-
Announcement 2",
- }
- }
- />
-
-
-
-
-
-`;
diff --git a/openedx/features/announcements/static/announcements/jsx/test-announcements.json b/openedx/features/announcements/static/announcements/jsx/test-announcements.json
deleted file mode 100644
index d23d39303020..000000000000
--- a/openedx/features/announcements/static/announcements/jsx/test-announcements.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "announcements": [
- {"content": "Test Announcement 1"},
- {"content": "Bold Announcement 2"},
- {"content": "Test Announcement 3"},
- {"content": "Test Announcement 4"},
- {"content": "Test Announcement 5"},
- {"content": "Test Announcement 6"}
- ],
- "has_next": true,
- "has_prev": false,
- "num_pages": 2,
- "count": 6,
- "start_index": 1,
- "end_index": 5,
- "page": 1
-}
diff --git a/openedx/features/announcements/tests/__init__.py b/openedx/features/announcements/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/openedx/features/announcements/tests/test_announcements.py b/openedx/features/announcements/tests/test_announcements.py
deleted file mode 100644
index 10c608b4a6cd..000000000000
--- a/openedx/features/announcements/tests/test_announcements.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-Unit tests for the announcements feature.
-"""
-
-import json
-from unittest.mock import patch
-
-from django.conf import settings
-from django.test import TestCase
-from django.test.client import Client
-from django.urls import reverse
-
-from common.djangoapps.student.tests.factories import AdminFactory
-from openedx.core.djangolib.testing.utils import skip_unless_lms
-from openedx.features.announcements.models import Announcement
-
-TEST_ANNOUNCEMENTS = [
- ("Active Announcement", True),
- ("Inactive Announcement", False),
- ("Another Test Announcement", True),
- ("Formatted Announcement", True),
- ("Other Formatted Announcement", True),
-]
-
-
-@skip_unless_lms
-class TestGlobalAnnouncements(TestCase):
- """
- Test Announcements in LMS
- """
-
- @classmethod
- def setUpTestData(cls):
- super().setUpTestData()
- Announcement.objects.bulk_create([
- Announcement(content=content, active=active)
- for content, active in TEST_ANNOUNCEMENTS
- ])
-
- def setUp(self):
- super().setUp()
- self.client = Client()
- self.admin = AdminFactory.create(
- email='staff@edx.org',
- username='admin',
- password='pass'
- )
- self.client.login(username=self.admin.username, password='pass')
-
- @patch.dict(settings.FEATURES, {'ENABLE_ANNOUNCEMENTS': False})
- def test_feature_flag_disabled(self):
- """Ensures that the default settings effectively disables the feature"""
- response = self.client.get('/dashboard')
- self.assertNotContains(response, 'AnnouncementsView')
- self.assertNotContains(response, '
-
-
- 1 - 5) of 6
-
-
-Formatted Announcement")
diff --git a/openedx/features/announcements/urls.py b/openedx/features/announcements/urls.py
deleted file mode 100644
index 0f0ad3a33960..000000000000
--- a/openedx/features/announcements/urls.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-Defines URLs for announcements in the LMS.
-"""
-from django.contrib.auth.decorators import login_required
-from django.urls import path
-
-from .views import AnnouncementsJSONView
-
-urlpatterns = [
- path('page/', login_required(AnnouncementsJSONView.as_view()),
- name='page',
- ),
-]
diff --git a/openedx/features/announcements/views.py b/openedx/features/announcements/views.py
deleted file mode 100644
index b6657c29cc12..000000000000
--- a/openedx/features/announcements/views.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Views to show announcements.
-"""
-
-
-from django.conf import settings
-from django.http import JsonResponse
-from django.views.generic.list import ListView
-
-from .models import Announcement
-
-
-class AnnouncementsJSONView(ListView):
- """
- View returning a page of announcements for the dashboard
- """
- model = Announcement
- object_list = Announcement.objects.filter(active=True)
- paginate_by = settings.FEATURES.get('ANNOUNCEMENTS_PER_PAGE', 5)
-
- def get(self, request, *args, **kwargs):
- """
- Return active announcements as json
- """
- context = self.get_context_data()
-
- announcements = [{"content": announcement.content} for announcement in context['object_list']]
- result = {
- "announcements": announcements,
- "next": context['page_obj'].has_next(),
- "prev": context['page_obj'].has_previous(),
- "start_index": context['page_obj'].start_index(),
- "end_index": context['page_obj'].end_index(),
- "count": context['paginator'].count,
- "num_pages": context['paginator'].num_pages,
- }
- return JsonResponse(result)
diff --git a/openedx/features/calendar_sync/ics.py b/openedx/features/calendar_sync/ics.py
index fc465443e714..c6d3a03a1ccf 100644
--- a/openedx/features/calendar_sync/ics.py
+++ b/openedx/features/calendar_sync/ics.py
@@ -2,7 +2,7 @@
from datetime import datetime, timedelta
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.utils.translation import gettext as _
from icalendar import Calendar, Event, vCalAddress, vText
@@ -59,7 +59,7 @@ def generate_ics_files_for_user_course(course, user, user_calendar_sync_config_i
assignments = get_course_assignments(course.id, user)
platform_name = get_value('platform_name', settings.PLATFORM_NAME)
platform_email = get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)
- now = datetime.now(pytz.utc)
+ now = datetime.now(ZoneInfo("UTC"))
site_config = SiteConfiguration.get_configuration_for_org(course.org)
ics_files = {}
diff --git a/openedx/features/calendar_sync/tests/test_ics.py b/openedx/features/calendar_sync/tests/test_ics.py
index 02301079285d..73327b09a964 100644
--- a/openedx/features/calendar_sync/tests/test_ics.py
+++ b/openedx/features/calendar_sync/tests/test_ics.py
@@ -3,7 +3,7 @@
from datetime import datetime, timedelta
from unittest.mock import patch
-import pytz
+from zoneinfo import ZoneInfo
from django.test import RequestFactory, TestCase
from freezegun import freeze_time
@@ -21,7 +21,7 @@ class TestIcsGeneration(TestCase):
def setUp(self):
super().setUp()
- freezer = freeze_time(datetime(2013, 10, 3, 8, 24, 55, tzinfo=pytz.utc))
+ freezer = freeze_time(datetime(2013, 10, 3, 8, 24, 55, tzinfo=ZoneInfo("UTC")))
self.addCleanup(freezer.stop)
freezer.start()
@@ -103,7 +103,7 @@ def assert_ics(self, *assignments):
def test_generate_ics_for_user_course(self):
""" Tests that a simple sample set of course assignments is generated correctly """
- now = datetime.now(pytz.utc)
+ now = datetime.now(ZoneInfo("UTC"))
day1 = now + timedelta(1)
day2 = now + timedelta(1)
diff --git a/openedx/features/content_type_gating/partitions.py b/openedx/features/content_type_gating/partitions.py
index 61851ec43bbd..a5e833f60bc5 100644
--- a/openedx/features/content_type_gating/partitions.py
+++ b/openedx/features/content_type_gating/partitions.py
@@ -10,7 +10,7 @@
import logging
import crum
-import pytz
+from zoneinfo import ZoneInfo
from django.template.loader import render_to_string
from django.utils.translation import gettext_lazy as _
from web_fragments.fragment import Fragment
@@ -88,7 +88,7 @@ def access_denied_fragment(self, block, user, user_group, allowed_groups):
return None
expiration_datetime = verified_mode.expiration_datetime
- if expiration_datetime and expiration_datetime < datetime.datetime.now(pytz.UTC):
+ if expiration_datetime and expiration_datetime < datetime.datetime.now(ZoneInfo("UTC")):
ecommerce_checkout_link = None
else:
ecommerce_checkout_link = self._get_checkout_link(user, verified_mode.sku, str(course_key))
diff --git a/openedx/features/content_type_gating/tests/test_models.py b/openedx/features/content_type_gating/tests/test_models.py
index 673ce805a750..adb9bd6737df 100644
--- a/openedx/features/content_type_gating/tests/test_models.py
+++ b/openedx/features/content_type_gating/tests/test_models.py
@@ -6,7 +6,7 @@
from datetime import datetime, timedelta # lint-amnesty, pylint: disable=wrong-import-order
import ddt
-import pytz
+from zoneinfo import ZoneInfo
from django.utils import timezone
from edx_django_utils.cache import RequestCache
from unittest.mock import Mock # lint-amnesty, pylint: disable=wrong-import-order
@@ -217,17 +217,17 @@ def test_all_current_course_configs(self):
# Point-test some of the final configurations
assert all_configs[CourseLocator('7-True', 'test_course', 'run-None')] == {
'enabled': (True, Provenance.org),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC), Provenance.run),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")), Provenance.run),
'studio_override_enabled': (None, Provenance.default)
}
assert all_configs[CourseLocator('7-True', 'test_course', 'run-False')] == {
'enabled': (False, Provenance.run),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC), Provenance.run),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")), Provenance.run),
'studio_override_enabled': (None, Provenance.default)
}
assert all_configs[CourseLocator('7-None', 'test_course', 'run-None')] == {
'enabled': (True, Provenance.site),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC), Provenance.run),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")), Provenance.run),
'studio_override_enabled': (None, Provenance.default)
}
diff --git a/openedx/features/course_duration_limits/tests/test_access.py b/openedx/features/course_duration_limits/tests/test_access.py
index 558afec22ab3..f948324b48b3 100644
--- a/openedx/features/course_duration_limits/tests/test_access.py
+++ b/openedx/features/course_duration_limits/tests/test_access.py
@@ -8,7 +8,7 @@
from crum import set_current_request
from django.test import RequestFactory
from django.utils import timezone
-from pytz import UTC
+from zoneinfo import ZoneInfo
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from common.djangoapps.course_modes.models import CourseMode
@@ -34,9 +34,12 @@ class TestAccess(ModuleStoreTestCase):
def setUp(self):
super().setUp() # lint-amnesty, pylint: disable=super-with-arguments
- CourseDurationLimitConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=UTC))
+ CourseDurationLimitConfig.objects.create(
+ enabled=True,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
- self.course = CourseOverviewFactory.create(start=datetime(2018, 1, 1, tzinfo=UTC), self_paced=True)
+ self.course = CourseOverviewFactory.create(start=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC")), self_paced=True)
def assertDateInMessage(self, date, message): # lint-amnesty, pylint: disable=missing-function-docstring
# First, check that the formatted version is in there
@@ -148,7 +151,7 @@ def test_schedule_start_date_in_past(self):
course_id=enrollment.course.id,
mode_slug=CourseMode.AUDIT,
)
- Schedule.objects.update(start_date=datetime(2017, 1, 1, tzinfo=UTC))
+ Schedule.objects.update(start_date=datetime(2017, 1, 1, tzinfo=ZoneInfo("UTC")))
content_availability_date = max(enrollment.created, enrollment.course.start)
access_duration = get_user_course_duration(enrollment.user, enrollment.course)
diff --git a/openedx/features/course_duration_limits/tests/test_models.py b/openedx/features/course_duration_limits/tests/test_models.py
index 0473faefd330..f596f3534489 100644
--- a/openedx/features/course_duration_limits/tests/test_models.py
+++ b/openedx/features/course_duration_limits/tests/test_models.py
@@ -8,7 +8,7 @@
import ddt
import pytest
-import pytz
+from zoneinfo import ZoneInfo
from django.utils import timezone
from edx_django_utils.cache import RequestCache
from opaque_keys.edx.locator import CourseLocator
@@ -178,13 +178,18 @@ def test_config_overrides(self, global_setting, site_setting, org_setting, cours
def test_all_current_course_configs(self):
# Set up test objects
for global_setting in (True, False, None):
- CourseDurationLimitConfig.objects.create(enabled=global_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ CourseDurationLimitConfig.objects.create(
+ enabled=global_setting,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
for site_setting in (True, False, None):
test_site_cfg = SiteConfigurationFactory.create(
site_values={'course_org_filter': []}
)
CourseDurationLimitConfig.objects.create(
- site=test_site_cfg.site, enabled=site_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)
+ site=test_site_cfg.site,
+ enabled=site_setting,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
)
for org_setting in (True, False, None):
@@ -193,7 +198,7 @@ def test_all_current_course_configs(self):
test_site_cfg.save()
CourseDurationLimitConfig.objects.create(
- org=test_org, enabled=org_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)
+ org=test_org, enabled=org_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
)
for course_setting in (True, False, None):
@@ -202,7 +207,7 @@ def test_all_current_course_configs(self):
id=CourseLocator(test_org, 'test_course', f'run-{course_setting}')
)
CourseDurationLimitConfig.objects.create(
- course=test_course, enabled=course_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC) # lint-amnesty, pylint: disable=line-too-long
+ course=test_course, enabled=course_setting, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC")) # lint-amnesty, pylint: disable=line-too-long
)
with self.assertNumQueries(4):
@@ -216,22 +221,25 @@ def test_all_current_course_configs(self):
# Point-test some of the final configurations
assert all_configs[CourseLocator('7-True', 'test_course', 'run-None')] == {
'enabled': (True, Provenance.org),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")),
Provenance.run)
}
assert all_configs[CourseLocator('7-True', 'test_course', 'run-False')] == {
'enabled': (False, Provenance.run),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")),
Provenance.run)
}
assert all_configs[CourseLocator('7-None', 'test_course', 'run-None')] == {
'enabled': (True, Provenance.site),
- 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=pytz.UTC),
+ 'enabled_as_of': (datetime(2018, 1, 1, 0, tzinfo=ZoneInfo("UTC")),
Provenance.run)
}
def test_caching_global(self):
- global_config = CourseDurationLimitConfig(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC))
+ global_config = CourseDurationLimitConfig(
+ enabled=True,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
global_config.save()
RequestCache.clear_all_namespaces()
@@ -257,7 +265,7 @@ def test_caching_global(self):
def test_caching_site(self):
site_cfg = SiteConfigurationFactory()
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
site_config.save()
RequestCache.clear_all_namespaces()
@@ -281,7 +289,10 @@ def test_caching_site(self):
with self.assertNumQueries(1):
assert not CourseDurationLimitConfig.current(site=site_cfg.site).enabled
- global_config = CourseDurationLimitConfig(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC))
+ global_config = CourseDurationLimitConfig(
+ enabled=True,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
global_config.save()
RequestCache.clear_all_namespaces()
@@ -295,7 +306,7 @@ def test_caching_org(self):
site_cfg = SiteConfigurationFactory.create(
site_values={'course_org_filter': course.org}
)
- org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
org_config.save()
RequestCache.clear_all_namespaces()
@@ -319,7 +330,10 @@ def test_caching_org(self):
with self.assertNumQueries(2):
assert not CourseDurationLimitConfig.current(org=course.org).enabled
- global_config = CourseDurationLimitConfig(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC))
+ global_config = CourseDurationLimitConfig(
+ enabled=True,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
global_config.save()
RequestCache.clear_all_namespaces()
@@ -328,7 +342,7 @@ def test_caching_org(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(org=course.org).enabled
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
site_config.save()
RequestCache.clear_all_namespaces()
@@ -342,7 +356,7 @@ def test_caching_course(self):
site_cfg = SiteConfigurationFactory.create(
site_values={'course_org_filter': course.org}
)
- course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ course_config = CourseDurationLimitConfig(course=course, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
course_config.save()
RequestCache.clear_all_namespaces()
@@ -366,7 +380,10 @@ def test_caching_course(self):
with self.assertNumQueries(2):
assert not CourseDurationLimitConfig.current(course_key=course.id).enabled
- global_config = CourseDurationLimitConfig(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC))
+ global_config = CourseDurationLimitConfig(
+ enabled=True,
+ enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))
+ )
global_config.save()
RequestCache.clear_all_namespaces()
@@ -375,7 +392,7 @@ def test_caching_course(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(course_key=course.id).enabled
- site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ site_config = CourseDurationLimitConfig(site=site_cfg.site, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
site_config.save()
RequestCache.clear_all_namespaces()
@@ -384,7 +401,7 @@ def test_caching_course(self):
with self.assertNumQueries(0):
assert not CourseDurationLimitConfig.current(course_key=course.id).enabled
- org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=pytz.UTC)) # lint-amnesty, pylint: disable=line-too-long
+ org_config = CourseDurationLimitConfig(org=course.org, enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC"))) # lint-amnesty, pylint: disable=line-too-long
org_config.save()
RequestCache.clear_all_namespaces()
diff --git a/openedx/features/course_experience/api/v1/tests/test_utils.py b/openedx/features/course_experience/api/v1/tests/test_utils.py
new file mode 100644
index 000000000000..741a2d7658f1
--- /dev/null
+++ b/openedx/features/course_experience/api/v1/tests/test_utils.py
@@ -0,0 +1,117 @@
+"""
+Tests utils of course expirience feature.
+"""
+import datetime
+
+from django.urls import reverse
+from django.utils import timezone
+from rest_framework.test import APIRequestFactory
+
+from common.djangoapps.course_modes.models import CourseMode
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.util.testing import EventTestMixin
+from lms.djangoapps.course_home_api.tests.utils import BaseCourseHomeTests
+from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin
+from openedx.core.djangoapps.schedules.models import Schedule
+from openedx.features.course_experience.api.v1.utils import (
+ reset_deadlines_for_course,
+ reset_course_deadlines_for_user,
+ reset_bulk_course_deadlines
+)
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class TestResetDeadlinesForCourse(EventTestMixin, BaseCourseHomeTests, MasqueradeMixin):
+ """
+ Tests for reset deadlines endpoint.
+ """
+ def setUp(self): # pylint: disable=arguments-differ
+ super().setUp("openedx.features.course_experience.api.v1.utils.tracker")
+ self.course = CourseFactory.create(self_paced=True, start=timezone.now() - datetime.timedelta(days=1000))
+
+ def test_reset_deadlines_for_course(self):
+ enrollment = CourseEnrollment.enroll(self.user, self.course.id, CourseMode.VERIFIED)
+ enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
+ enrollment.schedule.save()
+
+ request = APIRequestFactory().post(
+ reverse("course-experience-reset-course-deadlines"), {"course_key": self.course.id}
+ )
+ request.user = self.user
+
+ reset_deadlines_for_course(request, self.course.id, {})
+
+ assert enrollment.schedule.start_date < Schedule.objects.get(id=enrollment.schedule.id).start_date
+ self.assert_event_emitted(
+ "edx.ui.lms.reset_deadlines.clicked",
+ courserun_key=str(self.course.id),
+ is_masquerading=False,
+ is_staff=False,
+ org_key=self.course.org,
+ user_id=self.user.id,
+ )
+
+ def test_reset_deadlines_with_masquerade(self):
+ """Staff users should be able to masquerade as a learner and reset the learner's schedule"""
+ student_username = self.user.username
+ student_user_id = self.user.id
+ student_enrollment = CourseEnrollment.enroll(self.user, self.course.id)
+ student_enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
+ student_enrollment.schedule.save()
+
+ staff_enrollment = CourseEnrollment.enroll(self.staff_user, self.course.id)
+ staff_enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=30)
+ staff_enrollment.schedule.save()
+
+ self.switch_to_staff()
+ self.update_masquerade(course=self.course, username=student_username)
+
+ request = APIRequestFactory().post(
+ reverse("course-experience-reset-course-deadlines"), {"course_key": self.course.id}
+ )
+ request.user = self.staff_user
+ request.session = self.client.session
+
+ reset_deadlines_for_course(request, self.course.id, {})
+
+ updated_schedule = Schedule.objects.get(id=student_enrollment.schedule.id)
+ assert updated_schedule.start_date.date() == datetime.datetime.today().date()
+ updated_staff_schedule = Schedule.objects.get(id=staff_enrollment.schedule.id)
+ assert updated_staff_schedule.start_date == staff_enrollment.schedule.start_date
+ self.assert_event_emitted(
+ "edx.ui.lms.reset_deadlines.clicked",
+ courserun_key=str(self.course.id),
+ is_masquerading=True,
+ is_staff=False,
+ org_key=self.course.org,
+ user_id=student_user_id,
+ )
+
+ def test_reset_course_deadlines_for_user(self):
+ """Test the reset_course_deadlines_for_user utility function directly"""
+ enrollment = CourseEnrollment.enroll(self.user, self.course.id, CourseMode.VERIFIED)
+ enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
+ enrollment.schedule.save()
+
+ result = reset_course_deadlines_for_user(self.user, self.course.id)
+
+ assert result is True
+ assert enrollment.schedule.start_date < Schedule.objects.get(id=enrollment.schedule.id).start_date
+
+ def test_reset_bulk_course_deadlines(self):
+ """Test the reset_bulk_course_deadlines utility function"""
+ enrollment = CourseEnrollment.enroll(self.user, self.course.id, CourseMode.VERIFIED)
+ enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
+ enrollment.schedule.save()
+
+ request = APIRequestFactory().post(
+ reverse("course-experience-reset-all-course-deadlines"), {}
+ )
+ request.user = self.user
+
+ success_keys, failed_keys = reset_bulk_course_deadlines(request, [self.course.id], {})
+
+ assert len(success_keys) == 1
+ assert self.course.id in success_keys
+ assert len(failed_keys) == 0
+ assert enrollment.schedule.start_date < Schedule.objects.get(id=enrollment.schedule.id).start_date
diff --git a/openedx/features/course_experience/api/v1/tests/test_views.py b/openedx/features/course_experience/api/v1/tests/test_views.py
index 8cef39053b3e..097eb2c18c3b 100644
--- a/openedx/features/course_experience/api/v1/tests/test_views.py
+++ b/openedx/features/course_experience/api/v1/tests/test_views.py
@@ -1,7 +1,9 @@
"""
Tests for reset deadlines endpoint.
"""
+
import datetime
+from unittest import mock
import ddt
from django.urls import reverse
@@ -10,7 +12,6 @@
from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.util.testing import EventTestMixin
from lms.djangoapps.course_home_api.tests.utils import BaseCourseHomeTests
from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin
from openedx.core.djangoapps.schedules.models import Schedule
@@ -19,14 +20,12 @@
@ddt.ddt
-class ResetCourseDeadlinesViewTests(EventTestMixin, BaseCourseHomeTests, MasqueradeMixin):
+class ResetCourseDeadlinesViewTests(BaseCourseHomeTests, MasqueradeMixin):
"""
Tests for reset deadlines endpoint.
"""
def setUp(self): # pylint: disable=arguments-differ
- # Need to supply tracker name for the EventTestMixin. Also, EventTestMixin needs to come
- # first in class inheritance so the setUp call here appropriately works
- super().setUp('openedx.features.course_experience.api.v1.views.tracker')
+ super().setUp()
self.course = CourseFactory.create(self_paced=True, start=timezone.now() - datetime.timedelta(days=1000))
def test_reset_deadlines(self):
@@ -37,20 +36,11 @@ def test_reset_deadlines(self):
response = self.client.post(reverse('course-experience-reset-course-deadlines'), {'course': self.course.id})
assert response.status_code == 400
assert enrollment.schedule == Schedule.objects.get(id=enrollment.schedule.id)
- self.assert_no_events_were_emitted()
# Test correct post body
response = self.client.post(reverse('course-experience-reset-course-deadlines'), {'course_key': self.course.id})
assert response.status_code == 200
assert enrollment.schedule.start_date < Schedule.objects.get(id=enrollment.schedule.id).start_date
- self.assert_event_emitted(
- 'edx.ui.lms.reset_deadlines.clicked',
- courserun_key=str(self.course.id),
- is_masquerading=False,
- is_staff=False,
- org_key=self.course.org,
- user_id=self.user.id,
- )
@override_waffle_flag(RELATIVE_DATES_FLAG, active=True)
@override_waffle_flag(RELATIVE_DATES_DISABLE_RESET_FLAG, active=True)
@@ -62,36 +52,6 @@ def test_reset_deadlines_disabled(self):
response = self.client.post(reverse('course-experience-reset-course-deadlines'), {'course_key': self.course.id})
assert response.status_code == 200
assert enrollment.schedule == Schedule.objects.get(id=enrollment.schedule.id)
- self.assert_no_events_were_emitted()
-
- def test_reset_deadlines_with_masquerade(self):
- """ Staff users should be able to masquerade as a learner and reset the learner's schedule """
- student_username = self.user.username
- student_user_id = self.user.id
- student_enrollment = CourseEnrollment.enroll(self.user, self.course.id)
- student_enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
- student_enrollment.schedule.save()
-
- staff_enrollment = CourseEnrollment.enroll(self.staff_user, self.course.id)
- staff_enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=30)
- staff_enrollment.schedule.save()
-
- self.switch_to_staff()
- self.update_masquerade(course=self.course, username=student_username)
-
- self.client.post(reverse('course-experience-reset-course-deadlines'), {'course_key': self.course.id})
- updated_schedule = Schedule.objects.get(id=student_enrollment.schedule.id)
- assert updated_schedule.start_date.date() == datetime.datetime.today().date()
- updated_staff_schedule = Schedule.objects.get(id=staff_enrollment.schedule.id)
- assert updated_staff_schedule.start_date == staff_enrollment.schedule.start_date
- self.assert_event_emitted(
- 'edx.ui.lms.reset_deadlines.clicked',
- courserun_key=str(self.course.id),
- is_masquerading=True,
- is_staff=False,
- org_key=self.course.org,
- user_id=student_user_id,
- )
def test_post_unauthenticated_user(self):
self.client.logout()
@@ -115,3 +75,52 @@ def test_mobile_get_unauthenticated_user(self):
self.client.logout()
response = self.client.get(reverse('course-experience-course-deadlines-mobile', args=[self.course.id]))
assert response.status_code == 401
+
+
+class ResetAllRelativeCourseDeadlinesViewTests(BaseCourseHomeTests, MasqueradeMixin):
+ """
+ Tests for reset all relative deadlines endpoint.
+ """
+
+ def setUp(self): # pylint: disable=arguments-differ
+ super().setUp()
+ self.course = CourseFactory.create(self_paced=True, start=timezone.now() - datetime.timedelta(days=1000))
+ self.enrollment = CourseEnrollment.enroll(self.user, self.course.id, CourseMode.VERIFIED)
+ self.enrollment.schedule.start_date = timezone.now() - datetime.timedelta(days=100)
+ self.enrollment.schedule.save()
+
+ def test_reset_all_course_deadlines(self):
+ """
+ Test reset all course deadlines endpoint
+ """
+ response = self.client.post(
+ reverse("course-experience-reset-all-course-deadlines"),
+ {},
+ )
+ assert response.status_code == 200
+ assert self.enrollment.schedule.start_date < Schedule.objects.get(id=self.enrollment.schedule.id).start_date
+ assert str(self.course.id) in response.data.get("success_course_keys")
+
+ def test_reset_all_course_deadlines_failure(self):
+ """
+ Raise exception on reset_bulk_course_deadlines and assert if failure course id is returned
+ """
+ with mock.patch(
+ "openedx.features.course_experience.api.v1.views.reset_bulk_course_deadlines",
+ return_value=([], [self.course.id]),
+ ):
+ response = self.client.post(reverse("course-experience-reset-all-course-deadlines"), {})
+
+ assert response.status_code == 200
+ assert str(self.course.id) in response.data.get("failed_course_keys")
+
+ def test_post_unauthenticated_user(self):
+ """
+ Test reset all relative course deadlines endpoint for unauthenticated user
+ """
+ self.client.logout()
+ response = self.client.post(
+ reverse("course-experience-reset-all-course-deadlines"),
+ {},
+ )
+ assert response.status_code == 401
diff --git a/openedx/features/course_experience/api/v1/urls.py b/openedx/features/course_experience/api/v1/urls.py
index 9a2c7106cd1b..2c84af437f70 100644
--- a/openedx/features/course_experience/api/v1/urls.py
+++ b/openedx/features/course_experience/api/v1/urls.py
@@ -4,9 +4,13 @@
from django.conf import settings
-from django.urls import re_path
+from django.urls import re_path, path
-from openedx.features.course_experience.api.v1.views import reset_course_deadlines, CourseDeadlinesMobileView
+from openedx.features.course_experience.api.v1.views import (
+ reset_course_deadlines,
+ reset_all_course_deadlines,
+ CourseDeadlinesMobileView,
+)
urlpatterns = []
@@ -17,6 +21,11 @@
reset_course_deadlines,
name='course-experience-reset-course-deadlines'
),
+ path(
+ 'v1/reset_all_course_deadlines/',
+ reset_all_course_deadlines,
+ name='course-experience-reset-all-course-deadlines',
+ )
]
# URL for retrieving course deadlines info
diff --git a/openedx/features/course_experience/api/v1/utils.py b/openedx/features/course_experience/api/v1/utils.py
new file mode 100644
index 000000000000..8f9205b0f113
--- /dev/null
+++ b/openedx/features/course_experience/api/v1/utils.py
@@ -0,0 +1,115 @@
+
+"""
+Course Experience API utilities.
+"""
+import logging
+from eventtracking import tracker
+
+from lms.djangoapps.courseware.access import has_access
+from lms.djangoapps.courseware.masquerade import is_masquerading, setup_masquerade
+from lms.djangoapps.course_api.api import course_detail
+from openedx.core.djangoapps.schedules.utils import reset_self_paced_schedule
+from openedx.features.course_experience.utils import dates_banner_should_display
+
+
+logger = logging.getLogger(__name__)
+
+
+def reset_course_deadlines_for_user(user, course_key):
+ """
+ Core function to reset deadlines for a single course and user.
+
+ Args:
+ user: The user object
+ course_key: The course key
+
+ Returns:
+ bool: True if deadlines were reset, False if gated content prevents reset
+ """
+ # We ignore the missed_deadlines because this util is used in endpoint from the Learning MFE for
+ # learners who have remaining attempts on a problem and reset their due dates in order to
+ # submit additional attempts. This can apply for 'completed' (submitted) content that would
+ # not be marked as past_due
+ _missed_deadlines, missed_gated_content = dates_banner_should_display(course_key, user)
+ if not missed_gated_content:
+ reset_self_paced_schedule(user, course_key)
+ return True
+ return False
+
+
+def reset_bulk_course_deadlines(request, course_keys, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value
+ """
+ Reset deadlines for multiple courses for the requesting user.
+
+ Args:
+ request (Request): The request object
+ course_keys (list): List of course keys
+ research_event_data (dict): Any data that should be included in the research tracking event
+
+ Returns:
+ tuple: (success_course_keys, failed_course_keys)
+ """
+ success_course_keys = []
+ failed_course_keys = []
+
+ for course_key in course_keys:
+ try:
+ course_masquerade, user = setup_masquerade(
+ request,
+ course_key,
+ has_access(request.user, 'staff', course_key)
+ )
+
+ if reset_course_deadlines_for_user(user, course_key):
+ success_course_keys.append(course_key)
+
+ course_overview = course_detail(request, user.username, course_key)
+
+ research_event_data.update({
+ 'courserun_key': str(course_key),
+ 'is_masquerading': is_masquerading(user, course_key, course_masquerade),
+ 'is_staff': has_access(user, 'staff', course_key).has_access,
+ 'org_key': course_overview.display_org_with_default,
+ 'user_id': user.id,
+ })
+ tracker.emit('edx.ui.lms.reset_deadlines.clicked', research_event_data)
+ else:
+ failed_course_keys.append(course_key)
+ except Exception: # pylint: disable=broad-exception-caught
+ logger.exception('Error occurred while trying to reset deadlines!')
+ failed_course_keys.append(course_key)
+
+ return success_course_keys, failed_course_keys
+
+
+def reset_deadlines_for_course(request, course_key, research_event_data={}): # lint-amnesty, pylint: disable=dangerous-default-value
+ """
+ Set the start_date of a schedule to today, which in turn will adjust due dates for
+ sequentials belonging to a self paced course
+
+ Args:
+ request (Request): The request object
+ course_key (str): The course key
+ research_event_data (dict): Any data that should be included in the research tracking event
+ Example: sending the location of where the reset deadlines banner (i.e. outline-tab)
+ """
+
+ course_masquerade, user = setup_masquerade(
+ request,
+ course_key,
+ has_access(request.user, 'staff', course_key)
+ )
+
+ if reset_course_deadlines_for_user(user, course_key):
+ course_overview = course_detail(request, user.username, course_key)
+ # For context here, research_event_data should already contain `location` indicating
+ # the page/location dates were reset from and could also contain `block_id` if reset
+ # within courseware.
+ research_event_data.update({
+ 'courserun_key': str(course_key),
+ 'is_masquerading': is_masquerading(user, course_key, course_masquerade),
+ 'is_staff': has_access(user, 'staff', course_key).has_access,
+ 'org_key': course_overview.display_org_with_default,
+ 'user_id': user.id,
+ })
+ tracker.emit('edx.ui.lms.reset_deadlines.clicked', research_event_data)
diff --git a/openedx/features/course_experience/api/v1/views.py b/openedx/features/course_experience/api/v1/views.py
index 16be4a4e0ed4..d822fdd65c67 100644
--- a/openedx/features/course_experience/api/v1/views.py
+++ b/openedx/features/course_experience/api/v1/views.py
@@ -5,7 +5,6 @@
from django.utils.html import format_html
from django.utils.translation import gettext as _
-from eventtracking import tracker
from rest_framework.decorators import api_view, authentication_classes, permission_classes
from rest_framework.exceptions import APIException, ParseError
@@ -17,17 +16,14 @@
from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
from opaque_keys.edx.keys import CourseKey
-from lms.djangoapps.course_api.api import course_detail
+from common.djangoapps.student.models import CourseEnrollment
from lms.djangoapps.course_goals.models import UserActivity
-from lms.djangoapps.courseware.access import has_access
from lms.djangoapps.courseware.courses import get_course_with_access
-from lms.djangoapps.courseware.masquerade import is_masquerading, setup_masquerade
-from openedx.core.djangoapps.schedules.utils import reset_self_paced_schedule
from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
from openedx.features.course_experience.api.v1.serializers import CourseDeadlinesMobileSerializer
from openedx.features.course_experience.url_helpers import get_learning_mfe_home_url
-from openedx.features.course_experience.utils import dates_banner_should_display
+from openedx.features.course_experience.api.v1.utils import reset_deadlines_for_course, reset_bulk_course_deadlines
log = logging.getLogger(__name__)
@@ -65,32 +61,7 @@ def reset_course_deadlines(request):
try:
course_key = CourseKey.from_string(course_key)
- course_masquerade, user = setup_masquerade(
- request,
- course_key,
- has_access(request.user, 'staff', course_key)
- )
-
- # We ignore the missed_deadlines because this endpoint is used in the Learning MFE for
- # learners who have remaining attempts on a problem and reset their due dates in order to
- # submit additional attempts. This can apply for 'completed' (submitted) content that would
- # not be marked as past_due
- _missed_deadlines, missed_gated_content = dates_banner_should_display(course_key, user)
- if not missed_gated_content:
- reset_self_paced_schedule(user, course_key)
-
- course_overview = course_detail(request, user.username, course_key)
- # For context here, research_event_data should already contain `location` indicating
- # the page/location dates were reset from and could also contain `block_id` if reset
- # within courseware.
- research_event_data.update({
- 'courserun_key': str(course_key),
- 'is_masquerading': is_masquerading(user, course_key, course_masquerade),
- 'is_staff': has_access(user, 'staff', course_key).has_access,
- 'org_key': course_overview.display_org_with_default,
- 'user_id': user.id,
- })
- tracker.emit('edx.ui.lms.reset_deadlines.clicked', research_event_data)
+ reset_deadlines_for_course(request, course_key, research_event_data)
body_link = get_learning_mfe_home_url(course_key=course_key, url_fragment='dates')
@@ -106,6 +77,44 @@ def reset_course_deadlines(request):
raise UnableToResetDeadlines from reset_deadlines_exception
+@api_view(["POST"])
+@authentication_classes(
+ (
+ JwtAuthentication,
+ BearerAuthenticationAllowInactiveUser,
+ SessionAuthenticationAllowInactiveUser,
+ )
+)
+@permission_classes((IsAuthenticated,))
+def reset_all_course_deadlines(request):
+ """
+ Set the start_date of a schedule to today for all enrolled courses
+
+ Request Parameters:
+ research_event_data: any data that should be included in the research tracking event
+ Example: sending the location of where the reset deadlines banner (i.e. outline-tab)
+
+ Returns:
+ success_course_keys: list of course keys for which deadlines were successfully reset
+ failed_course_keys: list of course keys for which deadlines could not be reset
+ """
+ research_event_data = request.data.get("research_event_data", {})
+ course_keys = list(
+ CourseEnrollment.enrollments_for_user(request.user).select_related("course").values_list("course_id", flat=True)
+ )
+
+ success_course_keys, failed_course_keys = reset_bulk_course_deadlines(
+ request, course_keys, research_event_data
+ )
+
+ return Response(
+ {
+ "success_course_keys": [str(key) for key in success_course_keys],
+ "failed_course_keys": [str(key) for key in failed_course_keys],
+ }
+ )
+
+
class CourseDeadlinesMobileView(RetrieveAPIView):
"""
**Use Cases**
diff --git a/openedx/features/course_experience/tests/views/test_course_updates.py b/openedx/features/course_experience/tests/views/test_course_updates.py
index 379be52ed40f..6ca701f14677 100644
--- a/openedx/features/course_experience/tests/views/test_course_updates.py
+++ b/openedx/features/course_experience/tests/views/test_course_updates.py
@@ -5,7 +5,7 @@
from datetime import datetime
from django.urls import reverse
-from pytz import UTC
+from zoneinfo import ZoneInfo
from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES
from openedx.features.content_type_gating.models import ContentTypeGatingConfig
@@ -41,7 +41,7 @@ def test_view(self):
self.assertContains(response, 'Second Message')
def test_queries(self):
- ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=UTC))
+ ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=ZoneInfo("UTC")))
self.create_course_update('First Message')
# Pre-fetch the view to populate any caches
diff --git a/openedx/features/discounts/applicability.py b/openedx/features/discounts/applicability.py
index 97d6f74403bd..c930ae2da878 100644
--- a/openedx/features/discounts/applicability.py
+++ b/openedx/features/discounts/applicability.py
@@ -11,7 +11,7 @@
from datetime import datetime, timedelta
-import pytz
+from zoneinfo import ZoneInfo
from crum import get_current_request, impersonate
from django.conf import settings
from django.utils import timezone
@@ -197,7 +197,7 @@ def _is_in_holdback_and_bucket(user):
Return whether the specified user is in the first-purchase-discount holdback group.
This will also stable bucket the user.
"""
- if datetime(2020, 8, 1, tzinfo=pytz.UTC) <= datetime.now(tz=pytz.UTC):
+ if datetime(2020, 8, 1, tzinfo=ZoneInfo("UTC")) <= datetime.now(tz=ZoneInfo("UTC")):
return False
# Holdback is 10%
diff --git a/openedx/features/discounts/tests/test_applicability.py b/openedx/features/discounts/tests/test_applicability.py
index 60dbe7a67edf..472120b38705 100644
--- a/openedx/features/discounts/tests/test_applicability.py
+++ b/openedx/features/discounts/tests/test_applicability.py
@@ -6,7 +6,7 @@
import ddt
import pytest
-import pytz
+from zoneinfo import ZoneInfo
from django.contrib.sites.models import Site
from django.utils.timezone import now
from edx_toggles.toggles.testutils import override_waffle_flag
@@ -39,7 +39,7 @@ def setUp(self):
self.user = UserFactory.create()
self.course = CourseFactory.create(run='test', display_name='test')
CourseModeFactory.create(course_id=self.course.id, mode_slug='verified')
- now_time = datetime.now(tz=pytz.UTC).strftime("%Y-%m-%d %H:%M:%S%z")
+ now_time = datetime.now(tz=ZoneInfo("UTC")).strftime("%Y-%m-%d %H:%M:%S%z")
ExperimentData.objects.create(
user=self.user, experiment_id=REV1008_EXPERIMENT_ID, key=str(self.course.id), value=now_time
)
@@ -175,6 +175,6 @@ def test_holdback_expiry(self):
with patch('openedx.features.discounts.applicability.stable_bucketing_hash_group', return_value=0):
with patch(
'openedx.features.discounts.applicability.datetime',
- Mock(now=Mock(return_value=datetime(2020, 8, 1, 0, 1, tzinfo=pytz.UTC)), wraps=datetime),
+ Mock(now=Mock(return_value=datetime(2020, 8, 1, 0, 1, tzinfo=ZoneInfo("UTC"))), wraps=datetime),
):
assert not _is_in_holdback_and_bucket(self.user)
diff --git a/openedx/features/discounts/utils.py b/openedx/features/discounts/utils.py
index 92490f19bcb3..00b60f6cadfd 100644
--- a/openedx/features/discounts/utils.py
+++ b/openedx/features/discounts/utils.py
@@ -4,7 +4,7 @@
from datetime import datetime
-import pytz
+from zoneinfo import ZoneInfo
from django.conf import settings
from django.utils.translation import get_language
from django.utils.translation import gettext as _
@@ -89,7 +89,7 @@ def generate_offer_data(user, course):
ExperimentData.objects.get_or_create(
user=user, experiment_id=REV1008_EXPERIMENT_ID, key=str(course),
defaults={
- 'value': datetime.now(tz=pytz.UTC).strftime('%Y-%m-%d %H:%M:%S%z'),
+ 'value': datetime.now(tz=ZoneInfo("UTC")).strftime('%Y-%m-%d %H:%M:%S%z'),
},
)
diff --git a/openedx/features/enterprise_support/tests/test_logout.py b/openedx/features/enterprise_support/tests/test_logout.py
index c83b67c3a5e6..cbec23397795 100644
--- a/openedx/features/enterprise_support/tests/test_logout.py
+++ b/openedx/features/enterprise_support/tests/test_logout.py
@@ -19,6 +19,7 @@
factories
)
from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseServiceMockMixin
+from common.test.utils import assert_dict_contains_subset
@ddt.ddt
@@ -60,7 +61,7 @@ def test_logout_enterprise_target(self, redirect_url, enterprise_target):
expected = {
'enterprise_target': enterprise_target,
}
- self.assertDictContainsSubset(expected, response.context_data)
+ assert_dict_contains_subset(self, expected, response.context_data)
if enterprise_target:
self.assertContains(response, 'We are signing you in.')
diff --git a/openedx/features/offline_content/docs/001-mobile-offline-content-support.rst b/openedx/features/offline_content/docs/001-mobile-offline-content-support.rst
new file mode 100644
index 000000000000..29ecf7d01efe
--- /dev/null
+++ b/openedx/features/offline_content/docs/001-mobile-offline-content-support.rst
@@ -0,0 +1,156 @@
+1. Offline content generation for mobile OeX app
+=============================================
+
+Status
+------
+
+Accepted
+
+Context
+-------
+
+The primary goal is to enable offline access to course content in the Open edX mobile application.
+This will allow users to download course materials when they have internet access and access them
+later without an internet connection, also it should support synchronization of the submitted results
+with backend service as connection become available again. This feature is crucial for learners
+in areas with unreliable internet connectivity or those who prefer to study on the go without using mobile data.
+It is possible to provide different kind of content using the Open edX platform, such as read-only materials,
+videos, and assessments. Therefore to provide the whole course experience in offline mode it's required to
+make all these types of content available offline. Of course it won't be feasible to recreate grading
+algorithms in mobile, so it's possible to save submission on the mobile app and execute synchronization
+of the user progres as not limited connectivity is back.
+
+From the product perspective the following Figma designs and product requirements should be considered:
+
+* `Download and Delete (Figma)`_
+* `Downloads (Figma)`_
+
+.. _Download and Delete (Figma): https://www.figma.com/design/iZ56YMjbRMShCCDxqrqRrR/Mobile-App-v2.4-%5BOpen-edX%5D?node-id=18472-187387&t=tMgymS6WIZZJbJHn-0
+.. _Downloads (Figma): https://www.figma.com/design/iZ56YMjbRMShCCDxqrqRrR/Mobile-App-v2.4-%5BOpen-edX%5D
+
+Decision
+--------
+
+The implementation of the offline content support require addition of the following features to the edx-platform:
+
+* It's necessary to generate an archive with all necessary HTML and assets for a student view of an xBlock, so it's possible to display an xBlock using mobile WebView.
+* Implement a new standard XBlock view called `offline_view` which would generate user-agnostic fragments suitable for offline use. This view will avoid any dependence on student-specific state, focusing solely on content and settings.
+* XBlock classes can opt into supporting `offline_view`. They can implement this view fully or partially. For example, a block that relies on user-specific randomization or interactive elements that require online connectivity would not be rendered offline.
+* The generated offline content should be provided to mobile device through mobile API.
+* To support CAPA problems and other kinds of assessments in offline mode it's necessary to create an additional
+ JavaScript layer that will allow communication with Mobile applications by sending JSON messages
+ using Android and IOS Bridge.
+
+
+Offline content generation
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Generating zip archive with xBlock data for HTML and CAPA problems
+When content is published in CMS and offline generation is enabled for the course or entire platform using waffle flags, the content generation task should be started for supported blocks.
+Every time block content republished ZIP archive with offline content should be regenerated.
+Supported XBlock class should implement `offline_view` method that will be used to generate the content.
+HTML should be processed, all related assets files, images and scripts should be included in the generated ZIP archive with offline content
+The Generation process should work with local media storage as well as s3.
+If error retrieving block happened, the generation task will be scheduled for retry 2 more times, with progressive delay.
+
+ .. image:: _images/mobile_offline_content_generation.svg
+ :alt: Mobile Offline Content Generation Process Diagram
+
+
+Offline content deletion
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+When the course is published and some blocks are removed from the course, related ZIP archive should be deleted.
+When some blocks are removed from the course without publishing the course, the related ZIP archive shouldn't be deleted.
+
+
+Mobile API extension
+~~~~~~~~~~~~~~~~~~~~
+
+Extend the Course Home mobile API endpoint, and add a new version of the API (url /api/mobile/v4/course_info/blocks/)
+to return information about offline content available for download for supported blocks
+
+.. code-block:: json
+ {
+ ...
+ "offline_download": {
+ "file_url": "{file_url}" or null,
+ "last_modified": "{DT}" or null,
+ "file_size": ""
+ }
+ }
+
+
+JavaScript Bridge for interaction with mobile applications
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Implement JS Bridge JS script to intercept and send results to mobile device for supported CAPA problems.
+
+The JS bridge will intercept AJAX requests in the mobile application and store the responses locally. If the user submits the response offline he will be shown the message "Your response is accepted" and the Submit button will be disabled as the submission will be sent twice.
+When the internet connection is back the mobile client will submit the cached responses one by one through the regular xBlock handler endpoints.
+Data from submission should be submitted through bridge on iOS and Android devices.
+This script should expose markCompleted JS function so mobile can change state of the offline problem after the data was saved into internal database or on initialization of the problem.
+
+* **Implement of a mechanism for generating and storing on a server or external storage**: The course content should be pre-generated and saved to the storage for later download.
+ * **Render block fragment**: Implement a new standard XBlock view called `offline_view` which would generate user-agnostic fragments suitable for offline use. This view will avoid any dependence on student-specific state, focusing solely on content and settings.
+ * **Replace static and media**: Save static and media assets files used in block to temporary directory and replace their static paths with local paths.
+ * **Archive and store content**: Archive the generated content and store it on the server or external storage.
+* **Mechanism for updating the generated data**: When updating course blocks (namely when publishing) the content that has been changed should be re-generated.
+ * **Track course publishing events on CMS side**: Add a new signal `course_cache_updated` to be called after the course structure cache update in `update_course_in_cache_v2`. Add a signal that listens to `course_cache_updated` and starts block generation.
+ * **Update archive**: Check generated archive creation date and update it if less than course publishing date.
+* **Implement a Mobile Local Storage Mechanism**: Use the device's local storage to save course content for offline access.
+ * **Extend blocks API**: Add links to download blocks content and where it is possible.
+* **Sync Mechanism**: Periodically synchronize local data with the server when the device is online.
+ * **Sync on app side**: On course outline screen, check if the course content is up to date and update it if necessary.
+ * **Sync user responses**: When the device is offline, save user responses locally and send them to the server when the device is online.
+* **Selective Download**: Allow users to choose specific content to download for offline use.
+* **Full Course Download**: Provide an option to download entire courses for offline access.
+
+Supported xBlocks in offline mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It was decided to include a fraction of Open edX xBlocks to be supported.
+The following list of blocks is currently planned to be added to the support:
+
+* **Common problems**:
+ * **Checkboxes** - full support
+ * **Dropdown** - full support
+ * **Multiple Choice** - full support
+ * **Numerical Input** - full support
+ * **Text Input** - full support
+ * **Checkboxes with Hints and Feedback** - partial support without Hints and Feedback
+ * **Dropdown with Hints and Feedback** - partial support without Hints and Feedback
+ * **Multiple Choice with Hints and Feedback** - partial support without Hints and Feedback
+ * **Numerical Input with Hints and Feedback** - partially supported without Hints and Feedback
+ * **Text Input with Hints and Feedback** - partially supported without Hints and Feedback
+ * **Blank Advanced Problems** - partially supported, without loncapa/python problems or multi-part problems
+* **Text**:
+ * **Text** - full support
+ * **IFrame Tool** - full support
+ * **Raw HTML** - full support
+ * **Zooming Image Tool** - full support
+* **Video** - already supported
+
+
+Consequences
+------------
+
+* Enhanced learner experience with flexible access to course materials.
+* Increased accessibility for learners in regions with poor internet connectivity.
+* Improved engagement and completion rates due to uninterrupted access to content.
+* Simplified Maintenance by using a unified rendering view (`offline_view`), the complexity of maintaining separate renderers for online and offline content is significantly reduced.
+* The proposed approach not only caters to the current needs of mobile users but also sets a foundation for expanding offline access to other platforms and uses.
+* Potential increase in app size due to locally stored content.
+* Increased complexity in managing content synchronization and updates.
+* Need for continuous monitoring and updates to handle new content types and formats.
+
+Rejected Solutions
+------------------
+
+* **Store common .js and .css files of blocks in a separate folder:**
+ * This solution was rejected because it is unclear how to track potential changes to these files and re-generate the content of the blocks.
+
+* **Generate content on the fly when the user requests it:**
+ * This solution was rejected because it would require a significant amount of processing power and time to generate content for each block when requested.
+
+* **Separate Offline Renderer**:
+ * The initial proposal of creating a separate renderer for offline content was rejected due to the increased complexity and potential for inconsistent behavior between online and offline content.
diff --git a/openedx/features/offline_content/docs/002-mobile-offline-content-support.rst b/openedx/features/offline_content/docs/002-mobile-offline-content-support.rst
new file mode 100644
index 000000000000..7d1e91e7e882
--- /dev/null
+++ b/openedx/features/offline_content/docs/002-mobile-offline-content-support.rst
@@ -0,0 +1,55 @@
+2. Offline Mode enhancements
+=========================
+
+Status
+------
+
+Proposed
+
+Context
+-------
+
+`offline_view` generalized and can be used for Non-mobile offline mode, Anonymous access or Regular student access.
+Static files like JavaScript and CSS will be de-duplicated based on their content hash.
+
+Decisions
+--------
+
+1. Efficient resource management
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - Shared resources like JS and CSS files will be de-duplicated based on their content hash, to prevent duplication for every block.
+ - All shared content should be stored in the separate ZIP archive.
+ - This archive will be regenerated 1 time and contains all JS and CSS files related to default Xblocks.
+ - Xblock specific resources will still be stored in the block ZIP archive.
+ - This will ensure that the same resource is not duplicated across different blocks, reducing storage and bandwidth usage.
+
+
+2. Anonymous access
+~~~~~~~~~~~~~~~~~~~
+
+ - Re-implement `public_view` on top of `offline_view`. If it is possible to get pre-rendered block without knowing user state, then it is possible to serve that pre-renderable view as the public experience for logged-out users.
+ - This will allow broader access to educational content without the need for user authentication, potentially increasing user engagement and content reach.
+
+
+3. Non-mobile offline mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - The `offline_view` will be generalized to support non-mobile offline mode.
+ - This mode will enable users on desktop and other non-mobile platforms to download and access course content without an active internet connection, providing greater flexibility in how content is accessed.
+
+
+4. Regular student access
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - `student_view` will be implemented on top of `offline_view` wherever it is supported.
+ - For XBlocks compatible with this architecture, offline-ready content will be served by default, and dynamic online features will be engaged only when a user has a reliable connection.
+ - This setting is intended to improve the learning process by providing constant access to content when the Internet connection is unstable.
+
+
+Consequences
+------------
+
+* **Resource Efficiency**: The avoidance of duplicating static resources for each block enhances the efficient use of storage and bandwidth.
+* **Enhanced Flexibility**: The system can skip rendering blocks that require student-specific interactions, ensuring reliability and reducing the potential for behavior discrepancies between online and offline modes.
+* **Broader Accessibility**: The ability to serve pre-rendered views to anonymous users increases the reach of educational content, making it more accessible to a wider audience.
diff --git a/openedx/features/offline_content/docs/_images/mobile_offline_content_generation.svg b/openedx/features/offline_content/docs/_images/mobile_offline_content_generation.svg
new file mode 100644
index 000000000000..ca07617294a9
--- /dev/null
+++ b/openedx/features/offline_content/docs/_images/mobile_offline_content_generation.svg
@@ -0,0 +1,4 @@
+
+
+
\ No newline at end of file
diff --git a/openedx/features/survey_report/migrations/0006_mariadb_uuid_conversion.py b/openedx/features/survey_report/migrations/0006_mariadb_uuid_conversion.py
new file mode 100644
index 000000000000..13f1d284d792
--- /dev/null
+++ b/openedx/features/survey_report/migrations/0006_mariadb_uuid_conversion.py
@@ -0,0 +1,75 @@
+# Generated migration for MariaDB UUID field conversion (Django 5.2)
+"""
+Migration to convert UUIDField from char(32) to uuid type for MariaDB compatibility.
+
+This migration is necessary because Django 5 changed the behavior of UUIDField for MariaDB
+databases from using CharField(32) to using a proper UUID type. This change isn't managed
+automatically, so we need to generate migrations to safely convert the columns.
+
+This migration only executes for MariaDB databases and is a no-op for other backends.
+
+See: https://www.albertyw.com/note/django-5-mariadb-uuidfield
+"""
+
+from django.db import migrations
+
+
+def apply_mariadb_migration(apps, schema_editor):
+ """Apply the migration only for MariaDB databases."""
+ connection = schema_editor.connection
+
+ # Check if this is a MariaDB database
+ if connection.vendor != 'mysql':
+ return
+
+ # Additional check for MariaDB specifically (vs MySQL)
+ with connection.cursor() as cursor:
+ cursor.execute("SELECT VERSION()")
+ version = cursor.fetchone()[0]
+ if 'mariadb' not in version.lower():
+ return
+
+ # Apply the field changes for MariaDB
+ with connection.cursor() as cursor:
+ # The id field is a primary key
+ cursor.execute(
+ "ALTER TABLE survey_report_surveyreportanonymoussiteid "
+ "MODIFY id uuid NOT NULL"
+ )
+
+
+def reverse_mariadb_migration(apps, schema_editor):
+ """Reverse the migration only for MariaDB databases."""
+ connection = schema_editor.connection
+
+ # Check if this is a MariaDB database
+ if connection.vendor != 'mysql':
+ return
+
+ # Additional check for MariaDB specifically (vs MySQL)
+ with connection.cursor() as cursor:
+ cursor.execute("SELECT VERSION()")
+ version = cursor.fetchone()[0]
+ if 'mariadb' not in version.lower():
+ return
+
+ # Reverse the field changes for MariaDB
+ with connection.cursor() as cursor:
+ cursor.execute(
+ "ALTER TABLE survey_report_surveyreportanonymoussiteid "
+ "MODIFY id char(32) NOT NULL"
+ )
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('survey_report', '0005_surveyreportanonymoussiteid'),
+ ]
+
+ operations = [
+ migrations.RunPython(
+ code=apply_mariadb_migration,
+ reverse_code=reverse_mariadb_migration,
+ ),
+ ]
diff --git a/openedx/tests/completion_integration/test_handlers.py b/openedx/tests/completion_integration/test_handlers.py
index 677a7514628e..4522768739ad 100644
--- a/openedx/tests/completion_integration/test_handlers.py
+++ b/openedx/tests/completion_integration/test_handlers.py
@@ -11,7 +11,7 @@
from completion.models import BlockCompletion
from completion.test_utils import CompletionSetUpMixin
from django.test import TestCase
-from pytz import utc
+from zoneinfo import ZoneInfo
from xblock.completable import XBlockCompletionMode
from xblock.core import XBlock
@@ -66,7 +66,7 @@ def call_scorable_block_completion_handler(self, block_key, score_deleted=None):
usage_id=str(block_key),
weighted_earned=0.0,
weighted_possible=3.0,
- modified=datetime.utcnow().replace(tzinfo=utc),
+ modified=datetime.utcnow().replace(tzinfo=ZoneInfo("UTC")),
score_db_table='submissions',
**params
)
@@ -127,7 +127,7 @@ def test_signal_calls_handler(self):
usage_id=str(self.block_key),
weighted_earned=0.0,
weighted_possible=3.0,
- modified=datetime.utcnow().replace(tzinfo=utc),
+ modified=datetime.utcnow().replace(tzinfo=ZoneInfo("UTC")),
score_db_table='submissions',
)
mock_handler.assert_called()
@@ -153,7 +153,7 @@ def test_disabled_handler_does_not_submit_completion(self):
usage_id=str(self.block_key),
weighted_earned=0.0,
weighted_possible=3.0,
- modified=datetime.utcnow().replace(tzinfo=utc),
+ modified=datetime.utcnow().replace(tzinfo=ZoneInfo("UTC")),
score_db_table='submissions',
)
with pytest.raises(BlockCompletion.DoesNotExist):
diff --git a/openedx/tests/xblock_integration/xblock_testcase.py b/openedx/tests/xblock_integration/xblock_testcase.py
index 6f598a342cb1..af2a3410b75f 100644
--- a/openedx/tests/xblock_integration/xblock_testcase.py
+++ b/openedx/tests/xblock_integration/xblock_testcase.py
@@ -44,7 +44,7 @@
import html
from unittest import mock
-import pytz
+from zoneinfo import ZoneInfo
from bs4 import BeautifulSoup
from django.conf import settings
from django.urls import reverse
@@ -199,7 +199,7 @@ def capture_score(user_id, usage_key, score, max_score):
'score': score,
'max_score': max_score})
# Shim a return time, defaults to 1 hour before now
- return datetime.now().replace(tzinfo=pytz.UTC) - timedelta(hours=1)
+ return datetime.now().replace(tzinfo=ZoneInfo("UTC")) - timedelta(hours=1)
self.scores = []
patcher = mock.patch("lms.djangoapps.grades.signals.handlers.set_score", capture_score)
diff --git a/package-lock.json b/package-lock.json
index 6db7903427b4..68f63236fc65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
"@edx/edx-proctoring": "^4.18.1",
"@edx/frontend-component-cookie-policy-banner": "2.2.0",
"@edx/paragon": "2.6.4",
- "@edx/studio-frontend": "^2.1.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^12.8.3",
@@ -89,7 +88,6 @@
"karma-jasmine-html-reporter": "0.2.2",
"karma-junit-reporter": "2.0.1",
"karma-requirejs": "1.1.0",
- "karma-selenium-webdriver-launcher": "github:openedx/karma-selenium-webdriver-launcher#0.0.4-openedx.0",
"karma-sourcemap-loader": "0.4.0",
"karma-spec-reporter": "0.0.20",
"karma-webpack": "^5.0.1",
@@ -104,9 +102,9 @@
}
},
"node_modules/@adobe/css-tools": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.2.tgz",
- "integrity": "sha512-baYZExFpsdkBNuvGKTKWCwKH57HRZLVtycZS05WTQNVOiXVSeAki3nU35zlRbToeMW8aHlJfyS+1C4BOv27q0A==",
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.4.tgz",
+ "integrity": "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==",
"license": "MIT"
},
"node_modules/@ampproject/remapping": {
@@ -123,23 +121,23 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.26.2",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
- "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+ "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.27.1",
"js-tokens": "^4.0.0",
- "picocolors": "^1.0.0"
+ "picocolors": "^1.1.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/compat-data": {
- "version": "7.26.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
- "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
+ "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
@@ -150,6 +148,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.0",
@@ -176,15 +175,15 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
- "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+ "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.27.0",
- "@babel/types": "^7.27.0",
- "@jridgewell/gen-mapping": "^0.3.5",
- "@jridgewell/trace-mapping": "^0.3.25",
+ "@babel/parser": "^7.28.3",
+ "@babel/types": "^7.28.2",
+ "@jridgewell/gen-mapping": "^0.3.12",
+ "@jridgewell/trace-mapping": "^0.3.28",
"jsesc": "^3.0.2"
},
"engines": {
@@ -192,25 +191,25 @@
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
- "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+ "version": "7.27.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+ "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.25.9"
+ "@babel/types": "^7.27.3"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
- "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
+ "version": "7.27.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+ "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
"license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.26.8",
- "@babel/helper-validator-option": "^7.25.9",
+ "@babel/compat-data": "^7.27.2",
+ "@babel/helper-validator-option": "^7.27.1",
"browserslist": "^4.24.0",
"lru-cache": "^5.1.1",
"semver": "^6.3.1"
@@ -220,17 +219,17 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.0.tgz",
- "integrity": "sha512-vSGCvMecvFCd/BdpGlhpXYNhhC4ccxyvQWpbGL4CWbvfEoLFWUZuSuf7s9Aw70flgQF+6vptvgK2IfOnKlRmBg==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz",
+ "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-member-expression-to-functions": "^7.25.9",
- "@babel/helper-optimise-call-expression": "^7.25.9",
- "@babel/helper-replace-supers": "^7.26.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
- "@babel/traverse": "^7.27.0",
+ "@babel/helper-annotate-as-pure": "^7.27.3",
+ "@babel/helper-member-expression-to-functions": "^7.27.1",
+ "@babel/helper-optimise-call-expression": "^7.27.1",
+ "@babel/helper-replace-supers": "^7.27.1",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+ "@babel/traverse": "^7.28.3",
"semver": "^6.3.1"
},
"engines": {
@@ -241,12 +240,12 @@
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.0.tgz",
- "integrity": "sha512-fO8l08T76v48BhpNRW/nQ0MxfnSdoSKUJBMjubOAYffsVuGG5qOfMq7N6Es7UJvi7Y8goXXo07EfcHZXDPuELQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
+ "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-annotate-as-pure": "^7.27.1",
"regexpu-core": "^6.2.0",
"semver": "^6.3.1"
},
@@ -258,56 +257,65 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz",
- "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==",
+ "version": "0.6.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
+ "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.22.6",
- "@babel/helper-plugin-utils": "^7.22.5",
- "debug": "^4.1.1",
+ "@babel/helper-compilation-targets": "^7.27.2",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "debug": "^4.4.1",
"lodash.debounce": "^4.0.8",
- "resolve": "^1.14.2"
+ "resolve": "^1.22.10"
},
"peerDependencies": {
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
+ "node_modules/@babel/helper-globals": {
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+ "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
- "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
+ "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
"license": "MIT",
"dependencies": {
- "@babel/traverse": "^7.25.9",
- "@babel/types": "^7.25.9"
+ "@babel/traverse": "^7.27.1",
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-imports": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
- "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+ "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
"license": "MIT",
"dependencies": {
- "@babel/traverse": "^7.25.9",
- "@babel/types": "^7.25.9"
+ "@babel/traverse": "^7.27.1",
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.26.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
- "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+ "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-imports": "^7.25.9",
- "@babel/helper-validator-identifier": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-module-imports": "^7.27.1",
+ "@babel/helper-validator-identifier": "^7.27.1",
+ "@babel/traverse": "^7.28.3"
},
"engines": {
"node": ">=6.9.0"
@@ -317,35 +325,35 @@
}
},
"node_modules/@babel/helper-optimise-call-expression": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
- "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+ "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.25.9"
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.26.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
- "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+ "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-remap-async-to-generator": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
- "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+ "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-wrap-function": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-wrap-function": "^7.27.1",
+ "@babel/traverse": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -355,14 +363,14 @@
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.26.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
- "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
+ "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-member-expression-to-functions": "^7.25.9",
- "@babel/helper-optimise-call-expression": "^7.25.9",
- "@babel/traverse": "^7.26.5"
+ "@babel/helper-member-expression-to-functions": "^7.27.1",
+ "@babel/helper-optimise-call-expression": "^7.27.1",
+ "@babel/traverse": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -372,79 +380,79 @@
}
},
"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
- "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+ "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
"license": "MIT",
"dependencies": {
- "@babel/traverse": "^7.25.9",
- "@babel/types": "^7.25.9"
+ "@babel/traverse": "^7.27.1",
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
- "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+ "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
- "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+ "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
- "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+ "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
- "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz",
+ "integrity": "sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==",
"license": "MIT",
"dependencies": {
- "@babel/template": "^7.25.9",
- "@babel/traverse": "^7.25.9",
- "@babel/types": "^7.25.9"
+ "@babel/template": "^7.27.2",
+ "@babel/traverse": "^7.28.3",
+ "@babel/types": "^7.28.2"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
- "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+ "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
"license": "MIT",
"dependencies": {
- "@babel/template": "^7.27.0",
- "@babel/types": "^7.27.0"
+ "@babel/template": "^7.27.2",
+ "@babel/types": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/parser": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
- "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+ "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.27.0"
+ "@babel/types": "^7.28.4"
},
"bin": {
"parser": "bin/babel-parser.js"
@@ -454,13 +462,13 @@
}
},
"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
- "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
+ "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/traverse": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -470,12 +478,12 @@
}
},
"node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
- "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+ "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -485,12 +493,12 @@
}
},
"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
- "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+ "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -500,14 +508,14 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
- "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+ "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
- "@babel/plugin-transform-optional-chaining": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+ "@babel/plugin-transform-optional-chaining": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -517,13 +525,13 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
- "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz",
+ "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/traverse": "^7.28.3"
},
"engines": {
"node": ">=6.9.0"
@@ -620,12 +628,12 @@
}
},
"node_modules/@babel/plugin-syntax-import-assertions": {
- "version": "7.26.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
- "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
+ "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -635,12 +643,12 @@
}
},
"node_modules/@babel/plugin-syntax-import-attributes": {
- "version": "7.26.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
- "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+ "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -676,12 +684,12 @@
}
},
"node_modules/@babel/plugin-syntax-jsx": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
- "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+ "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -800,13 +808,13 @@
}
},
"node_modules/@babel/plugin-syntax-typescript": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
- "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+ "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -832,12 +840,12 @@
}
},
"node_modules/@babel/plugin-transform-arrow-functions": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
- "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+ "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -847,14 +855,14 @@
}
},
"node_modules/@babel/plugin-transform-async-generator-functions": {
- "version": "7.26.8",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
- "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
+ "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5",
- "@babel/helper-remap-async-to-generator": "^7.25.9",
- "@babel/traverse": "^7.26.8"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-remap-async-to-generator": "^7.27.1",
+ "@babel/traverse": "^7.28.0"
},
"engines": {
"node": ">=6.9.0"
@@ -864,14 +872,14 @@
}
},
"node_modules/@babel/plugin-transform-async-to-generator": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
- "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
+ "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-imports": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-remap-async-to-generator": "^7.25.9"
+ "@babel/helper-module-imports": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-remap-async-to-generator": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -881,12 +889,12 @@
}
},
"node_modules/@babel/plugin-transform-block-scoped-functions": {
- "version": "7.26.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
- "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+ "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -896,12 +904,12 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.0.tgz",
- "integrity": "sha512-u1jGphZ8uDI2Pj/HJj6YQ6XQLZCNjOlprjxB5SVz6rq2T6SwAR+CdrWK0CP7F+9rDVMXdB0+r6Am5G5aobOjAQ==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz",
+ "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -911,13 +919,13 @@
}
},
"node_modules/@babel/plugin-transform-class-properties": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
- "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
+ "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-class-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -927,13 +935,13 @@
}
},
"node_modules/@babel/plugin-transform-class-static-block": {
- "version": "7.26.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
- "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
+ "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-class-features-plugin": "^7.28.3",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -943,17 +951,17 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
- "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
+ "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-compilation-targets": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-replace-supers": "^7.25.9",
- "@babel/traverse": "^7.25.9",
- "globals": "^11.1.0"
+ "@babel/helper-annotate-as-pure": "^7.27.3",
+ "@babel/helper-compilation-targets": "^7.27.2",
+ "@babel/helper-globals": "^7.28.0",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-replace-supers": "^7.27.1",
+ "@babel/traverse": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
@@ -963,13 +971,13 @@
}
},
"node_modules/@babel/plugin-transform-computed-properties": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
- "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
+ "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/template": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/template": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -979,12 +987,13 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
- "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
+ "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/traverse": "^7.28.0"
},
"engines": {
"node": ">=6.9.0"
@@ -994,13 +1003,13 @@
}
},
"node_modules/@babel/plugin-transform-dotall-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
- "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
+ "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1010,12 +1019,12 @@
}
},
"node_modules/@babel/plugin-transform-duplicate-keys": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
- "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+ "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1025,13 +1034,13 @@
}
},
"node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
- "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
+ "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1041,12 +1050,28 @@
}
},
"node_modules/@babel/plugin-transform-dynamic-import": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
- "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+ "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.27.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-transform-explicit-resource-management": {
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
+ "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/plugin-transform-destructuring": "^7.28.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1056,12 +1081,12 @@
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.26.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
- "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
+ "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1071,12 +1096,12 @@
}
},
"node_modules/@babel/plugin-transform-export-namespace-from": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
- "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+ "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1086,13 +1111,13 @@
}
},
"node_modules/@babel/plugin-transform-for-of": {
- "version": "7.26.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
- "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+ "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1102,14 +1127,14 @@
}
},
"node_modules/@babel/plugin-transform-function-name": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
- "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+ "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-compilation-targets": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/traverse": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1119,12 +1144,12 @@
}
},
"node_modules/@babel/plugin-transform-json-strings": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
- "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
+ "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1134,12 +1159,12 @@
}
},
"node_modules/@babel/plugin-transform-literals": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
- "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+ "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1149,12 +1174,12 @@
}
},
"node_modules/@babel/plugin-transform-logical-assignment-operators": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
- "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
+ "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1164,12 +1189,12 @@
}
},
"node_modules/@babel/plugin-transform-member-expression-literals": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
- "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+ "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1179,13 +1204,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
- "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+ "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-module-transforms": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1195,13 +1220,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.26.3",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
- "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
+ "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.26.0",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-module-transforms": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1211,15 +1236,15 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
- "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
+ "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-validator-identifier": "^7.25.9",
- "@babel/traverse": "^7.25.9"
+ "@babel/helper-module-transforms": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-validator-identifier": "^7.27.1",
+ "@babel/traverse": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1229,13 +1254,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-umd": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
- "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+ "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
"license": "MIT",
"dependencies": {
- "@babel/helper-module-transforms": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-module-transforms": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1245,13 +1270,13 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
- "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
+ "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1261,12 +1286,12 @@
}
},
"node_modules/@babel/plugin-transform-new-target": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
- "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+ "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1276,12 +1301,12 @@
}
},
"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
- "version": "7.26.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
- "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
+ "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1291,12 +1316,12 @@
}
},
"node_modules/@babel/plugin-transform-numeric-separator": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
- "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
+ "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1306,12 +1331,12 @@
}
},
"node_modules/@babel/plugin-transform-object-assign": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.25.9.tgz",
- "integrity": "sha512-I/Vl1aQnPsrrn837oLbo+VQtkNcjuuiATqwmuweg4fTauwHHQoxyjmjjOVKyO8OaTxgqYTKW3LuQsykXjDf5Ag==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.27.1.tgz",
+ "integrity": "sha512-LP6tsnirA6iy13uBKiYgjJsfQrodmlSrpZModtlo1Vk8sOO68gfo7dfA9TGJyEgxTiO7czK4EGZm8FJEZtk4kQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1321,14 +1346,16 @@
}
},
"node_modules/@babel/plugin-transform-object-rest-spread": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
- "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
+ "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
"license": "MIT",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/plugin-transform-parameters": "^7.25.9"
+ "@babel/helper-compilation-targets": "^7.27.2",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/plugin-transform-destructuring": "^7.28.0",
+ "@babel/plugin-transform-parameters": "^7.27.7",
+ "@babel/traverse": "^7.28.4"
},
"engines": {
"node": ">=6.9.0"
@@ -1338,13 +1365,13 @@
}
},
"node_modules/@babel/plugin-transform-object-super": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
- "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+ "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-replace-supers": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-replace-supers": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1354,12 +1381,12 @@
}
},
"node_modules/@babel/plugin-transform-optional-catch-binding": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
- "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
+ "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1369,13 +1396,13 @@
}
},
"node_modules/@babel/plugin-transform-optional-chaining": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
- "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+ "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1385,12 +1412,12 @@
}
},
"node_modules/@babel/plugin-transform-parameters": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
- "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+ "version": "7.27.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+ "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1400,13 +1427,13 @@
}
},
"node_modules/@babel/plugin-transform-private-methods": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
- "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
+ "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-class-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1416,14 +1443,14 @@
}
},
"node_modules/@babel/plugin-transform-private-property-in-object": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
- "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
+ "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-create-class-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-create-class-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1433,12 +1460,12 @@
}
},
"node_modules/@babel/plugin-transform-property-literals": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
- "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+ "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1448,12 +1475,12 @@
}
},
"node_modules/@babel/plugin-transform-react-display-name": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
- "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+ "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1463,16 +1490,16 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
- "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
+ "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-module-imports": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/plugin-syntax-jsx": "^7.25.9",
- "@babel/types": "^7.25.9"
+ "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-module-imports": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/plugin-syntax-jsx": "^7.27.1",
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1482,12 +1509,12 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx-development": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
- "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
+ "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
"license": "MIT",
"dependencies": {
- "@babel/plugin-transform-react-jsx": "^7.25.9"
+ "@babel/plugin-transform-react-jsx": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1497,13 +1524,13 @@
}
},
"node_modules/@babel/plugin-transform-react-pure-annotations": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
- "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz",
+ "integrity": "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-annotate-as-pure": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1513,13 +1540,12 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.0.tgz",
- "integrity": "sha512-LX/vCajUJQDqE7Aum/ELUMZAY19+cDpghxrnyt5I1tV6X5PyC86AOoWXWFYFeIvauyeSA6/ktn4tQVn/3ZifsA==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
+ "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5",
- "regenerator-transform": "^0.15.2"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1529,13 +1555,13 @@
}
},
"node_modules/@babel/plugin-transform-regexp-modifiers": {
- "version": "7.26.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
- "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
+ "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1545,12 +1571,12 @@
}
},
"node_modules/@babel/plugin-transform-reserved-words": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
- "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+ "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1560,12 +1586,12 @@
}
},
"node_modules/@babel/plugin-transform-shorthand-properties": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
- "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+ "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1575,13 +1601,13 @@
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
- "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
+ "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1591,12 +1617,12 @@
}
},
"node_modules/@babel/plugin-transform-sticky-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
- "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+ "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1606,12 +1632,12 @@
}
},
"node_modules/@babel/plugin-transform-template-literals": {
- "version": "7.26.8",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
- "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+ "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1621,12 +1647,12 @@
}
},
"node_modules/@babel/plugin-transform-typeof-symbol": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.0.tgz",
- "integrity": "sha512-+LLkxA9rKJpNoGsbLnAgOCdESl73vwYn+V6b+5wHbrE7OGKVDPHIQvbFSzqE6rwqaCw2RE+zdJrlLkcf8YOA0w==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+ "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.26.5"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1636,12 +1662,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
- "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+ "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1651,13 +1677,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-property-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
- "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
+ "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1667,13 +1693,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
- "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+ "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1683,13 +1709,13 @@
}
},
"node_modules/@babel/plugin-transform-unicode-sets-regex": {
- "version": "7.25.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
- "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+ "version": "7.27.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
+ "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
"license": "MIT",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.25.9",
- "@babel/helper-plugin-utils": "^7.25.9"
+ "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+ "@babel/helper-plugin-utils": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
@@ -1698,91 +1724,81 @@
"@babel/core": "^7.0.0"
}
},
- "node_modules/@babel/polyfill": {
- "version": "7.12.1",
- "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
- "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
- "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
- "license": "MIT",
- "dependencies": {
- "core-js": "^2.6.5",
- "regenerator-runtime": "^0.13.4"
- }
- },
"node_modules/@babel/preset-env": {
- "version": "7.26.9",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz",
- "integrity": "sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==",
- "license": "MIT",
- "dependencies": {
- "@babel/compat-data": "^7.26.8",
- "@babel/helper-compilation-targets": "^7.26.5",
- "@babel/helper-plugin-utils": "^7.26.5",
- "@babel/helper-validator-option": "^7.25.9",
- "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
- "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
- "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
+ "version": "7.28.3",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.3.tgz",
+ "integrity": "sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/compat-data": "^7.28.0",
+ "@babel/helper-compilation-targets": "^7.27.2",
+ "@babel/helper-plugin-utils": "^7.27.1",
+ "@babel/helper-validator-option": "^7.27.1",
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
+ "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3",
"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
- "@babel/plugin-syntax-import-assertions": "^7.26.0",
- "@babel/plugin-syntax-import-attributes": "^7.26.0",
+ "@babel/plugin-syntax-import-assertions": "^7.27.1",
+ "@babel/plugin-syntax-import-attributes": "^7.27.1",
"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
- "@babel/plugin-transform-arrow-functions": "^7.25.9",
- "@babel/plugin-transform-async-generator-functions": "^7.26.8",
- "@babel/plugin-transform-async-to-generator": "^7.25.9",
- "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
- "@babel/plugin-transform-block-scoping": "^7.25.9",
- "@babel/plugin-transform-class-properties": "^7.25.9",
- "@babel/plugin-transform-class-static-block": "^7.26.0",
- "@babel/plugin-transform-classes": "^7.25.9",
- "@babel/plugin-transform-computed-properties": "^7.25.9",
- "@babel/plugin-transform-destructuring": "^7.25.9",
- "@babel/plugin-transform-dotall-regex": "^7.25.9",
- "@babel/plugin-transform-duplicate-keys": "^7.25.9",
- "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
- "@babel/plugin-transform-dynamic-import": "^7.25.9",
- "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
- "@babel/plugin-transform-export-namespace-from": "^7.25.9",
- "@babel/plugin-transform-for-of": "^7.26.9",
- "@babel/plugin-transform-function-name": "^7.25.9",
- "@babel/plugin-transform-json-strings": "^7.25.9",
- "@babel/plugin-transform-literals": "^7.25.9",
- "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
- "@babel/plugin-transform-member-expression-literals": "^7.25.9",
- "@babel/plugin-transform-modules-amd": "^7.25.9",
- "@babel/plugin-transform-modules-commonjs": "^7.26.3",
- "@babel/plugin-transform-modules-systemjs": "^7.25.9",
- "@babel/plugin-transform-modules-umd": "^7.25.9",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
- "@babel/plugin-transform-new-target": "^7.25.9",
- "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
- "@babel/plugin-transform-numeric-separator": "^7.25.9",
- "@babel/plugin-transform-object-rest-spread": "^7.25.9",
- "@babel/plugin-transform-object-super": "^7.25.9",
- "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
- "@babel/plugin-transform-optional-chaining": "^7.25.9",
- "@babel/plugin-transform-parameters": "^7.25.9",
- "@babel/plugin-transform-private-methods": "^7.25.9",
- "@babel/plugin-transform-private-property-in-object": "^7.25.9",
- "@babel/plugin-transform-property-literals": "^7.25.9",
- "@babel/plugin-transform-regenerator": "^7.25.9",
- "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
- "@babel/plugin-transform-reserved-words": "^7.25.9",
- "@babel/plugin-transform-shorthand-properties": "^7.25.9",
- "@babel/plugin-transform-spread": "^7.25.9",
- "@babel/plugin-transform-sticky-regex": "^7.25.9",
- "@babel/plugin-transform-template-literals": "^7.26.8",
- "@babel/plugin-transform-typeof-symbol": "^7.26.7",
- "@babel/plugin-transform-unicode-escapes": "^7.25.9",
- "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
- "@babel/plugin-transform-unicode-regex": "^7.25.9",
- "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+ "@babel/plugin-transform-arrow-functions": "^7.27.1",
+ "@babel/plugin-transform-async-generator-functions": "^7.28.0",
+ "@babel/plugin-transform-async-to-generator": "^7.27.1",
+ "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+ "@babel/plugin-transform-block-scoping": "^7.28.0",
+ "@babel/plugin-transform-class-properties": "^7.27.1",
+ "@babel/plugin-transform-class-static-block": "^7.28.3",
+ "@babel/plugin-transform-classes": "^7.28.3",
+ "@babel/plugin-transform-computed-properties": "^7.27.1",
+ "@babel/plugin-transform-destructuring": "^7.28.0",
+ "@babel/plugin-transform-dotall-regex": "^7.27.1",
+ "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+ "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
+ "@babel/plugin-transform-dynamic-import": "^7.27.1",
+ "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+ "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
+ "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+ "@babel/plugin-transform-for-of": "^7.27.1",
+ "@babel/plugin-transform-function-name": "^7.27.1",
+ "@babel/plugin-transform-json-strings": "^7.27.1",
+ "@babel/plugin-transform-literals": "^7.27.1",
+ "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+ "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+ "@babel/plugin-transform-modules-amd": "^7.27.1",
+ "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+ "@babel/plugin-transform-modules-systemjs": "^7.27.1",
+ "@babel/plugin-transform-modules-umd": "^7.27.1",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
+ "@babel/plugin-transform-new-target": "^7.27.1",
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+ "@babel/plugin-transform-numeric-separator": "^7.27.1",
+ "@babel/plugin-transform-object-rest-spread": "^7.28.0",
+ "@babel/plugin-transform-object-super": "^7.27.1",
+ "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
+ "@babel/plugin-transform-optional-chaining": "^7.27.1",
+ "@babel/plugin-transform-parameters": "^7.27.7",
+ "@babel/plugin-transform-private-methods": "^7.27.1",
+ "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+ "@babel/plugin-transform-property-literals": "^7.27.1",
+ "@babel/plugin-transform-regenerator": "^7.28.3",
+ "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
+ "@babel/plugin-transform-reserved-words": "^7.27.1",
+ "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+ "@babel/plugin-transform-spread": "^7.27.1",
+ "@babel/plugin-transform-sticky-regex": "^7.27.1",
+ "@babel/plugin-transform-template-literals": "^7.27.1",
+ "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+ "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+ "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
+ "@babel/plugin-transform-unicode-regex": "^7.27.1",
+ "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
"@babel/preset-modules": "0.1.6-no-external-plugins",
- "babel-plugin-polyfill-corejs2": "^0.4.10",
- "babel-plugin-polyfill-corejs3": "^0.11.0",
- "babel-plugin-polyfill-regenerator": "^0.6.1",
- "core-js-compat": "^3.40.0",
+ "babel-plugin-polyfill-corejs2": "^0.4.14",
+ "babel-plugin-polyfill-corejs3": "^0.13.0",
+ "babel-plugin-polyfill-regenerator": "^0.6.5",
+ "core-js-compat": "^3.43.0",
"semver": "^6.3.1"
},
"engines": {
@@ -1827,72 +1843,63 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
- "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+ "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
"license": "MIT",
- "dependencies": {
- "regenerator-runtime": "^0.14.0"
- },
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
- "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
- "license": "MIT"
- },
"node_modules/@babel/template": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
- "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+ "version": "7.27.2",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+ "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
"license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.26.2",
- "@babel/parser": "^7.27.0",
- "@babel/types": "^7.27.0"
+ "@babel/code-frame": "^7.27.1",
+ "@babel/parser": "^7.27.2",
+ "@babel/types": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
- "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
+ "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
"license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.26.2",
- "@babel/generator": "^7.27.0",
- "@babel/parser": "^7.27.0",
- "@babel/template": "^7.27.0",
- "@babel/types": "^7.27.0",
- "debug": "^4.3.1",
- "globals": "^11.1.0"
+ "@babel/code-frame": "^7.27.1",
+ "@babel/generator": "^7.28.3",
+ "@babel/helper-globals": "^7.28.0",
+ "@babel/parser": "^7.28.4",
+ "@babel/template": "^7.27.2",
+ "@babel/types": "^7.28.4",
+ "debug": "^4.3.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/types": {
- "version": "7.27.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
- "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+ "version": "7.28.4",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+ "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
"license": "MIT",
"dependencies": {
- "@babel/helper-string-parser": "^7.25.9",
- "@babel/helper-validator-identifier": "^7.25.9"
+ "@babel/helper-string-parser": "^7.27.1",
+ "@babel/helper-validator-identifier": "^7.27.1"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@bazel/runfiles": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.3.1.tgz",
- "integrity": "sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA==",
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-6.5.0.tgz",
+ "integrity": "sha512-RzahvqTkfpY2jsDxo8YItPX+/iZ6hbiikw1YhE0bA9EKBR5Og8Pa6FHn9PO9M0zaXRVsr0GFQLKbB/0rzy9SzA==",
"dev": true,
"license": "Apache-2.0"
},
@@ -1903,10 +1910,64 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@cacheable/memoize": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@cacheable/memoize/-/memoize-2.0.3.tgz",
+ "integrity": "sha512-hl9wfQgpiydhQEIv7fkjEzTGE+tcosCXLKFDO707wYJ/78FVOlowb36djex5GdbSyeHnG62pomYLMuV/OT8Pbw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@cacheable/utils": "^2.0.3"
+ }
+ },
+ "node_modules/@cacheable/memory": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.3.tgz",
+ "integrity": "sha512-R3UKy/CKOyb1LZG/VRCTMcpiMDyLH7SH3JrraRdK6kf3GweWCOU3sgvE13W3TiDRbxnDKylzKJvhUAvWl9LQOA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@cacheable/memoize": "^2.0.3",
+ "@cacheable/utils": "^2.0.3",
+ "@keyv/bigmap": "^1.0.2",
+ "hookified": "^1.12.1",
+ "keyv": "^5.5.3"
+ }
+ },
+ "node_modules/@cacheable/memory/node_modules/keyv": {
+ "version": "5.5.3",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.3.tgz",
+ "integrity": "sha512-h0Un1ieD+HUrzBH6dJXhod3ifSghk5Hw/2Y4/KHBziPlZecrFyE9YOTPU6eOs0V9pYl8gOs86fkr/KN8lUX39A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@keyv/serialize": "^1.1.1"
+ }
+ },
+ "node_modules/@cacheable/utils": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.1.0.tgz",
+ "integrity": "sha512-ZdxfOiaarMqMj+H7qwlt5EBKWaeGihSYVHdQv5lUsbn8MJJOTW82OIwirQ39U5tMZkNvy3bQE+ryzC+xTAb9/g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "keyv": "^5.5.3"
+ }
+ },
+ "node_modules/@cacheable/utils/node_modules/keyv": {
+ "version": "5.5.3",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.3.tgz",
+ "integrity": "sha512-h0Un1ieD+HUrzBH6dJXhod3ifSghk5Hw/2Y4/KHBziPlZecrFyE9YOTPU6eOs0V9pYl8gOs86fkr/KN8lUX39A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@keyv/serialize": "^1.1.1"
+ }
+ },
"node_modules/@csstools/css-parser-algorithms": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
- "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+ "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
"dev": true,
"funding": [
{
@@ -1924,13 +1985,13 @@
"node": ">=18"
},
"peerDependencies": {
- "@csstools/css-tokenizer": "^3.0.3"
+ "@csstools/css-tokenizer": "^3.0.4"
}
},
"node_modules/@csstools/css-tokenizer": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
- "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+ "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
"dev": true,
"funding": [
{
@@ -1949,9 +2010,9 @@
}
},
"node_modules/@csstools/media-query-list-parser": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz",
- "integrity": "sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+ "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
"dev": true,
"funding": [
{
@@ -1964,13 +2025,12 @@
}
],
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=18"
},
"peerDependencies": {
- "@csstools/css-parser-algorithms": "^3.0.4",
- "@csstools/css-tokenizer": "^3.0.3"
+ "@csstools/css-parser-algorithms": "^3.0.5",
+ "@csstools/css-tokenizer": "^3.0.4"
}
},
"node_modules/@csstools/selector-specificity": {
@@ -1989,7 +2049,6 @@
}
],
"license": "MIT-0",
- "peer": true,
"engines": {
"node": ">=18"
},
@@ -2008,22 +2067,28 @@
}
},
"node_modules/@dual-bundle/import-meta-resolve": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
- "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz",
+ "integrity": "sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==",
"dev": true,
"license": "MIT",
- "peer": true,
"funding": {
"type": "github",
- "url": "https://github.com/sponsors/wooorm"
+ "url": "https://github.com/sponsors/JounQin"
}
},
"node_modules/@edx/brand": {
"name": "@openedx/brand-openedx",
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/@openedx/brand-openedx/-/brand-openedx-1.2.3.tgz",
- "integrity": "sha512-Dn9CtpC8fovh++Xi4NF5NJoeR9yU2yXZnV9IujxIyGd/dn0Phq5t6dzJVfupwq09mpDnzJv7egA8Znz/3ljO+w=="
+ "integrity": "sha512-Dn9CtpC8fovh++Xi4NF5NJoeR9yU2yXZnV9IujxIyGd/dn0Phq5t6dzJVfupwq09mpDnzJv7egA8Znz/3ljO+w==",
+ "license": "GPL-3.0-or-later"
+ },
+ "node_modules/@edx/brand-edx.org": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@edx/brand-edx.org/-/brand-edx.org-2.0.3.tgz",
+ "integrity": "sha512-QRmq2su1Xy+9GhY3NRZ+WdjtYWHmgfuKbVCW2skxgfgW9Q6kea8L6LrgigfrZtW+kQq/KdX2tVJcYBkB9xALtQ==",
+ "license": "UNLICENSED"
},
"node_modules/@edx/edx-bootstrap": {
"version": "1.0.4",
@@ -2060,7 +2125,8 @@
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/@edx/edx-proctoring": {
"version": "4.18.4",
@@ -2087,12 +2153,6 @@
"react-dom": "^16.1.0 || ^17.0.0 || ^18.0.0"
}
},
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/@edx/brand-edx.org": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@edx/brand-edx.org/-/brand-edx.org-2.0.3.tgz",
- "integrity": "sha512-QRmq2su1Xy+9GhY3NRZ+WdjtYWHmgfuKbVCW2skxgfgW9Q6kea8L6LrgigfrZtW+kQq/KdX2tVJcYBkB9xALtQ==",
- "license": "UNLICENSED"
- },
"node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/@edx/paragon": {
"version": "12.8.0",
"resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-12.8.0.tgz",
@@ -2124,47 +2184,6 @@
"react-dom": "^16.8.6"
}
},
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/@edx/paragon/node_modules/airbnb-prop-types": {
- "version": "2.16.0",
- "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
- "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
- "deprecated": "This package has been renamed to 'prop-types-tools'",
- "license": "MIT",
- "dependencies": {
- "array.prototype.find": "^2.1.1",
- "function.prototype.name": "^1.1.2",
- "is-regex": "^1.1.0",
- "object-is": "^1.1.2",
- "object.assign": "^4.1.0",
- "object.entries": "^1.1.2",
- "prop-types": "^15.7.2",
- "prop-types-exact": "^1.2.0",
- "react-is": "^16.13.1"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "peerDependencies": {
- "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
- }
- },
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/@edx/paragon/node_modules/react-responsive": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-6.1.2.tgz",
- "integrity": "sha512-AXentVC/kN3KED9zhzJv2pu4vZ0i6cSHdTtbCScVV1MT6F5KXaG2qs5D7WLmhdaOvmiMX8UfmS4ZSO+WPwDt4g==",
- "license": "MIT",
- "dependencies": {
- "hyphenate-style-name": "^1.0.0",
- "matchmediaquery": "^0.3.0",
- "prop-types": "^15.6.1"
- },
- "engines": {
- "node": ">= 0.10"
- },
- "peerDependencies": {
- "react": "^16.3.0"
- }
- },
"node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/bootstrap": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
@@ -2185,16 +2204,6 @@
"popper.js": "^1.16.1"
}
},
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/dom-helpers": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
- "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.8.7",
- "csstype": "^3.0.2"
- }
- },
"node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/email-prop-type": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/email-prop-type/-/email-prop-type-3.0.1.tgz",
@@ -2204,28 +2213,6 @@
"email-validator": "^2.0.4"
}
},
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "license": "MIT"
- },
- "node_modules/@edx/frontend-component-cookie-policy-banner/node_modules/react-transition-group": {
- "version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
- "license": "BSD-3-Clause",
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "dom-helpers": "^5.0.1",
- "loose-envify": "^1.4.0",
- "prop-types": "^15.6.2"
- },
- "peerDependencies": {
- "react": ">=16.6.0",
- "react-dom": ">=16.6.0"
- }
- },
"node_modules/@edx/paragon": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-2.6.4.tgz",
@@ -2245,138 +2232,6 @@
"react-proptype-conditional-require": "^1.0.4"
}
},
- "node_modules/@edx/studio-frontend": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-2.4.0.tgz",
- "integrity": "sha512-wdbUG1zUqpo5uW91TuV49XWToDeUKBBcClVR2BSjjPzYTm1vk8jeDRlALOTcIEwfAIM5Qio7utsQBwe51S7SNw==",
- "license": "AGPL-3.0",
- "dependencies": {
- "@babel/polyfill": "^7.0.0",
- "@edx/edx-bootstrap": "^1.0.0",
- "@edx/paragon": "3.4.8",
- "airbnb-prop-types": "^2.10.0",
- "classnames": "^2.2.5",
- "copy-to-clipboard": "^3.0.8",
- "custom-event-polyfill": "^0.3.0",
- "font-awesome": "^4.7.0",
- "js-cookie": "^2.1.4",
- "popper.js": "^1.12.5",
- "prop-types": "^15.5.10",
- "react": "^16.2.0",
- "react-dom": "^16.1.0",
- "react-dropzone": "^4.2.3",
- "react-intl": "^2.4.0",
- "react-intl-translations-manager": "^5.0.1",
- "react-redux": "^5.0.6",
- "react-transition-group": "^2.2.1",
- "redux": "^4.0.0",
- "redux-devtools-extension": "^2.13.3",
- "redux-thunk": "^2.2.0",
- "reselect": "^3.0.1",
- "whatwg-fetch": "^2.0.3"
- }
- },
- "node_modules/@edx/studio-frontend/node_modules/@edx/paragon": {
- "version": "3.4.8",
- "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-3.4.8.tgz",
- "integrity": "sha512-Aba1/s7IEvHhyBvtILL3MIpghu4gJ04lvKXpuvl3AqdGluSVEp1u4dfCvsvBF4ZDP2CPUwkGXWolIA9yHxj7Nw==",
- "license": "Apache-2.0",
- "dependencies": {
- "@edx/edx-bootstrap": "^1.0.0",
- "airbnb-prop-types": "^2.10.0",
- "babel-polyfill": "^6.26.0",
- "classnames": "^2.2.5",
- "email-prop-type": "^1.1.5",
- "font-awesome": "^4.7.0",
- "mailto-link": "^1.0.0",
- "prop-types": "^15.5.8",
- "react": "^16.4.2",
- "react-dom": "^16.1.0",
- "react-element-proptypes": "^1.0.0",
- "react-proptype-conditional-require": "^1.0.4",
- "react-responsive": "^5.0.0",
- "sanitize-html": "^1.18.2"
- }
- },
- "node_modules/@edx/studio-frontend/node_modules/airbnb-prop-types": {
- "version": "2.16.0",
- "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
- "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
- "deprecated": "This package has been renamed to 'prop-types-tools'",
- "license": "MIT",
- "dependencies": {
- "array.prototype.find": "^2.1.1",
- "function.prototype.name": "^1.1.2",
- "is-regex": "^1.1.0",
- "object-is": "^1.1.2",
- "object.assign": "^4.1.0",
- "object.entries": "^1.1.2",
- "prop-types": "^15.7.2",
- "prop-types-exact": "^1.2.0",
- "react-is": "^16.13.1"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- },
- "peerDependencies": {
- "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
- }
- },
- "node_modules/@edx/studio-frontend/node_modules/js-cookie": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
- "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==",
- "license": "MIT"
- },
- "node_modules/@edx/studio-frontend/node_modules/react-intl": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
- "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==",
- "license": "BSD-3-Clause",
- "dependencies": {
- "hoist-non-react-statics": "^3.3.0",
- "intl-format-cache": "^2.0.5",
- "intl-messageformat": "^2.1.0",
- "intl-relativeformat": "^2.1.0",
- "invariant": "^2.1.1"
- },
- "peerDependencies": {
- "prop-types": "^15.5.4",
- "react": "^0.14.9 || ^15.0.0 || ^16.0.0"
- }
- },
- "node_modules/@edx/studio-frontend/node_modules/react-is": {
- "version": "16.13.1",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
- "license": "MIT"
- },
- "node_modules/@edx/studio-frontend/node_modules/react-responsive": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-5.0.0.tgz",
- "integrity": "sha512-oEimZ0FTCC3/pjGDEBHOz06nWbBNDIbMGOdRYp6K9SBUmrqgNAX77hTiqvmRQeLyI97zz4F4kiaFRxFspDxE+w==",
- "license": "MIT",
- "dependencies": {
- "hyphenate-style-name": "^1.0.0",
- "matchmediaquery": "^0.3.0",
- "prop-types": "^15.6.1"
- },
- "engines": {
- "node": ">= 0.10"
- },
- "peerDependencies": {
- "react": "^16.0.0"
- }
- },
- "node_modules/@edx/studio-frontend/node_modules/redux": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
- "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.9.2"
- }
- },
"node_modules/@edx/stylelint-config-edx": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/@edx/stylelint-config-edx/-/stylelint-config-edx-2.3.3.tgz",
@@ -2406,6 +2261,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": "^14 || ^16 || >=18"
},
@@ -2429,6 +2285,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": "^14 || ^16 || >=18"
}
@@ -2683,6 +2540,7 @@
"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -2772,14 +2630,11 @@
}
},
"node_modules/@edx/stylelint-config-edx/node_modules/strip-indent": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
- "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.1.1.tgz",
+ "integrity": "sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==",
"dev": true,
"license": "MIT",
- "dependencies": {
- "min-indent": "^1.0.1"
- },
"engines": {
"node": ">=12"
},
@@ -2793,6 +2648,7 @@
"integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@csstools/css-parser-algorithms": "^2.3.1",
"@csstools/css-tokenizer": "^2.2.0",
@@ -2976,6 +2832,7 @@
"integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==",
"hasInstallScript": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.36"
},
@@ -3027,9 +2884,9 @@
}
},
"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -3039,9 +2896,9 @@
}
},
"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
- "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+ "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -3074,9 +2931,9 @@
}
},
"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+ "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
"license": "MIT",
"dependencies": {
"ansi-regex": "^6.0.1"
@@ -3382,9 +3239,9 @@
}
},
"node_modules/@jest/reporters/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true,
"license": "ISC",
"bin": {
@@ -3498,17 +3355,13 @@
}
},
"node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
- "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+ "version": "0.3.13",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+ "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
"license": "MIT",
"dependencies": {
- "@jridgewell/set-array": "^1.2.1",
- "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/sourcemap-codec": "^1.5.0",
"@jridgewell/trace-mapping": "^0.3.24"
- },
- "engines": {
- "node": ">=6.0.0"
}
},
"node_modules/@jridgewell/resolve-uri": {
@@ -3520,19 +3373,10 @@
"node": ">=6.0.0"
}
},
- "node_modules/@jridgewell/set-array": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
- "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
- "license": "MIT",
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@jridgewell/source-map": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
- "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+ "version": "0.3.11",
+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+ "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
"license": "MIT",
"dependencies": {
"@jridgewell/gen-mapping": "^0.3.5",
@@ -3540,15 +3384,15 @@
}
},
"node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
- "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+ "version": "1.5.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+ "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
"license": "MIT"
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.25",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
- "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "version": "0.3.31",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+ "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
"license": "MIT",
"dependencies": {
"@jridgewell/resolve-uri": "^3.1.0",
@@ -3563,6 +3407,26 @@
"license": "MIT",
"peer": true
},
+ "node_modules/@keyv/bigmap": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.0.3.tgz",
+ "integrity": "sha512-jUEkNlnE9tYzX2AIBeoSe1gVUvSOfIOQ5EFPL5Un8cFHGvjD9L/fxpxlS1tEivRLHgapO2RZJ3D93HYAa049pg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookified": "^1.12.1"
+ },
+ "engines": {
+ "node": ">= 18"
+ }
+ },
+ "node_modules/@keyv/serialize": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+ "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3617,105 +3481,265 @@
"node": "^18.17.0 || >=20.5.0"
}
},
- "node_modules/@npmcli/agent/node_modules/agent-base": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
- "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "node_modules/@npmcli/agent/node_modules/agent-base": {
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/@npmcli/agent/node_modules/http-proxy-agent": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/@npmcli/agent/node_modules/lru-cache": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+ "license": "ISC"
+ },
+ "node_modules/@npmcli/fs": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+ "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
+ "license": "ISC",
+ "dependencies": {
+ "semver": "^7.3.5"
+ },
+ "engines": {
+ "node": "^18.17.0 || >=20.5.0"
+ }
+ },
+ "node_modules/@npmcli/fs/node_modules/semver": {
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@parcel/watcher": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+ "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "detect-libc": "^1.0.3",
+ "is-glob": "^4.0.3",
+ "micromatch": "^4.0.5",
+ "node-addon-api": "^7.0.0"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ },
+ "optionalDependencies": {
+ "@parcel/watcher-android-arm64": "2.5.1",
+ "@parcel/watcher-darwin-arm64": "2.5.1",
+ "@parcel/watcher-darwin-x64": "2.5.1",
+ "@parcel/watcher-freebsd-x64": "2.5.1",
+ "@parcel/watcher-linux-arm-glibc": "2.5.1",
+ "@parcel/watcher-linux-arm-musl": "2.5.1",
+ "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+ "@parcel/watcher-linux-arm64-musl": "2.5.1",
+ "@parcel/watcher-linux-x64-glibc": "2.5.1",
+ "@parcel/watcher-linux-x64-musl": "2.5.1",
+ "@parcel/watcher-win32-arm64": "2.5.1",
+ "@parcel/watcher-win32-ia32": "2.5.1",
+ "@parcel/watcher-win32-x64": "2.5.1"
+ }
+ },
+ "node_modules/@parcel/watcher-android-arm64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+ "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-darwin-arm64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+ "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-darwin-x64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+ "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-freebsd-x64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+ "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+ "cpu": [
+ "x64"
+ ],
"license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
"engines": {
- "node": ">= 14"
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
}
},
- "node_modules/@npmcli/agent/node_modules/http-proxy-agent": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
- "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+ "node_modules/@parcel/watcher-linux-arm-glibc": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+ "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+ "cpu": [
+ "arm"
+ ],
"license": "MIT",
- "dependencies": {
- "agent-base": "^7.1.0",
- "debug": "^4.3.4"
- },
+ "optional": true,
+ "os": [
+ "linux"
+ ],
"engines": {
- "node": ">= 14"
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
}
},
- "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
- "version": "7.0.6",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
- "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+ "node_modules/@parcel/watcher-linux-arm-musl": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+ "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+ "cpu": [
+ "arm"
+ ],
"license": "MIT",
- "dependencies": {
- "agent-base": "^7.1.2",
- "debug": "4"
- },
+ "optional": true,
+ "os": [
+ "linux"
+ ],
"engines": {
- "node": ">= 14"
- }
- },
- "node_modules/@npmcli/agent/node_modules/lru-cache": {
- "version": "10.4.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
- "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
- "license": "ISC"
- },
- "node_modules/@npmcli/fs": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
- "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
- "license": "ISC",
- "dependencies": {
- "semver": "^7.3.5"
+ "node": ">= 10.0.0"
},
- "engines": {
- "node": "^18.17.0 || >=20.5.0"
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
}
},
- "node_modules/@npmcli/fs/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
- "license": "ISC",
- "bin": {
- "semver": "bin/semver.js"
- },
+ "node_modules/@parcel/watcher-linux-arm64-glibc": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+ "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
"engines": {
- "node": ">=10"
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
}
},
- "node_modules/@parcel/watcher": {
+ "node_modules/@parcel/watcher-linux-arm64-musl": {
"version": "2.5.1",
- "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
- "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
- "hasInstallScript": true,
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+ "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+ "cpu": [
+ "arm64"
+ ],
"license": "MIT",
"optional": true,
- "dependencies": {
- "detect-libc": "^1.0.3",
- "is-glob": "^4.0.3",
- "micromatch": "^4.0.5",
- "node-addon-api": "^7.0.0"
- },
+ "os": [
+ "linux"
+ ],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
- },
- "optionalDependencies": {
- "@parcel/watcher-android-arm64": "2.5.1",
- "@parcel/watcher-darwin-arm64": "2.5.1",
- "@parcel/watcher-darwin-x64": "2.5.1",
- "@parcel/watcher-freebsd-x64": "2.5.1",
- "@parcel/watcher-linux-arm-glibc": "2.5.1",
- "@parcel/watcher-linux-arm-musl": "2.5.1",
- "@parcel/watcher-linux-arm64-glibc": "2.5.1",
- "@parcel/watcher-linux-arm64-musl": "2.5.1",
- "@parcel/watcher-linux-x64-glibc": "2.5.1",
- "@parcel/watcher-linux-x64-musl": "2.5.1",
- "@parcel/watcher-win32-arm64": "2.5.1",
- "@parcel/watcher-win32-ia32": "2.5.1",
- "@parcel/watcher-win32-x64": "2.5.1"
}
},
"node_modules/@parcel/watcher-linux-x64-glibc": {
@@ -3758,6 +3782,66 @@
"url": "https://opencollective.com/parcel"
}
},
+ "node_modules/@parcel/watcher-win32-arm64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+ "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+ "cpu": [
+ "arm64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-win32-ia32": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+ "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-win32-x64": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+ "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+ "cpu": [
+ "x64"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
"node_modules/@parcel/watcher/node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -3847,14 +3931,13 @@
}
},
"node_modules/@sinonjs/samsam": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
- "integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
+ "version": "8.0.3",
+ "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz",
+ "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
"@sinonjs/commons": "^3.0.1",
- "lodash.get": "^4.4.2",
"type-detect": "^4.1.0"
}
},
@@ -3876,9 +3959,9 @@
"license": "(Unlicense OR Apache-2.0)"
},
"node_modules/@testing-library/dom": {
- "version": "10.4.0",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
- "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
+ "version": "10.4.1",
+ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+ "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
"license": "MIT",
"peer": true,
"dependencies": {
@@ -3886,9 +3969,9 @@
"@babel/runtime": "^7.12.5",
"@types/aria-query": "^5.0.1",
"aria-query": "5.3.0",
- "chalk": "^4.1.0",
"dom-accessibility-api": "^0.5.9",
"lz-string": "^1.5.0",
+ "picocolors": "1.1.1",
"pretty-format": "^27.0.2"
},
"engines": {
@@ -3896,17 +3979,16 @@
}
},
"node_modules/@testing-library/jest-dom": {
- "version": "6.6.3",
- "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz",
- "integrity": "sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==",
+ "version": "6.9.1",
+ "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz",
+ "integrity": "sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==",
"license": "MIT",
"dependencies": {
"@adobe/css-tools": "^4.4.0",
"aria-query": "^5.0.0",
- "chalk": "^3.0.0",
"css.escape": "^1.5.1",
"dom-accessibility-api": "^0.6.3",
- "lodash": "^4.17.21",
+ "picocolors": "^1.1.1",
"redent": "^3.0.0"
},
"engines": {
@@ -3915,19 +3997,6 @@
"yarn": ">=1"
}
},
- "node_modules/@testing-library/jest-dom/node_modules/chalk": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
- "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
@@ -4047,13 +4116,13 @@
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.20.7",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
- "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
+ "version": "7.28.0",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+ "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.20.7"
+ "@babel/types": "^7.28.2"
}
},
"node_modules/@types/cookie": {
@@ -4083,9 +4152,9 @@
}
},
"node_modules/@types/estree": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
- "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+ "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
"license": "MIT"
},
"node_modules/@types/graceful-fs": {
@@ -4153,12 +4222,12 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "22.15.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
- "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
+ "version": "24.7.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.2.tgz",
+ "integrity": "sha512-/NbVmcGTP+lj5oa4yiYxxeBjRivKQ5Ns1eSZeB99ExsEQ6rX5XYU1Zy/gGxY/ilqtD4Etx9mKyrPxZRetiahhA==",
"license": "MIT",
"dependencies": {
- "undici-types": "~6.21.0"
+ "undici-types": "~7.14.0"
}
},
"node_modules/@types/normalize-package-data": {
@@ -4169,16 +4238,17 @@
"license": "MIT"
},
"node_modules/@types/prop-types": {
- "version": "15.7.14",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
- "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+ "version": "15.7.15",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
+ "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
"license": "MIT"
},
"node_modules/@types/react": {
- "version": "17.0.87",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.87.tgz",
- "integrity": "sha512-wpg9AbtJ6agjA+BKYmhG6dRWEU/2DHYwMzCaBzsz137ft6IyuqZ5fI4ic1DWL4DrI03Zy78IyVE6ucrXl0mu4g==",
+ "version": "17.0.89",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.89.tgz",
+ "integrity": "sha512-I98SaDCar5lvEYl80ClRIUztH/hyWHR+I2f+5yTVp/MQ205HgYkA2b5mVdry/+nsEIrf8I65KA5V/PASx68MsQ==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "^0.16",
@@ -4488,10 +4558,11 @@
}
},
"node_modules/acorn": {
- "version": "8.14.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
- "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+ "version": "8.15.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"license": "MIT",
+ "peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -4509,6 +4580,18 @@
"acorn-walk": "^8.0.2"
}
},
+ "node_modules/acorn-import-phases": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+ "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=10.13.0"
+ },
+ "peerDependencies": {
+ "acorn": "^8.14.0"
+ }
+ },
"node_modules/acorn-jsx": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
@@ -4563,11 +4646,42 @@
"node": ">= 6.0.0"
}
},
+ "node_modules/airbnb-prop-types": {
+ "version": "2.16.0",
+ "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
+ "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
+ "deprecated": "This package has been renamed to 'prop-types-tools'",
+ "license": "MIT",
+ "dependencies": {
+ "array.prototype.find": "^2.1.1",
+ "function.prototype.name": "^1.1.2",
+ "is-regex": "^1.1.0",
+ "object-is": "^1.1.2",
+ "object.assign": "^4.1.0",
+ "object.entries": "^1.1.2",
+ "prop-types": "^15.7.2",
+ "prop-types-exact": "^1.2.0",
+ "react-is": "^16.13.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ },
+ "peerDependencies": {
+ "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
+ }
+ },
+ "node_modules/airbnb-prop-types/node_modules/react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "license": "MIT"
+ },
"node_modules/ajv": {
"version": "8.17.1",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.3",
"fast-uri": "^3.0.1",
@@ -4719,9 +4833,9 @@
}
},
"node_modules/aria-hidden": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
- "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+ "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
"license": "MIT",
"dependencies": {
"tslib": "^2.0.0"
@@ -4941,18 +5055,6 @@
"node": ">= 4.5.0"
}
},
- "node_modules/attr-accept": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz",
- "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==",
- "license": "MIT",
- "dependencies": {
- "core-js": "^2.5.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/available-typed-arrays": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -5272,13 +5374,13 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
- "version": "0.4.13",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz",
- "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==",
+ "version": "0.4.14",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
+ "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
"license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.22.6",
- "@babel/helper-define-polyfill-provider": "^0.6.4",
+ "@babel/compat-data": "^7.27.7",
+ "@babel/helper-define-polyfill-provider": "^0.6.5",
"semver": "^6.3.1"
},
"peerDependencies": {
@@ -5286,25 +5388,25 @@
}
},
"node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
- "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz",
+ "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==",
"license": "MIT",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.6.3",
- "core-js-compat": "^3.40.0"
+ "@babel/helper-define-polyfill-provider": "^0.6.5",
+ "core-js-compat": "^3.43.0"
},
"peerDependencies": {
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
}
},
"node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz",
- "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==",
+ "version": "0.6.5",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
+ "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
"license": "MIT",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.6.4"
+ "@babel/helper-define-polyfill-provider": "^0.6.5"
},
"peerDependencies": {
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -5411,16 +5513,10 @@
"regenerator-runtime": "^0.10.5"
}
},
- "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
- "version": "0.10.5",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
- "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
- "license": "MIT"
- },
"node_modules/babel-preset-current-node-syntax": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
- "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+ "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5441,7 +5537,7 @@
"@babel/plugin-syntax-top-level-await": "^7.14.5"
},
"peerDependencies": {
- "@babel/core": "^7.0.0"
+ "@babel/core": "^7.0.0 || ^8.0.0-0"
}
},
"node_modules/babel-preset-jest": {
@@ -5543,17 +5639,8 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT",
- "dependencies": {
- "ms": "2.0.0"
- }
- },
- "node_modules/babel-traverse/node_modules/globals": {
- "version": "9.18.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
- "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
+ "dependencies": {
+ "ms": "2.0.0"
}
},
"node_modules/babel-traverse/node_modules/ms": {
@@ -5675,6 +5762,15 @@
"node": ">= 0.4.0"
}
},
+ "node_modules/baseline-browser-mapping": {
+ "version": "2.8.16",
+ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.16.tgz",
+ "integrity": "sha512-OMu3BGQ4E7P1ErFsIPpbJh0qvDudM/UuJeHgkAvfWe+0HFJCXh+t/l8L6fVLR55RI/UbKrVLnAXZSVwd9ysWYw==",
+ "license": "Apache-2.0",
+ "bin": {
+ "baseline-browser-mapping": "dist/cli.js"
+ }
+ },
"node_modules/batch": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
@@ -5712,6 +5808,17 @@
"node": ">=0.10.0"
}
},
+ "node_modules/bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
"node_modules/blob": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
@@ -5781,9 +5888,10 @@
}
},
"node_modules/brace-expansion": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0",
@@ -5803,9 +5911,9 @@
}
},
"node_modules/browserslist": {
- "version": "4.24.4",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
- "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+ "version": "4.26.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz",
+ "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==",
"funding": [
{
"type": "opencollective",
@@ -5821,11 +5929,13 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
- "caniuse-lite": "^1.0.30001688",
- "electron-to-chromium": "^1.5.73",
- "node-releases": "^2.0.19",
- "update-browserslist-db": "^1.1.1"
+ "baseline-browser-mapping": "^2.8.9",
+ "caniuse-lite": "^1.0.30001746",
+ "electron-to-chromium": "^1.5.227",
+ "node-releases": "^2.0.21",
+ "update-browserslist-db": "^1.1.3"
},
"bin": {
"browserslist": "cli.js"
@@ -5909,9 +6019,9 @@
}
},
"node_modules/cacache/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
@@ -5980,26 +6090,28 @@
}
},
"node_modules/cacheable": {
- "version": "1.8.10",
- "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.8.10.tgz",
- "integrity": "sha512-0ZnbicB/N2R6uziva8l6O6BieBklArWyiGx4GkwAhLKhSHyQtRfM9T1nx7HHuHDKkYB/efJQhz3QJ6x/YqoZzA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.1.0.tgz",
+ "integrity": "sha512-zzL1BxdnqwD69JRT0dihnawAcLkBMwAH+hZSKjUzeBbPedVhk3qYPjRw9VOMYWwt5xRih5xd8S+3kEdGohZm/g==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
- "hookified": "^1.8.1",
- "keyv": "^5.3.2"
+ "@cacheable/memoize": "^2.0.3",
+ "@cacheable/memory": "^2.0.3",
+ "@cacheable/utils": "^2.1.0",
+ "hookified": "^1.12.1",
+ "keyv": "^5.5.3",
+ "qified": "^0.5.0"
}
},
"node_modules/cacheable/node_modules/keyv": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.3.3.tgz",
- "integrity": "sha512-Rwu4+nXI9fqcxiEHtbkvoes2X+QfkTRo1TMkPfwzipGsJlJO/z69vqB4FNl9xJ3xCpAcbkvmEabZfPzrwN3+gQ==",
+ "version": "5.5.3",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.3.tgz",
+ "integrity": "sha512-h0Un1ieD+HUrzBH6dJXhod3ifSghk5Hw/2Y4/KHBziPlZecrFyE9YOTPU6eOs0V9pYl8gOs86fkr/KN8lUX39A==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
- "@keyv/serialize": "^1.0.3"
+ "@keyv/serialize": "^1.1.1"
}
},
"node_modules/call-bind": {
@@ -6156,9 +6268,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001715",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
- "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
+ "version": "1.0.30001750",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001750.tgz",
+ "integrity": "sha512-cuom0g5sdX6rw00qOoLNSFCJ9/mYIsuSOA+yzpDw8eopiFqcVwQvZHqov0vmEighRxX++cfC0Vg1G+1Iy/mSpQ==",
"funding": [
{
"type": "opencollective",
@@ -6282,6 +6394,26 @@
"node": ">=0.10.0"
}
},
+ "node_modules/chokidar/node_modules/fsevents": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+ "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+ "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "dependencies": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ },
+ "engines": {
+ "node": ">= 4.0"
+ }
+ },
"node_modules/chokidar/node_modules/kind-of": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -6658,6 +6790,7 @@
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+ "dev": true,
"license": "MIT"
},
"node_modules/concat-stream": {
@@ -6794,15 +6927,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/copy-to-clipboard": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
- "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
- "license": "MIT",
- "dependencies": {
- "toggle-selection": "^1.0.6"
- }
- },
"node_modules/core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
@@ -6812,12 +6936,12 @@
"license": "MIT"
},
"node_modules/core-js-compat": {
- "version": "3.41.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
- "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
+ "version": "3.46.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz",
+ "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==",
"license": "MIT",
"dependencies": {
- "browserslist": "^4.24.4"
+ "browserslist": "^4.26.3"
},
"funding": {
"type": "opencollective",
@@ -6837,7 +6961,6 @@
"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"env-paths": "^2.2.1",
"import-fresh": "^3.3.0",
@@ -6864,8 +6987,7 @@
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true,
- "license": "Python-2.0",
- "peer": true
+ "license": "Python-2.0"
},
"node_modules/cosmiconfig/node_modules/js-yaml": {
"version": "4.1.0",
@@ -6873,7 +6995,6 @@
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"argparse": "^2.0.1"
},
@@ -6963,9 +7084,9 @@
}
},
"node_modules/css-loader/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -6986,7 +7107,6 @@
"integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"mdn-data": "2.12.2",
"source-map-js": "^1.0.1"
@@ -7050,12 +7170,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/custom-event-polyfill": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz",
- "integrity": "sha512-dgGyHwa3sJVUVgnF1IQmPnco4SdAJKllCDXL2W7wyw70vchJTSubthvyjlrxUagc4QZrHq31Dz7p6tzukJ0OgA==",
- "license": "MIT"
- },
"node_modules/d": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
@@ -7145,9 +7259,9 @@
}
},
"node_modules/datatables.net": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.2.2.tgz",
- "integrity": "sha512-gfODIKE3gpgbVeZy2QGj2Dq9roO6hy00S+k1knklrqlMyAMrh1wt0Q6ryBUM7gU96U77ysbq8dYhxFdmcC/oPQ==",
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.4.tgz",
+ "integrity": "sha512-fKuRlrBIdpAl2uIFgl9enKecHB41QmFd/2nN9LBbOvItV/JalAxLcyqdZXex7wX4ZXjnJQEnv6xeS9veOpKzSw==",
"license": "MIT",
"dependencies": {
"jquery": ">=1.7"
@@ -7170,9 +7284,9 @@
"dev": true
},
"node_modules/debug": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
- "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
"license": "MIT",
"dependencies": {
"ms": "^2.1.3"
@@ -7237,9 +7351,9 @@
}
},
"node_modules/decimal.js": {
- "version": "10.5.0",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
- "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+ "version": "10.6.0",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+ "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
"license": "MIT"
},
"node_modules/decode-uri-component": {
@@ -7253,9 +7367,9 @@
}
},
"node_modules/dedent": {
- "version": "1.5.3",
- "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
- "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.0.tgz",
+ "integrity": "sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==",
"dev": true,
"license": "MIT",
"peerDependencies": {
@@ -7505,12 +7619,13 @@
"license": "MIT"
},
"node_modules/dom-helpers": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
- "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+ "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
"license": "MIT",
"dependencies": {
- "@babel/runtime": "^7.1.2"
+ "@babel/runtime": "^7.8.7",
+ "csstype": "^3.0.2"
}
},
"node_modules/dom-serialize": {
@@ -7699,9 +7814,9 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
- "version": "1.5.144",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz",
- "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==",
+ "version": "1.5.235",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.235.tgz",
+ "integrity": "sha512-i/7ntLFwOdoHY7sgjlTIDo4Sl8EdoTjWIaKinYOVfC6bOp71bmwenyZthWHcasxgHDNWbWxvG9M3Ia116zIaYQ==",
"license": "ISC"
},
"node_modules/email-prop-type": {
@@ -7890,9 +8005,9 @@
}
},
"node_modules/enhanced-resolve": {
- "version": "5.18.1",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
- "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+ "version": "5.18.3",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+ "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
"license": "MIT",
"dependencies": {
"graceful-fs": "^4.2.4",
@@ -7925,9 +8040,9 @@
}
},
"node_modules/entities": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
- "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+ "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
"license": "BSD-2-Clause",
"engines": {
"node": ">=0.12"
@@ -7946,9 +8061,9 @@
}
},
"node_modules/envinfo": {
- "version": "7.14.0",
- "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
- "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.18.0.tgz",
+ "integrity": "sha512-02QGCLRW+Jb8PC270ic02lat+N57iBaWsvHjcJViqp6UVupRB+Vsg7brYPTqEFXvsdTql3KnSczv5ModZFpl8Q==",
"dev": true,
"license": "MIT",
"bin": {
@@ -7978,9 +8093,9 @@
"license": "MIT"
},
"node_modules/error-ex": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
- "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+ "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -7988,27 +8103,27 @@
}
},
"node_modules/es-abstract": {
- "version": "1.23.9",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
- "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+ "version": "1.24.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+ "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
"license": "MIT",
"dependencies": {
"array-buffer-byte-length": "^1.0.2",
"arraybuffer.prototype.slice": "^1.0.4",
"available-typed-arrays": "^1.0.7",
"call-bind": "^1.0.8",
- "call-bound": "^1.0.3",
+ "call-bound": "^1.0.4",
"data-view-buffer": "^1.0.2",
"data-view-byte-length": "^1.0.2",
"data-view-byte-offset": "^1.0.1",
"es-define-property": "^1.0.1",
"es-errors": "^1.3.0",
- "es-object-atoms": "^1.0.0",
+ "es-object-atoms": "^1.1.1",
"es-set-tostringtag": "^2.1.0",
"es-to-primitive": "^1.3.0",
"function.prototype.name": "^1.1.8",
- "get-intrinsic": "^1.2.7",
- "get-proto": "^1.0.0",
+ "get-intrinsic": "^1.3.0",
+ "get-proto": "^1.0.1",
"get-symbol-description": "^1.1.0",
"globalthis": "^1.0.4",
"gopd": "^1.2.0",
@@ -8020,21 +8135,24 @@
"is-array-buffer": "^3.0.5",
"is-callable": "^1.2.7",
"is-data-view": "^1.0.2",
+ "is-negative-zero": "^2.0.3",
"is-regex": "^1.2.1",
+ "is-set": "^2.0.3",
"is-shared-array-buffer": "^1.0.4",
"is-string": "^1.1.1",
"is-typed-array": "^1.1.15",
- "is-weakref": "^1.1.0",
+ "is-weakref": "^1.1.1",
"math-intrinsics": "^1.1.0",
- "object-inspect": "^1.13.3",
+ "object-inspect": "^1.13.4",
"object-keys": "^1.1.1",
"object.assign": "^4.1.7",
"own-keys": "^1.0.1",
- "regexp.prototype.flags": "^1.5.3",
+ "regexp.prototype.flags": "^1.5.4",
"safe-array-concat": "^1.1.3",
"safe-push-apply": "^1.0.0",
"safe-regex-test": "^1.1.0",
"set-proto": "^1.0.0",
+ "stop-iteration-iterator": "^1.1.0",
"string.prototype.trim": "^1.2.10",
"string.prototype.trimend": "^1.0.9",
"string.prototype.trimstart": "^1.0.8",
@@ -8043,7 +8161,7 @@
"typed-array-byte-offset": "^1.0.4",
"typed-array-length": "^1.0.7",
"unbox-primitive": "^1.1.0",
- "which-typed-array": "^1.1.18"
+ "which-typed-array": "^1.1.19"
},
"engines": {
"node": ">= 0.4"
@@ -8488,16 +8606,6 @@
"node": ">=4.0"
}
},
- "node_modules/eslint/node_modules/globals": {
- "version": "9.18.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
- "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/eslint/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -8766,9 +8874,9 @@
}
},
"node_modules/exponential-backoff": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
- "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
+ "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==",
"license": "Apache-2.0"
},
"node_modules/exports-loader": {
@@ -8911,9 +9019,9 @@
"license": "MIT"
},
"node_modules/fast-uri": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
- "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+ "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
"funding": [
{
"type": "github",
@@ -9009,6 +9117,7 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -9067,6 +9176,14 @@
"url": "https://opencollective.com/webpack"
}
},
+ "node_modules/file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/filename-regex": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -9282,9 +9399,9 @@
"license": "MIT"
},
"node_modules/follow-redirects": {
- "version": "1.15.9",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
- "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+ "version": "1.15.11",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+ "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
"dev": true,
"funding": [
{
@@ -9378,14 +9495,15 @@
}
},
"node_modules/form-data": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
- "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+ "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
"license": "MIT",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"es-set-tostringtag": "^2.1.0",
+ "hasown": "^2.0.2",
"mime-types": "^2.1.12"
},
"engines": {
@@ -9444,8 +9562,24 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "dev": true,
"license": "ISC"
},
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
"node_modules/function-bind": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -9504,6 +9638,15 @@
"is-property": "^1.0.0"
}
},
+ "node_modules/generator-function": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+ "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/gensync": {
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -9524,9 +9667,9 @@
}
},
"node_modules/get-east-asian-width": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
- "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz",
+ "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==",
"dev": true,
"license": "MIT",
"engines": {
@@ -9637,6 +9780,7 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"deprecated": "Glob versions prior to v9 are no longer supported",
+ "dev": true,
"license": "ISC",
"dependencies": {
"fs.realpath": "^1.0.0",
@@ -9725,12 +9869,12 @@
}
},
"node_modules/globals": {
- "version": "11.12.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "version": "9.18.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+ "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
"license": "MIT",
"engines": {
- "node": ">=4"
+ "node": ">=0.10.0"
}
},
"node_modules/globalthis": {
@@ -10065,12 +10209,11 @@
"license": "MIT"
},
"node_modules/hookified": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.8.2.tgz",
- "integrity": "sha512-5nZbBNP44sFCDjSoB//0N7m508APCgbQ4mGGo1KJGBYyCKNHfry1Pvd0JVHZIxjdnqn8nFRBAN/eFB6Rk/4w5w==",
+ "version": "1.12.1",
+ "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.12.1.tgz",
+ "integrity": "sha512-xnKGl+iMIlhrZmGHB729MqlmPoWBznctSQTYCpFKqNsCgimJQmithcW0xSQMMFzYnV2iKUh25alswn6epgxS0Q==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/hosted-git-info": {
"version": "4.1.0",
@@ -10172,9 +10315,9 @@
}
},
"node_modules/http-cache-semantics": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
- "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
"license": "BSD-2-Clause"
},
"node_modules/http-errors": {
@@ -10302,9 +10445,9 @@
"license": "MIT"
},
"node_modules/immutable": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
- "integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
+ "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
"license": "MIT"
},
"node_modules/import-fresh": {
@@ -10428,6 +10571,7 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+ "dev": true,
"license": "ISC",
"dependencies": {
"once": "^1.3.0",
@@ -10553,38 +10697,6 @@
"node": ">=10.13.0"
}
},
- "node_modules/intl-format-cache": {
- "version": "2.2.9",
- "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz",
- "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==",
- "license": "BSD-3-Clause"
- },
- "node_modules/intl-messageformat": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
- "integrity": "sha512-I+tSvHnXqJYjDfNmY95tpFMj30yoakC6OXAo+wu/wTMy6tA/4Fd4mvV7Uzs4cqK/Ap29sHhwjcY+78a8eifcXw==",
- "license": "BSD-3-Clause",
- "dependencies": {
- "intl-messageformat-parser": "1.4.0"
- }
- },
- "node_modules/intl-messageformat-parser": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
- "integrity": "sha512-/XkqFHKezO6UcF4Av2/Lzfrez18R0jyw7kRFhSeB/YRakdrgSc9QfFZUwNJI9swMwMoNPygK1ArC5wdFSjPw+A==",
- "deprecated": "We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser",
- "license": "BSD-3-Clause"
- },
- "node_modules/intl-relativeformat": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz",
- "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==",
- "deprecated": "This package has been deprecated, please see migration guide at 'https://github.com/formatjs/formatjs/tree/master/packages/intl-relativeformat#migration-guide'",
- "license": "BSD-3-Clause",
- "dependencies": {
- "intl-messageformat": "^2.0.0"
- }
- },
"node_modules/invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -10595,24 +10707,14 @@
}
},
"node_modules/ip-address": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
- "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+ "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
"license": "MIT",
- "dependencies": {
- "jsbn": "1.1.0",
- "sprintf-js": "^1.1.3"
- },
"engines": {
"node": ">= 12"
}
},
- "node_modules/ip-address/node_modules/sprintf-js": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
- "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
- "license": "BSD-3-Clause"
- },
"node_modules/irregular-plurals": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
@@ -10933,13 +11035,14 @@
}
},
"node_modules/is-generator-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
- "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+ "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
"license": "MIT",
"dependencies": {
- "call-bound": "^1.0.3",
- "get-proto": "^1.0.0",
+ "call-bound": "^1.0.4",
+ "generator-function": "^2.0.0",
+ "get-proto": "^1.0.1",
"has-tostringtag": "^1.0.2",
"safe-regex-test": "^1.1.0"
},
@@ -10996,6 +11099,18 @@
"xtend": "^4.0.0"
}
},
+ "node_modules/is-negative-zero": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+ "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/is-number": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
@@ -11370,9 +11485,9 @@
}
},
"node_modules/istanbul-reports": {
- "version": "3.1.7",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
- "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+ "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
"dev": true,
"license": "BSD-3-Clause",
"dependencies": {
@@ -11403,12 +11518,13 @@
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
"integrity": "sha512-HUYBYi/hlSnCIr8QH9xuDBJUAzSHS0El3HxTomovIQcNxtbNhoOtKwpEZaB/jq3sfW/qyhqwW/VDUtoB2RZ4Tg==",
"dev": true,
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/jasmine-jquery": {
"version": "2.1.1",
"resolved": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
- "integrity": "sha512-P9aZDwDEAVgAbdHG/ViapRzAUJ6zBSq/4I1lJFluIbrld6Sv6LI+HT2J4dgWqtfaCgIyDnHBHSHiJ/anter7wQ==",
+ "integrity": "sha512-sWMb40chzlUOKrHZCGpZoUrVnGm6khfL/fAMKO8vLtUR8yOmWIVVN7MRmep3/DSFhy1Hilon6qAH+UbLZgGG0w==",
"dev": true,
"license": "MIT"
},
@@ -12197,9 +12313,9 @@
"license": "MIT"
},
"node_modules/jest-snapshot/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true,
"license": "ISC",
"bin": {
@@ -12349,7 +12465,8 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q==",
"deprecated": "This version is deprecated. Please upgrade to the latest version or find support at https://www.herodevs.com/support/jquery-nes.",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/jquery-migrate": {
"version": "1.4.1",
@@ -12395,12 +12512,6 @@
"js-yaml": "bin/js-yaml.js"
}
},
- "node_modules/jsbn": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
- "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
- "license": "MIT"
- },
"node_modules/jsdom": {
"version": "20.0.3",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
@@ -12540,6 +12651,7 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
"integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -12559,6 +12671,7 @@
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+ "dev": true,
"license": "MIT"
},
"node_modules/json2mq": {
@@ -12603,6 +12716,7 @@
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
"integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+ "dev": true,
"license": "Public Domain",
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -12684,6 +12798,7 @@
"integrity": "sha512-A9/7e/IzHUkTcfjnTy5Wzo2P5wPuf7+QZh1JzNdTpYA0AN/vSrxfFjPKtKC3jRYJFZMJ7S1I9L2LItaJS1XMSg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"batch": "^0.5.3",
"bluebird": "^2.9.27",
@@ -12849,19 +12964,6 @@
"requirejs": "^2.1.0"
}
},
- "node_modules/karma-selenium-webdriver-launcher": {
- "version": "0.0.4-openedx.0",
- "resolved": "git+ssh://git@github.com/openedx/karma-selenium-webdriver-launcher.git#79cfdc5037eb8585dd3e584875e4343febb6d61f",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "q": "~0.9.6"
- },
- "peerDependencies": {
- "karma": ">=0.9",
- "selenium-webdriver": ">=2.44.0"
- }
- },
"node_modules/karma-sourcemap-loader": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.4.0.tgz",
@@ -12913,9 +13015,9 @@
}
},
"node_modules/karma-webpack/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -12995,12 +13097,11 @@
}
},
"node_modules/known-css-properties": {
- "version": "0.36.0",
- "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz",
- "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==",
+ "version": "0.37.0",
+ "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.37.0.tgz",
+ "integrity": "sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/leven": {
"version": "3.1.0",
@@ -13044,12 +13145,16 @@
"license": "MIT"
},
"node_modules/loader-runner": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
- "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
+ "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
"license": "MIT",
"engines": {
"node": ">=6.11.5"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
}
},
"node_modules/loader-utils": {
@@ -13124,14 +13229,6 @@
"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
"license": "MIT"
},
- "node_modules/lodash.get": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
- "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
- "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
- "dev": true,
- "license": "MIT"
- },
"node_modules/lodash.template": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -13160,9 +13257,9 @@
"license": "MIT"
},
"node_modules/log-symbols": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.0.tgz",
- "integrity": "sha512-zrc91EDk2M+2AXo/9BTvK91pqb7qrPg2nX/Hy+u8a5qQlbaOflCKO+6SqgZ+M+xUFxGdKTgwnGiL96b1W3ikRA==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz",
+ "integrity": "sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -13266,9 +13363,9 @@
}
},
"node_modules/make-dir/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true,
"license": "ISC",
"bin": {
@@ -13387,8 +13484,7 @@
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
"integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
"dev": true,
- "license": "CC0-1.0",
- "peer": true
+ "license": "CC0-1.0"
},
"node_modules/media-typer": {
"version": "0.3.0",
@@ -13406,7 +13502,6 @@
"integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=18"
},
@@ -13521,9 +13616,9 @@
}
},
"node_modules/mini-css-extract-plugin": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
- "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+ "version": "2.9.4",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.4.tgz",
+ "integrity": "sha512-ZWYT7ln73Hptxqxk2DxPU9MmapXRhxkJD6tkSR04dnQxm8BGu2hzgKLugK5yySD97u/8yy7Ma7E76k9ZdvtjkQ==",
"license": "MIT",
"dependencies": {
"schema-utils": "^4.0.0",
@@ -13544,6 +13639,7 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
"license": "ISC",
"dependencies": {
"brace-expansion": "^1.1.7"
@@ -13703,9 +13799,9 @@
"license": "ISC"
},
"node_modules/minizlib": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
- "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+ "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
"license": "MIT",
"dependencies": {
"minipass": "^7.1.2"
@@ -13732,6 +13828,7 @@
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
"license": "MIT",
"dependencies": {
"minimist": "^1.2.6"
@@ -13744,6 +13841,7 @@
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -13783,6 +13881,14 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/nan": {
+ "version": "2.23.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz",
+ "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/nanoid": {
"version": "3.3.11",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -13888,13 +13994,14 @@
}
},
"node_modules/nise/node_modules/path-to-regexp": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
- "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
+ "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
"dev": true,
"license": "MIT",
- "engines": {
- "node": ">=16"
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express"
}
},
"node_modules/node-addon-api": {
@@ -13929,9 +14036,9 @@
}
},
"node_modules/node-gyp/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
@@ -13982,9 +14089,9 @@
}
},
"node_modules/node-gyp/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -14016,9 +14123,9 @@
"license": "MIT"
},
"node_modules/node-releases": {
- "version": "2.0.19",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
- "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+ "version": "2.0.23",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz",
+ "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==",
"license": "MIT"
},
"node_modules/nopt": {
@@ -14053,9 +14160,9 @@
}
},
"node_modules/normalize-package-data/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true,
"license": "ISC",
"bin": {
@@ -14099,9 +14206,9 @@
}
},
"node_modules/nwsapi": {
- "version": "2.2.20",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
- "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
+ "version": "2.2.22",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.22.tgz",
+ "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==",
"license": "MIT"
},
"node_modules/object-assign": {
@@ -14319,6 +14426,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dev": true,
"license": "ISC",
"dependencies": {
"wrappy": "1"
@@ -14634,6 +14742,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@@ -14928,6 +15037,7 @@
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
"deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
"license": "MIT",
+ "peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
@@ -14963,9 +15073,9 @@
}
},
"node_modules/postcss": {
- "version": "8.5.3",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
- "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+ "version": "8.5.6",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+ "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
"funding": [
{
"type": "opencollective",
@@ -14981,8 +15091,9 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
- "nanoid": "^3.3.8",
+ "nanoid": "^3.3.11",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
@@ -15083,7 +15194,6 @@
}
],
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=18.0"
},
@@ -15123,6 +15233,7 @@
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
"integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -15368,6 +15479,19 @@
"teleport": ">=0.2.0"
}
},
+ "node_modules/qified": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/qified/-/qified-0.5.0.tgz",
+ "integrity": "sha512-Zj6Q/Vc/SQ+Fzc87N90jJUzBzxD7MVQ2ZvGyMmYtnl2u1a07CejAhvtk4ZwASos+SiHKCAIylyGHJKIek75QBw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookified": "^1.12.1"
+ },
+ "engines": {
+ "node": ">=20"
+ }
+ },
"node_modules/qs": {
"version": "6.13.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
@@ -15502,6 +15626,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
"integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -15536,40 +15661,14 @@
"warning": "^4.0.3"
},
"peerDependencies": {
- "react": ">=16.8.0",
- "react-dom": ">=16.8.0"
- }
- },
- "node_modules/react-bootstrap/node_modules/dom-helpers": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
- "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.8.7",
- "csstype": "^3.0.2"
- }
- },
- "node_modules/react-bootstrap/node_modules/react-transition-group": {
- "version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
- "license": "BSD-3-Clause",
- "dependencies": {
- "@babel/runtime": "^7.5.5",
- "dom-helpers": "^5.0.1",
- "loose-envify": "^1.4.0",
- "prop-types": "^15.6.2"
- },
- "peerDependencies": {
- "react": ">=16.6.0",
- "react-dom": ">=16.6.0"
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
}
},
"node_modules/react-clientside-effect": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.7.tgz",
- "integrity": "sha512-gce9m0Pk/xYYMEojRI9bgvqQAkl6hm7ozQvqWPyQx+kULiatdHgkNM1QG4DQRx5N9BAzWSCJmt9mMV8/KsdgVg==",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.8.tgz",
+ "integrity": "sha512-ma2FePH0z3px2+WOu6h+YycZcEvFmmxIlAb62cF52bG86eMySciO/EQZeQMXd07kPCYB0a1dWDT5J+KE9mCDUw==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.12.13"
@@ -15583,6 +15682,7 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
"integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@@ -15593,19 +15693,6 @@
"react": "^16.14.0"
}
},
- "node_modules/react-dropzone": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.3.0.tgz",
- "integrity": "sha512-ULfrLaTSsd8BDa9KVAGCueuq1AN3L14dtMsGGqtP0UwYyjG4Vhf158f/ITSHuSPYkZXbvfcIiOlZsH+e3QWm+Q==",
- "license": "MIT",
- "dependencies": {
- "attr-accept": "^1.1.3",
- "prop-types": "^15.5.7"
- },
- "peerDependencies": {
- "react": ">=0.14.0"
- }
- },
"node_modules/react-element-proptypes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/react-element-proptypes/-/react-element-proptypes-1.0.0.tgz",
@@ -15628,24 +15715,24 @@
}
},
"node_modules/react-focus-on": {
- "version": "3.9.4",
- "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.9.4.tgz",
- "integrity": "sha512-NFKmeH6++wu8e7LJcbwV8TTd4L5w/U5LMXTMOdUcXhCcZ7F5VOvgeTHd4XN1PD7TNmdvldDu/ENROOykUQ4yQg==",
+ "version": "3.10.0",
+ "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.10.0.tgz",
+ "integrity": "sha512-r2yQchO6QfV5zB3J4Gj6cTYBoxD369vkt0oKj1NJLA5ChQzxjko6V/dqQ7nvmaUBm5pHC+pa8tzHT9jtsVRFMQ==",
"license": "MIT",
"dependencies": {
- "aria-hidden": "^1.2.2",
- "react-focus-lock": "^2.11.3",
- "react-remove-scroll": "^2.6.0",
- "react-style-singleton": "^2.2.1",
+ "aria-hidden": "^1.2.5",
+ "react-focus-lock": "^2.13.6",
+ "react-remove-scroll": "^2.6.3",
+ "react-style-singleton": "^2.2.3",
"tslib": "^2.3.1",
- "use-sidecar": "^1.1.2"
+ "use-sidecar": "^1.1.3"
},
"engines": {
"node": ">=8.5.0"
},
"peerDependencies": {
- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
- "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+ "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
@@ -15694,80 +15781,6 @@
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
- "node_modules/react-intl-translations-manager": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz",
- "integrity": "sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==",
- "license": "MIT",
- "dependencies": {
- "chalk": "^2.3.2",
- "glob": "^7.1.2",
- "json-stable-stringify": "^1.0.1",
- "mkdirp": "^0.5.1"
- }
- },
- "node_modules/react-intl-translations-manager/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "license": "MIT",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/react-intl-translations-manager/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/react-intl-translations-manager/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "license": "MIT",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/react-intl-translations-manager/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "license": "MIT"
- },
- "node_modules/react-intl-translations-manager/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "license": "MIT",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/react-intl-translations-manager/node_modules/supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "license": "MIT",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/react-is": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -15800,16 +15813,6 @@
"react-dom": ">=16.3.0"
}
},
- "node_modules/react-overlays/node_modules/dom-helpers": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
- "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.8.7",
- "csstype": "^3.0.2"
- }
- },
"node_modules/react-proptype-conditional-require": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz",
@@ -15842,9 +15845,9 @@
"license": "MIT"
},
"node_modules/react-remove-scroll": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
- "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz",
+ "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==",
"license": "MIT",
"dependencies": {
"react-remove-scroll-bar": "^2.3.7",
@@ -15900,6 +15903,23 @@
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
+ "node_modules/react-responsive": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-6.1.2.tgz",
+ "integrity": "sha512-AXentVC/kN3KED9zhzJv2pu4vZ0i6cSHdTtbCScVV1MT6F5KXaG2qs5D7WLmhdaOvmiMX8UfmS4ZSO+WPwDt4g==",
+ "license": "MIT",
+ "dependencies": {
+ "hyphenate-style-name": "^1.0.0",
+ "matchmediaquery": "^0.3.0",
+ "prop-types": "^15.6.1"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ },
+ "peerDependencies": {
+ "react": "^16.3.0"
+ }
+ },
"node_modules/react-router": {
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
@@ -16026,19 +16046,19 @@
"license": "MIT"
},
"node_modules/react-transition-group": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
- "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+ "version": "4.4.5",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+ "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
"license": "BSD-3-Clause",
"dependencies": {
- "dom-helpers": "^3.4.0",
+ "@babel/runtime": "^7.5.5",
+ "dom-helpers": "^5.0.1",
"loose-envify": "^1.4.0",
- "prop-types": "^15.6.2",
- "react-lifecycles-compat": "^3.0.4"
+ "prop-types": "^15.6.2"
},
"peerDependencies": {
- "react": ">=15.0.0",
- "react-dom": ">=15.0.0"
+ "react": ">=16.6.0",
+ "react-dom": ">=16.6.0"
}
},
"node_modules/read-pkg": {
@@ -16545,6 +16565,7 @@
"resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
"integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"lodash": "^4.2.1",
"lodash-es": "^4.2.1",
@@ -16552,16 +16573,6 @@
"symbol-observable": "^1.0.3"
}
},
- "node_modules/redux-devtools-extension": {
- "version": "2.13.9",
- "resolved": "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz",
- "integrity": "sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==",
- "deprecated": "Package moved to @redux-devtools/extension.",
- "license": "MIT",
- "peerDependencies": {
- "redux": "^3.1.0 || ^4.0.0"
- }
- },
"node_modules/redux-thunk": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.2.0.tgz",
@@ -16597,9 +16608,9 @@
"license": "MIT"
},
"node_modules/regenerate-unicode-properties": {
- "version": "10.2.0",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
- "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz",
+ "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==",
"license": "MIT",
"dependencies": {
"regenerate": "^1.4.2"
@@ -16609,20 +16620,11 @@
}
},
"node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+ "version": "0.10.5",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+ "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
"license": "MIT"
},
- "node_modules/regenerator-transform": {
- "version": "0.15.2",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
- "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
- "license": "MIT",
- "dependencies": {
- "@babel/runtime": "^7.8.4"
- }
- },
"node_modules/regex-cache": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
@@ -16671,17 +16673,17 @@
}
},
"node_modules/regexpu-core": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
- "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz",
+ "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==",
"license": "MIT",
"dependencies": {
"regenerate": "^1.4.2",
- "regenerate-unicode-properties": "^10.2.0",
+ "regenerate-unicode-properties": "^10.2.2",
"regjsgen": "^0.8.0",
- "regjsparser": "^0.12.0",
+ "regjsparser": "^0.13.0",
"unicode-match-property-ecmascript": "^2.0.0",
- "unicode-match-property-value-ecmascript": "^2.1.0"
+ "unicode-match-property-value-ecmascript": "^2.2.1"
},
"engines": {
"node": ">=4"
@@ -16694,29 +16696,17 @@
"license": "MIT"
},
"node_modules/regjsparser": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
- "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
+ "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
"license": "BSD-2-Clause",
"dependencies": {
- "jsesc": "~3.0.2"
+ "jsesc": "~3.1.0"
},
"bin": {
"regjsparser": "bin/parser"
}
},
- "node_modules/regjsparser/node_modules/jsesc": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
- "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
- "license": "MIT",
- "bin": {
- "jsesc": "bin/jsesc"
- },
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/remove-trailing-separator": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -16791,6 +16781,7 @@
"resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz",
"integrity": "sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==",
"license": "MIT",
+ "peer": true,
"bin": {
"r_js": "bin/r.js",
"r.js": "bin/r.js"
@@ -16811,12 +16802,6 @@
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
"license": "MIT"
},
- "node_modules/reselect": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
- "integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==",
- "license": "MIT"
- },
"node_modules/resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
@@ -17273,9 +17258,9 @@
}
},
"node_modules/sass": {
- "version": "1.87.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz",
- "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
+ "version": "1.93.2",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
+ "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
"license": "MIT",
"dependencies": {
"chokidar": "^4.0.0",
@@ -17383,9 +17368,9 @@
}
},
"node_modules/schema-utils": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
- "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+ "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
"license": "MIT",
"dependencies": {
"@types/json-schema": "^7.0.9",
@@ -17423,6 +17408,7 @@
}
],
"license": "Apache-2.0",
+ "peer": true,
"dependencies": {
"@bazel/runfiles": "^6.3.1",
"jszip": "^3.10.1",
@@ -18031,12 +18017,12 @@
}
},
"node_modules/socks": {
- "version": "2.8.4",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
- "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+ "version": "2.8.7",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+ "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
"license": "MIT",
"dependencies": {
- "ip-address": "^9.0.5",
+ "ip-address": "^10.0.1",
"smart-buffer": "^4.2.0"
},
"engines": {
@@ -18059,9 +18045,9 @@
}
},
"node_modules/socks-proxy-agent/node_modules/agent-base": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
- "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
"license": "MIT",
"engines": {
"node": ">= 14"
@@ -18159,9 +18145,9 @@
}
},
"node_modules/spdx-license-ids": {
- "version": "3.0.21",
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
- "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+ "version": "3.0.22",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+ "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
"dev": true,
"license": "CC0-1.0"
},
@@ -18325,85 +18311,19 @@
}
},
"node_modules/string-replace-loader": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.1.0.tgz",
- "integrity": "sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "loader-utils": "^2.0.0",
- "schema-utils": "^3.0.0"
- },
- "peerDependencies": {
- "webpack": "^5"
- }
- },
- "node_modules/string-replace-loader/node_modules/ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/string-replace-loader/node_modules/ajv-keywords": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
- "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "ajv": "^6.9.1"
- }
- },
- "node_modules/string-replace-loader/node_modules/json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/string-replace-loader/node_modules/loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- },
- "engines": {
- "node": ">=8.9.0"
- }
- },
- "node_modules/string-replace-loader/node_modules/schema-utils": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
- "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.2.0.tgz",
+ "integrity": "sha512-q7+F4DC6MAKkszF3ZQEuZ3dDH25wXPxFA0maTLk3TOTAYPLDgwqCeCKIvOd8xJhYYYl+EXusYRCyKIJliT/olg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/json-schema": "^7.0.8",
- "ajv": "^6.12.5",
- "ajv-keywords": "^3.5.2"
+ "schema-utils": "^4"
},
"engines": {
- "node": ">= 10.13.0"
+ "node": ">=4"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
+ "peerDependencies": {
+ "webpack": "^5"
}
},
"node_modules/string-width": {
@@ -18625,9 +18545,9 @@
"license": "ISC"
},
"node_modules/stylelint": {
- "version": "16.19.1",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.19.1.tgz",
- "integrity": "sha512-C1SlPZNMKl+d/C867ZdCRthrS+6KuZ3AoGW113RZCOL0M8xOGpgx7G70wq7lFvqvm4dcfdGFVLB/mNaLFChRKw==",
+ "version": "16.25.0",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.25.0.tgz",
+ "integrity": "sha512-Li0avYWV4nfv1zPbdnxLYBGq4z8DVZxbRgx4Kn6V+Uftz1rMoF1qiEI3oL4kgWqyYgCgs7gT5maHNZ82Gk03vQ==",
"dev": true,
"funding": [
{
@@ -18640,36 +18560,35 @@
}
],
"license": "MIT",
- "peer": true,
"dependencies": {
- "@csstools/css-parser-algorithms": "^3.0.4",
- "@csstools/css-tokenizer": "^3.0.3",
- "@csstools/media-query-list-parser": "^4.0.2",
+ "@csstools/css-parser-algorithms": "^3.0.5",
+ "@csstools/css-tokenizer": "^3.0.4",
+ "@csstools/media-query-list-parser": "^4.0.3",
"@csstools/selector-specificity": "^5.0.0",
- "@dual-bundle/import-meta-resolve": "^4.1.0",
+ "@dual-bundle/import-meta-resolve": "^4.2.1",
"balanced-match": "^2.0.0",
"colord": "^2.9.3",
"cosmiconfig": "^9.0.0",
"css-functions-list": "^3.2.3",
"css-tree": "^3.1.0",
- "debug": "^4.3.7",
+ "debug": "^4.4.3",
"fast-glob": "^3.3.3",
"fastest-levenshtein": "^1.0.16",
- "file-entry-cache": "^10.0.8",
+ "file-entry-cache": "^10.1.4",
"global-modules": "^2.0.0",
"globby": "^11.1.0",
"globjoin": "^0.1.4",
"html-tags": "^3.3.1",
- "ignore": "^7.0.3",
+ "ignore": "^7.0.5",
"imurmurhash": "^0.1.4",
"is-plain-object": "^5.0.0",
- "known-css-properties": "^0.36.0",
+ "known-css-properties": "^0.37.0",
"mathml-tag-names": "^2.1.3",
"meow": "^13.2.0",
"micromatch": "^4.0.8",
"normalize-path": "^3.0.0",
"picocolors": "^1.1.1",
- "postcss": "^8.5.3",
+ "postcss": "^8.5.6",
"postcss-resolve-nested-selector": "^0.1.6",
"postcss-safe-parser": "^7.0.1",
"postcss-selector-parser": "^7.1.0",
@@ -18720,9 +18639,9 @@
}
},
"node_modules/stylelint-formatter-pretty/node_modules/ansi-escapes": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
- "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
+ "integrity": "sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -18736,9 +18655,9 @@
}
},
"node_modules/stylelint-formatter-pretty/node_modules/ansi-regex": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
"dev": true,
"license": "MIT",
"engines": {
@@ -18749,9 +18668,9 @@
}
},
"node_modules/stylelint-formatter-pretty/node_modules/emoji-regex": {
- "version": "10.4.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
- "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+ "version": "10.6.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+ "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
"dev": true,
"license": "MIT"
},
@@ -18774,9 +18693,9 @@
}
},
"node_modules/stylelint-formatter-pretty/node_modules/strip-ansi": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
- "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+ "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -18794,40 +18713,36 @@
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/stylelint/node_modules/file-entry-cache": {
- "version": "10.0.8",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.0.8.tgz",
- "integrity": "sha512-FGXHpfmI4XyzbLd3HQ8cbUcsFGohJpZtmQRHr8z8FxxtCe2PcpgIlVLwIgunqjvRmXypBETvwhV4ptJizA+Y1Q==",
+ "version": "10.1.4",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.1.4.tgz",
+ "integrity": "sha512-5XRUFc0WTtUbjfGzEwXc42tiGxQHBmtbUG1h9L2apu4SulCGN3Hqm//9D6FAolf8MYNL7f/YlJl9vy08pj5JuA==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
- "flat-cache": "^6.1.8"
+ "flat-cache": "^6.1.13"
}
},
"node_modules/stylelint/node_modules/flat-cache": {
- "version": "6.1.8",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.8.tgz",
- "integrity": "sha512-R6MaD3nrJAtO7C3QOuS79ficm2pEAy++TgEUD8ii1LVlbcgZ9DtASLkt9B+RZSFCzm7QHDMlXPsqqB6W2Pfr1Q==",
+ "version": "6.1.18",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.18.tgz",
+ "integrity": "sha512-JUPnFgHMuAVmLmoH9/zoZ6RHOt5n9NlUw/sDXsTbROJ2SFoS2DS4s+swAV6UTeTbGH/CAsZIE6M8TaG/3jVxgQ==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
- "cacheable": "^1.8.9",
+ "cacheable": "^2.1.0",
"flatted": "^3.3.3",
- "hookified": "^1.8.1"
+ "hookified": "^1.12.0"
}
},
"node_modules/stylelint/node_modules/ignore": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
- "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+ "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">= 4"
}
@@ -18838,7 +18753,6 @@
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=8"
}
@@ -18849,7 +18763,6 @@
"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -18860,7 +18773,6 @@
"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
"dev": true,
"license": "ISC",
- "peer": true,
"engines": {
"node": ">=14"
},
@@ -18874,7 +18786,6 @@
"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"ansi-styles": "^4.0.0",
"astral-regex": "^2.0.0",
@@ -18893,7 +18804,6 @@
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@@ -18909,7 +18819,6 @@
"integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
"dev": true,
"license": "BSD-3-Clause",
- "peer": true,
"dependencies": {
"ajv": "^8.0.1",
"lodash.truncate": "^4.4.2",
@@ -18927,7 +18836,6 @@
"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
"dev": true,
"license": "ISC",
- "peer": true,
"dependencies": {
"imurmurhash": "^0.1.4",
"signal-exit": "^4.0.1"
@@ -19036,6 +18944,7 @@
"integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"co": "^4.6.0",
"json-stable-stringify": "^1.0.1"
@@ -19149,46 +19058,34 @@
}
},
"node_modules/tapable": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
- "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+ "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
"license": "MIT",
"engines": {
"node": ">=6"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
}
},
"node_modules/tar": {
- "version": "7.4.3",
- "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
- "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+ "version": "7.5.1",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
+ "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
"license": "ISC",
"dependencies": {
"@isaacs/fs-minipass": "^4.0.0",
"chownr": "^3.0.0",
"minipass": "^7.1.2",
- "minizlib": "^3.0.1",
- "mkdirp": "^3.0.1",
+ "minizlib": "^3.1.0",
"yallist": "^5.0.0"
},
"engines": {
"node": ">=18"
}
},
- "node_modules/tar/node_modules/mkdirp": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
- "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
- "license": "MIT",
- "bin": {
- "mkdirp": "dist/cjs/src/bin.js"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/tar/node_modules/yallist": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
@@ -19199,13 +19096,13 @@
}
},
"node_modules/terser": {
- "version": "5.39.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
- "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+ "version": "5.44.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz",
+ "integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
"license": "BSD-2-Clause",
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
- "acorn": "^8.8.2",
+ "acorn": "^8.15.0",
"commander": "^2.20.0",
"source-map-support": "~0.5.20"
},
@@ -19382,9 +19279,9 @@
"license": "MIT"
},
"node_modules/tmp": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
- "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+ "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
"dev": true,
"license": "MIT",
"engines": {
@@ -19476,12 +19373,6 @@
"node": ">=0.12.0"
}
},
- "node_modules/toggle-selection": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
- "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==",
- "license": "MIT"
- },
"node_modules/toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -19831,9 +19722,9 @@
"license": "BSD-3-Clause"
},
"node_modules/undici-types": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
- "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+ "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
"license": "MIT"
},
"node_modules/unicode-canonical-property-names-ecmascript": {
@@ -19859,18 +19750,18 @@
}
},
"node_modules/unicode-match-property-value-ecmascript": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
- "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz",
+ "integrity": "sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==",
"license": "MIT",
"engines": {
"node": ">=4"
}
},
"node_modules/unicode-property-aliases-ecmascript": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
- "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz",
+ "integrity": "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==",
"license": "MIT",
"engines": {
"node": ">=4"
@@ -20318,9 +20209,9 @@
}
},
"node_modules/watchpack": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
- "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+ "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
"license": "MIT",
"dependencies": {
"glob-to-regexp": "^0.4.1",
@@ -20340,21 +20231,23 @@
}
},
"node_modules/webpack": {
- "version": "5.99.7",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
- "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
+ "version": "5.102.1",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.1.tgz",
+ "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.7",
- "@types/estree": "^1.0.6",
+ "@types/estree": "^1.0.8",
"@types/json-schema": "^7.0.15",
"@webassemblyjs/ast": "^1.14.1",
"@webassemblyjs/wasm-edit": "^1.14.1",
"@webassemblyjs/wasm-parser": "^1.14.1",
- "acorn": "^8.14.0",
- "browserslist": "^4.24.0",
+ "acorn": "^8.15.0",
+ "acorn-import-phases": "^1.0.3",
+ "browserslist": "^4.26.3",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.17.1",
+ "enhanced-resolve": "^5.17.3",
"es-module-lexer": "^1.2.1",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@@ -20364,11 +20257,11 @@
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
- "schema-utils": "^4.3.2",
- "tapable": "^2.1.1",
+ "schema-utils": "^4.3.3",
+ "tapable": "^2.3.0",
"terser-webpack-plugin": "^5.3.11",
- "watchpack": "^2.4.1",
- "webpack-sources": "^3.2.3"
+ "watchpack": "^2.4.4",
+ "webpack-sources": "^3.3.3"
},
"bin": {
"webpack": "bin/webpack.js"
@@ -20398,6 +20291,7 @@
"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^2.1.1",
@@ -20478,9 +20372,9 @@
}
},
"node_modules/webpack-sources": {
- "version": "3.2.3",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
- "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+ "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
"license": "MIT",
"engines": {
"node": ">=10.13.0"
@@ -20510,12 +20404,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/whatwg-fetch": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
- "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
- "license": "MIT"
- },
"node_modules/whatwg-mimetype": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
@@ -20768,6 +20656,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "dev": true,
"license": "ISC"
},
"node_modules/write": {
@@ -20798,9 +20687,9 @@
}
},
"node_modules/ws": {
- "version": "8.18.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
- "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+ "version": "8.18.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
@@ -20960,9 +20849,9 @@
}
},
"node_modules/yoctocolors": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz",
- "integrity": "sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz",
+ "integrity": "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==",
"dev": true,
"license": "MIT",
"engines": {
diff --git a/package.json b/package.json
index a3dfdd45feff..969e4a017b1a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"watch-sass": "scripts/watch_sass.sh",
"test": "npm run test-jest && npm run test-karma",
"test-jest": "jest",
- "test-karma": "npm run test-karma-vanilla && npm run test-karma-require && echo 'WARNING: Skipped broken webpack tests. For details, see: https://github.com/openedx/edx-platform/issues/35956'",
+ "test-karma": "npm run test-karma-vanilla && npm run test-karma-require && npm run test-xmodule-webpack && echo 'WARNING: Skipped broken lms-webpack and cms-webpack tests. For details, see: https://github.com/openedx/edx-platform/issues/35956'",
"test-karma-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
"test-karma-require": "npm run test-cms-require && npm run test-common-require",
"test-karma-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
@@ -44,7 +44,6 @@
"@edx/edx-proctoring": "^4.18.1",
"@edx/frontend-component-cookie-policy-banner": "2.2.0",
"@edx/paragon": "2.6.4",
- "@edx/studio-frontend": "^2.1.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^12.8.3",
@@ -114,7 +113,6 @@
"karma-jasmine-html-reporter": "0.2.2",
"karma-junit-reporter": "2.0.1",
"karma-requirejs": "1.1.0",
- "karma-selenium-webdriver-launcher": "github:openedx/karma-selenium-webdriver-launcher#0.0.4-openedx.0",
"karma-sourcemap-loader": "0.4.0",
"karma-spec-reporter": "0.0.20",
"karma-webpack": "^5.0.1",
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index 748858b7015a..1f3e81f50334 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -22,3 +22,10 @@ Django<6.0
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0
+
+# pip 25.3 is incompatible with pip-tools hence causing failures during the build process
+# Make upgrade command and all requirements upgrade jobs are broken due to this.
+# See issue https://github.com/openedx/public-engineering/issues/440 for details regarding the ongoing fix.
+# The constraint can be removed once a release (pip-tools > 7.5.1) is available with support for pip 25.3
+# Issue to track this dependency and unpin later on: https://github.com/openedx/edx-lint/issues/503
+pip<25.3
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 30dad548fed8..b18a0fb0f381 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -13,16 +13,16 @@
# This file contains all common constraints for edx-repos
-c common_constraints.txt
+# Date: 2025-10-07
+# Stay on LTS version, remove once this is added to common constraint
+Django<6.0
+
# Date: 2020-02-26
# As it is not clarified what exact breaking changes will be introduced as per
# the next major release, ensure the installed version is within boundaries.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35280
celery>=5.2.2,<6.0.0
-# Date: 2024-02-02
-# Stay on LTS version, remove once this is added to common constraint
-Django<5.0
-
# Date: 2020-02-10
# django-oauth-toolkit version >=2.0.0 has breaking changes. More details
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
@@ -61,7 +61,7 @@ numpy<2.0.0
# Date: 2023-09-18
# pinning this version to avoid updates while the library is being developed
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269
-openedx-learning==0.27.1
+openedx-learning==0.30.2
# Date: 2023-11-29
# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
diff --git a/requirements/edx-sandbox/README.rst b/requirements/edx-sandbox/README.rst
index 4d628f3e2add..d4b1ab8199a1 100644
--- a/requirements/edx-sandbox/README.rst
+++ b/requirements/edx-sandbox/README.rst
@@ -74,3 +74,21 @@ releases/sumac.txt
.. _Python changelog: https://docs.python.org/3.11/whatsnew/changelog.html
.. _SciPy changelog: https://docs.scipy.org/doc/scipy/release.html
.. _NumPy changelog: https://numpy.org/doc/stable/release.html
+
+releases/teak.txt
+------------------
+
+* Frozen at the time of the Teak release
+* Supports Python 3.11 and Python 3.12
+* SciPy is upgraded from 1.14.1 to 1.15.2
+
+.. _SciPy changelog: https://docs.scipy.org/doc/scipy/release.html
+
+releases/ulmo.txt
+------------------
+
+* Frozen at the time of the Ulmo release
+* Supports Python 3.11 and Python 3.12
+* SciPy is upgraded from 1.15.2 to 1.16.3
+
+.. _SciPy changelog: https://docs.scipy.org/doc/scipy/release.html
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index a2013ea7485f..887f5cc1beaf 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -38,7 +38,7 @@ markupsafe==3.0.3
# via
# chem
# openedx-calc
-matplotlib==3.10.6
+matplotlib==3.10.7
# via -r requirements/edx-sandbox/base.in
mpmath==1.3.0
# via sympy
@@ -60,7 +60,7 @@ openedx-calc==4.0.2
# via -r requirements/edx-sandbox/base.in
packaging==25.0
# via matplotlib
-pillow==11.3.0
+pillow==12.0.0
# via matplotlib
pycparser==2.23
# via cffi
@@ -74,9 +74,9 @@ python-dateutil==2.9.0.post0
# via matplotlib
random2==1.0.2
# via -r requirements/edx-sandbox/base.in
-regex==2025.9.18
+regex==2025.10.23
# via nltk
-scipy==1.16.2
+scipy==1.16.3
# via
# -r requirements/edx-sandbox/base.in
# chem
diff --git a/requirements/edx-sandbox/releases/ulmo.txt b/requirements/edx-sandbox/releases/ulmo.txt
new file mode 100644
index 000000000000..887f5cc1beaf
--- /dev/null
+++ b/requirements/edx-sandbox/releases/ulmo.txt
@@ -0,0 +1,90 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+# make upgrade
+#
+cffi==2.0.0
+ # via cryptography
+chem==2.0.0
+ # via -r requirements/edx-sandbox/base.in
+click==8.3.0
+ # via nltk
+codejail-includes==2.0.0
+ # via -r requirements/edx-sandbox/base.in
+contourpy==1.3.3
+ # via matplotlib
+cryptography==45.0.7
+ # via
+ # -c requirements/constraints.txt
+ # -r requirements/edx-sandbox/base.in
+cycler==0.12.1
+ # via matplotlib
+fonttools==4.60.1
+ # via matplotlib
+joblib==1.5.2
+ # via nltk
+kiwisolver==1.4.9
+ # via matplotlib
+lxml[html-clean]==5.3.2
+ # via
+ # -c requirements/constraints.txt
+ # -r requirements/edx-sandbox/base.in
+ # lxml-html-clean
+ # openedx-calc
+lxml-html-clean==0.4.3
+ # via lxml
+markupsafe==3.0.3
+ # via
+ # chem
+ # openedx-calc
+matplotlib==3.10.7
+ # via -r requirements/edx-sandbox/base.in
+mpmath==1.3.0
+ # via sympy
+networkx==3.5
+ # via -r requirements/edx-sandbox/base.in
+nltk==3.9.2
+ # via
+ # -r requirements/edx-sandbox/base.in
+ # chem
+numpy==1.26.4
+ # via
+ # -c requirements/constraints.txt
+ # chem
+ # contourpy
+ # matplotlib
+ # openedx-calc
+ # scipy
+openedx-calc==4.0.2
+ # via -r requirements/edx-sandbox/base.in
+packaging==25.0
+ # via matplotlib
+pillow==12.0.0
+ # via matplotlib
+pycparser==2.23
+ # via cffi
+pyparsing==3.2.5
+ # via
+ # -r requirements/edx-sandbox/base.in
+ # chem
+ # matplotlib
+ # openedx-calc
+python-dateutil==2.9.0.post0
+ # via matplotlib
+random2==1.0.2
+ # via -r requirements/edx-sandbox/base.in
+regex==2025.10.23
+ # via nltk
+scipy==1.16.3
+ # via
+ # -r requirements/edx-sandbox/base.in
+ # chem
+six==1.17.0
+ # via python-dateutil
+sympy==1.14.0
+ # via
+ # -r requirements/edx-sandbox/base.in
+ # openedx-calc
+tqdm==4.67.1
+ # via nltk
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 2b875e8e75ed..70dce4614e74 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -40,6 +40,7 @@ attrs==25.4.0
# edx-ace
# jsonschema
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-learning
# referencing
@@ -58,7 +59,7 @@ beautifulsoup4==4.14.2
# pynliner
billiard==4.2.2
# via celery
-bleach[css]==6.2.0
+bleach[css]==6.3.0
# via
# edx-enterprise
# lti-consumer-xblock
@@ -68,29 +69,33 @@ bleach[css]==6.2.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/kernel.in
-boto3==1.40.46
+boto3==1.40.62
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
# snowflake-connector-python
-botocore==1.40.46
+botocore==1.40.62
# via
# -r requirements/edx/kernel.in
# boto3
# s3transfer
# snowflake-connector-python
+bracex==2.6
+ # via wcmatch
bridgekeeper==0.9
# via -r requirements/edx/kernel.in
cachecontrol==0.14.3
# via firebase-admin
-cachetools==6.2.0
+cachetools==6.2.1
# via
# edxval
# google-auth
-camel-converter[pydantic]==4.0.1
+camel-converter[pydantic]==5.0.0
# via meilisearch
+casbin-django-orm-adapter==1.7.0
+ # via openedx-authz
celery==5.5.3
# via
# -c requirements/constraints.txt
@@ -109,13 +114,13 @@ certifi==2025.10.5
# httpx
# requests
# snowflake-connector-python
-cffi==1.17.1
+cffi==2.0.0
# via
# cryptography
# pynacl
chardet==5.2.0
# via pysrt
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via
# requests
# snowflake-connector-python
@@ -156,7 +161,6 @@ cryptography==45.0.7
# pyjwt
# pyopenssl
# snowflake-connector-python
- # social-auth-core
cssutils==2.11.1
# via pynliner
defusedxml==0.7.1
@@ -166,11 +170,12 @@ defusedxml==0.7.1
# ora2
# python3-openid
# social-auth-core
-django==4.2.28
+django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/edx/kernel.in
+ # casbin-django-orm-adapter
# django-appconf
# django-autocomplete-light
# django-celery-results
@@ -230,6 +235,7 @@ django==4.2.28
# help-tokens
# jsonfield
# lti-consumer-xblock
+ # openedx-authz
# openedx-django-pyfs
# openedx-django-wiki
# openedx-events
@@ -277,7 +283,7 @@ django-fernet-fields-v2==0.9
# via
# edx-enterprise
# enterprise-integrated-channels
-django-filter==25.1
+django-filter==25.2
# via
# -r requirements/edx/kernel.in
# edx-enterprise
@@ -360,7 +366,7 @@ django-storages==1.14.6
# via
# -r requirements/edx/kernel.in
# edxval
-django-user-tasks==3.4.3
+django-user-tasks==3.4.4
# via -r requirements/edx/kernel.in
django-waffle==5.0.0
# via
@@ -390,6 +396,7 @@ djangorestframework==3.16.1
# edx-organizations
# edx-proctoring
# edx-submissions
+ # openedx-authz
# openedx-forum
# openedx-learning
# ora2
@@ -414,7 +421,8 @@ edx-api-doc-tools==2.1.0
# via
# -r requirements/edx/kernel.in
# edx-name-affirmation
-edx-auth-backends==4.6.1
+ # openedx-authz
+edx-auth-backends==4.6.2
# via -r requirements/edx/kernel.in
edx-bulk-grades==1.2.0
# via
@@ -457,6 +465,7 @@ edx-django-utils==8.0.1
# edx-when
# enterprise-integrated-channels
# event-tracking
+ # openedx-authz
# openedx-events
# ora2
# super-csv
@@ -472,6 +481,7 @@ edx-drf-extensions==10.6.0
# edx-when
# edxval
# enterprise-integrated-channels
+ # openedx-authz
# openedx-learning
edx-enterprise==6.6.5
# via
@@ -504,6 +514,7 @@ edx-opaque-keys[django]==3.0.0
# edx-when
# enterprise-integrated-channels
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-filters
# ora2
@@ -528,7 +539,7 @@ edx-search==4.3.0
# openedx-forum
edx-sga==0.26.0
# via -r requirements/edx/bundled.in
-edx-submissions==3.12.0
+edx-submissions==3.12.1
# via
# -r requirements/edx/kernel.in
# ora2
@@ -571,9 +582,9 @@ event-tracking==3.3.0
# edx-completion
# edx-proctoring
# edx-search
-fastavro==1.12.0
+fastavro==1.12.1
# via openedx-events
-filelock==3.19.1
+filelock==3.20.0
# via snowflake-connector-python
firebase-admin==7.1.0
# via edx-ace
@@ -595,25 +606,25 @@ geoip2==5.1.0
# via -r requirements/edx/kernel.in
glob2==0.7
# via -r requirements/edx/kernel.in
-google-api-core[grpc]==2.25.2
+google-api-core[grpc]==2.28.1
# via
# firebase-admin
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-auth==2.41.1
+google-auth==2.42.0
# via
# google-api-core
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-cloud-core==2.4.3
+google-cloud-core==2.5.0
# via
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.21.0
# via firebase-admin
-google-cloud-storage==3.4.0
+google-cloud-storage==3.4.1
# via firebase-admin
google-crc32c==1.7.1
# via
@@ -621,15 +632,15 @@ google-crc32c==1.7.1
# google-resumable-media
google-resumable-media==2.7.2
# via google-cloud-storage
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via
# google-api-core
# grpcio-status
-grpcio==1.75.1
+grpcio==1.76.0
# via
# google-api-core
# grpcio-status
-grpcio-status==1.75.1
+grpcio-status==1.76.0
# via google-api-core
gunicorn==23.0.0
# via -r requirements/edx/kernel.in
@@ -653,7 +664,7 @@ hyperframe==6.1.0
# via h2
icalendar==6.3.1
# via -r requirements/edx/kernel.in
-idna==3.10
+idna==3.11
# via
# anyio
# httpx
@@ -667,7 +678,7 @@ inflection==0.5.1
# via
# drf-spectacular
# drf-yasg
-invoke==2.2.0
+invoke==2.2.1
# via paramiko
ipaddress==1.0.23
# via -r requirements/edx/kernel.in
@@ -715,7 +726,7 @@ lazy==1.6
# xblock
loremipsum==1.0.5
# via ora2
-lti-consumer-xblock==9.14.2
+lti-consumer-xblock==9.14.3
# via -r requirements/edx/kernel.in
lxml[html-clean]==5.3.2
# via
@@ -757,7 +768,7 @@ markupsafe==3.0.3
# xblock
maxminddb==2.8.2
# via geoip2
-meilisearch==0.37.0
+meilisearch==0.37.1
# via
# -r requirements/edx/kernel.in
# edx-search
@@ -769,7 +780,7 @@ more-itertools==10.8.0
# via cssutils
mpmath==1.3.0
# via sympy
-msgpack==1.1.1
+msgpack==1.1.2
# via cachecontrol
multidict==6.7.0
# via
@@ -779,7 +790,7 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/kernel.in
# openedx-forum
-nh3==0.3.0
+nh3==0.3.1
# via
# -r requirements/edx/kernel.in
# xblocks-contrib
@@ -809,7 +820,10 @@ openedx-atlas==0.7.0
# -r requirements/edx/kernel.in
# edx-enterprise
# enterprise-integrated-channels
+ # openedx-authz
# openedx-forum
+openedx-authz==0.20.0
+ # via -r requirements/edx/kernel.in
openedx-calc==4.0.2
# via -r requirements/edx/kernel.in
openedx-django-pyfs==3.8.0
@@ -835,15 +849,15 @@ openedx-filters==2.1.0
# -r requirements/edx/kernel.in
# lti-consumer-xblock
# ora2
-openedx-forum==0.3.6
+openedx-forum==0.3.8
# via -r requirements/edx/kernel.in
-openedx-learning==0.27.1
+openedx-learning==0.30.2
# via
# -c requirements/constraints.txt
# -r requirements/edx/kernel.in
optimizely-sdk==5.2.0
# via -r requirements/edx/bundled.in
-ora2==6.16.4
+ora2==6.17.1
# via -r requirements/edx/bundled.in
packaging==25.0
# via
@@ -868,19 +882,19 @@ pgpy==0.6.0
# via edx-enterprise
piexif==1.1.3
# via -r requirements/edx/kernel.in
-pillow==11.3.0
+pillow==12.0.0
# via
# -r requirements/edx/kernel.in
# edx-enterprise
# edx-organizations
# edxval
-platformdirs==4.4.0
+platformdirs==4.5.0
# via snowflake-connector-python
polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.52
# via click-repl
-propcache==0.4.0
+propcache==0.4.1
# via
# aiohttp
# yarl
@@ -888,14 +902,14 @@ proto-plus==1.26.1
# via
# google-api-core
# google-cloud-firestore
-protobuf==6.32.1
+protobuf==6.33.0
# via
# google-api-core
# google-cloud-firestore
# googleapis-common-protos
# grpcio-status
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via
# -r requirements/edx/kernel.in
# edx-django-utils
@@ -906,6 +920,10 @@ pyasn1==0.6.1
# rsa
pyasn1-modules==0.4.2
# via google-auth
+pycasbin==2.4.0
+ # via
+ # casbin-django-orm-adapter
+ # openedx-authz
pycountry==24.6.1
# via -r requirements/edx/kernel.in
pycparser==2.23
@@ -915,9 +933,9 @@ pycryptodomex==3.23.0
# -r requirements/edx/kernel.in
# edx-proctoring
# lti-consumer-xblock
-pydantic==2.11.10
+pydantic==2.12.3
# via camel-converter
-pydantic-core==2.33.2
+pydantic-core==2.41.4
# via pydantic
pyjwt[crypto]==2.10.1
# via
@@ -1021,15 +1039,15 @@ random2==1.0.2
# via -r requirements/edx/kernel.in
recommender-xblock==3.1.0
# via -r requirements/edx/bundled.in
-redis==6.4.0
+redis==7.0.1
# via
# -r requirements/edx/kernel.in
# walrus
-referencing==0.36.2
+referencing==0.37.0
# via
# jsonschema
# jsonschema-specifications
-regex==2025.9.18
+regex==2025.10.23
# via nltk
requests==2.32.5
# via
@@ -1060,7 +1078,7 @@ requests-oauthlib==2.0.0
# via
# -r requirements/edx/kernel.in
# social-auth-core
-rpds-py==0.27.1
+rpds-py==0.28.0
# via
# jsonschema
# referencing
@@ -1076,12 +1094,14 @@ s3transfer==0.14.0
# via boto3
sailthru-client==2.2.3
# via edx-ace
-scipy==1.16.2
+scipy==1.16.3
# via chem
semantic-version==2.10.0
# via edx-drf-extensions
shapely==2.1.2
# via -r requirements/edx/kernel.in
+simpleeval==1.0.3
+ # via pycasbin
simplejson==3.20.2
# via
# -r requirements/edx/kernel.in
@@ -1123,7 +1143,7 @@ social-auth-app-django==5.4.1
# -c requirements/constraints.txt
# -r requirements/edx/kernel.in
# edx-auth-backends
-social-auth-core==4.7.0
+social-auth-core==4.8.1
# via
# -r requirements/edx/kernel.in
# edx-auth-backends
@@ -1154,7 +1174,7 @@ super-csv==4.1.0
# via edx-bulk-grades
sympy==1.14.0
# via openedx-calc
-testfixtures==9.1.0
+testfixtures==10.0.0
# via edx-enterprise
text-unidecode==1.3
# via python-slugify
@@ -1215,6 +1235,8 @@ voluptuous==0.15.2
# via ora2
walrus==0.9.5
# via edx-event-bus-redis
+wcmatch==10.1
+ # via pycasbin
wcwidth==0.2.14
# via prompt-toolkit
web-fragments==3.1.0
@@ -1236,7 +1258,7 @@ webob==1.8.9
# xblock
wheel==0.45.1
# via django-pipeline
-wrapt==1.17.3
+wrapt==2.0.0
# via -r requirements/edx/kernel.in
xblock[django]==5.2.0
# via
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
index 010306d68c45..92b0c43b73e3 100644
--- a/requirements/edx/coverage.txt
+++ b/requirements/edx/coverage.txt
@@ -6,7 +6,7 @@
#
chardet==5.2.0
# via diff-cover
-coverage==7.10.7
+coverage==7.11.0
# via -r requirements/edx/coverage.in
diff-cover==9.7.1
# via -r requirements/edx/coverage.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 24054476b2aa..3a2a3fa77635 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -46,6 +46,10 @@ aniso8601==10.0.1
# -r requirements/edx/testing.txt
# edx-tincan-py35
# tincan
+annotated-doc==0.0.4
+ # via
+ # -r requirements/edx/testing.txt
+ # fastapi
annotated-types==0.7.0
# via
# -r requirements/edx/doc.txt
@@ -89,6 +93,7 @@ attrs==25.4.0
# edx-ace
# jsonschema
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-learning
# referencing
@@ -122,7 +127,7 @@ billiard==4.2.2
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# celery
-bleach[css]==6.2.0
+bleach[css]==6.3.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -136,7 +141,7 @@ boto==2.49.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-boto3==1.40.46
+boto3==1.40.62
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -144,13 +149,18 @@ boto3==1.40.46
# fs-s3fs
# ora2
# snowflake-connector-python
-botocore==1.40.46
+botocore==1.40.62
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# boto3
# s3transfer
# snowflake-connector-python
+bracex==2.6
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
+ # wcmatch
bridgekeeper==0.9
# via
# -r requirements/edx/doc.txt
@@ -164,18 +174,23 @@ cachecontrol==0.14.3
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# firebase-admin
-cachetools==6.2.0
+cachetools==6.2.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edxval
# google-auth
# tox
-camel-converter[pydantic]==4.0.1
+camel-converter[pydantic]==5.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# meilisearch
+casbin-django-orm-adapter==1.7.0
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
+ # openedx-authz
celery==5.5.3
# via
# -c requirements/constraints.txt
@@ -197,12 +212,11 @@ certifi==2025.10.5
# httpx
# requests
# snowflake-connector-python
-cffi==1.17.1
+cffi==2.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# cryptography
- # pact-python
# pynacl
chardet==5.2.0
# via
@@ -211,7 +225,7 @@ chardet==5.2.0
# diff-cover
# pysrt
# tox
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -275,7 +289,7 @@ colorama==0.4.6
# via
# -r requirements/edx/testing.txt
# tox
-coverage[toml]==7.10.7
+coverage[toml]==7.11.0
# via
# -r requirements/edx/testing.txt
# pytest-cov
@@ -296,7 +310,6 @@ cryptography==45.0.7
# pyjwt
# pyopenssl
# snowflake-connector-python
- # social-auth-core
cssselect==1.3.0
# via
# -r requirements/edx/testing.txt
@@ -330,12 +343,13 @@ distlib==0.4.0
# via
# -r requirements/edx/testing.txt
# virtualenv
-django==4.2.28
+django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
+ # casbin-django-orm-adapter
# django-appconf
# django-autocomplete-light
# django-celery-results
@@ -398,6 +412,7 @@ django==4.2.28
# help-tokens
# jsonfield
# lti-consumer-xblock
+ # openedx-authz
# openedx-django-pyfs
# openedx-django-wiki
# openedx-events
@@ -469,7 +484,7 @@ django-fernet-fields-v2==0.9
# -r requirements/edx/testing.txt
# edx-enterprise
# enterprise-integrated-channels
-django-filter==25.1
+django-filter==25.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -582,14 +597,14 @@ django-storages==1.14.6
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edxval
-django-stubs[compatible-mypy]==5.2.6
+django-stubs[compatible-mypy]==5.2.7
# via
# -c requirements/constraints.txt
# -r requirements/edx/development.in
# djangorestframework-stubs
-django-stubs-ext==5.2.6
+django-stubs-ext==5.2.7
# via django-stubs
-django-user-tasks==3.4.3
+django-user-tasks==3.4.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -624,11 +639,12 @@ djangorestframework==3.16.1
# edx-organizations
# edx-proctoring
# edx-submissions
+ # openedx-authz
# openedx-forum
# openedx-learning
# ora2
# super-csv
-djangorestframework-stubs==3.16.4
+djangorestframework-stubs==3.16.5
# via -r requirements/edx/development.in
djangorestframework-xml==2.0.0
# via
@@ -674,7 +690,8 @@ edx-api-doc-tools==2.1.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-name-affirmation
-edx-auth-backends==4.6.1
+ # openedx-authz
+edx-auth-backends==4.6.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -730,6 +747,7 @@ edx-django-utils==8.0.1
# edx-when
# enterprise-integrated-channels
# event-tracking
+ # openedx-authz
# openedx-events
# ora2
# super-csv
@@ -746,6 +764,7 @@ edx-drf-extensions==10.6.0
# edx-when
# edxval
# enterprise-integrated-channels
+ # openedx-authz
# openedx-learning
edx-enterprise==6.6.5
# via
@@ -791,6 +810,7 @@ edx-opaque-keys[django]==3.0.0
# edx-when
# enterprise-integrated-channels
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-filters
# ora2
@@ -825,7 +845,7 @@ edx-sga==0.26.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-edx-submissions==3.12.0
+edx-submissions==3.12.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -892,20 +912,20 @@ execnet==2.1.1
# pytest-xdist
factory-boy==3.3.3
# via -r requirements/edx/testing.txt
-faker==37.8.0
+faker==37.12.0
# via
# -r requirements/edx/testing.txt
# factory-boy
-fastapi==0.118.0
+fastapi==0.120.2
# via
# -r requirements/edx/testing.txt
# pact-python
-fastavro==1.12.0
+fastavro==1.12.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# openedx-events
-filelock==3.19.1
+filelock==3.20.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -951,7 +971,7 @@ glob2==0.7
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-google-api-core[grpc]==2.25.2
+google-api-core[grpc]==2.28.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -959,7 +979,7 @@ google-api-core[grpc]==2.25.2
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-auth==2.41.1
+google-auth==2.42.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -967,7 +987,7 @@ google-auth==2.41.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-cloud-core==2.4.3
+google-cloud-core==2.5.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -978,7 +998,7 @@ google-cloud-firestore==2.21.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# firebase-admin
-google-cloud-storage==3.4.0
+google-cloud-storage==3.4.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -994,23 +1014,23 @@ google-resumable-media==2.7.2
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# google-cloud-storage
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# google-api-core
# grpcio-status
-grimp==3.11
+grimp==3.13
# via
# -r requirements/edx/testing.txt
# import-linter
-grpcio==1.75.1
+grpcio==1.76.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# google-api-core
# grpcio-status
-grpcio-status==1.75.1
+grpcio-status==1.76.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1065,7 +1085,7 @@ icalendar==6.3.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-idna==3.10
+idna==3.11
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1079,7 +1099,7 @@ imagesize==1.4.1
# via
# -r requirements/edx/doc.txt
# sphinx
-import-linter==2.5
+import-linter==2.5.2
# via -r requirements/edx/testing.txt
importlib-metadata==8.7.0
# via
@@ -1091,11 +1111,11 @@ inflection==0.5.1
# -r requirements/edx/testing.txt
# drf-spectacular
# drf-yasg
-iniconfig==2.1.0
+iniconfig==2.3.0
# via
# -r requirements/edx/testing.txt
# pytest
-invoke==2.2.0
+invoke==2.2.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1192,7 +1212,7 @@ loremipsum==1.0.5
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# ora2
-lti-consumer-xblock==9.14.2
+lti-consumer-xblock==9.14.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1254,7 +1274,7 @@ mccabe==0.7.0
# via
# -r requirements/edx/testing.txt
# pylint
-meilisearch==0.37.0
+meilisearch==0.37.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1284,7 +1304,7 @@ mpmath==1.3.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# sympy
-msgpack==1.1.1
+msgpack==1.1.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1306,7 +1326,7 @@ mysqlclient==2.2.7
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# openedx-forum
-nh3==0.3.0
+nh3==0.3.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1349,7 +1369,12 @@ openedx-atlas==0.7.0
# -r requirements/edx/testing.txt
# edx-enterprise
# enterprise-integrated-channels
+ # openedx-authz
# openedx-forum
+openedx-authz==0.20.0
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
openedx-calc==4.0.2
# via
# -r requirements/edx/doc.txt
@@ -1385,11 +1410,11 @@ openedx-filters==2.1.0
# -r requirements/edx/testing.txt
# lti-consumer-xblock
# ora2
-openedx-forum==0.3.6
+openedx-forum==0.3.8
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-openedx-learning==0.27.1
+openedx-learning==0.30.2
# via
# -c requirements/constraints.txt
# -r requirements/edx/doc.txt
@@ -1398,7 +1423,7 @@ optimizely-sdk==5.2.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-ora2==6.16.4
+ora2==6.17.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1417,7 +1442,7 @@ packaging==25.0
# snowflake-connector-python
# sphinx
# tox
-pact-python==2.3.3
+pact-python==1.6.0
# via
# -c requirements/constraints.txt
# -r requirements/edx/testing.txt
@@ -1455,7 +1480,7 @@ piexif==1.1.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-pillow==11.3.0
+pillow==12.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1464,7 +1489,7 @@ pillow==11.3.0
# edxval
pip-tools==7.5.1
# via -r requirements/pip-tools.txt
-platformdirs==4.4.0
+platformdirs==4.5.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1489,7 +1514,7 @@ prompt-toolkit==3.0.52
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# click-repl
-propcache==0.4.0
+propcache==0.4.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1501,7 +1526,7 @@ proto-plus==1.26.1
# -r requirements/edx/testing.txt
# google-api-core
# google-cloud-firestore
-protobuf==6.32.1
+protobuf==6.33.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1510,7 +1535,7 @@ protobuf==6.32.1
# googleapis-common-protos
# grpcio-status
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1531,6 +1556,12 @@ pyasn1-modules==0.4.2
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# google-auth
+pycasbin==2.4.0
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
+ # casbin-django-orm-adapter
+ # openedx-authz
pycodestyle==2.8.0
# via
# -c requirements/constraints.txt
@@ -1550,13 +1581,13 @@ pycryptodomex==3.23.0
# -r requirements/edx/testing.txt
# edx-proctoring
# lti-consumer-xblock
-pydantic==2.11.10
+pydantic==2.12.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# camel-converter
# fastapi
-pydantic-core==2.33.2
+pydantic-core==2.41.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1654,7 +1685,7 @@ pyparsing==3.2.5
# -r requirements/edx/testing.txt
# chem
# openedx-calc
-pyproject-api==1.9.1
+pyproject-api==1.10.0
# via
# -r requirements/edx/testing.txt
# tox
@@ -1785,18 +1816,18 @@ recommender-xblock==3.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-redis==6.4.0
+redis==7.0.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# walrus
-referencing==0.36.2
+referencing==0.37.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# jsonschema
# jsonschema-specifications
-regex==2025.9.18
+regex==2025.10.23
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1840,7 +1871,7 @@ roman-numerals-py==3.1.0
# via
# -r requirements/edx/doc.txt
# sphinx
-rpds-py==0.27.1
+rpds-py==0.28.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1868,7 +1899,7 @@ sailthru-client==2.2.3
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-ace
-scipy==1.16.2
+scipy==1.16.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1882,6 +1913,11 @@ shapely==2.1.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
+simpleeval==1.0.3
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
+ # pycasbin
simplejson==3.20.2
# via
# -r requirements/edx/doc.txt
@@ -1947,7 +1983,7 @@ social-auth-app-django==5.4.1
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-auth-backends
-social-auth-core==4.7.0
+social-auth-core==4.8.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -2036,7 +2072,7 @@ staff-graded-xblock==3.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-starlette==0.48.0
+starlette==0.49.1
# via
# -r requirements/edx/testing.txt
# fastapi
@@ -2059,7 +2095,7 @@ sympy==1.14.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# openedx-calc
-testfixtures==9.1.0
+testfixtures==10.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -2086,7 +2122,7 @@ tomlkit==0.13.3
# openedx-learning
# pylint
# snowflake-connector-python
-tox==4.30.3
+tox==4.32.0
# via -r requirements/edx/testing.txt
tqdm==4.67.1
# via
@@ -2162,9 +2198,10 @@ urllib3==2.5.0
# -r requirements/edx/testing.txt
# botocore
# elasticsearch
+ # pact-python
# requests
# types-requests
-uvicorn==0.37.0
+uvicorn==0.38.0
# via
# -r requirements/edx/testing.txt
# pact-python
@@ -2175,7 +2212,7 @@ vine==5.1.0
# amqp
# celery
# kombu
-virtualenv==20.34.0
+virtualenv==20.35.4
# via
# -r requirements/edx/testing.txt
# tox
@@ -2193,6 +2230,11 @@ walrus==0.9.5
# edx-event-bus-redis
watchdog==6.0.0
# via -r requirements/edx/development.in
+wcmatch==10.1
+ # via
+ # -r requirements/edx/doc.txt
+ # -r requirements/edx/testing.txt
+ # pycasbin
wcwidth==0.2.14
# via
# -r requirements/edx/doc.txt
@@ -2226,7 +2268,7 @@ wheel==0.45.1
# -r requirements/pip-tools.txt
# django-pipeline
# pip-tools
-wrapt==1.17.3
+wrapt==2.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -2284,7 +2326,6 @@ yarl==1.22.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# aiohttp
- # pact-python
zipp==3.23.0
# via
# -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 8d7576b1dfbd..06b1965fbf28 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -64,6 +64,7 @@ attrs==25.4.0
# edx-ace
# jsonschema
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-learning
# referencing
@@ -92,7 +93,7 @@ billiard==4.2.2
# via
# -r requirements/edx/base.txt
# celery
-bleach[css]==6.2.0
+bleach[css]==6.3.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
@@ -103,34 +104,42 @@ bleach[css]==6.2.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/base.txt
-boto3==1.40.46
+boto3==1.40.62
# via
# -r requirements/edx/base.txt
# django-ses
# fs-s3fs
# ora2
# snowflake-connector-python
-botocore==1.40.46
+botocore==1.40.62
# via
# -r requirements/edx/base.txt
# boto3
# s3transfer
# snowflake-connector-python
+bracex==2.6
+ # via
+ # -r requirements/edx/base.txt
+ # wcmatch
bridgekeeper==0.9
# via -r requirements/edx/base.txt
cachecontrol==0.14.3
# via
# -r requirements/edx/base.txt
# firebase-admin
-cachetools==6.2.0
+cachetools==6.2.1
# via
# -r requirements/edx/base.txt
# edxval
# google-auth
-camel-converter[pydantic]==4.0.1
+camel-converter[pydantic]==5.0.0
# via
# -r requirements/edx/base.txt
# meilisearch
+casbin-django-orm-adapter==1.7.0
+ # via
+ # -r requirements/edx/base.txt
+ # openedx-authz
celery==5.5.3
# via
# -c requirements/constraints.txt
@@ -150,7 +159,7 @@ certifi==2025.10.5
# httpx
# requests
# snowflake-connector-python
-cffi==1.17.1
+cffi==2.0.0
# via
# -r requirements/edx/base.txt
# cryptography
@@ -159,7 +168,7 @@ chardet==5.2.0
# via
# -r requirements/edx/base.txt
# pysrt
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via
# -r requirements/edx/base.txt
# requests
@@ -210,7 +219,6 @@ cryptography==45.0.7
# pyjwt
# pyopenssl
# snowflake-connector-python
- # social-auth-core
cssutils==2.11.1
# via
# -r requirements/edx/base.txt
@@ -224,11 +232,12 @@ defusedxml==0.7.1
# ora2
# python3-openid
# social-auth-core
-django==4.2.28
+django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
+ # casbin-django-orm-adapter
# django-appconf
# django-autocomplete-light
# django-celery-results
@@ -288,6 +297,7 @@ django==4.2.28
# help-tokens
# jsonfield
# lti-consumer-xblock
+ # openedx-authz
# openedx-django-pyfs
# openedx-django-wiki
# openedx-events
@@ -342,7 +352,7 @@ django-fernet-fields-v2==0.9
# -r requirements/edx/base.txt
# edx-enterprise
# enterprise-integrated-channels
-django-filter==25.1
+django-filter==25.2
# via
# -r requirements/edx/base.txt
# edx-enterprise
@@ -432,7 +442,7 @@ django-storages==1.14.6
# via
# -r requirements/edx/base.txt
# edxval
-django-user-tasks==3.4.3
+django-user-tasks==3.4.4
# via -r requirements/edx/base.txt
django-waffle==5.0.0
# via
@@ -462,6 +472,7 @@ djangorestframework==3.16.1
# edx-organizations
# edx-proctoring
# edx-submissions
+ # openedx-authz
# openedx-forum
# openedx-learning
# ora2
@@ -498,7 +509,8 @@ edx-api-doc-tools==2.1.0
# via
# -r requirements/edx/base.txt
# edx-name-affirmation
-edx-auth-backends==4.6.1
+ # openedx-authz
+edx-auth-backends==4.6.2
# via -r requirements/edx/base.txt
edx-bulk-grades==1.2.0
# via
@@ -541,6 +553,7 @@ edx-django-utils==8.0.1
# edx-when
# enterprise-integrated-channels
# event-tracking
+ # openedx-authz
# openedx-events
# ora2
# super-csv
@@ -556,6 +569,7 @@ edx-drf-extensions==10.6.0
# edx-when
# edxval
# enterprise-integrated-channels
+ # openedx-authz
# openedx-learning
edx-enterprise==6.6.5
# via
@@ -588,6 +602,7 @@ edx-opaque-keys[django]==3.0.0
# edx-when
# enterprise-integrated-channels
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-filters
# ora2
@@ -613,7 +628,7 @@ edx-search==4.3.0
# openedx-forum
edx-sga==0.26.0
# via -r requirements/edx/base.txt
-edx-submissions==3.12.0
+edx-submissions==3.12.1
# via
# -r requirements/edx/base.txt
# ora2
@@ -661,11 +676,11 @@ event-tracking==3.3.0
# edx-completion
# edx-proctoring
# edx-search
-fastavro==1.12.0
+fastavro==1.12.1
# via
# -r requirements/edx/base.txt
# openedx-events
-filelock==3.19.1
+filelock==3.20.0
# via
# -r requirements/edx/base.txt
# snowflake-connector-python
@@ -696,21 +711,21 @@ gitpython==3.1.45
# via -r requirements/edx/doc.in
glob2==0.7
# via -r requirements/edx/base.txt
-google-api-core[grpc]==2.25.2
+google-api-core[grpc]==2.28.1
# via
# -r requirements/edx/base.txt
# firebase-admin
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-auth==2.41.1
+google-auth==2.42.0
# via
# -r requirements/edx/base.txt
# google-api-core
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-cloud-core==2.4.3
+google-cloud-core==2.5.0
# via
# -r requirements/edx/base.txt
# google-cloud-firestore
@@ -719,7 +734,7 @@ google-cloud-firestore==2.21.0
# via
# -r requirements/edx/base.txt
# firebase-admin
-google-cloud-storage==3.4.0
+google-cloud-storage==3.4.1
# via
# -r requirements/edx/base.txt
# firebase-admin
@@ -732,17 +747,17 @@ google-resumable-media==2.7.2
# via
# -r requirements/edx/base.txt
# google-cloud-storage
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
-grpcio==1.75.1
+grpcio==1.76.0
# via
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
-grpcio-status==1.75.1
+grpcio-status==1.76.0
# via
# -r requirements/edx/base.txt
# google-api-core
@@ -780,7 +795,7 @@ hyperframe==6.1.0
# h2
icalendar==6.3.1
# via -r requirements/edx/base.txt
-idna==3.10
+idna==3.11
# via
# -r requirements/edx/base.txt
# anyio
@@ -798,7 +813,7 @@ inflection==0.5.1
# -r requirements/edx/base.txt
# drf-spectacular
# drf-yasg
-invoke==2.2.0
+invoke==2.2.1
# via
# -r requirements/edx/base.txt
# paramiko
@@ -869,7 +884,7 @@ loremipsum==1.0.5
# via
# -r requirements/edx/base.txt
# ora2
-lti-consumer-xblock==9.14.2
+lti-consumer-xblock==9.14.3
# via -r requirements/edx/base.txt
lxml[html-clean]==5.3.2
# via
@@ -916,7 +931,7 @@ maxminddb==2.8.2
# via
# -r requirements/edx/base.txt
# geoip2
-meilisearch==0.37.0
+meilisearch==0.37.1
# via
# -r requirements/edx/base.txt
# edx-search
@@ -936,7 +951,7 @@ mpmath==1.3.0
# via
# -r requirements/edx/base.txt
# sympy
-msgpack==1.1.1
+msgpack==1.1.2
# via
# -r requirements/edx/base.txt
# cachecontrol
@@ -949,7 +964,7 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/base.txt
# openedx-forum
-nh3==0.3.0
+nh3==0.3.1
# via
# -r requirements/edx/base.txt
# xblocks-contrib
@@ -982,7 +997,10 @@ openedx-atlas==0.7.0
# -r requirements/edx/base.txt
# edx-enterprise
# enterprise-integrated-channels
+ # openedx-authz
# openedx-forum
+openedx-authz==0.20.0
+ # via -r requirements/edx/base.txt
openedx-calc==4.0.2
# via -r requirements/edx/base.txt
openedx-django-pyfs==3.8.0
@@ -1009,15 +1027,15 @@ openedx-filters==2.1.0
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
-openedx-forum==0.3.6
+openedx-forum==0.3.8
# via -r requirements/edx/base.txt
-openedx-learning==0.27.1
+openedx-learning==0.30.2
# via
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
optimizely-sdk==5.2.0
# via -r requirements/edx/base.txt
-ora2==6.16.4
+ora2==6.17.1
# via -r requirements/edx/base.txt
packaging==25.0
# via
@@ -1052,13 +1070,13 @@ picobox==4.0.0
# via sphinxcontrib-openapi
piexif==1.1.3
# via -r requirements/edx/base.txt
-pillow==11.3.0
+pillow==12.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
# edx-organizations
# edxval
-platformdirs==4.4.0
+platformdirs==4.5.0
# via
# -r requirements/edx/base.txt
# snowflake-connector-python
@@ -1070,7 +1088,7 @@ prompt-toolkit==3.0.52
# via
# -r requirements/edx/base.txt
# click-repl
-propcache==0.4.0
+propcache==0.4.1
# via
# -r requirements/edx/base.txt
# aiohttp
@@ -1080,7 +1098,7 @@ proto-plus==1.26.1
# -r requirements/edx/base.txt
# google-api-core
# google-cloud-firestore
-protobuf==6.32.1
+protobuf==6.33.0
# via
# -r requirements/edx/base.txt
# google-api-core
@@ -1088,7 +1106,7 @@ protobuf==6.32.1
# googleapis-common-protos
# grpcio-status
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via
# -r requirements/edx/base.txt
# edx-django-utils
@@ -1102,6 +1120,11 @@ pyasn1-modules==0.4.2
# via
# -r requirements/edx/base.txt
# google-auth
+pycasbin==2.4.0
+ # via
+ # -r requirements/edx/base.txt
+ # casbin-django-orm-adapter
+ # openedx-authz
pycountry==24.6.1
# via -r requirements/edx/base.txt
pycparser==2.23
@@ -1113,11 +1136,11 @@ pycryptodomex==3.23.0
# -r requirements/edx/base.txt
# edx-proctoring
# lti-consumer-xblock
-pydantic==2.11.10
+pydantic==2.12.3
# via
# -r requirements/edx/base.txt
# camel-converter
-pydantic-core==2.33.2
+pydantic-core==2.41.4
# via
# -r requirements/edx/base.txt
# pydantic
@@ -1247,16 +1270,16 @@ random2==1.0.2
# via -r requirements/edx/base.txt
recommender-xblock==3.1.0
# via -r requirements/edx/base.txt
-redis==6.4.0
+redis==7.0.1
# via
# -r requirements/edx/base.txt
# walrus
-referencing==0.36.2
+referencing==0.37.0
# via
# -r requirements/edx/base.txt
# jsonschema
# jsonschema-specifications
-regex==2025.9.18
+regex==2025.10.23
# via
# -r requirements/edx/base.txt
# nltk
@@ -1293,7 +1316,7 @@ requests-oauthlib==2.0.0
# social-auth-core
roman-numerals-py==3.1.0
# via sphinx
-rpds-py==0.27.1
+rpds-py==0.28.0
# via
# -r requirements/edx/base.txt
# jsonschema
@@ -1316,7 +1339,7 @@ sailthru-client==2.2.3
# via
# -r requirements/edx/base.txt
# edx-ace
-scipy==1.16.2
+scipy==1.16.3
# via
# -r requirements/edx/base.txt
# chem
@@ -1326,6 +1349,10 @@ semantic-version==2.10.0
# edx-drf-extensions
shapely==2.1.2
# via -r requirements/edx/base.txt
+simpleeval==1.0.3
+ # via
+ # -r requirements/edx/base.txt
+ # pycasbin
simplejson==3.20.2
# via
# -r requirements/edx/base.txt
@@ -1375,7 +1402,7 @@ social-auth-app-django==5.4.1
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
# edx-auth-backends
-social-auth-core==4.7.0
+social-auth-core==4.8.1
# via
# -r requirements/edx/base.txt
# edx-auth-backends
@@ -1456,7 +1483,7 @@ sympy==1.14.0
# via
# -r requirements/edx/base.txt
# openedx-calc
-testfixtures==9.1.0
+testfixtures==10.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
@@ -1540,6 +1567,10 @@ walrus==0.9.5
# via
# -r requirements/edx/base.txt
# edx-event-bus-redis
+wcmatch==10.1
+ # via
+ # -r requirements/edx/base.txt
+ # pycasbin
wcwidth==0.2.14
# via
# -r requirements/edx/base.txt
@@ -1566,7 +1597,7 @@ wheel==0.45.1
# via
# -r requirements/edx/base.txt
# django-pipeline
-wrapt==1.17.3
+wrapt==2.0.0
# via -r requirements/edx/base.txt
xblock[django]==5.2.0
# via
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index 2b043f71dd79..de2667f28438 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -161,3 +161,4 @@ wrapt # Better functools.wrapped. TODO: functools
XBlock[django] # Courseware component architecture
xss-utils # https://github.com/openedx/edx-platform/pull/20633 Fix XSS via Translations
unicodeit # Converts mathjax equation to plain text by using unicode symbols
+openedx-authz # Authorization Framework for the Open edX Ecosystem
diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt
index 6adeb975ef01..2a779f3cfab0 100644
--- a/requirements/edx/semgrep.txt
+++ b/requirements/edx/semgrep.txt
@@ -30,26 +30,24 @@ certifi==2025.10.5
# httpcore
# httpx
# requests
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via requests
click==8.1.8
# via
# click-option-group
# semgrep
# uvicorn
-click-option-group==0.5.8
+click-option-group==0.5.9
# via semgrep
colorama==0.4.6
# via semgrep
-defusedxml==0.7.1
- # via semgrep
exceptiongroup==1.2.2
# via semgrep
face==24.0.0
# via glom
glom==22.1.0
# via semgrep
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via opentelemetry-exporter-otlp-proto-http
h11==0.16.0
# via
@@ -59,16 +57,16 @@ httpcore==1.0.9
# via httpx
httpx==0.28.1
# via mcp
-httpx-sse==0.4.1
+httpx-sse==0.4.3
# via mcp
-idna==3.10
+idna==3.11
# via
# anyio
# httpx
# requests
importlib-metadata==8.7.0
# via opentelemetry-api
-jsonschema==4.20.0
+jsonschema==4.25.1
# via
# mcp
# semgrep
@@ -76,7 +74,7 @@ jsonschema-specifications==2025.9.1
# via jsonschema
markdown-it-py==4.0.0
# via rich
-mcp==1.12.2
+mcp==1.16.0
# via semgrep
mdurl==0.1.2
# via markdown-it-py
@@ -117,25 +115,25 @@ packaging==25.0
# semgrep
peewee==3.18.2
# via semgrep
-protobuf==6.32.1
+protobuf==6.33.0
# via
# googleapis-common-protos
# opentelemetry-proto
-pydantic==2.11.10
+pydantic==2.12.3
# via
# mcp
# pydantic-settings
-pydantic-core==2.33.2
+pydantic-core==2.41.4
# via pydantic
pydantic-settings==2.11.0
# via mcp
pygments==2.19.2
# via rich
-python-dotenv==1.1.1
+python-dotenv==1.2.1
# via pydantic-settings
python-multipart==0.0.20
# via mcp
-referencing==0.36.2
+referencing==0.37.0
# via
# jsonschema
# jsonschema-specifications
@@ -145,23 +143,23 @@ requests==2.32.5
# semgrep
rich==13.5.3
# via semgrep
-rpds-py==0.27.1
+rpds-py==0.28.0
# via
# jsonschema
# referencing
-ruamel-yaml==0.18.15
+ruamel-yaml==0.18.16
# via semgrep
-ruamel-yaml-clib==0.2.12
+ruamel-yaml-clib==0.2.14
# via
# ruamel-yaml
# semgrep
-semgrep==1.139.0
+semgrep==1.141.1
# via -r requirements/edx/semgrep.in
sniffio==1.3.1
# via anyio
sse-starlette==3.0.2
# via mcp
-starlette==0.48.0
+starlette==0.49.1
# via mcp
tomli==2.0.2
# via semgrep
@@ -186,7 +184,7 @@ urllib3==2.5.0
# via
# requests
# semgrep
-uvicorn==0.37.0
+uvicorn==0.38.0
# via mcp
wcmatch==8.5.2
# via semgrep
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 238fde4e137a..9d51cbffa80a 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -29,6 +29,8 @@ aniso8601==10.0.1
# -r requirements/edx/base.txt
# edx-tincan-py35
# tincan
+annotated-doc==0.0.4
+ # via fastapi
annotated-types==0.7.0
# via
# -r requirements/edx/base.txt
@@ -63,6 +65,7 @@ attrs==25.4.0
# edx-ace
# jsonschema
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-learning
# referencing
@@ -89,7 +92,7 @@ billiard==4.2.2
# via
# -r requirements/edx/base.txt
# celery
-bleach[css]==6.2.0
+bleach[css]==6.3.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
@@ -100,35 +103,43 @@ bleach[css]==6.2.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/base.txt
-boto3==1.40.46
+boto3==1.40.62
# via
# -r requirements/edx/base.txt
# django-ses
# fs-s3fs
# ora2
# snowflake-connector-python
-botocore==1.40.46
+botocore==1.40.62
# via
# -r requirements/edx/base.txt
# boto3
# s3transfer
# snowflake-connector-python
+bracex==2.6
+ # via
+ # -r requirements/edx/base.txt
+ # wcmatch
bridgekeeper==0.9
# via -r requirements/edx/base.txt
cachecontrol==0.14.3
# via
# -r requirements/edx/base.txt
# firebase-admin
-cachetools==6.2.0
+cachetools==6.2.1
# via
# -r requirements/edx/base.txt
# edxval
# google-auth
# tox
-camel-converter[pydantic]==4.0.1
+camel-converter[pydantic]==5.0.0
# via
# -r requirements/edx/base.txt
# meilisearch
+casbin-django-orm-adapter==1.7.0
+ # via
+ # -r requirements/edx/base.txt
+ # openedx-authz
celery==5.5.3
# via
# -c requirements/constraints.txt
@@ -148,11 +159,10 @@ certifi==2025.10.5
# httpx
# requests
# snowflake-connector-python
-cffi==1.17.1
+cffi==2.0.0
# via
# -r requirements/edx/base.txt
# cryptography
- # pact-python
# pynacl
chardet==5.2.0
# via
@@ -161,7 +171,7 @@ chardet==5.2.0
# diff-cover
# pysrt
# tox
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via
# -r requirements/edx/base.txt
# requests
@@ -208,7 +218,7 @@ codejail-includes==2.0.0
# via -r requirements/edx/base.txt
colorama==0.4.6
# via tox
-coverage[toml]==7.10.7
+coverage[toml]==7.11.0
# via
# -r requirements/edx/coverage.txt
# pytest-cov
@@ -226,7 +236,6 @@ cryptography==45.0.7
# pyjwt
# pyopenssl
# snowflake-connector-python
- # social-auth-core
cssselect==1.3.0
# via
# -r requirements/edx/testing.in
@@ -250,11 +259,12 @@ dill==0.4.0
# via pylint
distlib==0.4.0
# via virtualenv
-django==4.2.28
+django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
+ # casbin-django-orm-adapter
# django-appconf
# django-autocomplete-light
# django-celery-results
@@ -314,6 +324,7 @@ django==4.2.28
# help-tokens
# jsonfield
# lti-consumer-xblock
+ # openedx-authz
# openedx-django-pyfs
# openedx-django-wiki
# openedx-events
@@ -368,7 +379,7 @@ django-fernet-fields-v2==0.9
# -r requirements/edx/base.txt
# edx-enterprise
# enterprise-integrated-channels
-django-filter==25.1
+django-filter==25.2
# via
# -r requirements/edx/base.txt
# edx-enterprise
@@ -458,7 +469,7 @@ django-storages==1.14.6
# via
# -r requirements/edx/base.txt
# edxval
-django-user-tasks==3.4.3
+django-user-tasks==3.4.4
# via -r requirements/edx/base.txt
django-waffle==5.0.0
# via
@@ -488,6 +499,7 @@ djangorestframework==3.16.1
# edx-organizations
# edx-proctoring
# edx-submissions
+ # openedx-authz
# openedx-forum
# openedx-learning
# ora2
@@ -519,7 +531,8 @@ edx-api-doc-tools==2.1.0
# via
# -r requirements/edx/base.txt
# edx-name-affirmation
-edx-auth-backends==4.6.1
+ # openedx-authz
+edx-auth-backends==4.6.2
# via -r requirements/edx/base.txt
edx-bulk-grades==1.2.0
# via
@@ -562,6 +575,7 @@ edx-django-utils==8.0.1
# edx-when
# enterprise-integrated-channels
# event-tracking
+ # openedx-authz
# openedx-events
# ora2
# super-csv
@@ -577,6 +591,7 @@ edx-drf-extensions==10.6.0
# edx-when
# edxval
# enterprise-integrated-channels
+ # openedx-authz
# openedx-learning
edx-enterprise==6.6.5
# via
@@ -611,6 +626,7 @@ edx-opaque-keys[django]==3.0.0
# edx-when
# enterprise-integrated-channels
# lti-consumer-xblock
+ # openedx-authz
# openedx-events
# openedx-filters
# ora2
@@ -636,7 +652,7 @@ edx-search==4.3.0
# openedx-forum
edx-sga==0.26.0
# via -r requirements/edx/base.txt
-edx-submissions==3.12.0
+edx-submissions==3.12.1
# via
# -r requirements/edx/base.txt
# ora2
@@ -688,15 +704,15 @@ execnet==2.1.1
# via pytest-xdist
factory-boy==3.3.3
# via -r requirements/edx/testing.in
-faker==37.8.0
+faker==37.12.0
# via factory-boy
-fastapi==0.118.0
+fastapi==0.120.2
# via pact-python
-fastavro==1.12.0
+fastavro==1.12.1
# via
# -r requirements/edx/base.txt
# openedx-events
-filelock==3.19.1
+filelock==3.20.0
# via
# -r requirements/edx/base.txt
# snowflake-connector-python
@@ -727,21 +743,21 @@ geoip2==5.1.0
# via -r requirements/edx/base.txt
glob2==0.7
# via -r requirements/edx/base.txt
-google-api-core[grpc]==2.25.2
+google-api-core[grpc]==2.28.1
# via
# -r requirements/edx/base.txt
# firebase-admin
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-auth==2.41.1
+google-auth==2.42.0
# via
# -r requirements/edx/base.txt
# google-api-core
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
-google-cloud-core==2.4.3
+google-cloud-core==2.5.0
# via
# -r requirements/edx/base.txt
# google-cloud-firestore
@@ -750,7 +766,7 @@ google-cloud-firestore==2.21.0
# via
# -r requirements/edx/base.txt
# firebase-admin
-google-cloud-storage==3.4.0
+google-cloud-storage==3.4.1
# via
# -r requirements/edx/base.txt
# firebase-admin
@@ -763,19 +779,19 @@ google-resumable-media==2.7.2
# via
# -r requirements/edx/base.txt
# google-cloud-storage
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
-grimp==3.11
+grimp==3.13
# via import-linter
-grpcio==1.75.1
+grpcio==1.76.0
# via
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
-grpcio-status==1.75.1
+grpcio-status==1.76.0
# via
# -r requirements/edx/base.txt
# google-api-core
@@ -816,7 +832,7 @@ hyperframe==6.1.0
# h2
icalendar==6.3.1
# via -r requirements/edx/base.txt
-idna==3.10
+idna==3.11
# via
# -r requirements/edx/base.txt
# anyio
@@ -825,7 +841,7 @@ idna==3.10
# requests
# snowflake-connector-python
# yarl
-import-linter==2.5
+import-linter==2.5.2
# via -r requirements/edx/testing.in
importlib-metadata==8.7.0
# via -r requirements/edx/base.txt
@@ -834,9 +850,9 @@ inflection==0.5.1
# -r requirements/edx/base.txt
# drf-spectacular
# drf-yasg
-iniconfig==2.1.0
+iniconfig==2.3.0
# via pytest
-invoke==2.2.0
+invoke==2.2.1
# via
# -r requirements/edx/base.txt
# paramiko
@@ -910,7 +926,7 @@ loremipsum==1.0.5
# via
# -r requirements/edx/base.txt
# ora2
-lti-consumer-xblock==9.14.2
+lti-consumer-xblock==9.14.3
# via -r requirements/edx/base.txt
lxml[html-clean]==5.3.2
# via
@@ -961,7 +977,7 @@ maxminddb==2.8.2
# geoip2
mccabe==0.7.0
# via pylint
-meilisearch==0.37.0
+meilisearch==0.37.1
# via
# -r requirements/edx/base.txt
# edx-search
@@ -981,7 +997,7 @@ mpmath==1.3.0
# via
# -r requirements/edx/base.txt
# sympy
-msgpack==1.1.1
+msgpack==1.1.2
# via
# -r requirements/edx/base.txt
# cachecontrol
@@ -994,7 +1010,7 @@ mysqlclient==2.2.7
# via
# -r requirements/edx/base.txt
# openedx-forum
-nh3==0.3.0
+nh3==0.3.1
# via
# -r requirements/edx/base.txt
# xblocks-contrib
@@ -1027,7 +1043,10 @@ openedx-atlas==0.7.0
# -r requirements/edx/base.txt
# edx-enterprise
# enterprise-integrated-channels
+ # openedx-authz
# openedx-forum
+openedx-authz==0.20.0
+ # via -r requirements/edx/base.txt
openedx-calc==4.0.2
# via -r requirements/edx/base.txt
openedx-django-pyfs==3.8.0
@@ -1054,15 +1073,15 @@ openedx-filters==2.1.0
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
-openedx-forum==0.3.6
+openedx-forum==0.3.8
# via -r requirements/edx/base.txt
-openedx-learning==0.27.1
+openedx-learning==0.30.2
# via
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
optimizely-sdk==5.2.0
# via -r requirements/edx/base.txt
-ora2==6.16.4
+ora2==6.17.1
# via -r requirements/edx/base.txt
packaging==25.0
# via
@@ -1074,7 +1093,7 @@ packaging==25.0
# pytest
# snowflake-connector-python
# tox
-pact-python==2.3.3
+pact-python==1.6.0
# via
# -c requirements/constraints.txt
# -r requirements/edx/testing.in
@@ -1100,13 +1119,13 @@ pgpy==0.6.0
# edx-enterprise
piexif==1.1.3
# via -r requirements/edx/base.txt
-pillow==11.3.0
+pillow==12.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
# edx-organizations
# edxval
-platformdirs==4.4.0
+platformdirs==4.5.0
# via
# -r requirements/edx/base.txt
# pylint
@@ -1129,7 +1148,7 @@ prompt-toolkit==3.0.52
# via
# -r requirements/edx/base.txt
# click-repl
-propcache==0.4.0
+propcache==0.4.1
# via
# -r requirements/edx/base.txt
# aiohttp
@@ -1139,7 +1158,7 @@ proto-plus==1.26.1
# -r requirements/edx/base.txt
# google-api-core
# google-cloud-firestore
-protobuf==6.32.1
+protobuf==6.33.0
# via
# -r requirements/edx/base.txt
# google-api-core
@@ -1147,7 +1166,7 @@ protobuf==6.32.1
# googleapis-common-protos
# grpcio-status
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via
# -r requirements/edx/base.txt
# edx-django-utils
@@ -1165,6 +1184,11 @@ pyasn1-modules==0.4.2
# via
# -r requirements/edx/base.txt
# google-auth
+pycasbin==2.4.0
+ # via
+ # -r requirements/edx/base.txt
+ # casbin-django-orm-adapter
+ # openedx-authz
pycodestyle==2.8.0
# via
# -c requirements/constraints.txt
@@ -1180,12 +1204,12 @@ pycryptodomex==3.23.0
# -r requirements/edx/base.txt
# edx-proctoring
# lti-consumer-xblock
-pydantic==2.11.10
+pydantic==2.12.3
# via
# -r requirements/edx/base.txt
# camel-converter
# fastapi
-pydantic-core==2.33.2
+pydantic-core==2.41.4
# via
# -r requirements/edx/base.txt
# pydantic
@@ -1255,7 +1279,7 @@ pyparsing==3.2.5
# -r requirements/edx/base.txt
# chem
# openedx-calc
-pyproject-api==1.9.1
+pyproject-api==1.10.0
# via tox
pyquery==2.0.1
# via -r requirements/edx/testing.in
@@ -1358,16 +1382,16 @@ random2==1.0.2
# via -r requirements/edx/base.txt
recommender-xblock==3.1.0
# via -r requirements/edx/base.txt
-redis==6.4.0
+redis==7.0.1
# via
# -r requirements/edx/base.txt
# walrus
-referencing==0.36.2
+referencing==0.37.0
# via
# -r requirements/edx/base.txt
# jsonschema
# jsonschema-specifications
-regex==2025.9.18
+regex==2025.10.23
# via
# -r requirements/edx/base.txt
# nltk
@@ -1402,7 +1426,7 @@ requests-oauthlib==2.0.0
# via
# -r requirements/edx/base.txt
# social-auth-core
-rpds-py==0.27.1
+rpds-py==0.28.0
# via
# -r requirements/edx/base.txt
# jsonschema
@@ -1425,7 +1449,7 @@ sailthru-client==2.2.3
# via
# -r requirements/edx/base.txt
# edx-ace
-scipy==1.16.2
+scipy==1.16.3
# via
# -r requirements/edx/base.txt
# chem
@@ -1435,6 +1459,10 @@ semantic-version==2.10.0
# edx-drf-extensions
shapely==2.1.2
# via -r requirements/edx/base.txt
+simpleeval==1.0.3
+ # via
+ # -r requirements/edx/base.txt
+ # pycasbin
simplejson==3.20.2
# via
# -r requirements/edx/base.txt
@@ -1483,7 +1511,7 @@ social-auth-app-django==5.4.1
# -c requirements/constraints.txt
# -r requirements/edx/base.txt
# edx-auth-backends
-social-auth-core==4.7.0
+social-auth-core==4.8.1
# via
# -r requirements/edx/base.txt
# edx-auth-backends
@@ -1506,7 +1534,7 @@ sqlparse==0.5.3
# django
staff-graded-xblock==3.1.0
# via -r requirements/edx/base.txt
-starlette==0.48.0
+starlette==0.49.1
# via fastapi
stevedore==5.5.0
# via
@@ -1524,7 +1552,7 @@ sympy==1.14.0
# via
# -r requirements/edx/base.txt
# openedx-calc
-testfixtures==9.1.0
+testfixtures==10.0.0
# via
# -r requirements/edx/base.txt
# -r requirements/edx/testing.in
@@ -1547,7 +1575,7 @@ tomlkit==0.13.3
# openedx-learning
# pylint
# snowflake-connector-python
-tox==4.30.3
+tox==4.32.0
# via -r requirements/edx/testing.in
tqdm==4.67.1
# via
@@ -1603,8 +1631,9 @@ urllib3==2.5.0
# -r requirements/edx/base.txt
# botocore
# elasticsearch
+ # pact-python
# requests
-uvicorn==0.37.0
+uvicorn==0.38.0
# via pact-python
vine==5.1.0
# via
@@ -1612,7 +1641,7 @@ vine==5.1.0
# amqp
# celery
# kombu
-virtualenv==20.34.0
+virtualenv==20.35.4
# via tox
voluptuous==0.15.2
# via
@@ -1622,6 +1651,10 @@ walrus==0.9.5
# via
# -r requirements/edx/base.txt
# edx-event-bus-redis
+wcmatch==10.1
+ # via
+ # -r requirements/edx/base.txt
+ # pycasbin
wcwidth==0.2.14
# via
# -r requirements/edx/base.txt
@@ -1648,7 +1681,7 @@ wheel==0.45.1
# via
# -r requirements/edx/base.txt
# django-pipeline
-wrapt==1.17.3
+wrapt==2.0.0
# via -r requirements/edx/base.txt
xblock[django]==5.2.0
# via
@@ -1690,7 +1723,6 @@ yarl==1.22.0
# via
# -r requirements/edx/base.txt
# aiohttp
- # pact-python
zipp==3.23.0
# via
# -r requirements/edx/base.txt
diff --git a/requirements/pip.txt b/requirements/pip.txt
index dec15874f740..c6158d38e981 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -9,6 +9,8 @@ wheel==0.45.1
# The following packages are considered to be unsafe in a requirements file:
pip==25.2
- # via -r requirements/pip.in
+ # via
+ # -c requirements/common_constraints.txt
+ # -r requirements/pip.in
setuptools==80.9.0
# via -r requirements/pip.in
diff --git a/scripts/copy-node-modules.sh b/scripts/copy-node-modules.sh
index 16b38fc8fe59..0f5ae655401c 100755
--- a/scripts/copy-node-modules.sh
+++ b/scripts/copy-node-modules.sh
@@ -42,15 +42,6 @@ log "Ensuring vendor directories exist..."
log_and_run mkdir -p "$vendor_js"
log_and_run mkdir -p "$vendor_css"
-log "Copying studio-frontend JS & CSS from node_modules into vendor directores..."
-while read -r -d $'\0' src_file ; do
- if [[ "$src_file" = *.css ]] || [[ "$src_file" = *.css.map ]] ; then
- log_and_run cp --force "$src_file" "$vendor_css"
- else
- log_and_run cp --force "$src_file" "$vendor_js"
- fi
-done < <(find "$node_modules/@edx/studio-frontend/dist" -type f -print0)
-
log "Copying certain JS modules from node_modules into vendor directory..."
log_and_run cp --force \
"$node_modules/backbone.paginator/lib/backbone.paginator.js" \
diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt
index 1b387d33c4d9..e5ce8b2a8133 100644
--- a/scripts/structures_pruning/requirements/testing.txt
+++ b/scripts/structures_pruning/requirements/testing.txt
@@ -18,7 +18,7 @@ dnspython==2.8.0
# pymongo
edx-opaque-keys==3.0.0
# via -r scripts/structures_pruning/requirements/base.txt
-iniconfig==2.1.0
+iniconfig==2.3.0
# via pytest
packaging==25.0
# via pytest
diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt
index fc887f27d165..b726b8a49f40 100644
--- a/scripts/user_retirement/requirements/base.txt
+++ b/scripts/user_retirement/requirements/base.txt
@@ -10,13 +10,13 @@ attrs==25.4.0
# via zeep
backoff==2.2.1
# via -r scripts/user_retirement/requirements/base.in
-boto3==1.40.46
+boto3==1.40.62
# via -r scripts/user_retirement/requirements/base.in
-botocore==1.40.46
+botocore==1.40.62
# via
# boto3
# s3transfer
-cachetools==6.2.0
+cachetools==6.2.1
# via google-auth
certifi==2025.10.5
# via requests
@@ -24,7 +24,7 @@ cffi==2.0.0
# via
# cryptography
# pynacl
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via requests
click==8.3.0
# via
@@ -34,7 +34,7 @@ cryptography==45.0.7
# via
# -c requirements/constraints.txt
# pyjwt
-django==4.2.28
+django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
@@ -49,24 +49,24 @@ edx-django-utils==8.0.1
# via edx-rest-api-client
edx-rest-api-client==6.2.0
# via -r scripts/user_retirement/requirements/base.in
-google-api-core==2.25.2
+google-api-core==2.28.1
# via google-api-python-client
-google-api-python-client==2.184.0
+google-api-python-client==2.185.0
# via -r scripts/user_retirement/requirements/base.in
-google-auth==2.41.1
+google-auth==2.42.0
# via
# google-api-core
# google-api-python-client
# google-auth-httplib2
google-auth-httplib2==0.2.0
# via google-api-python-client
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via google-api-core
httplib2==0.31.0
# via
# google-api-python-client
# google-auth-httplib2
-idna==3.10
+idna==3.11
# via requests
isodate==0.7.2
# via zeep
@@ -82,16 +82,16 @@ lxml==5.3.2
# zeep
more-itertools==10.8.0
# via simple-salesforce
-platformdirs==4.4.0
+platformdirs==4.5.0
# via zeep
proto-plus==1.26.1
# via google-api-core
-protobuf==6.32.1
+protobuf==6.33.0
# via
# google-api-core
# googleapis-common-protos
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via edx-django-utils
pyasn1==0.6.1
# via
@@ -127,7 +127,7 @@ requests==2.32.5
# requests-toolbelt
# simple-salesforce
# zeep
-requests-file==2.1.0
+requests-file==3.0.1
# via zeep
requests-toolbelt==1.0.0
# via zeep
diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt
index 1c37620093ed..3299e4f8fd78 100644
--- a/scripts/user_retirement/requirements/testing.txt
+++ b/scripts/user_retirement/requirements/testing.txt
@@ -14,17 +14,17 @@ attrs==25.4.0
# zeep
backoff==2.2.1
# via -r scripts/user_retirement/requirements/base.txt
-boto3==1.40.46
+boto3==1.40.62
# via
# -r scripts/user_retirement/requirements/base.txt
# moto
-botocore==1.40.46
+botocore==1.40.62
# via
# -r scripts/user_retirement/requirements/base.txt
# boto3
# moto
# s3transfer
-cachetools==6.2.0
+cachetools==6.2.1
# via
# -r scripts/user_retirement/requirements/base.txt
# google-auth
@@ -37,7 +37,7 @@ cffi==2.0.0
# -r scripts/user_retirement/requirements/base.txt
# cryptography
# pynacl
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via
# -r scripts/user_retirement/requirements/base.txt
# requests
@@ -52,7 +52,7 @@ cryptography==45.0.7
# pyjwt
ddt==1.7.2
# via -r scripts/user_retirement/requirements/testing.in
-django==4.2.28
+django==5.2.7
# via
# -r scripts/user_retirement/requirements/base.txt
# django-crum
@@ -72,13 +72,13 @@ edx-django-utils==8.0.1
# edx-rest-api-client
edx-rest-api-client==6.2.0
# via -r scripts/user_retirement/requirements/base.txt
-google-api-core==2.25.2
+google-api-core==2.28.1
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-python-client
-google-api-python-client==2.184.0
+google-api-python-client==2.185.0
# via -r scripts/user_retirement/requirements/base.txt
-google-auth==2.41.1
+google-auth==2.42.0
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-core
@@ -88,7 +88,7 @@ google-auth-httplib2==0.2.0
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-python-client
-googleapis-common-protos==1.70.0
+googleapis-common-protos==1.71.0
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-core
@@ -97,11 +97,11 @@ httplib2==0.31.0
# -r scripts/user_retirement/requirements/base.txt
# google-api-python-client
# google-auth-httplib2
-idna==3.10
+idna==3.11
# via
# -r scripts/user_retirement/requirements/base.txt
# requests
-iniconfig==2.1.0
+iniconfig==2.3.0
# via pytest
isodate==0.7.2
# via
@@ -130,11 +130,11 @@ more-itertools==10.8.0
# via
# -r scripts/user_retirement/requirements/base.txt
# simple-salesforce
-moto==5.1.14
+moto==5.1.15
# via -r scripts/user_retirement/requirements/testing.in
packaging==25.0
# via pytest
-platformdirs==4.4.0
+platformdirs==4.5.0
# via
# -r scripts/user_retirement/requirements/base.txt
# zeep
@@ -144,13 +144,13 @@ proto-plus==1.26.1
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-core
-protobuf==6.32.1
+protobuf==6.33.0
# via
# -r scripts/user_retirement/requirements/base.txt
# google-api-core
# googleapis-common-protos
# proto-plus
-psutil==7.1.0
+psutil==7.1.2
# via
# -r scripts/user_retirement/requirements/base.txt
# edx-django-utils
@@ -211,7 +211,7 @@ requests==2.32.5
# responses
# simple-salesforce
# zeep
-requests-file==2.1.0
+requests-file==3.0.1
# via
# -r scripts/user_retirement/requirements/base.txt
# zeep
diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
index 23d2ac5b8eed..533cd92824e4 100644
--- a/scripts/xblock/requirements.txt
+++ b/scripts/xblock/requirements.txt
@@ -6,9 +6,9 @@
#
certifi==2025.10.5
# via requests
-charset-normalizer==3.4.3
+charset-normalizer==3.4.4
# via requests
-idna==3.10
+idna==3.11
# via requests
requests==2.32.5
# via -r scripts/xblock/requirements.in
diff --git a/scripts/xsslint/tests/test_linters.py b/scripts/xsslint/tests/test_linters.py
index 1c1589416172..2aba52ed78d7 100644
--- a/scripts/xsslint/tests/test_linters.py
+++ b/scripts/xsslint/tests/test_linters.py
@@ -1244,22 +1244,16 @@ def test_check_mako_expressions_in_mixed_contexts(self):
${x | h}
${x | h}
- <%static:studiofrontend page="${x}">
- ${x | h}
-
- ${x | h}
""")
linter._check_mako_file_is_safe(mako_template, results)
- assert len(results.violations) == 7
+ assert len(results.violations) == 5
assert results.violations[0].rule == MAKO_LINTER_RULESET.mako_unwanted_html_filter
assert results.violations[1].rule == MAKO_LINTER_RULESET.mako_invalid_js_filter
assert results.violations[2].rule == MAKO_LINTER_RULESET.mako_unwanted_html_filter
assert results.violations[3].rule == MAKO_LINTER_RULESET.mako_invalid_js_filter
assert results.violations[4].rule == MAKO_LINTER_RULESET.mako_unwanted_html_filter
- assert results.violations[5].rule == MAKO_LINTER_RULESET.mako_invalid_js_filter
- assert results.violations[6].rule == MAKO_LINTER_RULESET.mako_unwanted_html_filter
def test_check_mako_expressions_javascript_strings(self):
"""
diff --git a/scripts/xsslint/xsslint/linters.py b/scripts/xsslint/xsslint/linters.py
index a73e805dac8e..911c50a34f9c 100644
--- a/scripts/xsslint/xsslint/linters.py
+++ b/scripts/xsslint/xsslint/linters.py
@@ -1359,8 +1359,6 @@ def _get_contexts(self, mako_template):
| # require js script tag end (optionally the _async version)
<%static:webpack.*(? | # webpack script tag start
| # webpack script tag end
- <%static:studiofrontend.*?(? | # studiofrontend script tag start
- | # studiofrontend script tag end
<%block[ ]*name=['"]requirejs['"]\w*(? | # require js tag start
# require js tag end
""",
diff --git a/setup.cfg b/setup.cfg
index e4419bd149a9..06aea046d413 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -166,6 +166,7 @@ ignore_imports =
name = Do not depend on non-public API of isolated apps.
type = isolated_apps
isolated_apps =
+ cms.djangoapps.modulestore_migrator
openedx.core.djangoapps.agreements
openedx.core.djangoapps.bookmarks
openedx.core.djangoapps.content_libraries
diff --git a/setup.py b/setup.py
index 5b9f020ac3c5..eeb7b79f534d 100644
--- a/setup.py
+++ b/setup.py
@@ -139,7 +139,6 @@
],
"lms.djangoapp": [
"ace_common = openedx.core.djangoapps.ace_common.apps:AceCommonConfig",
- "announcements = openedx.features.announcements.apps:AnnouncementsConfig",
"content_libraries = openedx.core.djangoapps.content_libraries.apps:ContentLibrariesConfig",
"course_apps = openedx.core.djangoapps.course_apps.apps:CourseAppsConfig",
"course_live = openedx.core.djangoapps.course_live.apps:CourseLiveConfig",
@@ -158,7 +157,6 @@
"program_enrollments = lms.djangoapps.program_enrollments.apps:ProgramEnrollmentsConfig",
],
"cms.djangoapp": [
- "announcements = openedx.features.announcements.apps:AnnouncementsConfig",
"ace_common = openedx.core.djangoapps.ace_common.apps:AceCommonConfig",
"bookmarks = openedx.core.djangoapps.bookmarks.apps:BookmarksConfig",
"course_live = openedx.core.djangoapps.course_live.apps:CourseLiveConfig",
diff --git a/webpack.builtinblocks.config.js b/webpack.builtinblocks.config.js
index 1c5a9b1e0e9d..c0f2fdaeb4fa 100644
--- a/webpack.builtinblocks.config.js
+++ b/webpack.builtinblocks.config.js
@@ -79,14 +79,13 @@ module.exports = {
'./xmodule/js/src/xmodule.js',
'./xmodule/js/src/sequence/edit.js'
],
- VideoBlockDisplay: [
- './xmodule/js/src/xmodule.js',
- './xmodule/js/src/video/10_main.js'
- ],
VideoBlockEditor: [
'./xmodule/js/src/xmodule.js',
'./xmodule/js/src/tabs/tabs-aggregator.js'
],
+ VideoBlockDisplay: [
+ './xmodule/assets/video/public/js/10_main.js'
+ ],
WordCloudBlockDisplay: [
'./xmodule/js/src/xmodule.js',
'./xmodule/assets/word_cloud/src/js/word_cloud.js'
diff --git a/webpack.common.config.js b/webpack.common.config.js
index 36ac75708c23..ac283c3d40d8 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -134,7 +134,6 @@ module.exports = Merge.merge({
// Features
Currency: './openedx/features/course_experience/static/course_experience/js/currency.js',
- AnnouncementsView: './openedx/features/announcements/static/announcements/jsx/Announcements.jsx',
CookiePolicyBanner: './common/static/js/src/CookiePolicyBanner.jsx',
// Common
@@ -505,15 +504,6 @@ module.exports = Merge.merge({
}
]
},
- {
- test: /xmodule\/js\/src\/video\/10_main.js/,
- use: [
- {
- loader: 'imports-loader',
- options: 'this=>window'
- }
- ]
- },
/*
* END BUILT-IN XBLOCK ASSETS WITH GLOBAL DEFINITIONS
***************************************************************************************************** */
@@ -680,9 +670,11 @@ module.exports = Merge.merge({
$: 'jQuery',
backbone: 'Backbone',
canvas: 'canvas',
+ fs: 'fs',
gettext: 'gettext',
jquery: 'jQuery',
logger: 'Logger',
+ path: 'path',
underscore: '_',
URI: 'URI',
XBlockToXModuleShim: 'XBlockToXModuleShim',
diff --git a/xmodule/assets/library_content/public/js/library_content_edit.js b/xmodule/assets/library_content/public/js/library_content_edit.js
index fea66e266120..8dba248ca0dc 100644
--- a/xmodule/assets/library_content/public/js/library_content_edit.js
+++ b/xmodule/assets/library_content/public/js/library_content_edit.js
@@ -1,11 +1,39 @@
/* JavaScript for special editing operations that can be done on LibraryContentXBlock */
-window.LibraryContentAuthorView = function(runtime, element) {
+window.LibraryContentAuthorView = function(runtime, element, initArgs) {
'use strict';
var $element = $(element);
var usage_id = $element.data('usage-id');
// The "Update Now" button is not a child of 'element', as it is in the validation message area
// But it is still inside this xblock's wrapper element, which we can easily find:
var $wrapper = $element.parents('*[data-locator="' + usage_id + '"]');
+ var { is_root: isRoot = false } = initArgs;
+
+ function postMessageToParent(body, callbackFn = null) {
+ try {
+ window.parent.postMessage(body, document.referrer);
+ if (callbackFn) {
+ callbackFn();
+ }
+ } catch (e) {
+ console.error('Failed to post message:', e);
+ }
+ };
+
+ function reloadPreviewPage() {
+ if (window.self !== window.top) {
+ // We are inside iframe
+ // Normal location.reload() reloads the iframe but subsequent calls to
+ // postMessage fails. So we are using postMessage to tell the parent page
+ // to reload the iframe.
+ postMessageToParent({
+ type: 'refreshIframe',
+ message: 'Refresh Iframe',
+ payload: {},
+ })
+ } else {
+ location.reload();
+ }
+ }
$wrapper.on('click', '.library-update-btn', function(e) {
e.preventDefault();
@@ -20,17 +48,33 @@ window.LibraryContentAuthorView = function(runtime, element) {
state: 'end',
element: element
});
- if ($element.closest('.wrapper-xblock').is(':not(.level-page)')) {
- // We are on a course unit page. The notify('save') should refresh this block,
- // but that is only working on the container page view of this block.
- // Why? On the unit page, this XBlock's runtime has no reference to the
- // XBlockContainerPage - only the top-level XBlock (a vertical) runtime does.
- // But unfortunately there is no way to get a reference to our parent block's
- // JS 'runtime' object. So instead we must refresh the whole page:
- location.reload();
+ if (isRoot) {
+ // We are inside preview page where all children blocks are listed.
+ reloadPreviewPage();
}
});
});
+
+ $wrapper.on('click', '.library-block-migrate-btn', function(e) {
+ e.preventDefault();
+ // migrate library content block to item bank block
+ runtime.notify('save', {
+ state: 'start',
+ element: element,
+ message: gettext('Migrating to Problem Bank')
+ });
+ $.post(runtime.handlerUrl(element, 'upgrade_to_v2_library')).done(function() {
+ runtime.notify('save', {
+ state: 'end',
+ element: element
+ });
+ if (isRoot) {
+ // We are inside preview page where all children blocks are listed.
+ reloadPreviewPage();
+ }
+ });
+ });
+
// Hide loader and show element when update task finished.
var $loader = $wrapper.find('.ui-loading');
var $xblockHeader = $wrapper.find('.xblock-header');
diff --git a/xmodule/assets/video/public/js/00_async_process.js b/xmodule/assets/video/public/js/00_async_process.js
new file mode 100644
index 000000000000..a909e8225a2f
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_async_process.js
@@ -0,0 +1,52 @@
+'use strict';
+
+/**
+ * Provides convenient way to process big amount of data without UI blocking.
+ *
+ * @param {array} list Array to process.
+ * @param {function} process Calls this function on each item in the list.
+ * @return {array} Returns a Promise object to observe when all actions of a
+ * certain type bound to the collection, queued or not, have finished.
+ */
+let AsyncProcess = {
+ array: function(list, process) {
+ if (!_.isArray(list)) {
+ return $.Deferred().reject().promise();
+ }
+
+ if (!_.isFunction(process) || !list.length) {
+ return $.Deferred().resolve(list).promise();
+ }
+
+ let MAX_DELAY = 50, // maximum amount of time that js code should be allowed to run continuously
+ dfd = $.Deferred();
+ let result = [];
+ let index = 0;
+ let len = list.length;
+
+ let getCurrentTime = function() {
+ return (new Date()).getTime();
+ };
+
+ let handler = function() {
+ let start = getCurrentTime();
+
+ do {
+ result[index] = process(list[index], index);
+ index++;
+ } while (index < len && getCurrentTime() - start < MAX_DELAY);
+
+ if (index < len) {
+ setTimeout(handler, 25);
+ } else {
+ dfd.resolve(result);
+ }
+ };
+
+ setTimeout(handler, 25);
+
+ return dfd.promise();
+ }
+};
+
+export default AsyncProcess;
diff --git a/xmodule/assets/video/public/js/00_component.js b/xmodule/assets/video/public/js/00_component.js
new file mode 100644
index 000000000000..2ac183b1982f
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_component.js
@@ -0,0 +1,81 @@
+'use strict';
+
+import _ from 'underscore';
+
+
+/**
+ * Creates a new object with the specified prototype object and properties.
+ * @param {Object} o The object which should be the prototype of the
+ * newly-created object.
+ * @private
+ * @throws {TypeError, Error}
+ * @return {Object}
+ */
+let inherit = Object.create || (function() {
+ let F = function() {};
+
+ return function(o) {
+ if (arguments.length > 1) {
+ throw Error('Second argument not supported');
+ }
+ if (_.isNull(o) || _.isUndefined(o)) {
+ throw Error('Cannot set a null [[Prototype]]');
+ }
+ if (!_.isObject(o)) {
+ throw TypeError('Argument must be an object');
+ }
+
+ F.prototype = o;
+
+ return new F();
+ };
+}());
+
+/**
+ * Component module.
+ * @exports video/00_component.js
+ * @constructor
+ * @return {jquery Promise}
+ */
+let Component = function() {
+ if ($.isFunction(this.initialize)) {
+ // eslint-disable-next-line prefer-spread
+ return this.initialize.apply(this, arguments);
+ }
+};
+
+/**
+ * Returns new constructor that inherits form the current constructor.
+ * @static
+ * @param {Object} protoProps The object containing which will be added to
+ * the prototype.
+ * @return {Object}
+ */
+Component.extend = function(protoProps, staticProps) {
+ let Parent = this;
+ let Child = function() {
+ if ($.isFunction(this.initialize)) {
+ // eslint-disable-next-line prefer-spread
+ return this.initialize.apply(this, arguments);
+ }
+ };
+
+ // Inherit methods and properties from the Parent prototype.
+ Child.prototype = inherit(Parent.prototype);
+ Child.constructor = Parent;
+ // Provide access to parent's methods and properties
+ Child.__super__ = Parent.prototype;
+
+ // Extends inherited methods and properties by methods/properties
+ // passed as argument.
+ if (protoProps) {
+ $.extend(Child.prototype, protoProps);
+ }
+
+ // Inherit static methods and properties
+ $.extend(Child, Parent, staticProps);
+
+ return Child;
+};
+
+export default Component;
diff --git a/xmodule/assets/video/public/js/00_i18n.js b/xmodule/assets/video/public/js/00_i18n.js
new file mode 100644
index 000000000000..1962ed4ee8c4
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_i18n.js
@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * i18n module.
+ * @exports video/00_i18n.js
+ * @return {object}
+ */
+
+let i18n = {
+ Play: gettext('Play'),
+ Pause: gettext('Pause'),
+ Mute: gettext('Mute'),
+ Unmute: gettext('Unmute'),
+ 'Exit full browser': gettext('Exit full browser'),
+ 'Fill browser': gettext('Fill browser'),
+ Speed: gettext('Speed'),
+ 'Auto-advance': gettext('Auto-advance'),
+ Volume: gettext('Volume'),
+ // Translators: Volume level equals 0%.
+ Muted: gettext('Muted'),
+ // Translators: Volume level in range ]0,20]%
+ 'Very low': gettext('Very low'),
+ // Translators: Volume level in range ]20,40]%
+ Low: gettext('Low'),
+ // Translators: Volume level in range ]40,60]%
+ Average: gettext('Average'),
+ // Translators: Volume level in range ]60,80]%
+ Loud: gettext('Loud'),
+ // Translators: Volume level in range ]80,99]%
+ 'Very loud': gettext('Very loud'),
+ // Translators: Volume level equals 100%.
+ Maximum: gettext('Maximum')
+};
+
+export default i18n;
diff --git a/xmodule/assets/video/public/js/00_iterator.js b/xmodule/assets/video/public/js/00_iterator.js
new file mode 100644
index 000000000000..5b597f200ec5
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_iterator.js
@@ -0,0 +1,83 @@
+'use strict';
+
+/**
+ * Provides convenient way to work with iterable data.
+ * @exports video/00_iterator.js
+ * @constructor
+ * @param {array} list Array to be iterated.
+ */
+let Iterator = function(list) {
+ this.list = list;
+ this.index = 0;
+ this.size = this.list.length;
+ this.lastIndex = this.list.length - 1;
+};
+
+Iterator.prototype = {
+
+ /**
+ * Checks validity of provided index for the iterator.
+ * @access protected
+ * @param {numebr} index
+ * @return {boolean}
+ */
+ _isValid: function(index) {
+ return _.isNumber(index) && index < this.size && index >= 0;
+ },
+
+ /**
+ * Returns next element.
+ * @param {number} [index] Updates current position.
+ * @return {any}
+ */
+ next: function(index) {
+ if (!(this._isValid(index))) {
+ index = this.index;
+ }
+
+ this.index = (index >= this.lastIndex) ? 0 : index + 1;
+
+ return this.list[this.index];
+ },
+
+ /**
+ * Returns previous element.
+ * @param {number} [index] Updates current position.
+ * @return {any}
+ */
+ prev: function(index) {
+ if (!(this._isValid(index))) {
+ index = this.index;
+ }
+
+ this.index = (index < 1) ? this.lastIndex : index - 1;
+
+ return this.list[this.index];
+ },
+
+ /**
+ * Returns last element in the list.
+ * @return {any}
+ */
+ last: function() {
+ return this.list[this.lastIndex];
+ },
+
+ /**
+ * Returns first element in the list.
+ * @return {any}
+ */
+ first: function() {
+ return this.list[0];
+ },
+
+ /**
+ * Returns `true` if current position is last for the iterator.
+ * @return {boolean}
+ */
+ isEnd: function() {
+ return this.index === this.lastIndex;
+ }
+};
+
+export default Iterator;
diff --git a/xmodule/assets/video/public/js/00_resizer.js b/xmodule/assets/video/public/js/00_resizer.js
new file mode 100644
index 000000000000..d892ec4d1873
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_resizer.js
@@ -0,0 +1,236 @@
+'use strict';
+
+import _ from 'underscore';
+
+
+let Resizer = function(params) {
+ let defaults = {
+ container: window,
+ element: null,
+ containerRatio: null,
+ elementRatio: null
+ },
+ callbacksList = [],
+ delta = {
+ height: 0,
+ width: 0
+ },
+ module = {};
+ let mode = null,
+ config;
+
+ // eslint-disable-next-line no-shadow
+ let initialize = function(params) {
+ if (!config) {
+ config = defaults;
+ }
+
+ config = $.extend(true, {}, config, params);
+
+ if (!config.element) {
+ console.log(
+ 'Required parameter `element` is not passed.'
+ );
+ }
+
+ return module;
+ };
+
+ let getData = function() {
+ let $container = $(config.container),
+ containerWidth = $container.width() + delta.width,
+ containerHeight = $container.height() + delta.height;
+ let containerRatio = config.containerRatio;
+
+ let $element = $(config.element);
+ let elementRatio = config.elementRatio;
+
+ if (!containerRatio) {
+ containerRatio = containerWidth / containerHeight;
+ }
+
+ if (!elementRatio) {
+ elementRatio = $element.width() / $element.height();
+ }
+
+ return {
+ containerWidth: containerWidth,
+ containerHeight: containerHeight,
+ containerRatio: containerRatio,
+ element: $element,
+ elementRatio: elementRatio
+ };
+ };
+
+ let align = function() {
+ let data = getData();
+
+ switch (mode) {
+ case 'height':
+ alignByHeightOnly();
+ break;
+
+ case 'width':
+ alignByWidthOnly();
+ break;
+
+ default:
+ if (data.containerRatio >= data.elementRatio) {
+ alignByHeightOnly();
+ } else {
+ alignByWidthOnly();
+ }
+ break;
+ }
+
+ fireCallbacks();
+
+ return module;
+ };
+
+ let alignByWidthOnly = function() {
+ let data = getData(),
+ height = data.containerWidth / data.elementRatio;
+
+ data.element.css({
+ height: height,
+ width: data.containerWidth,
+ top: 0.5 * (data.containerHeight - height),
+ left: 0
+ });
+
+ return module;
+ };
+
+ let alignByHeightOnly = function() {
+ let data = getData(),
+ width = data.containerHeight * data.elementRatio;
+
+ data.element.css({
+ height: data.containerHeight,
+ width: data.containerHeight * data.elementRatio,
+ top: 0,
+ left: 0.5 * (data.containerWidth - width)
+ });
+
+ return module;
+ };
+
+ let setMode = function(param) {
+ if (_.isString(param)) {
+ mode = param;
+ align();
+ }
+
+ return module;
+ };
+
+ let setElement = function(element) {
+ config.element = element;
+
+ return module;
+ };
+
+ let addCallback = function(func) {
+ if ($.isFunction(func)) {
+ callbacksList.push(func);
+ } else {
+ console.error('[Video info]: TypeError: Argument is not a function.');
+ }
+
+ return module;
+ };
+
+ let addOnceCallback = function(func) {
+ if ($.isFunction(func)) {
+ let decorator = function() {
+ func();
+ removeCallback(func);
+ };
+
+ addCallback(decorator);
+ } else {
+ console.error('TypeError: Argument is not a function.');
+ }
+
+ return module;
+ };
+
+ let fireCallbacks = function() {
+ $.each(callbacksList, function(index, callback) {
+ callback();
+ });
+ };
+
+ let removeCallbacks = function() {
+ callbacksList.length = 0;
+
+ return module;
+ };
+
+ let removeCallback = function(func) {
+ let index = $.inArray(func, callbacksList);
+
+ if (index !== -1) {
+ return callbacksList.splice(index, 1);
+ }
+ };
+
+ let resetDelta = function() {
+ // eslint-disable-next-line no-multi-assign
+ delta.height = delta.width = 0;
+
+ return module;
+ };
+
+ let addDelta = function(value, side) {
+ if (_.isNumber(value) && _.isNumber(delta[side])) {
+ delta[side] += value;
+ }
+
+ return module;
+ };
+
+ let substractDelta = function(value, side) {
+ if (_.isNumber(value) && _.isNumber(delta[side])) {
+ delta[side] -= value;
+ }
+
+ return module;
+ };
+
+ let destroy = function() {
+ let data = getData();
+ data.element.css({
+ height: '', width: '', top: '', left: ''
+ });
+ removeCallbacks();
+ resetDelta();
+ mode = null;
+ };
+
+ initialize.apply(module, arguments);
+
+ return $.extend(true, module, {
+ align: align,
+ alignByWidthOnly: alignByWidthOnly,
+ alignByHeightOnly: alignByHeightOnly,
+ destroy: destroy,
+ setParams: initialize,
+ setMode: setMode,
+ setElement: setElement,
+ callbacks: {
+ add: addCallback,
+ once: addOnceCallback,
+ remove: removeCallback,
+ removeAll: removeCallbacks
+ },
+ delta: {
+ add: addDelta,
+ substract: substractDelta,
+ reset: resetDelta
+ }
+ });
+};
+
+export default Resizer;
diff --git a/xmodule/assets/video/public/js/00_sjson.js b/xmodule/assets/video/public/js/00_sjson.js
new file mode 100644
index 000000000000..99d870ff84a7
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_sjson.js
@@ -0,0 +1,108 @@
+'use strict';
+
+let Sjson = function(data) {
+ let sjson = {
+ start: data.start.concat(),
+ text: data.text.concat()
+ },
+ module = {};
+
+ let getter = function(propertyName) {
+ return function() {
+ return sjson[propertyName];
+ };
+ };
+
+ let getStartTimes = getter('start');
+
+ let getCaptions = getter('text');
+
+ let size = function() {
+ return sjson.text.length;
+ };
+
+ function search(time, startTime, endTime) {
+ let start = getStartTimes(),
+ max = size() - 1,
+ min = 0,
+ results,
+ index;
+
+ // if we specify a start and end time to search,
+ // search the filtered list of captions in between
+ // the start / end times.
+ // Else, search the unfiltered list.
+ if (typeof startTime !== 'undefined'
+ && typeof endTime !== 'undefined') {
+ results = filter(startTime, endTime);
+ start = results.start;
+ max = results.captions.length - 1;
+ } else {
+ start = getStartTimes();
+ }
+ while (min < max) {
+ index = Math.ceil((max + min) / 2);
+
+ if (time < start[index]) {
+ max = index - 1;
+ }
+
+ if (time >= start[index]) {
+ min = index;
+ }
+ }
+
+ return min;
+ }
+
+ function filter(start, end) {
+ /* filters captions that occur between inputs
+ * `start` and `end`. Start and end should
+ * be Numbers (doubles) corresponding to the
+ * number of seconds elapsed since the beginning
+ * of the video.
+ *
+ * Returns an object with properties
+ * "start" and "captions" representing
+ * parallel arrays of start times and
+ * their corresponding captions.
+ */
+ let filteredTimes = [];
+ let filteredCaptions = [];
+ let startTimes = getStartTimes();
+ let captions = getCaptions();
+
+ if (startTimes.length !== captions.length) {
+ console.warn('video caption and start time arrays do not match in length');
+ }
+
+ // if end is null, then it's been set to
+ // some erroneous value, so filter using the
+ // entire array as long as it's not empty
+ if (end === null && startTimes.length) {
+ end = startTimes[startTimes.length - 1];
+ }
+
+ _.filter(startTimes, function(currentStartTime, i) {
+ if (currentStartTime >= start && currentStartTime <= end) {
+ filteredTimes.push(currentStartTime);
+ filteredCaptions.push(captions[i]);
+ }
+ });
+
+ return {
+ start: filteredTimes,
+ captions: filteredCaptions
+ };
+ }
+
+ return {
+ getCaptions: getCaptions,
+ getStartTimes: getStartTimes,
+ getSize: size,
+ filter: filter,
+ search: search
+ };
+};
+
+export default Sjson;
diff --git a/xmodule/assets/video/public/js/00_video_storage.js b/xmodule/assets/video/public/js/00_video_storage.js
new file mode 100644
index 000000000000..f2293336fe01
--- /dev/null
+++ b/xmodule/assets/video/public/js/00_video_storage.js
@@ -0,0 +1,96 @@
+'use strict';
+
+/**
+ * Provides convenient way to store key value pairs.
+ *
+ * @param {string} namespace Namespace that is used to store data.
+ * @return {object} VideoStorage API.
+ */
+let VideoStorage = function(namespace, id) {
+ /**
+ * Adds new value to the storage or rewrites existent.
+ *
+ * @param {string} name Identifier of the data.
+ * @param {any} value Data to store.
+ * @param {boolean} instanceSpecific Data with this flag will be added
+ * to instance specific storage.
+ */
+ let setItem = function(name, value, instanceSpecific) {
+ if (name) {
+ if (instanceSpecific) {
+ window[namespace][id][name] = value;
+ } else {
+ window[namespace][name] = value;
+ }
+ }
+ };
+
+ /**
+ * Returns the current value associated with the given name.
+ *
+ * @param {string} name Identifier of the data.
+ * @param {boolean} instanceSpecific Data with this flag will be added
+ * to instance specific storage.
+ * @return {any} The current value associated with the given name.
+ * If the given key does not exist in the list
+ * associated with the object then this method must return null.
+ */
+ let getItem = function(name, instanceSpecific) {
+ if (instanceSpecific) {
+ return window[namespace][id][name];
+ } else {
+ return window[namespace][name];
+ }
+ };
+
+ /**
+ * Removes the current value associated with the given name.
+ *
+ * @param {string} name Identifier of the data.
+ * @param {boolean} instanceSpecific Data with this flag will be added
+ * to instance specific storage.
+ */
+ let removeItem = function(name, instanceSpecific) {
+ if (instanceSpecific) {
+ delete window[namespace][id][name];
+ } else {
+ delete window[namespace][name];
+ }
+ };
+
+ /**
+ * Empties the storage.
+ *
+ */
+ let clear = function() {
+ window[namespace] = {};
+ window[namespace][id] = {};
+ };
+
+ /**
+ * Initializes the module: creates a storage with proper namespace.
+ *
+ * @private
+ */
+ (function initialize() {
+ if (!namespace) {
+ namespace = 'VideoStorage';
+ }
+ if (!id) {
+ // Generate random alpha-numeric string.
+ id = Math.random().toString(36).slice(2);
+ }
+
+ window[namespace] = window[namespace] || {};
+ window[namespace][id] = window[namespace][id] || {};
+ }());
+
+ return {
+ clear: clear,
+ getItem: getItem,
+ removeItem: removeItem,
+ setItem: setItem
+ };
+};
+
+export default VideoStorage;
diff --git a/xmodule/assets/video/public/js/01_initialize.js b/xmodule/assets/video/public/js/01_initialize.js
new file mode 100644
index 000000000000..85248b3f0266
--- /dev/null
+++ b/xmodule/assets/video/public/js/01_initialize.js
@@ -0,0 +1,845 @@
+/* eslint-disable no-console, no-param-reassign */
+/**
+ * @file Initialize module works with the JSON config, and sets up various
+ * settings, parameters, variables. After all setup actions are performed, it
+ * invokes the video player to play the specified video. This module must be
+ * invoked first. It provides several functions which do not fit in with other
+ * modules.
+ *
+ * @external VideoPlayer
+ *
+ * @module Initialize
+ */
+
+import VideoPlayer from './03_video_player.js';
+import i18n from './00_i18n.js';
+import _ from 'underscore';
+import moment from 'moment';
+
+/**
+ * @function
+ *
+ * Initialize module exports this function.
+ *
+ * @param {object} state The object containg the state of the video player.
+ * All other modules, their parameters, public variables, etc. are
+ * available via this object.
+ * @param {DOM element} element Container of the entire Video DOM element.
+ */
+let Initialize = function(state, element) {
+ _makeFunctionsPublic(state);
+
+ state.initialize(element)
+ .done(function() {
+ if (state.isYoutubeType()) {
+ state.parseSpeed();
+ }
+ // On iPhones and iPods native controls are used.
+ if (/iP(hone|od)/i.test(state.isTouch[0])) {
+ _hideWaitPlaceholder(state);
+ state.el.trigger('initialize', arguments);
+
+ return false;
+ }
+
+ _initializeModules(state, i18n)
+ .done(function() {
+ // On iPad ready state occurs just after start playing.
+ // We hide controls before video starts playing.
+ if (/iPad|Android/i.test(state.isTouch[0])) {
+ state.el.on('play', _.once(function() {
+ state.trigger('videoControl.show', null);
+ }));
+ } else {
+ // On PC show controls immediately.
+ state.trigger('videoControl.show', null);
+ }
+
+ _hideWaitPlaceholder(state);
+ state.el.trigger('initialize', arguments);
+ });
+ });
+};
+
+/* eslint-disable no-use-before-define */
+let methodsDict = {
+ bindTo: bindTo,
+ fetchMetadata: fetchMetadata,
+ getCurrentLanguage: getCurrentLanguage,
+ getDuration: getDuration,
+ getPlayerMode: getPlayerMode,
+ getVideoMetadata: getVideoMetadata,
+ initialize: initialize,
+ isHtml5Mode: isHtml5Mode,
+ isFlashMode: isFlashMode,
+ isYoutubeType: isYoutubeType,
+ parseSpeed: parseSpeed,
+ parseYoutubeStreams: parseYoutubeStreams,
+ setPlayerMode: setPlayerMode,
+ setSpeed: setSpeed,
+ setAutoAdvance: setAutoAdvance,
+ speedToString: speedToString,
+ trigger: trigger,
+ youtubeId: youtubeId,
+ loadHtmlPlayer: loadHtmlPlayer,
+ loadYoutubePlayer: loadYoutubePlayer,
+ loadYouTubeIFrameAPI: loadYouTubeIFrameAPI
+};
+/* eslint-enable no-use-before-define */
+
+let _youtubeApiDeferred = null;
+let _oldOnYouTubeIframeAPIReady;
+
+Initialize.prototype = methodsDict;
+
+export default Initialize;
+
+// ***************************************************************
+// Private functions start here. Private functions start with underscore.
+// ***************************************************************
+
+/**
+ * @function _makeFunctionsPublic
+ *
+ * Functions which will be accessible via 'state' object. When called,
+ * these functions will get the 'state'
+ * object as a context.
+ *
+ * @param {object} state The object containg the state (properties,
+ * methods, modules) of the Video player.
+ */
+function _makeFunctionsPublic(state) {
+ bindTo(methodsDict, state, state);
+}
+
+// function _renderElements(state)
+//
+// Create any necessary DOM elements, attach them, and set their
+// initial configuration. Also make the created DOM elements available
+// via the 'state' object. Much easier to work this way - you don't
+// have to do repeated jQuery element selects.
+function _renderElements(state) {
+ // Launch embedding of actual video content, or set it up so that it
+ // will be done as soon as the appropriate video player (YouTube or
+ // stand-alone HTML5) is loaded, and can handle embedding.
+ //
+ // Note that the loading of stand alone HTML5 player API is handled by
+ // Require JS. At the time when we reach this code, the stand alone
+ // HTML5 player is already loaded, so no further testing in that case
+ // is required.
+ let video;
+ let onYTApiReady;
+ let setupOnYouTubeIframeAPIReady;
+
+ if (state.videoType === 'youtube') {
+ state.youtubeApiAvailable = false;
+
+ onYTApiReady = function() {
+ console.log('[Video info]: YouTube API is available and is loaded.');
+ if (state.htmlPlayerLoaded) { return; }
+
+ console.log('[Video info]: Starting YouTube player.');
+ video = VideoPlayer(state);
+
+ state.modules.push(video);
+ state.__dfd__.resolve();
+ state.youtubeApiAvailable = true;
+ };
+
+ if (window.YT) {
+ // If we have a Deferred object responsible for calling OnYouTubeIframeAPIReady
+ // callbacks, make sure that they have all been called by trying to resolve the
+ // Deferred object. Upon resolving, all the OnYouTubeIframeAPIReady will be
+ // called. If the object has been already resolved, the callbacks will not
+ // be called a second time.
+ if (_youtubeApiDeferred) {
+ _youtubeApiDeferred.resolve();
+ }
+
+ window.YT.ready(onYTApiReady);
+ } else {
+ // There is only one global variable window.onYouTubeIframeAPIReady which
+ // is supposed to be a function that will be called by the YouTube API
+ // when it finished initializing. This function will update this global function
+ // so that it resolves our Deferred object, which will call all of the
+ // OnYouTubeIframeAPIReady callbacks.
+ //
+ // If this global function is already defined, we store it first, and make
+ // sure that it gets executed when our Deferred object is resolved.
+ setupOnYouTubeIframeAPIReady = function() {
+ _oldOnYouTubeIframeAPIReady = window.onYouTubeIframeAPIReady || undefined;
+
+ window.onYouTubeIframeAPIReady = function() {
+ _youtubeApiDeferred.resolve();
+ };
+
+ window.onYouTubeIframeAPIReady.done = _youtubeApiDeferred.done;
+
+ if (_oldOnYouTubeIframeAPIReady) {
+ window.onYouTubeIframeAPIReady.done(_oldOnYouTubeIframeAPIReady);
+ }
+ };
+
+ // If a Deferred object hasn't been created yet, create one now. It will
+ // be responsible for calling OnYouTubeIframeAPIReady callbacks once the
+ // YouTube API loads. After creating the Deferred object, load the YouTube
+ // API.
+ if (!_youtubeApiDeferred) {
+ _youtubeApiDeferred = $.Deferred();
+ setupOnYouTubeIframeAPIReady();
+ } else if (!window.onYouTubeIframeAPIReady || !window.onYouTubeIframeAPIReady.done) {
+ // The Deferred object could have been already defined in a previous
+ // initialization of the video module. However, since then the global variable
+ // window.onYouTubeIframeAPIReady could have been overwritten. If so,
+ // we should set it up again.
+ setupOnYouTubeIframeAPIReady();
+ }
+
+ // Attach a callback to our Deferred object to be called once the
+ // YouTube API loads.
+ window.onYouTubeIframeAPIReady.done(function() {
+ window.YT.ready(onYTApiReady);
+ });
+ }
+ } else {
+ video = VideoPlayer(state);
+
+ state.modules.push(video);
+ state.__dfd__.resolve();
+ state.htmlPlayerLoaded = true;
+ }
+}
+
+function _waitForYoutubeApi(state) {
+ console.log('[Video info]: Starting to wait for YouTube API to load.');
+ window.setTimeout(function() {
+ // If YouTube API will load OK, it will run `onYouTubeIframeAPIReady`
+ // callback, which will set `state.youtubeApiAvailable` to `true`.
+ // If something goes wrong at this stage, `state.youtubeApiAvailable` is
+ // `false`.
+ if (!state.youtubeApiAvailable) {
+ console.log('[Video info]: YouTube API is not available.');
+ if (!state.htmlPlayerLoaded) {
+ state.loadHtmlPlayer();
+ }
+ }
+ state.el.trigger('youtube_availability', [state.youtubeApiAvailable]);
+ }, state.config.ytTestTimeout);
+}
+
+function loadYouTubeIFrameAPI(scriptTag) {
+ let firstScriptTag = document.getElementsByTagName('script')[0];
+ firstScriptTag.parentNode.insertBefore(scriptTag, firstScriptTag);
+}
+
+// function _parseYouTubeIDs(state)
+// The function parse YouTube stream ID's.
+// @return
+// false: We don't have YouTube video IDs to work with; most likely
+// we have HTML5 video sources.
+// true: Parsing of YouTube video IDs went OK, and we can proceed
+// onwards to play YouTube videos.
+function _parseYouTubeIDs(state) {
+ if (state.parseYoutubeStreams(state.config.streams)) {
+ state.videoType = 'youtube';
+
+ return true;
+ }
+
+ console.log(
+ '[Video info]: Youtube Video IDs are incorrect or absent.'
+ );
+
+ return false;
+}
+
+/**
+ * Extract HLS video URLs from available video URLs.
+ *
+ * @param {object} state The object contaning the state (properties, methods, modules) of the Video player.
+ * @returns Array of available HLS video source urls.
+ */
+function extractHLSVideoSources(state) {
+ return _.filter(state.config.sources, function(source) {
+ return /\.m3u8(\?.*)?$/.test(source);
+ });
+}
+
+// function _prepareHTML5Video(state)
+// The function prepare HTML5 video, parse HTML5
+// video sources etc.
+function _prepareHTML5Video(state) {
+ state.speeds = ['0.75', '1.0', '1.25', '1.50', '2.0'];
+ // If none of the supported video formats can be played and there is no
+ // short-hand video links, than hide the spinner and show error message.
+ if (!state.config.sources.length) {
+ _hideWaitPlaceholder(state);
+ state.el
+ .find('.video-player div')
+ .addClass('hidden');
+ state.el
+ .find('.video-player .video-error')
+ .removeClass('is-hidden');
+
+ return false;
+ }
+
+ state.videoType = 'html5';
+
+ if (!_.keys(state.config.transcriptLanguages).length) {
+ state.config.showCaptions = false;
+ }
+ state.setSpeed(state.speed);
+
+ return true;
+}
+
+function _hideWaitPlaceholder(state) {
+ state.el
+ .addClass('is-initialized')
+ .find('.spinner')
+ .attr({
+ 'aria-hidden': 'true',
+ tabindex: -1
+ });
+}
+
+function _setConfigurations(state) {
+ state.setPlayerMode(state.config.mode);
+ // Possible value are: 'visible', 'hiding', and 'invisible'.
+ state.controlState = 'visible';
+ state.controlHideTimeout = null;
+ state.captionState = 'invisible';
+ state.captionHideTimeout = null;
+ state.HLSVideoSources = extractHLSVideoSources(state);
+}
+
+// eslint-disable-next-line no-shadow
+function _initializeModules(state, i18n) {
+ let dfd = $.Deferred(),
+ modulesList = $.map(state.modules, function(module) {
+ let options = state.options[module.moduleName] || {};
+ if (_.isFunction(module)) {
+ return module(state, i18n, options);
+ } else if ($.isPlainObject(module)) {
+ return module;
+ }
+ });
+
+ $.when.apply(null, modulesList)
+ .done(dfd.resolve);
+
+ return dfd.promise();
+}
+
+function _getConfiguration(data, storage) {
+ let isBoolean = function(value) {
+ let regExp = /^true$/i;
+ return regExp.test(value.toString());
+ },
+ // List of keys that will be extracted form the configuration.
+ extractKeys = [],
+ // Compatibility keys used to change names of some parameters in
+ // the final configuration.
+ compatKeys = {
+ start: 'startTime',
+ end: 'endTime'
+ },
+ // Conversions used to pre-process some configuration data.
+ conversions = {
+ showCaptions: isBoolean,
+ autoplay: isBoolean,
+ autohideHtml5: isBoolean,
+ autoAdvance: function(value) {
+ let shouldAutoAdvance = storage.getItem('auto_advance');
+ if (_.isUndefined(shouldAutoAdvance)) {
+ return isBoolean(value) || false;
+ } else {
+ return shouldAutoAdvance;
+ }
+ },
+ savedVideoPosition: function(value) {
+ return storage.getItem('savedVideoPosition', true)
+ || Number(value)
+ || 0;
+ },
+ speed: function(value) {
+ return storage.getItem('speed', true) || value;
+ },
+ generalSpeed: function(value) {
+ return storage.getItem('general_speed')
+ || value
+ || '1.0';
+ },
+ transcriptLanguage: function(value) {
+ return storage.getItem('language')
+ || value
+ || 'en';
+ },
+ ytTestTimeout: function(value) {
+ value = parseInt(value, 10);
+
+ if (!isFinite(value)) {
+ value = 1500;
+ }
+
+ return value;
+ },
+ startTime: function(value) {
+ value = parseInt(value, 10);
+ if (!isFinite(value) || value < 0) {
+ return 0;
+ }
+
+ return value;
+ },
+ endTime: function(value) {
+ value = parseInt(value, 10);
+
+ if (!isFinite(value) || value === 0) {
+ return null;
+ }
+
+ return value;
+ }
+ },
+ config = {};
+
+ data = _.extend({
+ startTime: 0,
+ endTime: null,
+ sub: '',
+ streams: ''
+ }, data);
+
+ $.each(data, function(option, value) {
+ // Extract option that is in `extractKeys`.
+ if ($.inArray(option, extractKeys) !== -1) {
+ return;
+ }
+
+ // Change option name to key that is in `compatKeys`.
+ if (compatKeys[option]) {
+ option = compatKeys[option];
+ }
+
+ // Pre-process data.
+ if (conversions[option]) {
+ if (_.isFunction(conversions[option])) {
+ value = conversions[option].call(this, value);
+ } else {
+ throw new TypeError(option + ' is not a function.');
+ }
+ }
+ config[option] = value;
+ });
+
+ return config;
+}
+
+// ***************************************************************
+// Public functions start here.
+// These are available via the 'state' object. Their context ('this'
+// keyword) is the 'state' object. The magic private function that makes
+// them available and sets up their context is makeFunctionsPublic().
+// ***************************************************************
+
+// function bindTo(methodsDict, obj, context, rewrite)
+// Creates a new function with specific context and assigns it to the provided
+// object.
+// eslint-disable-next-line no-shadow
+function bindTo(methodsDict, obj, context, rewrite) {
+ $.each(methodsDict, function(name, method) {
+ if (_.isFunction(method)) {
+ if (_.isUndefined(rewrite)) {
+ rewrite = true;
+ }
+
+ if (_.isUndefined(obj[name]) || rewrite) {
+ obj[name] = _.bind(method, context);
+ }
+ }
+ });
+}
+
+function loadYoutubePlayer() {
+ if (this.htmlPlayerLoaded) { return; }
+
+ console.log(
+ '[Video info]: Fetch metadata for YouTube video.'
+ );
+
+ this.fetchMetadata();
+ this.parseSpeed();
+}
+
+function loadHtmlPlayer() {
+ // When the youtube link doesn't work for any reason
+ // (for example, firewall) any
+ // alternate sources should automatically play.
+ if (!_prepareHTML5Video(this)) {
+ console.log(
+ '[Video info]: Continue loading '
+ + 'YouTube video.'
+ );
+
+ // Non-YouTube sources were not found either.
+
+ this.el.find('.video-player div')
+ .removeClass('hidden');
+ this.el.find('.video-player .video-error')
+ .addClass('is-hidden');
+
+ // If in reality the timeout was to short, try to
+ // continue loading the YouTube video anyways.
+ this.loadYoutubePlayer();
+ } else {
+ console.log(
+ '[Video info]: Start HTML5 player.'
+ );
+
+ // In-browser HTML5 player does not support quality
+ // control.
+ this.el.find('.quality_control').hide();
+ _renderElements(this);
+ }
+}
+
+// function initialize(element)
+// The function set initial configuration and preparation.
+
+function initialize(element) {
+ let self = this,
+ el = this.el,
+ id = this.id,
+ container = el.find('.video-wrapper'),
+ __dfd__ = $.Deferred(),
+ isTouch = onTouchBasedDevice() || '';
+
+ if (isTouch) {
+ el.addClass('is-touch');
+ }
+
+ $.extend(this, {
+ __dfd__: __dfd__,
+ container: container,
+ isFullScreen: false,
+ isTouch: isTouch
+ });
+
+ console.log('[Video info]: Initializing video with id "%s".', id);
+
+ // We store all settings passed to us by the server in one place. These
+ // are "read only", so don't modify them. All variable content lives in
+ // 'state' object.
+ // jQuery .data() return object with keys in lower camelCase format.
+ this.config = $.extend({}, _getConfiguration(this.metadata, this.storage), {
+ element: element,
+ fadeOutTimeout: 1400,
+ captionsFreezeTime: 10000,
+ mode: $.cookie('edX_video_player_mode'),
+ // Available HD qualities will only be accessible once the video has
+ // been played once, via player.getAvailableQualityLevels.
+ availableHDQualities: []
+ });
+
+ if (this.config.endTime < this.config.startTime) {
+ this.config.endTime = null;
+ }
+
+ this.lang = this.config.transcriptLanguage;
+ this.speed = this.speedToString(
+ this.config.speed || this.config.generalSpeed
+ );
+ this.auto_advance = this.config.autoAdvance;
+ this.htmlPlayerLoaded = false;
+ this.duration = this.metadata.duration;
+
+ _setConfigurations(this);
+
+ // If `prioritizeHls` is set to true than `hls` is the primary playback
+ if (this.config.prioritizeHls || !(_parseYouTubeIDs(this))) {
+ // If we do not have YouTube ID's, try parsing HTML5 video sources.
+ if (!_prepareHTML5Video(this)) {
+ __dfd__.reject();
+ // Non-YouTube sources were not found either.
+ return __dfd__.promise();
+ }
+
+ console.log('[Video info]: Start player in HTML5 mode.');
+ _renderElements(this);
+ } else {
+ _renderElements(this);
+
+ _waitForYoutubeApi(this);
+
+ let scriptTag = document.createElement('script');
+
+ scriptTag.src = this.config.ytApiUrl;
+ scriptTag.async = true;
+
+ $(scriptTag).on('load', function() {
+ self.loadYoutubePlayer();
+ });
+ $(scriptTag).on('error', function() {
+ console.log(
+ '[Video info]: YouTube returned an error for '
+ + 'video with id "' + self.id + '".'
+ );
+ // If the video is already loaded in `_waitForYoutubeApi` by the
+ // time we get here, then we shouldn't load it again.
+ if (!self.htmlPlayerLoaded) {
+ self.loadHtmlPlayer();
+ }
+ });
+
+ window.Video.loadYouTubeIFrameAPI(scriptTag);
+ }
+ return __dfd__.promise();
+}
+
+// function parseYoutubeStreams(state, youtubeStreams)
+//
+// Take a string in the form:
+// "iCawTYPtehk:0.75,KgpclqP-LBA:1.0,9-2670d5nvU:1.5"
+// parse it, and make it available via the 'state' object. If we are
+// not given a string, or it's length is zero, then we return false.
+//
+// @return
+// false: We don't have YouTube video IDs to work with; most likely
+// we have HTML5 video sources.
+// true: Parsing of YouTube video IDs went OK, and we can proceed
+// onwards to play YouTube videos.
+function parseYoutubeStreams(youtubeStreams) {
+ if (_.isUndefined(youtubeStreams) || !youtubeStreams.length) {
+ return false;
+ }
+
+ this.videos = {};
+
+ _.each(youtubeStreams.split(/,/), function(video) {
+ let speed;
+ video = video.split(/:/);
+ speed = this.speedToString(video[0]);
+ this.videos[speed] = video[1];
+ }, this);
+
+ return _.isString(this.videos['1.0']);
+}
+
+// function fetchMetadata()
+//
+// When dealing with YouTube videos, we must fetch meta data that has
+// certain key facts not available while the video is loading. For
+// example the length of the video can be determined from the meta
+// data.
+function fetchMetadata() {
+ let self = this,
+ metadataXHRs = [];
+
+ this.metadata = {};
+
+ metadataXHRs = _.map(this.videos, function(url, speed) {
+ return self.getVideoMetadata(url, function(data) {
+ if (data.items.length > 0) {
+ let metaDataItem = data.items[0];
+ self.metadata[metaDataItem.id] = metaDataItem.contentDetails;
+ }
+ });
+ });
+
+ $.when.apply(this, metadataXHRs).done(function() {
+ self.el.trigger('metadata_received');
+
+ // Not only do we trigger the "metadata_received" event, we also
+ // set a flag to notify that metadata has been received. This
+ // allows for code that will miss the "metadata_received" event
+ // to know that metadata has been received. This is important in
+ // cases when some code will subscribe to the "metadata_received"
+ // event after it has been triggered.
+ self.youtubeMetadataReceived = true;
+ });
+}
+
+// function parseSpeed()
+//
+// Create a separate array of available speeds.
+function parseSpeed() {
+ this.speeds = _.keys(this.videos).sort();
+}
+
+function setSpeed(newSpeed) {
+ // Possible speeds for each player type.
+ // HTML5 = [0.75, 1, 1.25, 1.5, 2]
+ // Youtube Flash = [0.75, 1, 1.25, 1.5]
+ // Youtube HTML5 = [0.25, 0.5, 1, 1.5, 2]
+ let map = {
+ 0.25: '0.75', // Youtube HTML5 -> HTML5 or Youtube Flash
+ '0.50': '0.75', // Youtube HTML5 -> HTML5 or Youtube Flash
+ 0.75: '0.50', // HTML5 or Youtube Flash -> Youtube HTML5
+ 1.25: '1.50', // HTML5 or Youtube Flash -> Youtube HTML5
+ 2.0: '1.50' // HTML5 or Youtube HTML5 -> Youtube Flash
+ };
+
+ if (_.contains(this.speeds, newSpeed)) {
+ this.speed = newSpeed;
+ } else {
+ newSpeed = map[newSpeed];
+ this.speed = _.contains(this.speeds, newSpeed) ? newSpeed : '1.0';
+ }
+ this.speed = parseFloat(this.speed);
+}
+
+function setAutoAdvance(enabled) {
+ this.auto_advance = enabled;
+}
+
+function getVideoMetadata(url, callback) {
+ let youTubeEndpoint;
+ if (!(_.isString(url))) {
+ url = this.videos['1.0'] || '';
+ }
+ // Will hit the API URL to get the youtube video metadata.
+ youTubeEndpoint = this.config.ytMetadataEndpoint; // The new runtime supports anonymous users
+ // and uses an XBlock handler to get YouTube metadata
+ if (!youTubeEndpoint) {
+ // The old runtime has a full/separate LMS API for getting YouTube metadata, but it doesn't
+ // support anonymous users nor videos that play in a sandboxed iframe.
+ youTubeEndpoint = [this.config.lmsRootURL, '/courses/yt_video_metadata', '?id=', url].join('');
+ }
+ return $.ajax({
+ url: youTubeEndpoint,
+ success: _.isFunction(callback) ? callback : null,
+ error: function() {
+ console.warn(
+ 'Unable to get youtube video metadata. Some video metadata may be unavailable.'
+ );
+ },
+ notifyOnError: false
+ });
+}
+
+function youtubeId(speed) {
+ let currentSpeed = this.isFlashMode() ? this.speed : '1.0';
+
+ return this.videos[speed]
+ || this.videos[currentSpeed]
+ || this.videos['1.0'];
+}
+
+function getDuration() {
+ try {
+ let safeMoment = typeof moment !== 'undefined' ? moment : window.moment;
+ return safeMoment.duration(this.metadata[this.youtubeId()].duration, safeMoment.ISO_8601).asSeconds();
+ } catch (err) {
+ return _.result(this.metadata[this.youtubeId('1.0')], 'duration') || 0;
+ }
+}
+
+/**
+ * Sets player mode.
+ *
+ * @param {string} mode Mode to set for the video player if it is supported.
+ * Otherwise, `html5` is used by default.
+ */
+function setPlayerMode(mode) {
+ let supportedModes = ['html5', 'flash'];
+
+ mode = _.contains(supportedModes, mode) ? mode : 'html5';
+ this.currentPlayerMode = mode;
+}
+
+/**
+ * Returns current player mode.
+ *
+ * @return {string} Returns string that describes player mode
+ */
+function getPlayerMode() {
+ return this.currentPlayerMode;
+}
+
+/**
+ * Checks if current player mode is Flash.
+ *
+ * @return {boolean} Returns `true` if current mode is `flash`, otherwise
+ * it returns `false`
+ */
+function isFlashMode() {
+ return this.getPlayerMode() === 'flash';
+}
+
+/**
+ * Checks if current player mode is Html5.
+ *
+ * @return {boolean} Returns `true` if current mode is `html5`, otherwise
+ * it returns `false`
+ */
+function isHtml5Mode() {
+ return this.getPlayerMode() === 'html5';
+}
+
+function isYoutubeType() {
+ return this.videoType === 'youtube';
+}
+
+function speedToString(speed) {
+ return parseFloat(speed).toFixed(2).replace(/\.00$/, '.0');
+}
+
+function getCurrentLanguage() {
+ let keys = _.keys(this.config.transcriptLanguages);
+
+ if (keys.length) {
+ if (!_.contains(keys, this.lang)) {
+ if (_.contains(keys, 'en')) {
+ this.lang = 'en';
+ } else {
+ this.lang = keys.pop();
+ }
+ }
+ } else {
+ return null;
+ }
+
+ return this.lang;
+}
+
+/*
+ * The trigger() function will assume that the @objChain is a complete
+ * chain with a method (function) at the end. It will call this function.
+ * So for example, when trigger() is called like so:
+ *
+ * state.trigger('videoPlayer.pause', {'param1': 10});
+ *
+ * Then trigger() will execute:
+ *
+ * state.videoPlayer.pause({'param1': 10});
+ */
+function trigger(objChain) {
+ let extraParameters = Array.prototype.slice.call(arguments, 1),
+ i, tmpObj, chain;
+
+ // Remember that 'this' is the 'state' object.
+ tmpObj = this;
+ chain = objChain.split('.');
+
+ // At the end of the loop the variable 'tmpObj' will either be the
+ // correct object/function to trigger/invoke. If the 'chain' chain of
+ // object is incorrect (one of the link is non-existent), then the loop
+ // will immediately exit.
+ while (chain.length) {
+ i = chain.shift();
+
+ if (tmpObj.hasOwnProperty(i)) {
+ tmpObj = tmpObj[i];
+ } else {
+ // An incorrect object chain was specified.
+
+ return false;
+ }
+ }
+
+ tmpObj.apply(this, extraParameters);
+
+ return true;
+}
diff --git a/xmodule/assets/video/public/js/025_focus_grabber.js b/xmodule/assets/video/public/js/025_focus_grabber.js
new file mode 100644
index 000000000000..48ec5527ad0e
--- /dev/null
+++ b/xmodule/assets/video/public/js/025_focus_grabber.js
@@ -0,0 +1,132 @@
+/*
+ * 025_focus_grabber.js
+ *
+ * Purpose: Provide a way to focus on autohidden Video controls.
+ *
+ *
+ * Because in HTML player mode we have a feature of autohiding controls on
+ * mouse inactivity, sometimes focus is lost from the currently selected
+ * control. What's more, when all controls are autohidden, we can't get to any
+ * of them because by default browser does not place hidden elements on the
+ * focus chain.
+ *
+ * To get around this minor annoyance, this module will manage 2 placeholder
+ * elements that will be invisible to the user's eye, but visible to the
+ * browser. This will allow for a sneaky stealing of focus and placing it where
+ * we need (on hidden controls).
+ *
+ * This code has been moved to a separate module because it provides a concrete
+ * block of functionality that can be turned on (off).
+ */
+
+/*
+ * "If you want to climb a mountain, begin at the top."
+ *
+ * ~ Zen saying
+ */
+
+
+
+// FocusGrabber module.
+let FocusGrabber = function(state) {
+ let dfd = $.Deferred();
+
+ state.focusGrabber = {};
+
+ _makeFunctionsPublic(state);
+ _renderElements(state);
+ _bindHandlers(state);
+
+ dfd.resolve();
+ return dfd.promise();
+};
+
+// Private functions.
+
+function _makeFunctionsPublic(state) {
+ let methodsDict = {
+ disableFocusGrabber: disableFocusGrabber,
+ enableFocusGrabber: enableFocusGrabber,
+ onFocus: onFocus
+ };
+
+ state.bindTo(methodsDict, state.focusGrabber, state);
+}
+
+function _renderElements(state) {
+ state.focusGrabber.elFirst = state.el.find('.focus_grabber.first');
+ state.focusGrabber.elLast = state.el.find('.focus_grabber.last');
+
+ // From the start, the Focus Grabber must be disabled so that
+ // tabbing (switching focus) does not land the user on one of the
+ // placeholder elements (elFirst, elLast).
+ state.focusGrabber.disableFocusGrabber();
+}
+
+function _bindHandlers(state) {
+ state.focusGrabber.elFirst.on('focus', state.focusGrabber.onFocus);
+ state.focusGrabber.elLast.on('focus', state.focusGrabber.onFocus);
+
+ // When the video container element receives programmatic focus, then
+ // on un-focus ('blur' event) we should trigger a 'mousemove' event so
+ // as to reveal autohidden controls.
+ state.el.on('blur', function() {
+ state.el.trigger('mousemove');
+ });
+}
+
+// Public functions.
+
+function enableFocusGrabber() {
+ let tabIndex;
+
+ // When the Focus Grabber is being enabled, there are two different
+ // scenarios:
+ //
+ // 1.) Currently focused element was inside the video player.
+ // 2.) Currently focused element was somewhere else on the page.
+ //
+ // In the first case we must make sure that the video player doesn't
+ // loose focus, even though the controls are autohidden.
+ if ($(document.activeElement).parents().hasClass('video')) {
+ tabIndex = -1;
+ } else {
+ tabIndex = 0;
+ }
+
+ this.focusGrabber.elFirst.attr('tabindex', tabIndex);
+ this.focusGrabber.elLast.attr('tabindex', tabIndex);
+
+ // Don't loose focus. We are inside video player on some control, but
+ // because we can't remain focused on a hidden element, we will shift
+ // focus to the main video element.
+ //
+ // Once the main element will receive the un-focus ('blur') event, a
+ // 'mousemove' event will be triggered, and the video controls will
+ // receive focus once again.
+ if (tabIndex === -1) {
+ this.el.focus();
+
+ this.focusGrabber.elFirst.attr('tabindex', 0);
+ this.focusGrabber.elLast.attr('tabindex', 0);
+ }
+}
+
+function disableFocusGrabber() {
+ // Only programmatic focusing on these elements will be available.
+ // We don't want the user to focus on them (for example with the 'Tab'
+ // key).
+ this.focusGrabber.elFirst.attr('tabindex', -1);
+ this.focusGrabber.elLast.attr('tabindex', -1);
+}
+
+function onFocus(event, params) {
+ // Once the Focus Grabber placeholder elements will gain focus, we will
+ // trigger 'mousemove' event so that the autohidden controls will
+ // become visible.
+ this.el.trigger('mousemove');
+
+ this.focusGrabber.disableFocusGrabber();
+}
+
+export default FocusGrabber;
diff --git a/xmodule/assets/video/public/js/02_html5_hls_video.js b/xmodule/assets/video/public/js/02_html5_hls_video.js
new file mode 100644
index 000000000000..b324476f7780
--- /dev/null
+++ b/xmodule/assets/video/public/js/02_html5_hls_video.js
@@ -0,0 +1,151 @@
+/* eslint-disable no-console, no-param-reassign */
+/**
+ * HTML5 video player module to support HLS video playback.
+ *
+ */
+
+'use strict';
+
+import _ from 'underscore';
+import HTML5Video from './02_html5_video.js';
+import HLS from 'hls.js';
+
+let HLSVideo = {};
+
+HLSVideo.Player = (function() {
+ /**
+ * Initialize HLS video player.
+ *
+ * @param {jQuery} el Reference to video player container element
+ * @param {Object} config Contains common config for video player
+ */
+ function Player(el, config) {
+ let self = this;
+
+ this.config = config;
+
+ // do common initialization independent of player type
+ this.init(el, config);
+
+ // set a default audio codec if not provided, this helps reduce issues
+ // switching audio codecs during playback
+ if (!this.config.defaultAudioCodec) {
+ this.config.defaultAudioCodec = "mp4a.40.5";
+ }
+
+ _.bindAll(this, 'playVideo', 'pauseVideo', 'onReady');
+
+ // If we have only HLS sources and browser doesn't support HLS then show error message.
+ if (config.HLSOnlySources && !config.canPlayHLS) {
+ this.showErrorMessage(null, '.video-hls-error');
+ return;
+ }
+
+ this.config.state.el.on('initialize', _.once(function() {
+ console.log('[HLS Video]: HLS Player initialized');
+ self.showPlayButton();
+ }));
+
+ // Safari has native support to play HLS videos
+ if (config.browserIsSafari) {
+ this.videoEl.attr('src', config.videoSources[0]);
+ } else {
+ // load auto start if auto_advance is enabled
+ if (config.state.auto_advance) {
+ this.hls = new HLS({autoStartLoad: true});
+ } else {
+ this.hls = new HLS({autoStartLoad: false});
+ }
+ this.hls.loadSource(config.videoSources[0]);
+ this.hls.attachMedia(this.video);
+
+ this.hls.on(HLS.Events.ERROR, this.onError.bind(this));
+
+ this.hls.on(HLS.Events.MANIFEST_PARSED, function(event, data) {
+ console.log(
+ '[HLS Video]: MANIFEST_PARSED, qualityLevelsInfo: ',
+ data.levels.map(function(level) {
+ return {
+ bitrate: level.bitrate,
+ resolution: level.width + 'x' + level.height
+ };
+ })
+ );
+ self.config.onReadyHLS();
+ });
+ this.hls.on(HLS.Events.LEVEL_SWITCHED, function(event, data) {
+ let level = self.hls.levels[data.level];
+ console.log(
+ '[HLS Video]: LEVEL_SWITCHED, qualityLevelInfo: ',
+ {
+ bitrate: level.bitrate,
+ resolution: level.width + 'x' + level.height
+ }
+ );
+ });
+ }
+ }
+
+ Player.prototype = Object.create(HTML5Video.Player.prototype);
+ Player.prototype.constructor = Player;
+
+ Player.prototype.playVideo = function() {
+ HTML5Video.Player.prototype.updatePlayerLoadingState.apply(this, ['show']);
+ if (!this.config.browserIsSafari) {
+ this.hls.startLoad();
+ }
+ HTML5Video.Player.prototype.playVideo.apply(this);
+ };
+
+ Player.prototype.pauseVideo = function() {
+ HTML5Video.Player.prototype.pauseVideo.apply(this);
+ HTML5Video.Player.prototype.updatePlayerLoadingState.apply(this, ['hide']);
+ };
+
+ Player.prototype.onPlaying = function() {
+ HTML5Video.Player.prototype.onPlaying.apply(this);
+ HTML5Video.Player.prototype.updatePlayerLoadingState.apply(this, ['hide']);
+ };
+
+ Player.prototype.onReady = function() {
+ this.config.events.onReady(null);
+ };
+
+ /**
+ * Handler for HLS video errors. This only takes care of fatal erros, non-fatal errors
+ * are automatically handled by hls.js
+ *
+ * @param {String} event `hlsError`
+ * @param {Object} data Contains the information regarding error occurred.
+ */
+ Player.prototype.onError = function(event, data) {
+ if (data.fatal) {
+ switch (data.type) {
+ case HLS.ErrorTypes.NETWORK_ERROR:
+ console.error(
+ '[HLS Video]: Fatal network error encountered, try to recover. Details: %s',
+ data.details
+ );
+ this.hls.startLoad();
+ break;
+ case HLS.ErrorTypes.MEDIA_ERROR:
+ console.error(
+ '[HLS Video]: Fatal media error encountered, try to recover. Details: %s',
+ data.details
+ );
+ this.hls.recoverMediaError();
+ break;
+ default:
+ console.error(
+ '[HLS Video]: Unrecoverable error encountered. Details: %s',
+ data.details
+ );
+ break;
+ }
+ }
+ };
+
+ return Player;
+}());
+
+export default HLSVideo;
diff --git a/xmodule/assets/video/public/js/02_html5_video.js b/xmodule/assets/video/public/js/02_html5_video.js
new file mode 100644
index 000000000000..839372054377
--- /dev/null
+++ b/xmodule/assets/video/public/js/02_html5_video.js
@@ -0,0 +1,380 @@
+/* eslint-disable no-console, no-param-reassign */
+/**
+ * @file HTML5 video player module. Provides methods to control the in-browser
+ * HTML5 video player.
+ *
+ * The goal was to write this module so that it closely resembles the YouTube
+ * API. The main reason for this is because initially the edX video player
+ * supported only YouTube videos. When HTML5 support was added, for greater
+ * compatibility, and to reduce the amount of code that needed to be modified,
+ * it was decided to write a similar API as the one provided by YouTube.
+ *
+ * @module HTML5Video
+ */
+
+import _ from 'underscore';
+
+let HTML5Video = {};
+
+HTML5Video.Player = (function() {
+ /*
+ * Constructor function for HTML5 Video player.
+ *
+ * @param {String|Object} el A DOM element where the HTML5 player will
+ * be inserted (as returned by jQuery(selector) function), or a
+ * selector string which will be used to select an element. This is a
+ * required parameter.
+ *
+ * @param config - An object whose properties will be used as
+ * configuration options for the HTML5 video player. This is an
+ * optional parameter. In the case if this parameter is missing, or
+ * some of the config object's properties are missing, defaults will be
+ * used. The available options (and their defaults) are as
+ * follows:
+ *
+ * config = {
+ *
+ * videoSources: [], // An array with properties being video
+ * // sources. The property name is the
+ * // video format of the source. Supported
+ * // video formats are: 'mp4', 'webm', and
+ * // 'ogg'.
+ * poster: Video poster URL
+ *
+ * browserIsSafari: Flag to tell if current browser is Safari
+ *
+ * events: { // Object's properties identify the
+ * // events that the API fires, and the
+ * // functions (event listeners) that the
+ * // API will call when those events occur.
+ * // If value is null, or property is not
+ * // specified, then no callback will be
+ * // called for that event.
+ *
+ * onReady: null,
+ * onStateChange: null
+ * }
+ * }
+ */
+ function Player(el, config) {
+ let errorMessage, lastSource, sourceList;
+
+ // Create HTML markup for individual sources of the HTML5