fixup! temp: support optional completion for individual XBlocks

Author: Agrendalath

common/templates/xblock_wrapper.html

@@ -1,7 +1,11 @@
 ## xss-lint: disable=mako-missing-default
 <%!
 from openedx.core.djangolib.js_utils import dump_js_escaped_json
+from django.utils.translation import gettext as _
 %>
+% if 'data-is-optional="True"' in data_attributes:
+  <span class="optional-completion-badge text-uppercase border badge badge-light mb-3">${_("Optional")}</span>
+% endif
 <div class="${' '.join(classes) | n, decode.utf8}" ${data_attributes}>
 % if js_init_parameters:
   <script type="json/xblock-args" class="xblock-json-init-args">

openedx/core/lib/xblock_utils/__init__.py

@@ -23,6 +23,7 @@
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
 from xblock.exceptions import InvalidScopeError
+from xblock.fields import Scope
 from xblock.scorable import ScorableXBlockMixin
 
 from common.djangoapps import static_replace
@@ -141,6 +142,13 @@ def wrap_xblock(
     if block.name:
         data['name'] = block.name
 
+    # We check whether the block is explicitly set as optional because this information is already displayed for units
+    # in the Learning MFE.
+    has_children = getattr(block, "children", False)
+    is_explicitly_optional = block.get_explicitly_set_fields_by_scope(Scope.settings).get('optional_completion', False)
+    if view != STUDIO_VIEW and not has_children and is_explicitly_optional:
+        data['is-optional'] = getattr(block, 'optional_completion', False)
+
     template_context = {
         'content': block.display_name if display_name_only else frag.content,
         'classes': css_classes,