From 4da2f0937a993ff31046e7c2384690a660586352 Mon Sep 17 00:00:00 2001 From: farhan Date: Tue, 28 Apr 2026 21:01:06 +0500 Subject: [PATCH] chore: remove legacy video editor code --- cms/djangoapps/contentstore/toggles.py | 21 +-------------------- cms/static/js/views/pages/container.js | 10 ++++------ cms/templates/container.html | 4 +--- cms/templates/studio_xblock_wrapper.html | 4 +--- 4 files changed, 7 insertions(+), 32 deletions(-) diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py index 30a030f966a9..aade40c2fb9b 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.video_editor -# .. toggle_implementation: WaffleFlag -# .. toggle_default: False -# .. toggle_description: Temporarily fall back to the old Video component (a.k.a. video 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_VIDEO_EDITOR = CourseWaffleFlag('legacy_studio.video_editor', __name__) - - -def use_new_video_editor(course_key): - """ - Returns a boolean = true if new video editor is enabled - """ - return not LEGACY_STUDIO_VIDEO_EDITOR.is_enabled(course_key) - - # .. toggle_name: legacy_studio.pdf_editor # .. toggle_implementation: WaffleFlag # .. toggle_default: False @@ -129,7 +110,7 @@ def use_new_pdf_editor(): # .. toggle_use_cases: temporary # .. toggle_creation_date: 2023-04-03 # .. toggle_target_removal_date: 2023-6-01 -# .. toggle_warning: You need to activate the `new_core_editors.use_new_video_editor` flag to use this new flow. +# .. toggle_warning: This controls the new core video xblock editor flow. ENABLE_VIDEO_GALLERY_FLOW_FLAG = WaffleFlag('new_core_editors.use_video_gallery_flow', __name__) diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js index 543503a598df..561e04e8e115 100644 --- a/cms/static/js/views/pages/container.js +++ b/cms/static/js/views/pages/container.js @@ -538,12 +538,11 @@ function($, _, Backbone, gettext, BasePage, if (!options || options.view !== 'visibility_view') { const primaryHeader = $(event.target).closest('.xblock-header-primary, .nav-actions'); - var useNewVideoEditor = primaryHeader.attr('use-new-editor-video'), - blockType = primaryHeader.attr('data-block-type'), + var blockType = primaryHeader.attr('data-block-type'), useNewPdfEditor = primaryHeader.attr('use-new-editor-pdf'); if((blockType === 'html') - || (useNewVideoEditor === 'True' && blockType === 'video') + || (blockType === 'video') || (blockType === 'problem') || (useNewPdfEditor === 'True' && blockType === 'pdf') ) { @@ -1204,8 +1203,7 @@ function($, _, Backbone, gettext, BasePage, }, onNewXBlock: function(xblockElement, scrollOffset, is_duplicate, data) { - var useNewVideoEditor = this.$('.xblock-header-primary').attr('use-new-editor-video'), - useVideoGalleryFlow = this.$('.xblock-header-primary').attr("use-video-gallery-flow"); + var useVideoGalleryFlow = this.$('.xblock-header-primary').attr("use-video-gallery-flow"); // find the block type in the locator if availible if(data.hasOwnProperty('locator')) { @@ -1214,7 +1212,7 @@ function($, _, Backbone, gettext, BasePage, } // open mfe editors for new blocks only and not for content imported from libraries if(!data.hasOwnProperty('upstreamRef') && (blockType.includes('html') - || (useNewVideoEditor === 'True' && blockType.includes('video')) + || (blockType.includes('video')) || (blockType.includes('problem'))) ){ if (this.options.isIframeEmbed && (this.isSplitTestContentPage || this.isVerticalContentPage)) { diff --git a/cms/templates/container.html b/cms/templates/container.html index 09fcf19047e7..e1995de4ba58 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_pdf_editor, use_new_video_editor, use_video_gallery_flow +from cms.djangoapps.contentstore.toggles import use_new_pdf_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 @@ -111,7 +111,6 @@ <%block name="content"> <% -use_new_editor_video = use_new_video_editor(xblock_locator.course_key) use_new_editor_pdf = use_new_pdf_editor() use_new_video_gallery_flow = use_video_gallery_flow() %> @@ -167,7 +166,6 @@