Merge branch 'learning-core-libs-readwrite-runtime' into kdmccormick/…

…noop
openedx · Feb 21, 2024 · 4a32dc2 · 4a32dc2
2 parents 91b330c + 9829f60
commit 4a32dc2
Show file tree

Hide file tree

Showing 38 changed files with 1,208 additions and 3,005 deletions.
diff --git a/cms/djangoapps/contentstore/management/commands/backfill_orgs_and_org_courses.py b/cms/djangoapps/contentstore/management/commands/backfill_orgs_and_org_courses.py
@@ -273,9 +273,9 @@ def find_orgslug_libraryid_pairs() -> Set[Tuple[str, str]]:
 
     Note that this only considers "version 1" (aka "legacy" or "modulestore-based")
     content libraries.
-    We do not consider "version 2" (aka "blockstore-based") content libraries,
-    because those require a database-level link to their authoring organization,
-    and thus would not need backfilling via this command.
+    We do not consider "version 2" content libraries, because those require a
+    database-level link to their authoring organization, and thus would not need
+    backfilling via this command.
 
     Returns: set[tuple[str, str]]
     """

diff --git a/cms/djangoapps/contentstore/tasks.py b/cms/djangoapps/contentstore/tasks.py
@@ -922,15 +922,14 @@ def _create_metadata(v1_library_key, collection_uuid):
     library_license = ''  # '' = ALL_RIGHTS_RESERVED
     with atomic():
         return v2contentlib_api.create_library(
-            collection,
-            library_type,
             org,
             slug,
             title,
             description,
             allow_public_learning,
             allow_public_read,
-            library_license
+            library_license,
+            library_type,
         )
 
 

diff --git a/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py b/cms/djangoapps/contentstore/views/tests/test_clipboard_paste.py
@@ -4,7 +4,6 @@
 APIs.
 """
 import ddt
-from django.test import LiveServerTestCase
 from opaque_keys.edx.keys import UsageKey
 from rest_framework.test import APIClient
 from organizations.models import Organization
@@ -13,9 +12,7 @@
 from xmodule.modulestore.tests.factories import BlockFactory, CourseFactory, ToyCourseFactory
 
 from cms.djangoapps.contentstore.utils import reverse_usage_url
-from openedx.core.lib.blockstore_api.tests.base import BlockstoreAppTestMixin
 from openedx.core.djangoapps.content_libraries import api as library_api
-from blockstore.apps import api as blockstore_api
 
 CLIPBOARD_ENDPOINT = "/api/content-staging/v1/clipboard/"
 XBLOCK_ENDPOINT = "/xblock/"
@@ -214,7 +211,7 @@ def test_paste_with_assets(self):
         assert source_pic2_hash != dest_pic2_hash  # Because there was a conflict, this file was unchanged.
 
 
-class ClipboardLibraryContentPasteTestCase(BlockstoreAppTestMixin, LiveServerTestCase, ModuleStoreTestCase):
+class ClipboardLibraryContentPasteTestCase(ModuleStoreTestCase):
     """
     Test Clipboard Paste functionality with library content
     """
@@ -229,7 +226,6 @@ def setUp(self):
         self.store = modulestore()
         # Create a content library:
         library = library_api.create_library(
-            collection_uuid=blockstore_api.create_collection("Collection").uuid,
             library_type=library_api.COMPLEX,
             org=Organization.objects.create(name="Test Org", short_name="CL-TEST"),
             slug="lib",

diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -1816,7 +1816,13 @@
 
     # alternative swagger generator for CMS API
     'drf_spectacular',
+
     'openedx_events',
+
+    # Learning Core Apps, used by v2 content libraries (content_libraries app)
+    "openedx_learning.core.components",
+    "openedx_learning.core.contents",
+    "openedx_learning.core.publishing",
 ]
 
 

diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -40,7 +40,6 @@
 # and throws spurious errors. Therefore, we disable invalid-name checking.
 # pylint: disable=invalid-name
 
-
 import importlib.util
 import sys
 import os
@@ -3343,9 +3342,16 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 
     # Notifications
     'openedx.core.djangoapps.notifications',
+
     'openedx_events',
+
+    # Learning Core Apps, used by v2 content libraries (content_libraries app)
+    "openedx_learning.core.components",
+    "openedx_learning.core.contents",
+    "openedx_learning.core.publishing",
 ]
 
+
 ######################### CSRF #########################################
 
 # Forwards-compatibility with Django 1.7

diff --git a/openedx/core/djangoapps/content_libraries/admin.py b/openedx/core/djangoapps/content_libraries/admin.py
@@ -24,19 +24,18 @@ class ContentLibraryAdmin(admin.ModelAdmin):
         "library_key",
         "org",
         "slug",
-        "bundle_uuid",
         "allow_public_learning",
         "allow_public_read",
         "authorized_lti_configs",
     )
-    list_display = ("slug", "org", "bundle_uuid")
+    list_display = ("slug", "org",)
     inlines = (ContentLibraryPermissionInline, )
 
     def get_readonly_fields(self, request, obj=None):
         """
         Ensure that 'slug' and 'uuid' cannot be edited after creation.
         """
         if obj:
-            return ["library_key", "org", "slug", "bundle_uuid"]
+            return ["library_key", "org", "slug"]
         else:
             return ["library_key", ]