diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py index c287f8c4dbec..55ec0e4ff5dc 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 diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index c6861b134dd8..efd6905745b3 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -53,11 +53,9 @@ 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 @@ -289,11 +287,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 diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js index d50f6b4bbe4a..f65f88e2811d 100644 --- a/cms/static/js/views/pages/container.js +++ b/cms/static/js/views/pages/container.js @@ -504,12 +504,11 @@ function($, _, Backbone, gettext, BasePage, if (!options || options.view !== 'visibility_view') { const primaryHeader = $(event.target).closest('.xblock-header-primary, .nav-actions'); - var useNewTextEditor = primaryHeader.attr('use-new-editor-text'), - useNewVideoEditor = primaryHeader.attr('use-new-editor-video'), + var useNewVideoEditor = primaryHeader.attr('use-new-editor-video'), useNewProblemEditor = primaryHeader.attr('use-new-editor-problem'), blockType = primaryHeader.attr('data-block-type'); - if((useNewTextEditor === 'True' && blockType === 'html') + if((blockType === 'html') || (useNewVideoEditor === 'True' && blockType === 'video') || (useNewProblemEditor === 'True' && blockType === 'problem') ) { @@ -1170,8 +1169,7 @@ function($, _, Backbone, gettext, BasePage, }, onNewXBlock: function(xblockElement, scrollOffset, is_duplicate, data) { - var useNewTextEditor = this.$('.xblock-header-primary').attr('use-new-editor-text'), - useNewVideoEditor = this.$('.xblock-header-primary').attr('use-new-editor-video'), + var useNewVideoEditor = this.$('.xblock-header-primary').attr('use-new-editor-video'), useVideoGalleryFlow = this.$('.xblock-header-primary').attr("use-video-gallery-flow"), useNewProblemEditor = this.$('.xblock-header-primary').attr('use-new-editor-problem'); @@ -1181,7 +1179,7 @@ function($, _, Backbone, gettext, BasePage, var blockType = data.locator.match(matchBlockTypeFromLocator); } // open mfe editors for new blocks only and not for content imported from libraries - if(!data.hasOwnProperty('upstreamRef') && ((useNewTextEditor === 'True' && blockType.includes('html')) + if(!data.hasOwnProperty('upstreamRef') && (blockType.includes('html') || (useNewVideoEditor === 'True' && blockType.includes('video')) || (useNewProblemEditor === 'True' && blockType.includes('problem'))) ){ diff --git a/cms/templates/container.html b/cms/templates/container.html index 1c56740ca9e3..36cf84d2b40a 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 @@ -115,7 +115,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 +171,6 @@

% endif -
- <%static:studiofrontend entry="editImageModal"> - { - "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.revision | n, js_escaped_string}" - }, - "help_tokens": { - "image_accessibility": "${get_online_help_info('image_accessibility')['doc_url'] | n, js_escaped_string}" - }, - "lang": "${language_code | n, js_escaped_string}" - } - -
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html index 4fb3c71803cb..b3bfc3893660 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} diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html deleted file mode 100644 index 8074e0d58359..000000000000 --- a/cms/templates/widgets/html-edit.html +++ /dev/null @@ -1,13 +0,0 @@ -<%! from django.utils.translation import gettext as _ %> - -
-
-
- % if editor == 'visual': - - % endif - -
-
-
-<%include file="metadata-edit.html" /> diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py index 8fcc8b9a687f..c465fdd03ead 100644 --- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py +++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py @@ -415,11 +415,11 @@ def test_library_blocks_studio_view(self): # Add a 'html' XBlock to the library: create_date = datetime(2024, 6, 6, 6, 6, 6, tzinfo=timezone.utc) with freeze_time(create_date): - block_data = self._add_block_to_library(lib_id, "html", "html1") + block_data = self._add_block_to_library(lib_id, "problem", "problem1") self.assertDictContainsEntries(block_data, { - "id": "lb:CL-TEST:testlib2:html:html1", - "display_name": "Text", - "block_type": "html", + "id": "lb:CL-TEST:testlib2:problem:problem1", + "display_name": "Blank Problem", + "block_type": "problem", "has_unpublished_changes": True, "last_published": None, "published_by": None, @@ -441,14 +441,14 @@ def test_library_blocks_studio_view(self): block_data["has_unpublished_changes"] = False block_data["last_published"] = publish_date.isoformat().replace('+00:00', 'Z') block_data["published_by"] = "Bob" - block_data["published_display_name"] = "Text" + block_data["published_display_name"] = "Blank Problem" self.assertDictContainsEntries(self._get_library_block(block_id), block_data) assert self._get_library_blocks(lib_id)['results'] == [block_data] # Now update the block's OLX: orig_olx = self._get_library_block_olx(block_id) - assert ' dict[str, str | None]: