Skip to content

feat: remove built-in HTML XBlock implementation (slash-n-burn #37819) #38748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
irfanuddinahmad wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: remove built-in HTML XBlock implementation (slash-n-burn #37819) #38748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64626a7
feat: remove built-in HTML XBlock implementation (slash-n-burn #37819)
Jun 11, 2026
2c56315
fix: restore html entrypoint pointing to xblocks_contrib
Jun 12, 2026
430730d
fix: sort imports (ruff isort) after xblocks_contrib migration
Jun 12, 2026
998f59c
fix: update HtmlBlock mock.patch paths to xblocks_contrib.html
Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cms/djangoapps/contentstore/views/tests/test_course_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def test_empty_content_type(self):
self.assertContains(response, self.SUCCESSFUL_RESPONSE)
self.assertEqual(response.status_code, 200) # noqa: PT009

@mock.patch('xmodule.html_block.HtmlBlock.index_dictionary')
@mock.patch('xblocks_contrib.html.HtmlBlock.index_dictionary')
def test_reindex_course_search_index_error(self, mock_index_dictionary):
"""
Test json response with mocked error data for html
Expand Down Expand Up @@ -377,7 +377,7 @@ def test_reindex_video_error_json_responses(self, mock_index_dictionary):
with self.assertRaises(SearchIndexingError): # noqa: PT027
reindex_course_and_check_access(self.course.id, self.user)

@mock.patch('xmodule.html_block.HtmlBlock.index_dictionary')
@mock.patch('xblocks_contrib.html.HtmlBlock.index_dictionary')
def test_reindex_html_error_json_responses(self, mock_index_dictionary):
"""
Test json response with mocked error data for html
Expand Down Expand Up @@ -487,7 +487,7 @@ def test_indexing_video_error_responses(self, mock_index_dictionary):
with self.assertRaises(SearchIndexingError): # noqa: PT027
CoursewareSearchIndexer.do_course_reindex(modulestore(), self.course.id)

@mock.patch('xmodule.html_block.HtmlBlock.index_dictionary')
@mock.patch('xblocks_contrib.html.HtmlBlock.index_dictionary')
def test_indexing_html_error_responses(self, mock_index_dictionary):
"""
Test do_course_reindex response with mocked error data for html
Expand Down
3 changes: 2 additions & 1 deletion lms/djangoapps/courseware/tests/test_block_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
Mixologist, # pylint: disable=wrong-import-order
)
from xblock.test.tools import TestRuntime # pylint: disable=wrong-import-order
from xblocks_contrib.html import HtmlBlock
from xblocks_contrib.problem.capa.tests.response_xml_factory import (
OptionResponseXMLFactory, # pylint: disable=reimported
)
Expand Down Expand Up @@ -96,7 +97,7 @@
from openedx.core.lib.url_utils import quote_slashes
from xmodule.capa_block import ProblemBlock
from xmodule.contentstore.django import contentstore
from xmodule.html_block import AboutBlock, CourseInfoBlock, HtmlBlock, StaticTabBlock
from xmodule.html_block import AboutBlock, CourseInfoBlock, StaticTabBlock
from xmodule.lti_block import LTIBlock
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import XBlockI18nService, modulestore
Expand Down
8 changes: 0 additions & 8 deletions openedx/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,14 +2095,6 @@ def add_optional_apps(optional_apps, installed_apps):
# .. toggle_target_removal_date: 2026-04-10
USE_EXTRACTED_LTI_BLOCK = True

# .. toggle_name: USE_EXTRACTED_HTML_BLOCK
# .. toggle_default: True
# .. toggle_implementation: DjangoSetting
# .. toggle_description: Enables the use of the extracted HTML XBlock, which has been shifted to the 'openedx/xblocks-contrib' repo.
# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-11-10
# .. toggle_target_removal_date: 2026-04-10
USE_EXTRACTED_HTML_BLOCK = True

# .. toggle_name: USE_EXTRACTED_DISCUSSION_BLOCK
# .. toggle_default: False
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ discuss = "xmodule.template_block:TranslateCustomTagBlock"
discussion = "xmodule.discussion_block:DiscussionXBlock"
error = "xmodule.error_block:ErrorBlock"
hidden = "xmodule.hidden_block:HiddenBlock"
html = "xmodule.html_block:HtmlBlock"
itembank = "xmodule.item_bank_block:ItemBankBlock"
html = "xblocks_contrib:HtmlBlock"
image = "xmodule.template_block:TranslateCustomTagBlock"
library = "xmodule.library_root_xblock:LibraryRoot"
library_content = "xmodule.library_content_block:LegacyLibraryContentBlock"
Expand Down
8 changes: 0 additions & 8 deletions webpack.builtinblocks.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ module.exports = {
'./xmodule/js/src/xmodule.js',
'./xmodule/js/src/raw/edit/xml.js'
],
HtmlBlockDisplay: [
'./xmodule/js/src/xmodule.js',
'./xmodule/js/src/html/display.js',
'./xmodule/js/src/javascript_loader.js',
'./xmodule/js/src/collapsible.js',
'./xmodule/js/src/html/imageModal.js',
'./xmodule/js/common_static/js/vendor/draggabilly.js'
],
HtmlBlockEditor: [
'./xmodule/js/src/xmodule.js',
'./xmodule/js/src/html/edit.js'
Expand Down
Loading
Loading