perf: Drop the addition of XModuleMixin for the xblocks-contrib blocks

Author: farhan

cms/djangoapps/contentstore/views/component.py

@@ -20,6 +20,7 @@
 from xblock.exceptions import NoSuchHandlerError
 from xblock.plugin import PluginMissingError
 from xblock.runtime import Mixologist
+from xmodule.x_module import XModuleMixin
 
 from common.djangoapps.edxmako.shortcuts import render_to_response
 from common.djangoapps.student.auth import has_course_author_access
@@ -132,7 +133,11 @@ def _load_mixed_class(category):
         return None
 
     component_class = XBlock.load_class(category)
-    mixologist = Mixologist(settings.XBLOCK_MIXINS)
+    mixins = settings.XBLOCK_MIXINS
+    class_with_path_name = f"{component_class.__module__}.{component_class.__name__}"
+    if class_with_path_name in getattr(settings, "STANDARD_COMPLIANT_XBLOCKS", ()):
+        mixins = tuple(m for m in mixins if m is not XModuleMixin)
+    mixologist = Mixologist(mixins)
     return mixologist.mix(component_class)
 
 

openedx/envs/common.py

@@ -2030,6 +2030,20 @@ def add_optional_apps(optional_apps, installed_apps):
     EditInfoMixin,
 )
 
+# .. setting_name: STANDARD_COMPLIANT_XBLOCKS
+# .. setting_default: ()
+# .. setting_description: Tuple of fully-qualified XBlock class names that conform to the standard XBlock
+#     interface. For these XBlocks, the platform will not inject legacy mixins like XModuleMixin when
+#     instantiating them via the various XBlock runtimes.
+STANDARD_COMPLIANT_XBLOCKS = (
+    "xblocks_contrib.video.video.VideoBlock",
+    "xblocks_contrib.word_cloud.word_cloud.WordCloudBlock",
+    "xblocks_contrib.discussion.discussion.DiscussionXBlock",
+    "xblocks_contrib.poll.poll.PollBlock",
+    "xblocks_contrib.html.html.HtmlBlockMixin",
+    "xblocks_contrib.annotatable.annotatable.AnnotatableBlock",
+)
+
 ######################## Built-in Blocks Extraction ########################
 
 # The following Django settings flags have been introduced temporarily to facilitate