fix: Update SyncFromUpstreamView support accept/decline containers

Author: ChrisChV

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

@@ -99,7 +99,10 @@
     ComponentLinksSerializer,
     PublishableEntityLinksSummarySerializer,
 )
-from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import sync_library_content
+from cms.djangoapps.contentstore.xblock_storage_handlers.view_handlers import (
+    sync_library_content,
+    get_upstream,
+)
 from cms.lib.xblock.upstream_sync import (
     BadDownstream,
     BadUpstream,
@@ -110,6 +113,7 @@
     decline_sync,
     sever_upstream_link,
 )
+from cms.lib.xblock.container_upstream_sync import decline_sync_container
 from common.djangoapps.student.auth import has_studio_read_access, has_studio_write_access
 from openedx.core.lib.api.view_utils import (
     DeveloperErrorViewMixin,
@@ -330,7 +334,7 @@ def post(self, request: _AuthenticatedRequest, usage_key_string: str) -> Respons
             raise ValidationError(detail=str(exc)) from exc
         # Note: We call `get_for_block` (rather than `try_get_for_block`) 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 = get_upstream(downstream)
         response["static_file_notices"] = attrs_asdict(static_file_notices)
         return Response(response)
 
@@ -340,7 +344,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

@@ -35,7 +35,7 @@
 from cms.djangoapps.contentstore.config.waffle import SHOW_REVIEW_RULES_FLAG
 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.upstream_sync import *
 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 (
@@ -551,6 +551,15 @@ def sync_library_content(downstream: XBlock, request, store, remove_upstream_lin
     return static_file_notices
 
 
+def get_upstream(downstream: XBlock):
+    """
+    Handle get upstream for containers or blocks, depending of the donwstream type.
+    """
+    if downstream.usage_key.block_type == 'vertical':
+        return ContainerUpstreamLink.get_for_container(downstream).to_json()
+    return UpstreamLink.get_for_block(downstream).to_json()
+
+
 @login_required
 @expect_json
 def _create_block(request):