fix: feat: remove legacy attrs from extracted annotatable, html & problem block

Author: irtazaakram

openedx/envs/common.py

@@ -2101,7 +2101,7 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
 # .. toggle_target_removal_date: 2026-04-10
-USE_EXTRACTED_PROBLEM_BLOCK = False
+USE_EXTRACTED_PROBLEM_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
 # .. toggle_default: True

requirements/edx/base.txt

@@ -1299,7 +1299,7 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-attrs-annotatable-html-problem#egg=xblocks-contrib
     # via -r requirements/edx/bundled.in
 xmlsec==1.3.14
     # via

requirements/edx/development.txt

@@ -2326,7 +2326,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-attrs-annotatable-html-problem#egg=xblocks-contrib
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

requirements/edx/doc.txt

@@ -1637,7 +1637,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-attrs-annotatable-html-problem#egg=xblocks-contrib
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

requirements/edx/testing.txt

@@ -1732,7 +1732,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-attrs-annotatable-html-problem#egg=xblocks-contrib
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

xmodule/conditional_block.py

@@ -222,9 +222,9 @@ def student_view(self, _context):
         return fragment
 
     def get_html(self):
-        required_html_ids = [block.location.html_id() for block in self.get_required_blocks]
+        required_html_ids = [block.usage_key.html_id() for block in self.get_required_blocks]
         return self.runtime.service(self, 'mako').render_lms_template('conditional_ajax.html', {
-            'element_id': self.location.html_id(),
+            'element_id': self.usage_key.html_id(),
             'ajax_url': self.ajax_url,
             'depends': ';'.join(required_html_ids)
         })

xmodule/lti_block.py

@@ -595,7 +595,7 @@ def get_resource_link_id(self):
         i4x-2-3-lti-31de800015cf4afb973356dbe81496df this part of resource_link_id:
         makes resource_link_id to be unique among courses inside same system.
         """
-        return str(parse.quote(f"{settings.LMS_BASE}-{self.location.html_id()}"))
+        return str(parse.quote(f"{settings.LMS_BASE}-{self.usage_key.html_id()}"))
 
     def get_lis_result_sourcedid(self):
         """

xmodule/tests/test_conditional.py

@@ -84,6 +84,7 @@ def create(system, source_is_error_block=False, source_visible_to_staff_only=Fal
         else:
             source_block = Mock(name='source_block')
             source_block.location = source_location
+            source_block.usage_key = source_location
 
         source_block.visible_to_staff_only = source_visible_to_staff_only
         source_block.runtime = system
@@ -97,6 +98,7 @@ def create(system, source_is_error_block=False, source_visible_to_staff_only=Fal
         child_block.runtime = system
         child_block.render = lambda view, context=None: system.render(child_block, view, context)
         child_block.location = source_location.replace(category='html', name='child')
+        child_block.usage_key = child_block.location
 
         def visible_to_nonstaff_users(desc):
             """
@@ -121,7 +123,7 @@ def load_item(usage_id, for_parent=None):  # pylint: disable=unused-argument
             'conditional_attr': 'attempted',
             'conditional_value': 'true',
             'xml_attributes': {'attempted': 'true'},
-            'children': [child_block.location],
+            'children': [child_block.usage_key],
         })
 
         cond_block = ConditionalBlock(