Merge branch 'master' into pwnage101/ENT-11569

Author: kiram15

cms/djangoapps/contentstore/helpers.py

@@ -509,8 +509,18 @@ def _fetch_and_set_upstream_link(
             # temp_xblock.display_name == temp_xblock.upstream_display_name
             # temp_xblock.data == temp_xblock.upstream_data   # for html blocks
             # Even then we want to set `downstream_customized` value to avoid overriding user customisations on sync
-            downstream_customized = temp_xblock.xml_attributes.get("downstream_customized", '[]')
-            temp_xblock.downstream_customized = json.loads(downstream_customized)
+            downstream_customized = getattr(temp_xblock, "downstream_customized", [])
+            # XmlMixin blocks expose raw XML attrs on `xml_attributes`; other blocks (e.g. DnD)
+            # may not have this attribute, but still have parsed downstream_customized field.
+            xml_attributes = getattr(temp_xblock, "xml_attributes", None)
+            if isinstance(xml_attributes, dict):
+                raw_downstream_customized = xml_attributes.get("downstream_customized")
+                if isinstance(raw_downstream_customized, str):
+                    downstream_customized = json.loads(raw_downstream_customized)
+                elif isinstance(raw_downstream_customized, list):
+                    downstream_customized = raw_downstream_customized
+            if hasattr(temp_xblock, "downstream_customized"):
+                temp_xblock.downstream_customized = downstream_customized
 
 
 def _import_xml_node_to_parent(

cms/djangoapps/modulestore_migrator/tasks.py

@@ -959,16 +959,18 @@ def _migrate_component(
         return component.versioning.draft.publishable_entity_version, None
 
     # If component existed and was deleted or we have to replace the current version
-    # Create the new component version for it
-    component_version = libraries_api.set_library_block_olx(target_key, new_olx_str=olx)
+    paths_to_media_ids = {}
     for filename, media_pk in context.content_by_filename.items():
         filename_no_ext, _ = os.path.splitext(filename)
         if filename_no_ext not in olx:
             continue
         new_path = f"static/{filename}"
-        content_api.create_component_version_media(
-            component_version.pk, media_pk, path=new_path
-        )
+        paths_to_media_ids[new_path] = media_pk
+
+    # Create the new component version for it
+    component_version = libraries_api.set_library_block_olx(
+        target_key, new_olx_str=olx, paths_to_media=paths_to_media_ids,
+    )
 
     # Publish the component
     libraries_api.publish_component_changes(target_key, context.created_by)

cms/envs/help_tokens.ini

@@ -27,6 +27,7 @@ video = course_author:references/course_development/guide_to_video.html
 certificates = course_author:concepts/open_edx_platform/about_certificates.html
 content_highlights = course_author:how-tos/course_development/manage_course_highlight_emails.html
 social_sharing = course_author:how-tos/course_development/social_sharing.html
+sync_library_updates = course_author:how-tos/course_development/sync_a_library_update_to_your_course.html
 
 # below are the language directory names for the different locales
 [locales]

cms/static/sass/elements/_modal-window.scss

@@ -406,43 +406,43 @@
     display: flex;
     flex-direction: column;
 
-
-    // Set the components to flex so that they can grow
-    div,
-    form {
+    div.edit-xblock-modal {
       display: flex;
       flex-direction: column;
       flex-grow: 1;
 
-      // Set the header to not grow
-      header,
-      &.modal-header {
-        flex-grow: 0;
-      }
+      div.modal-content {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        padding: 0;
 
-    }
+        div.xblock-editor {
+          display: flex;
+          flex-direction: column;
+          flex-grow: 1;
 
-    ul {
-      flex-grow: 1;
+          div.xblock-studio_view {
+            display: flex;
+            flex-direction: column;
+            flex-grow: 1;
+          }
 
-      // Reset the divs inside the ul to preserve previous styling
-      div,
-      form {
-        display: unset;
-        flex-direction: unset;
-        flex-grow: unset;
-      }
-    }
+          div.editor-with-buttons {
+            display: flex;
+            flex-direction: column;
+            flex-grow: 1;
+            margin-bottom: 0;
 
-    &.modal-editor {
-      .modal-content {
-        padding: 0px;
+            ul.settings-list {
+              flex-grow: 1;
+            }
+          }
+        }
       }
     }
   }
 
-
-
   // specific modal overrides
   // ------------------------
 

common/djangoapps/student/views/dashboard.py

@@ -614,8 +614,6 @@ def student_dashboard(request):  # lint-amnesty, pylint: disable=too-many-statem
             link_end=HTML("</a>"),
         )
 
-    enterprise_message = ''
-
     recovery_email_message = recovery_email_activation_message = None
     if is_secondary_email_feature_enabled():
         try:
@@ -792,7 +790,6 @@ def student_dashboard(request):  # lint-amnesty, pylint: disable=too-many-statem
     context = {
         'urls': urls,
         'programs_data': programs_data,
-        'enterprise_message': enterprise_message,
         'consent_required_courses': set(),
         'enrollment_message': enrollment_message,
         'redirect_message': Text(redirect_message),

common/djangoapps/student/views/management.py

@@ -25,7 +25,10 @@
 from django.template.context_processors import csrf
 from django.urls import reverse
 from django.utils.translation import gettext as _
-from django.views.decorators.csrf import ensure_csrf_cookie  # lint-amnesty, pylint: disable=unused-import  # noqa: F401
+from django.views.decorators.csrf import (  # lint-amnesty, pylint: disable=unused-import  # noqa: F401
+    csrf_exempt,
+    ensure_csrf_cookie,
+)
 from django.views.decorators.http import (  # lint-amnesty, pylint: disable=unused-import
     require_GET,
     require_POST,

lms/djangoapps/course_api/blocks/tests/pacts/verify_pact.py

@@ -17,24 +17,15 @@
 class ProviderVerificationServer(LiveServerTestCase):
     """ Django Test Live Server for Pact Verification """
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-
-        cls.verifier = Verifier(
-            provider='lms',
-            provider_base_url=cls.live_server_url,
-        )
-
-    @classmethod
-    def tearDownClass(cls):
-        super().tearDownClass()
-
     def test_verify_pact(self):
-        output, _ = self.verifier.verify_pacts(
-            os.path.join(PACT_DIR, PACT_FILE),
-            headers=['Pact-Authentication: Allow', ],
-            provider_states_setup_url=f"{self.live_server_url}{reverse('provider-state-view')}",
+        (
+            Verifier(name='lms')
+            .add_transport(url=self.live_server_url)
+            .add_source(os.path.join(PACT_DIR, PACT_FILE))
+            .add_custom_header('Pact-Authentication', 'Allow')
+            .state_handler(
+                f"{self.live_server_url}{reverse('provider-state-view')}",
+                body=True,
+            )
+            .verify()
         )
-
-        assert output == 0

lms/djangoapps/courseware/tests/pacts/verify_pact.py

@@ -17,24 +17,15 @@
 class ProviderVerificationServer(LiveServerTestCase):
     """ Django Test Live Server for Pact Verification """
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-
-        cls.verifier = Verifier(
-            provider='lms',
-            provider_base_url=cls.live_server_url,
-        )
-
-    @classmethod
-    def tearDownClass(cls):
-        super().tearDownClass()
-
     def test_verify_pact(self):
-        output, _ = self.verifier.verify_pacts(
-            os.path.join(PACT_DIR, PACT_FILE),
-            headers=['Pact-Authentication: Allow', ],
-            provider_states_setup_url=f"{self.live_server_url}{reverse('courseware_xblock_handler_provider_state')}",
+        (
+            Verifier(name='lms')
+            .add_transport(url=self.live_server_url)
+            .add_source(os.path.join(PACT_DIR, PACT_FILE))
+            .add_custom_header('Pact-Authentication', 'Allow')
+            .state_handler(
+                f"{self.live_server_url}{reverse('courseware_xblock_handler_provider_state')}",
+                body=True,
+            )
+            .verify()
         )
-
-        assert output == 0

lms/djangoapps/discussion/rest_api/tasks.py

@@ -7,6 +7,7 @@
 from django.contrib.auth import get_user_model
 from edx_django_utils.monitoring import set_code_owner_attribute
 from eventtracking import tracker
+from forum import api as forum_api
 from opaque_keys.edx.locator import CourseKey
 
 from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
@@ -99,8 +100,12 @@ def delete_course_post_for_user(user_id, username, course_ids, event_data=None):
     """
     event_data = event_data or {}
     log.info(f"<<Bulk Delete>> Deleting all posts for {username} in course {course_ids}")
-    threads_deleted = Thread.delete_user_threads(user_id, course_ids)
-    comments_deleted = Comment.delete_user_comments(user_id, course_ids)
+    threads_deleted = 0
+    comments_deleted = 0
+    for course_id in course_ids:
+        result = forum_api.delete_user_posts(user_id=str(user_id), course_id=course_id)
+        threads_deleted += result.get("thread_count", 0)
+        comments_deleted += result.get("comment_count", 0)
     log.info(f"<<Bulk Delete>> Deleted {threads_deleted} posts and {comments_deleted} comments for {username} "
              f"in course {course_ids}")
     event_data.update({

lms/djangoapps/discussion/rest_api/views.py

@@ -11,6 +11,7 @@
 from drf_yasg import openapi
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
+from forum import api as forum_api
 from opaque_keys.edx.keys import CourseKey
 from rest_framework import permissions, status
 from rest_framework.authentication import SessionAuthentication
@@ -35,8 +36,6 @@
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider
 from openedx.core.djangoapps.discussions.serializers import DiscussionSettingsSerializer
 from openedx.core.djangoapps.django_comment_common import comment_client
-from openedx.core.djangoapps.django_comment_common.comment_client.comment import Comment
-from openedx.core.djangoapps.django_comment_common.comment_client.thread import Thread
 from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings, Role
 from openedx.core.djangoapps.user_api.accounts.permissions import CanReplaceUsername, CanRetireUser
 from openedx.core.djangoapps.user_api.models import UserRetirementStatus
@@ -1571,7 +1570,6 @@ class BulkDeleteUserPosts(DeveloperErrorViewMixin, APIView):
     def post(self, request, course_id):
         """
         Implements the delete user posts endpoint.
-        TODO: Add support for MySQLBackend as well
         """
         username = request.GET.get("username", None)
         execute_task = request.GET.get("execute", "false").lower() == "true"
@@ -1595,8 +1593,12 @@ def post(self, request, course_id):
             log.info(f"<<Bulk Delete>> {username} enrolled in {enrollments}")
         log.info(f"<<Bulk Delete>> Posts for {username} in {course_ids} - for {course_or_org} {course_id}")
 
-        comment_count = Comment.get_user_comment_count(user.id, course_ids)
-        thread_count = Thread.get_user_threads_count(user.id, course_ids)
+        thread_count = 0
+        comment_count = 0
+        for cid in course_ids:
+            counts = forum_api.get_user_post_counts(user_id=str(user.id), course_id=cid)
+            thread_count += counts.get("thread_count", 0)
+            comment_count += counts.get("comment_count", 0)
         log.info(f"<<Bulk Delete>> {username} in {course_ids} - Count thread {thread_count}, comment {comment_count}")
 
         if execute_task: