fix: Convert UUIDField columns to uuid type for Mariadb

The behavior of the MariaDB backend has changed behavior for UUIDField
from a `CharField(32)` to an actual `uuid` type. This is not converted
automatically, which results in all writes to the affected columns to
error with a message about the data being too long. This is because the
actual string being written is a UUID with the `-` included, resulting in
a 36 character value which can't be inserted into a 32 character column.

fix: renamed migration to 0016

Update cms/djangoapps/contentstore/migrations/0016_mariadb_uuid_conversion.py

Co-authored-by: David Ormsbee <dave@axim.org>

refactor: remove deprecated sidebar toggles (openedx#37983)

DEPR ticket: openedx/public-engineering#316

feat: Add Waffle flag for AuthZ for Course Authoring (openedx#37985)

build: Upgrade to `ora2==6.17.2` which removes loremipsum base dep (openedx#37991)

We hope this will fix an error where loremipsum is using pkg_resources,
which setuptools dropped support for as of v82 (released yesterday).

fix: Nits on styles of library icon [FC-0114] (openedx#37980)

- Fixes the issues described in openedx/frontend-app-authoring#2762 (comment):
    - Changed the background color for the library icon in the unit page.
    - Update punctuation for the library icon tooltip in the unit page.
    - Allows breaking the tooltip into multiple lines.

refactor: xblock api upstream info and course details api (openedx#37971)

- Returns top parent key instead of boolean in upstream info api
- Adds edited_on raw time in course outline api
- Adds has_changes to course details api

feat: Add enable_authz_course_authoring flag to course_waffle_flags endpoint (openedx#37990)

Discussion service to enable permission and access provider (openedx#37912)

* chore: discussion service to enable permission and access provider

Author: Ardiea

cms/djangoapps/contentstore/migrations/0016_mariadb_uuid_conversion.py

@@ -0,0 +1,74 @@
+# Generated migration for MariaDB UUID field conversion (Django 5.2)
+"""
+Migration to convert UUIDField from char(32) to uuid type for MariaDB compatibility.
+
+This migration is necessary because Django 5 changed the behavior of UUIDField for MariaDB
+databases from using CharField(32) to using a proper UUID type. This change isn't managed
+automatically, so we need to generate migrations to safely convert the columns.
+
+This migration only executes for MariaDB databases and is a no-op for other backends.
+
+See: https://www.albertyw.com/note/django-5-mariadb-uuidfield
+"""
+
+from django.db import migrations
+
+
+def apply_mariadb_migration(apps, schema_editor):
+    """Apply the migration only for MariaDB databases."""
+    connection = schema_editor.connection
+    
+    # Check if this is a MariaDB database
+    if connection.vendor != 'mysql':
+        return
+    
+    # Additional check for MariaDB specifically (vs MySQL)
+    with connection.cursor() as cursor:
+        cursor.execute("SELECT VERSION()")
+        version = cursor.fetchone()[0]
+        if 'mariadb' not in version.lower():
+            return
+    
+    # Apply the field changes for MariaDB
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "ALTER TABLE oel_publishing_learningpackage "
+            "MODIFY uuid uuid NOT NULL"
+        )
+
+
+def reverse_mariadb_migration(apps, schema_editor):
+    """Reverse the migration only for MariaDB databases."""
+    connection = schema_editor.connection
+    
+    # Check if this is a MariaDB database
+    if connection.vendor != 'mysql':
+        return
+    
+    # Additional check for MariaDB specifically (vs MySQL)
+    with connection.cursor() as cursor:
+        cursor.execute("SELECT VERSION()")
+        version = cursor.fetchone()[0]
+        if 'mariadb' not in version.lower():
+            return
+    
+    # Reverse the field changes for MariaDB
+    with connection.cursor() as cursor:
+        cursor.execute(
+            "ALTER TABLE oel_publishing_learningpackage "
+            "MODIFY uuid char(32) NOT NULL"
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentstore', '0015_switch_to_openedx_content'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=apply_mariadb_migration,
+            reverse_code=reverse_mariadb_migration,
+        ),
+    ]

cms/djangoapps/contentstore/rest_api/v1/serializers/course_details.py

@@ -53,6 +53,7 @@ class CourseDetailsSerializer(serializers.Serializer):
     pre_requisite_courses = serializers.ListField(child=CourseKeyField())
     run = serializers.CharField()
     self_paced = serializers.BooleanField()
+    has_changes = serializers.BooleanField()
     short_description = serializers.CharField(allow_blank=True)
     start_date = serializers.DateTimeField()
     subtitle = serializers.CharField(allow_blank=True)

cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py

@@ -5,6 +5,7 @@
 from rest_framework import serializers
 
 from cms.djangoapps.contentstore import toggles
+from openedx.core import toggles as core_toggles
 
 
 class CourseWaffleFlagsSerializer(serializers.Serializer):
@@ -31,6 +32,7 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
     use_react_markdown_editor = serializers.SerializerMethodField()
     use_video_gallery_flow = serializers.SerializerMethodField()
     enable_course_optimizer_check_prev_run_links = serializers.SerializerMethodField()
+    enable_authz_course_authoring = serializers.SerializerMethodField()
 
     def get_course_key(self):
         """
@@ -201,3 +203,10 @@ def get_enable_course_optimizer_check_prev_run_links(self, obj):
         """
         course_key = self.get_course_key()
         return toggles.enable_course_optimizer_check_prev_run_links(course_key)
+
+    def get_enable_authz_course_authoring(self, obj):
+        """
+        Method to get the authz.enable_course_authoring waffle flag
+        """
+        course_key = self.get_course_key()
+        return core_toggles.enable_authz_course_authoring(course_key)

cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py

@@ -125,7 +125,7 @@ class UpstreamLinkSerializer(serializers.Serializer):
     error_message = serializers.CharField(allow_null=True)
     ready_to_sync = serializers.BooleanField()
     downstream_customized = serializers.ListField(child=serializers.CharField(), allow_empty=True)
-    has_top_level_parent = serializers.BooleanField()
+    top_level_parent_key = serializers.CharField(allow_null=True)
     ready_to_sync_children = UpstreamChildrenInfoSerializer(many=True, required=False)
 
 

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py

@@ -38,6 +38,7 @@ class CourseWaffleFlagsViewTest(CourseTestCase):
         "use_react_markdown_editor": False,
         "use_video_gallery_flow": False,
         "enable_course_optimizer_check_prev_run_links": False,
+        "enable_authz_course_authoring": False,
     }
 
     def setUp(self):

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py

@@ -323,7 +323,7 @@ def test_children_content(self):
                     "version_declined": None,
                     "error_message": None,
                     "ready_to_sync": True,
-                    "has_top_level_parent": False,
+                    "top_level_parent_key": None,
                     "downstream_customized": [],
                 },
                 "user_partition_info": expected_user_partition_info,

cms/djangoapps/contentstore/rest_api/v2/views/tests/test_downstreams.py

@@ -50,7 +50,7 @@ def _get_upstream_link_good_and_syncable(downstream):
         version_declined=downstream.upstream_version_declined,
         error_message=None,
         downstream_customized=[],
-        has_top_level_parent=False,
+        top_level_parent_key=None,
         upstream_name=downstream.upstream_display_name,
     )
 

cms/djangoapps/contentstore/tasks.py

@@ -35,7 +35,7 @@
 from olxcleaner.reporting import report_error_summary, report_errors
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
-from opaque_keys.edx.locator import LibraryContainerLocator, LibraryLocator, BlockUsageLocator
+from opaque_keys.edx.locator import LibraryContainerLocator, LibraryLocator
 from openedx_events.content_authoring.data import CourseData
 from openedx_events.content_authoring.signals import COURSE_RERUN_COMPLETED
 from organizations.api import add_organization_course, ensure_organization
@@ -1641,11 +1641,7 @@ def handle_create_xblock_upstream_link(usage_key):
         return
     if xblock.top_level_downstream_parent_key is not None:
         block_key = BlockKey.from_string(xblock.top_level_downstream_parent_key)
-        top_level_parent_usage_key = BlockUsageLocator(
-            xblock.course_id,
-            block_key.type,
-            block_key.id,
-        )
+        top_level_parent_usage_key = block_key.to_usage_key(xblock.course_id)
         try:
             ContainerLink.get_by_downstream_usage_key(top_level_parent_usage_key)
         except ContainerLink.DoesNotExist:

cms/djangoapps/contentstore/views/preview.py

@@ -19,6 +19,7 @@
 from xblock.runtime import KvsFieldData
 
 from openedx.core.djangoapps.video_config.services import VideoConfigService
+from openedx.core.djangoapps.discussions.services import DiscussionConfigService
 from xmodule.contentstore.django import contentstore
 from xmodule.exceptions import NotFoundError as XModuleNotFoundError
 from xmodule.modulestore.django import XBlockI18nService, modulestore
@@ -228,6 +229,7 @@ def _prepare_runtime_for_preview(request, block):
         "cache": CacheService(cache),
         'replace_urls': ReplaceURLService,
         'video_config': VideoConfigService(),
+        'discussion_config_service': DiscussionConfigService(),
     }
 
     block.runtime.get_block_for_descriptor = partial(_load_preview_block, request)

cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py

@@ -1202,6 +1202,9 @@ def create_xblock_info(  # lint-amnesty, pylint: disable=too-many-statements
                 "edited_on": get_default_time_display(xblock.subtree_edited_on)
                 if xblock.subtree_edited_on
                 else None,
+                "edited_on_raw": str(xblock.subtree_edited_on)
+                if xblock.subtree_edited_on
+                else None,
                 "published": published,
                 "published_on": published_on,
                 "studio_url": xblock_studio_url(xblock, parent_xblock),
@@ -1331,7 +1334,7 @@ def create_xblock_info(  # lint-amnesty, pylint: disable=too-many-statements
             # Disable adding or removing children component if xblock is imported from library
             xblock_actions["childAddable"] = False
             # Enable unlinking only for top level imported components
-            xblock_actions["unlinkable"] = not upstream_info["has_top_level_parent"]
+            xblock_actions["unlinkable"] = not upstream_info["top_level_parent_key"]
 
         if is_xblock_unit:
             # if xblock is a Unit we add the discussion_enabled option