Skip to content

Commit d037e9e

Browse files
committed
feat!: Drop support for the legacy video upload page.
The legacy video uploads page in Studio has been replaced with a new view in the Authoring MFE. This change removes the now unused JS/CSS/HTML/Python related to the old video page. This work is part of #36108 BREAKING CHANGE: The `contentstore.new_studio_mfe.use_new_video_uploads_page` waffle flag is no longer respected. The code operates as if this is set to True.
1 parent ec1d959 commit d037e9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+15
-5957
lines changed

cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,14 @@ def get_use_new_files_uploads_page(self, obj):
111111
def get_use_new_video_uploads_page(self, obj):
112112
"""
113113
Method to get the use_new_video_uploads_page switch
114+
115+
This used to be based on a waffle flag but the flag is being removed so we
116+
default it to true for now until we can remove the need for it from the consumers
117+
of this serializer and the related APIs.
118+
119+
See https://github.com/openedx/edx-platform/issues/37497
114120
"""
115-
course_key = self.get_course_key()
116-
return toggles.use_new_video_uploads_page(course_key)
121+
return True
117122

118123
def get_use_new_course_outline_page(self, obj):
119124
"""

cms/djangoapps/contentstore/toggles.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -313,26 +313,6 @@ def use_new_export_page(course_key):
313313
return not LEGACY_STUDIO_EXPORT.is_enabled(course_key)
314314

315315

316-
# .. toggle_name: contentstore.new_studio_mfe.use_new_video_uploads_page
317-
# .. toggle_implementation: CourseWaffleFlag
318-
# .. toggle_default: False
319-
# .. toggle_description: This flag enables the use of the new studio video uploads page mfe
320-
# .. toggle_use_cases: temporary
321-
# .. toggle_creation_date: 2023-5-15
322-
# .. toggle_target_removal_date: 2023-8-31
323-
# .. toggle_tickets: TNL-10619
324-
# .. toggle_warning:
325-
ENABLE_NEW_STUDIO_VIDEO_UPLOADS_PAGE = CourseWaffleFlag(
326-
f'{CONTENTSTORE_NAMESPACE}.new_studio_mfe.use_new_video_uploads_page', __name__)
327-
328-
329-
def use_new_video_uploads_page(course_key):
330-
"""
331-
Returns a boolean if new studio video uploads mfe is enabled
332-
"""
333-
return ENABLE_NEW_STUDIO_VIDEO_UPLOADS_PAGE.is_enabled(course_key)
334-
335-
336316
# .. toggle_name: legacy_studio.course_outline
337317
# .. toggle_implementation: WaffleFlag
338318
# .. toggle_default: False

cms/djangoapps/contentstore/utils.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
use_new_textbooks_page,
5454
use_new_unit_page,
5555
use_new_updates_page,
56-
use_new_video_uploads_page,
5756
)
5857
from cms.djangoapps.models.settings.course_grading import CourseGradingModel
5958
from cms.djangoapps.models.settings.course_metadata import CourseMetadata
@@ -427,11 +426,10 @@ def get_video_uploads_url(course_locator) -> str:
427426
Gets course authoring microfrontend URL for files and uploads page view.
428427
"""
429428
video_uploads_url = None
430-
if use_new_video_uploads_page(course_locator):
431-
mfe_base_url = get_course_authoring_url(course_locator)
432-
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/videos/'
433-
if mfe_base_url:
434-
video_uploads_url = course_mfe_url
429+
mfe_base_url = get_course_authoring_url(course_locator)
430+
course_mfe_url = f'{mfe_base_url}/course/{course_locator}/videos/'
431+
if mfe_base_url:
432+
video_uploads_url = course_mfe_url
435433
return video_uploads_url
436434

437435

cms/djangoapps/contentstore/video_storage_handlers.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
from tempfile import NamedTemporaryFile, mkdtemp
5252
from wsgiref.util import FileWrapper
5353

54-
from common.djangoapps.edxmako.shortcuts import render_to_response
5554
from common.djangoapps.util.json_request import JsonResponse
5655
from openedx.core.djangoapps.video_config.models import VideoTranscriptEnabledFlag
5756
from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE
@@ -63,8 +62,8 @@
6362
from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order
6463

6564
from .models import VideoUploadConfig
66-
from .toggles import use_new_video_uploads_page, use_mock_video_uploads
67-
from .utils import get_video_uploads_url, get_course_videos_context
65+
from .toggles import use_mock_video_uploads
66+
from .utils import get_video_uploads_url
6867
from .video_utils import validate_video_image
6968
from .views.course import get_course_and_check_access
7069

@@ -741,13 +740,7 @@ def videos_index_html(course, pagination_conf=None):
741740
"""
742741
Returns an HTML page to display previous video uploads and allow new ones
743742
"""
744-
if use_new_video_uploads_page(course.id):
745-
return redirect(get_video_uploads_url(course.id))
746-
context = get_course_videos_context(
747-
course,
748-
pagination_conf,
749-
)
750-
return render_to_response('videos_index.html', context)
743+
return redirect(get_video_uploads_url(course.id))
751744

752745

753746
def videos_index_json(course):

cms/static/cms/js/spec/main.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,8 @@
252252
'js/spec/utils/drag_and_drop_spec',
253253
'js/spec/utils/handle_iframe_binding_spec',
254254
'js/spec/utils/module_spec',
255-
'js/spec/views/active_video_upload_list_spec',
256-
'js/spec/views/previous_video_upload_spec',
257255
'js/spec/views/video_thumbnail_spec',
258-
'js/spec/views/course_video_settings_spec',
259256
'js/spec/views/video_transcripts_spec',
260-
'js/spec/views/previous_video_upload_list_spec',
261257
'js/spec/views/assets_spec',
262258
'js/spec/views/baseview_spec',
263259
'js/spec/views/paged_container_spec',

cms/static/js/factories/videos_index.js

Lines changed: 0 additions & 81 deletions
This file was deleted.

cms/static/js/models/active_video_upload.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)