Merge branch 'master' into pwnage101/ENT-11510

Author: kiram15

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

@@ -21,6 +21,7 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
     use_new_import_page = serializers.SerializerMethodField()
     use_new_export_page = serializers.SerializerMethodField()
     use_new_files_uploads_page = serializers.SerializerMethodField()
+    use_new_pdf_editor = serializers.SerializerMethodField()
     use_new_video_uploads_page = serializers.SerializerMethodField()
     use_new_course_outline_page = serializers.SerializerMethodField()
     use_new_unit_page = serializers.SerializerMethodField()
@@ -120,6 +121,12 @@ def get_use_new_files_uploads_page(self, obj):
         """
         return True
 
+    def get_use_new_pdf_editor(self, obj):
+        """
+        Method to get the use_new_pdf_editor switch
+        """
+        return toggles.use_new_pdf_editor()
+
     def get_use_new_video_uploads_page(self, obj):
         """
         Method to get the use_new_video_uploads_page switch.

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py

@@ -35,6 +35,7 @@ class CourseWaffleFlagsViewTest(CourseTestCase):
         "use_new_unit_page": True,
         "use_new_updates_page": True,
         "use_new_video_uploads_page": False,
+        "use_new_pdf_editor": True,
         "use_react_markdown_editor": False,
         "use_video_gallery_flow": False,
         "enable_course_optimizer_check_prev_run_links": False,

cms/djangoapps/contentstore/toggles.py

@@ -105,6 +105,23 @@ def use_new_video_editor(course_key):
     return not LEGACY_STUDIO_VIDEO_EDITOR.is_enabled(course_key)
 
 
+# .. toggle_name: legacy_studio.pdf_editor
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Use the PDF XBlock's studio_view instead of the new React-based editor. You may wish to do
+#      this if you run a custom PDF block.
+# .. toggle_use_cases: opt_out
+# .. toggle_creation_date: 2026-03-10
+LEGACY_STUDIO_PDF_EDITOR = WaffleFlag('legacy_studio.pdf_editor', __name__)
+
+
+def use_new_pdf_editor():
+    """
+    Returns a boolean = true if new video editor is enabled
+    """
+    return not LEGACY_STUDIO_PDF_EDITOR.is_enabled()
+
+
 # .. toggle_name: new_core_editors.use_video_gallery_flow
 # .. toggle_implementation: WaffleFlag
 # .. toggle_default: False

cms/static/js/views/pages/container.js

@@ -491,14 +491,14 @@ function($, _, Backbone, gettext, BasePage,
             if ($target.closest('button, a, input, label, .actions-list').length) {
                 return;
             }
-            
+
             var $wrapper = $target.closest('.studio-xblock-wrapper');
 
             // Deselect all other xblocks
             this.$('.studio-xblock-wrapper.is-selected').not($wrapper).removeClass('is-selected');
 
             $wrapper.toggleClass('is-selected');
-           
+
             if (this.options.isIframeEmbed) {
                 const contentId = this.findXBlockElement(event.target).data('locator');
                 this.postMessageToParent({
@@ -539,11 +539,13 @@ function($, _, Backbone, gettext, BasePage,
                 const primaryHeader = $(event.target).closest('.xblock-header-primary, .nav-actions');
 
                 var useNewVideoEditor = primaryHeader.attr('use-new-editor-video'),
-                    blockType = primaryHeader.attr('data-block-type');
+                    blockType = primaryHeader.attr('data-block-type'),
+                    useNewPdfEditor = primaryHeader.attr('use-new-editor-pdf');
 
                 if((blockType === 'html')
                         || (useNewVideoEditor === 'True' && blockType === 'video')
                         || (blockType === 'problem')
+                        || (useNewPdfEditor === 'True' && blockType === 'pdf')
                 ) {
                     var destinationUrl = primaryHeader.attr('authoring_MFE_base_url')
                         + '/' + blockType

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_video_editor, use_video_gallery_flow
+from cms.djangoapps.contentstore.toggles import use_new_pdf_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
@@ -112,6 +112,7 @@
 
 <%
 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,6 +168,7 @@ <h1 class="page-header-title xblock-field-value incontext-editor-value"><span cl
 
         <nav class="nav-actions" aria-label="${_('Page Actions')}"
         use-new-editor-video = ${use_new_editor_video}
+        use-new-editor-pdf = ${use_new_editor_pdf}
         use-video-gallery-flow = ${use_new_video_gallery_flow}
         authoring_MFE_base_url = ${get_editor_page_base_url(xblock_locator.course_key)}
         data-block-type = ${xblock.scope_ids.block_type}

cms/templates/studio_xblock_wrapper.html

@@ -8,12 +8,13 @@
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string
 )
-from cms.djangoapps.contentstore.toggles import use_new_video_editor, use_video_gallery_flow
+from cms.djangoapps.contentstore.toggles import use_new_pdf_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_video = use_new_video_editor(xblock.context_key)
+use_new_editor_pdf = use_new_pdf_editor()
 use_new_video_gallery_flow = use_video_gallery_flow()
 use_tagging = not is_tagging_feature_disabled()
 xblock_url = xblock_studio_url(xblock)
@@ -83,6 +84,7 @@
     % endif
     "
     use-new-editor-video = ${use_new_editor_video}
+    use-new-editor-pdf = ${use_new_editor_pdf}
     use-video-gallery-flow = ${use_new_video_gallery_flow}
     authoring_MFE_base_url = ${get_editor_page_base_url(xblock.location.course_key)}
     data-block-type = ${xblock.scope_ids.block_type}

lms/djangoapps/course_blocks/transformers/library_content.py

@@ -1,20 +1,24 @@
 """
-Content Library Transformer.
+Item Bank Transformer.
+
+Transformers for handling item bank blocks (library_content, itembank, etc.)
+that use ItemBankMixin for randomized content selection.
 """
 
 
 import json
 import logging
 
 from eventtracking import tracker
+from xblock.core import XBlock
 
 from common.djangoapps.track import contexts
 from lms.djangoapps.courseware.models import StudentModule
 from openedx.core.djangoapps.content.block_structure.transformer import (
     BlockStructureTransformer,
     FilteringTransformerMixin,
 )
-from xmodule.library_content_block import LegacyLibraryContentBlock  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.item_bank_block import ItemBankMixin  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 from ..utils import get_student_module_as_dict
@@ -25,10 +29,13 @@
 class ContentLibraryTransformer(FilteringTransformerMixin, BlockStructureTransformer):
     """
     A transformer that manipulates the block structure by removing all
-    blocks within a library_content block to which a user should not
-    have access.
+    blocks within item bank blocks (library_content, itembank, etc.)
+    to which a user should not have access.
+
+    This transformer works with any XBlock that inherits from ItemBankMixin,
+    filtering children based on the selection logic defined by each block type.
 
-    Staff users are not to be exempted from library content pathways.
+    Staff users are not to be exempted from item bank pathways.
     """
     WRITE_VERSION = 1
     READ_VERSION = 1
@@ -61,10 +68,10 @@ def summarize_block(usage_key):
                 "original_usage_version": str(orig_version) if orig_version else None,
             }
 
-        # For each block check if block is library_content.
-        # If library_content add children array to content_library_children field
+        # For each block check if block uses ItemBankMixin (e.g., library_content, itembank).
+        # If so add block analytics summary for each of its children.
         for block_key in block_structure.topological_traversal(
-                filter_func=lambda block_key: block_key.block_type == 'library_content',
+                filter_func=lambda block_key: issubclass(XBlock.load_class(block_key.block_type), ItemBankMixin),
                 yield_descendants_of_unyielded=True,
         ):
             xblock = block_structure.get_xblock(block_key)
@@ -76,7 +83,9 @@ def transform_block_filters(self, usage_info, block_structure):
         all_library_children = set()
         all_selected_children = set()
         for block_key in block_structure:
-            if block_key.block_type != 'library_content':
+            block_class = XBlock.load_class(block_key.block_type)
+
+            if block_class is None or not issubclass(block_class, ItemBankMixin):
                 continue
             library_children = block_structure.get_children(block_key)
             if library_children:
@@ -98,7 +107,12 @@ def transform_block_filters(self, usage_info, block_structure):
 
                 # Update selected
                 previous_count = len(selected)
-                block_keys = LegacyLibraryContentBlock.make_selection(selected, library_children, max_count)
+                # Get the cached block class to call make_selection
+                block_class = XBlock.load_class(block_key.block_type)
+                if block_class is None:
+                    logger.error('Failed to load block class for %s', block_key)
+                    continue
+                block_keys = block_class.make_selection(selected, library_children, max_count)
                 selected = block_keys['selected']
 
                 # Save back any changes
@@ -128,7 +142,7 @@ def check_child_removal(block_key):
             """
             Return True if selected block should be removed.
 
-            Block is removed if it is part of library_content, but has
+            Block is removed if it is a child of an item bank block, but has
             not been selected for current user.
             """
             if block_key not in all_library_children:
@@ -156,6 +170,12 @@ def format_block_keys(keys):
                 json_result.append(info)
             return json_result
 
+        # Get the cached block class to call publish_selected_children_events
+        block_class = XBlock.load_class(location.block_type)
+        if block_class is None:
+            logger.error('Failed to load block class for publishing events: %s', location)
+            return
+
         def publish_event(event_name, result, **kwargs):
             """
             Helper function to publish an event for analytics purposes
@@ -170,11 +190,12 @@ def publish_event(event_name, result, **kwargs):
             context = contexts.course_context_from_course_id(location.course_key)
             if user_id:
                 context['user_id'] = user_id
-            full_event_name = f"edx.librarycontentblock.content.{event_name}"
+            event_prefix = block_class.get_selected_event_prefix()
+            full_event_name = f"{event_prefix}.{event_name}"
             with tracker.get_tracker().context(full_event_name, context):
                 tracker.emit(full_event_name, event_data)
 
-        LegacyLibraryContentBlock.publish_selected_children_events(
+        block_class.publish_selected_children_events(
             block_keys,
             format_block_keys,
             publish_event,
@@ -184,12 +205,14 @@ def publish_event(event_name, result, **kwargs):
 class ContentLibraryOrderTransformer(BlockStructureTransformer):
     """
     A transformer that manipulates the block structure by modifying the order of the
-    selected blocks within a library_content block to match the order of the selections
-    made by the ContentLibraryTransformer or the corresponding XBlock. So this transformer
-    requires the selections for the randomized content block to be already
-    made either by the ContentLibraryTransformer or the XBlock.
+    selected blocks within item bank blocks (library_content, itembank, etc.)
+    to match the order of the selections made by the ContentLibraryTransformer or the
+    corresponding XBlock. This transformer requires the selections for the item bank block
+    to be already made either by the ContentLibraryTransformer or the XBlock.
+
+    This transformer works with any XBlock that inherits from ItemBankMixin.
 
-    Staff users are *not* exempted from library content pathways.
+    Staff users are *not* exempted from item bank pathways.
     """
     WRITE_VERSION = 1
     READ_VERSION = 1
@@ -217,7 +240,8 @@ def transform(self, usage_info, block_structure):
         to match the order of the selections made and stored in the XBlock 'selected' field.
         """
         for block_key in block_structure:
-            if block_key.block_type != 'library_content':
+            block_class = XBlock.load_class(block_key.block_type)
+            if block_class is None or not issubclass(block_class, ItemBankMixin):
                 continue
 
             library_children = block_structure.get_children(block_key)
@@ -228,7 +252,7 @@ def transform(self, usage_info, block_structure):
                 current_selected_blocks = {item[1] for item in state_dict.get('selected', [])}
 
                 # As the selections should have already been made by the ContentLibraryTransformer,
-                # the current children of the library_content block should be the same as the stored
+                # the current children of the item bank block should be the same as the stored
                 # selections. If they aren't, some other transformer that ran before this transformer
                 # has modified those blocks (for example, content gating may have affected this). So do not
                 # transform the order in that case.