refactor: more renames and doc updates

Author: kdmccormick

cms/djangoapps/contentstore/views/component.py

@@ -614,7 +614,7 @@ def get_unit_tags(usage_key):
     Get the tags of a Unit and build a json to be read by the UI
 
     Note: When migrating the `TagList` subview from `container_subview.js` to the course-authoring MFE,
-    this function can be simplified to use the REST API of openedx-learning,
+    this function can be simplified to use the REST API of openedx-core,
     which already provides this grouping + sorting logic.
     """
     # Get content tags from content tagging API

cms/djangoapps/modulestore_migrator/api/read_api.py

@@ -123,7 +123,7 @@ def get_migrations(
     is_failed: bool | None = None,
 ) -> t.Generator[ModulestoreMigration]:
     """
-    Given some criteria, get all modulestore->LearningCore migrations.
+    Given some criteria, get all modulestore->OexCore migrations.
 
     Returns an iterable, ordered from NEWEST to OLDEST.
 

cms/envs/test.py

@@ -210,7 +210,7 @@
 
 RATELIMIT_RATE = '2/m'
 
-############## openedx-learning (Learning Core) config ##############
+############## Open edX Core (openedx-core) config ##############
 OPENEDX_LEARNING = {
     "MEDIA": {"BACKEND": "django.core.files.storage.InMemoryStorage", "OPTIONS": {"location": MEDIA_ROOT + "_private"}}
 }

common/templates/xblock_v2/xblock_iframe.html

@@ -286,7 +286,7 @@
                 // Does the XBlock HTML contain arguments to pass to the InitFunction?
                 let data = {};
                 [].forEach.call(element.children, (childNode) => {
-                    // The newer/pure/LearningCore runtime uses 'xblock_json_init_args'
+                    // The newer/pure/OexCore runtime uses 'xblock_json_init_args'
                     // while the LMS runtime uses 'xblock-json-init-args'.
                     if (
                         childNode.matches('script.xblock_json_init_args')
@@ -405,13 +405,13 @@
               //
               // Here that is an issue because we show a confirmation modal when clicking cancel,
               // if the user stays to edit all TinyMCE editors are no longer there.
-              // 
+              //
               // We uncouple the listener to avoid remove the TinyMCE editors
               const extraCancelSelector = '.cancel-button';
               const elements = $(extraCancelSelector).first();
               if (elements.length) {
                 elements.first().unbind("click");
-                elements.on('click', function() {                    
+                elements.on('click', function() {
                     event.preventDefault();
                     runtime.notify('cancel', {});
                 });
@@ -421,7 +421,7 @@
 
         // Recursively initialize the JavaScript code of each XBlock:
         function initializeXBlockAndChildren(element, callback) {
-            // The newer/pure/LearningCore runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
+            // The newer/pure/OexCore runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
             const usageId = element.getAttribute('data-usage') || element.getAttribute('data-usage-id');
             if (usageId !== null) {
                 element[USAGE_ID_KEY] = usageId;
@@ -461,7 +461,7 @@
         }
 
         // Find the root XBlock node.
-        // The newer/pure/LearningCore runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
+        // The newer/pure/OexCore runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
         const rootNode = document.querySelector('.xblock, .xblock-v1'); // will always return the first matching element
         initializeXBlockAndChildren(rootNode, () => {
         });

openedx/core/djangoapps/content_libraries/api/blocks.py

@@ -474,8 +474,8 @@ def _import_staged_block(
             if source_assumes_global_assets:
                 filename = f"static/{filename}"
 
-            # Now construct the Learning Core data models for it...
-            # TODO: more of this logic should be pushed down to openedx-learning
+            # Now construct the Core data models for it...
+            # TODO: more of this logic should be pushed down to openedx-core
             media_type_str, _encoding = mimetypes.guess_type(filename)
             if not media_type_str:
                 media_type_str = "application/octet-stream"

openedx/core/djangoapps/content_libraries/tests/test_containers.py

@@ -875,7 +875,7 @@ def test_publish_subsection(self) -> None:
         )
 
         # TODO -- remove this when containers publish their children:
-        # https://github.com/openedx/openedx-learning/pull/307
+        # https://github.com/openedx/openedx-core/pull/307
         # Removing the unit with components because the components (children of children) are not published.
         # If the unit is kept, the subsection continues to have changes even after it is published.
         self._remove_container_children(
@@ -951,7 +951,7 @@ def test_publish_section(self) -> None:
         )
 
         # TODO -- remove this when containers publish their children:
-        # https://github.com/openedx/openedx-learning/pull/307
+        # https://github.com/openedx/openedx-core/pull/307
         # Removing the subsection with units because the units (children of children) are not published.
         # If the subsection is kept, the section continues to have changes even after it is published.
         self._remove_container_children(

openedx/core/djangoapps/xblock/api.py

@@ -28,9 +28,9 @@
 from openedx.core.types import User as UserType
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
-from openedx.core.djangoapps.xblock.runtime.learning_core_runtime import (
-    LearningCoreFieldData,
-    LearningCoreXBlockRuntime,
+from openedx.core.djangoapps.xblock.runtime.oex_core_runtime import (
+    OexCoreFieldData,
+    OexCoreXBlockRuntime,
 )
 from .data import CheckPerm, LatestVersion
 from .rest_api.url_converters import VersionConverter
@@ -40,7 +40,7 @@
     get_auto_latest_version,
 )
 
-from .runtime.learning_core_runtime import LearningCoreXBlockRuntime
+from .runtime.oex_core_runtime import OexCoreXBlockRuntime
 
 # Made available as part of this package's public API:
 from openedx.core.djangoapps.xblock.learning_context import LearningContext
@@ -50,7 +50,7 @@
 log = logging.getLogger(__name__)
 
 
-def get_runtime(user: UserType | None) -> LearningCoreXBlockRuntime:
+def get_runtime(user: UserType | None) -> OexCoreXBlockRuntime:
     """
     Return a new XBlockRuntime.
 
@@ -62,9 +62,9 @@ def get_runtime(user: UserType | None) -> LearningCoreXBlockRuntime:
     params = get_xblock_app_config().get_runtime_params()
     params.update(
         handler_url=get_handler_url,
-        authored_data_store=LearningCoreFieldData(),
+        authored_data_store=OexCoreFieldData(),
     )
-    runtime = LearningCoreXBlockRuntime(user, **params)
+    runtime = OexCoreXBlockRuntime(user, **params)
 
     return runtime
 

openedx/core/djangoapps/xblock/apps.py

@@ -18,7 +18,7 @@ class XBlockAppConfig(AppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OexCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content.
         """
         raise NotImplementedError
@@ -45,7 +45,7 @@ class LmsXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OexCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content in the LMS
         """
         return dict(
@@ -68,7 +68,7 @@ class StudioXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OexCoreXBlockRuntime parameters appropriate for viewing and/or
         editing XBlock content in Studio
         """
         return dict(

…/xblock/runtime/learning_core_runtime.py …oapps/xblock/runtime/oex_core_runtime.pyopenedx/core/djangoapps/xblock/runtime/learning_core_runtime.py renamed to openedx/core/djangoapps/xblock/runtime/oex_core_runtime.py openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py renamed to openedx/core/djangoapps/xblock/runtime/oex_core_runtime.py

@@ -33,30 +33,30 @@
 log = logging.getLogger(__name__)
 
 
-class LearningCoreFieldData(FieldData):
+class OexCoreFieldData(FieldData):
     """
     FieldData for the Learning Core XBlock Runtime
 
-    LearningCoreFieldData only supports the ``content`` and ``settings`` scopes.
+    OexCoreFieldData only supports the ``content`` and ``settings`` scopes.
     Any attempt to read or write fields with other scopes will raise a
     ``NotImplementedError``. This class does NOT support the parent and children
     scopes.
 
-    LearningCoreFieldData should only live for the duration of one request. The
-    interaction between LearningCoreXBlockRuntime and LearningCoreFieldData is
+    OexCoreFieldData should only live for the duration of one request. The
+    interaction between OexCoreXBlockRuntime and OexCoreFieldData is
     as follows:
 
-    1. LearningCoreXBlockRuntime knows how retrieve authored content data from
-       the Learning Core APIs in openedx-learning. This content is stored as
-       OLX, and LearningCoreXBlockRuntime won't know how to parse it into
+    1. OexCoreXBlockRuntime knows how retrieve authored content data from
+       the Content API in openedx-core. This content is stored as
+       OLX, and OexCoreXBlockRuntime won't know how to parse it into
        fields, since serialization logic can happen in the XBlock itself.
-    2. LearningCoreXBlockRuntime will then invoke the block to parse the OLX and
-       then force_save its field data into LearningCoreFieldData.
+    2. OexCoreXBlockRuntime will then invoke the block to parse the OLX and
+       then force_save its field data into OexCoreFieldData.
     3. After this point, various handler and API calls might alter fields for
        a given block using the XBlock.
-    4. The main thing that LearningCoreXBlockRuntime will want to know later on
+    4. The main thing that OexCoreXBlockRuntime will want to know later on
        is whether it needs to write any changes when its save_block method is
-       invoked. To support this, LearningCoreFieldData needs to track which
+       invoked. To support this, OexCoreFieldData needs to track which
        blocks have changes to any of their fields. See the marked_unchanged
        method docstring for more details.
     """
@@ -74,9 +74,9 @@ def mark_unchanged(self, block):
         Calling set or delete on a field always marks the block with that field
         as changed, by adding its usage key to self.changed. But set() is also
         called at the very beginning, when a block is first loaded from the
-        database by the LearningCoreXBlockRuntime's get_block call.
+        database by the OexCoreXBlockRuntime's get_block call.
 
-        This method exists so that LearningCoreXBlockRuntime can call it
+        This method exists so that OexCoreXBlockRuntime can call it
         whenever it has either just done a get_block operation (because those
         set() calls represent the already-persisted content state), or a
         save_block operation (since those changes will have been persisted).
@@ -153,14 +153,14 @@ def _check_field(self, block, name):
         if field.scope not in (Scope.content, Scope.settings):
             raise NotImplementedError(
                 f"Scope {field.scope} (field {name} of {block.scope_ids.usage_id}) "
-                "is unsupported. LearningCoreFieldData only supports the content"
+                "is unsupported. OexCoreFieldData only supports the content"
                 " and settings scopes."
             )
 
 
-class LearningCoreXBlockRuntime(XBlockRuntime):
+class OexCoreXBlockRuntime(XBlockRuntime):
     """
-    XBlock runtime that uses openedx-learning apps for content storage.
+    XBlock runtime that uses openedx-core APIs (not ModuleStore).
 
     The superclass is doing all the hard stuff. This class only only has to
     worry about the block storage, block serialization/de-serialization, and
@@ -173,7 +173,7 @@ def get_block(self, usage_key, for_parent=None, *, version: int | LatestVersion
 
         This method will find the OLX for the content in Learning Core, parse it
         into an XBlock (with mixins) instance, and properly initialize our
-        internal LearningCoreFieldData instance with the field values from the
+        internal OexCoreFieldData instance with the field values from the
         parsed OLX.
         """
         # We can do this more efficiently in a single query later, but for now

openedx/core/djangoapps/xblock/runtime/runtime.py

@@ -259,14 +259,14 @@ def applicable_aside_types(self, block: XBlock):
 
     def parse_xml_file(self, fileobj):
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with LearningCoreXBlockRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OexCoreXBlockRuntime")
 
     def add_node_as_child(self, block, node):
         """
         Called by XBlock.parse_xml to treat a child node as a child block.
         """
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with LearningCoreXBlockRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OexCoreXBlockRuntime")
 
     def service(self, block: XBlock, service_name: str):
         """