feat: [AXIMST-688] Refactoring for the states (#2521)

* feat: [AXIMST-688] Refactoring for the states * fix: rebase artefacts
raccoongang · Mar 29, 2024 · 467307e · 467307e
1 parent 7119daf
commit 467307e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py
@@ -123,13 +123,22 @@ def get_actions(self, obj):  # pylint: disable=unused-argument
         """
 
         can_manage_tags = use_tagging_taxonomy_list_page()
-        # temporary decision defining the default value 'True' for each xblock.
+        xblock = obj["xblock"]
+        is_course = xblock.scope_ids.usage_id.context_key.is_course
+        xblock_url = xblock_studio_url(xblock)
+        # Responsible for the ability to edit container xblock(copy, duplicate, move and manage access).
+        # It was used in the legacy and transferred here with simplification.
+        # After the investigation it was determined that the "show_other_action"
+        # condition below is sufficient to enable/disable actions on each xblock.
+        show_inline = xblock.has_children and not xblock_url
+        # All except delete and manage tags
+        show_other_action = not show_inline and is_course
         actions = {
-            "can_copy": True,
-            "can_duplicate": True,
-            "can_move": True,
-            "can_manage_access": True,
-            "can_delete": True,
+            "can_copy": show_other_action,
+            "can_duplicate": show_other_action,
+            "can_move": show_other_action,
+            "can_manage_access": show_other_action,
+            "can_delete": is_course,
             "can_manage_tags": can_manage_tags,
         }
 

diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py
@@ -201,8 +201,6 @@ def test_children_content(self):
                     "can_delete": True,
                     "can_manage_tags": True,
                 },
-                "user_partition_info": expected_user_partition_info,
-                "user_partitions": expected_user_partitions,
                 "validation_messages": [],
                 "render_error": "",
             },
@@ -218,8 +216,6 @@ def test_children_content(self):
                     "can_delete": True,
                     "can_manage_tags": True,
                 },
-                "user_partition_info": expected_user_partition_info,
-                "user_partitions": expected_user_partitions,
                 "validation_messages": [],
                 "render_error": "",
             },

diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py b/cms/djangoapps/contentstore/rest_api/v1/views/vertical_block.py
@@ -1,5 +1,6 @@
 """ API Views for unit page """
 
+import logging
 import edx_api_doc_tools as apidocs
 from django.http import HttpResponseBadRequest
 from rest_framework.request import Request
@@ -26,6 +27,9 @@
 from cms.djangoapps.contentstore.rest_api.v1.mixins import ContainerHandlerMixin
 
 
+log = logging.getLogger(__name__)
+
+
 @view_auth_classes(is_authenticated=True)
 class ContainerHandlerView(APIView, ContainerHandlerMixin):
     """
@@ -231,33 +235,41 @@ def get(self, request: Request, usage_key_string: str):
         """
         usage_key = self.get_object(usage_key_string)
         current_xblock = get_xblock(usage_key, request.user)
+        is_course = current_xblock.scope_ids.usage_id.context_key.is_course
 
         with modulestore().bulk_operations(usage_key.course_key):
             # load course once to reuse it for user_partitions query
             course = modulestore().get_course(current_xblock.location.course_key)
             children = []
-            for child in current_xblock.children:
-                child_info = modulestore().get_item(child)
-                user_partition_info = get_visibility_partition_info(child_info, course=course)
-                user_partitions = get_user_partition_info(child_info, course=course)
-                validation_messages = get_xblock_validation_messages(child_info)
-                render_error = get_xblock_render_error(request, child_info)
+            if hasattr(current_xblock, "children"):
+                for child in current_xblock.children:
+                    child_info = modulestore().get_item(child)
+                    user_partition_info = get_visibility_partition_info(child_info, course=course)
+                    user_partitions = get_user_partition_info(child_info, course=course)
+                    validation_messages = get_xblock_validation_messages(child_info)
+                    render_error = get_xblock_render_error(request, child_info)
+
+                    children.append({
+                        "xblock": child_info,
+                        "name": child_info.display_name_with_default,
+                        "block_id": child_info.location,
+                        "block_type": child_info.location.block_type,
+                        "user_partition_info": user_partition_info,
+                        "user_partitions": user_partitions,
+                        "validation_messages": validation_messages,
+                        "render_error": render_error,
+                    })
 
-                children.append({
-                    "name": child_info.display_name_with_default,
-                    "block_id": child_info.location,
-                    "block_type": child_info.location.block_type,
-                    "user_partition_info": user_partition_info,
-                    "user_partitions": user_partitions,
-                    "validation_messages": validation_messages,
-                    "render_error": render_error,
-                })
+            is_published = False
+            try:
+                is_published = not modulestore().has_changes(current_xblock)
+            except ItemNotFoundError:
+                logging.error('Could not find any changes for block [%s]', usage_key)
 
-            is_published = not modulestore().has_changes(current_xblock)
             container_data = {
                 "children": children,
                 "is_published": is_published,
-                "can_paste_component": True,
+                "can_paste_component": is_course,
             }
             serializer = VerticalContainerSerializer(container_data)
             return Response(serializer.data)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
@@ -79,6 +79,7 @@
 from lms.djangoapps.courseware.testutils import RenderXBlockTestMixin
 from lms.djangoapps.courseware.toggles import (
     COURSEWARE_MICROFRONTEND_DISCUSSION_SIDEBAR_OPEN_DISABLED,
+    COURSEWARE_MICROFRONTEND_SIDEBAR_DISABLED,
     COURSEWARE_MICROFRONTEND_SEARCH_ENABLED,
     COURSEWARE_MICROFRONTEND_SIDEBAR_DISABLED,
     COURSEWARE_OPTIMIZED_RENDER_XBLOCK,