Fix bug when deleting first of two recently added blocks

cms/templates/js/mock/mock-container-paged-xblock.underscore

@@ -70,6 +70,7 @@
                 </header>
                 <article class="xblock-render">
                     <div class="xblock" data-request-token="page-render-token">
+                        <div>
                             <div class="studio-xblock-wrapper" data-locator="locator-component-A1">
                                 <section class="wrapper-xblock level-element">
                                     <header class="xblock-header">
@@ -145,6 +146,7 @@
                                     <article class="xblock-render"></article>
                                 </section>
                             </div>
+                        </div>
                         <div class="add-xblock-component new-component-item adding"></div>
                     </div>
                 </article>
@@ -173,6 +175,7 @@
 
                 <article class="xblock-render">
                     <div class="xblock" data-request-token="page-render-token">
+                        <div>
                             <div class="studio-xblock-wrapper" data-locator="locator-component-B1">
                                 <section class="wrapper-xblock level-element">
                                     <header class="xblock-header">
@@ -248,6 +251,7 @@
                                     <article class="xblock-render"></article>
                                 </section>
                             </div>
+                        </div>
                         <div class="add-xblock-component new-component-item adding"></div>
                     </div>
                 </article>

common/test/acceptance/tests/studio/test_studio_library.py

@@ -148,6 +148,27 @@ class LibraryEditPageTest(StudioLibraryTest):
         add_component(self.lib_page, "problem", "Multiple Choice")
         self.assertTrue(self.lib_page.nav_disabled(position))
 
+    def test_delete_deletes_only_desired_block(self):
+        """
+        Scenario: Ensure that when deleting XBlock only desired XBlock is deleted
+        Given that I have a library in Studio with no XBlocks
+        And I create Blank Common Problem XBlock
+        And I create Checkboxes XBlock
+        When I delete Blank Problem XBlock
+        Then Checkboxes XBlock is not deleted
+        And Blank Common Problem XBlock is deleted
+        """
+        self.assertEqual(len(self.lib_page.xblocks), 0)
+        add_component(self.lib_page, "problem", "Blank Common Problem")
+        add_component(self.lib_page, "problem", "Checkboxes")
+        self.assertEqual(len(self.lib_page.xblocks), 2)
+        self.assertIn("Blank Common Problem", self.lib_page.xblocks[0].name)
+        self.assertIn("Checkboxes", self.lib_page.xblocks[1].name)
+        self.lib_page.click_delete_button(self.lib_page.xblocks[0].locator)
+        self.assertEqual(len(self.lib_page.xblocks), 1)
+        problem_block = self.lib_page.xblocks[0]
+        self.assertIn("Checkboxes", problem_block.name)
+
 
 @ddt
 class LibraryNavigationTest(StudioLibraryTest):

lms/templates/studio_render_paged_children_view.html

@@ -12,9 +12,11 @@
 
 <div class="container-paging-header"></div>
 
+<div>
 % for item in items:
     ${item['content']}
 % endfor
+</div>
 
 % if can_add:
     <div class="add-xblock-component new-component-item adding"></div>