fix: Sync and decline sync of units

Author: ChrisChV

cms/djangoapps/contentstore/rest_api/v2/views/downstreams.py

@@ -111,6 +111,7 @@
     sever_upstream_link,
     sync_from_upstream,
 )
+from cms.lib.xblock.container_upstream_sync import *
 from common.djangoapps.student.auth import has_studio_read_access, has_studio_write_access
 from openedx.core.lib.api.view_utils import (
     DeveloperErrorViewMixin,
@@ -310,11 +311,21 @@ def post(self, request: _AuthenticatedRequest, usage_key_string: str) -> Respons
         """
         downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
         try:
-            if downstream.usage_key.block_type == "video":
-                # Delete all transcripts so we can copy new ones from upstream
-                clear_transcripts(downstream)
-            upstream = sync_from_upstream(downstream, request.user)
-            static_file_notices = import_static_assets_for_library_sync(downstream, upstream, request)
+            if downstream.usage_key.block_type == "vertical":
+                UpstreamLinkClass = ContainerUpstreamLink
+                upstream = sync_from_upstream_container(downstream, request.user)
+
+                # TODO support static assets on containers
+                static_file_notices = None
+            else:
+                if downstream.usage_key.block_type == "video":
+                    # Delete all transcripts so we can copy new ones from upstream
+                    clear_transcripts(downstream)
+
+                UpstreamLinkClass = UpstreamLink
+                upstream = sync_from_upstream(downstream, request.user)
+
+                static_file_notices = import_static_assets_for_library_sync(downstream, upstream, request)
         except UpstreamLinkException as exc:
             logger.exception(
                 "Could not sync from upstream '%s' to downstream '%s'",
@@ -323,10 +334,15 @@ def post(self, request: _AuthenticatedRequest, usage_key_string: str) -> Respons
             )
             raise ValidationError(detail=str(exc)) from exc
         modulestore().update_item(downstream, request.user.id)
-        # Note: We call `get_for_block` (rather than `try_get_for_block`) because if anything is wrong with the
+
+        # Note: We call `get_for_*` (rather than `try_get_for_*`) because if anything is wrong with the
         #       upstream at this point, then that is completely unexpected, so it's appropriate to let the 500 happen.
-        response = UpstreamLink.get_for_block(downstream).to_json()
-        response["static_file_notices"] = attrs_asdict(static_file_notices)
+        if downstream.usage_key.block_type == "vertical":
+            response = ContainerUpstreamLink.get_for_container(downstream).to_json()
+        else:
+            response = UpstreamLinkClass.get_for_block(downstream).to_json()
+            response["static_file_notices"] = attrs_asdict(static_file_notices)
+
         return Response(response)
 
     def delete(self, request: _AuthenticatedRequest, usage_key_string: str) -> Response:
@@ -335,7 +351,10 @@ def delete(self, request: _AuthenticatedRequest, usage_key_string: str) -> Respo
         """
         downstream = _load_accessible_block(request.user, usage_key_string, require_write_access=True)
         try:
-            decline_sync(downstream)
+            if downstream.usage_key.block_type == "vertical":
+                decline_sync_container(downstream)
+            else:
+                decline_sync(downstream)
         except (NoUpstream, BadUpstream, BadDownstream) as exc:
             # This is somewhat unexpected. If the upstream link is missing or invalid, then the downstream author
             # shouldn't have been prompted to accept/decline a sync in the first place. Of course, they could have just

cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py

@@ -36,7 +36,7 @@
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.lib.ai_aside_summary_config import AiAsideSummaryConfig
 from cms.lib.xblock.upstream_sync import BadUpstream, check_and_parse_upstream_key, sync_from_upstream
-from cms.lib.xblock.container_upstream_sync import sync_from_upstream_container
+from cms.lib.xblock.container_upstream_sync import sync_from_upstream_container, ContainerUpstreamLink
 from common.djangoapps.static_replace import replace_static_urls
 from common.djangoapps.student.auth import (
     has_studio_read_access,
@@ -1244,6 +1244,10 @@ def create_xblock_info(  # lint-amnesty, pylint: disable=too-many-statements
         if is_xblock_unit:
             # if xblock is a Unit we add the discussion_enabled option
             xblock_info["discussion_enabled"] = xblock.discussion_enabled
+
+            # Also add upstream info
+            xblock_info["upstream_info"] = ContainerUpstreamLink.try_get_for_container(xblock).to_json()
+
         if xblock.category == "sequential":
             # Entrance exam subsection should be hidden. in_entrance_exam is
             # inherited metadata, all children will have it.

cms/lib/xblock/container_upstream_sync.py

@@ -200,3 +200,15 @@ def sync_from_upstream_container(downstream: XBlock, user: User) -> tuple[XBlock
     downstream.upstream_version = manager.link.version_available
     return manager.upstream, manager.new_children_blocks
 
+
+def decline_sync_container(downstream: XBlock) -> None:
+    """
+    Given an Container that is linked to upstream content, mark the latest available update as 'declined' so that its
+    authors are not prompted (until another upstream version becomes available).
+
+    Does not save `downstream` to the store. That is left up to the caller.
+
+    If `downstream` lacks a valid+supported upstream link, this raises an UpstreamLinkException.
+    """
+    upstream_link = ContainerUpstreamLink.get_for_container(downstream)  # Can raise UpstreamLinkException
+    downstream.upstream_version_declined = upstream_link.version_available