Merge branch '692_fix_skipped_tests' of github.com:magento/magento2-page-builder into PR-bundle

Author: omiroshnichenko

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateCannotMoveContentTypeIntoHiddenRowTest.xml

@@ -20,9 +20,6 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-hideShow"/>
-            <skip>
-                <issueId value="PB-701" />
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateCannotMoveContentTypeIntoHiddenTabTest.xml

@@ -21,9 +21,6 @@
             <group value="pagebuilder-tab"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
-            <skip>
-                <issueId value="PB-701" />
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/drag-drop/sortable.js

@@ -243,13 +243,19 @@ function onSortReceive(preview: Preview, event: Event, ui: JQueryUI.SortableUIPa
  */
 function onSortUpdate(preview: Preview, event: Event, ui: JQueryUI.SortableUIParams) {
     // If the sortable instance is disabled don't complete this operation
-    if ($(this).sortable("option", "disabled") || ui.item.parents(hiddenClass).length > 0) {
+    if (($(this).hasClass("ui-sortable") && $(this).sortable("option", "disabled"))
+        || ui.item.parents(hiddenClass).length > 0
+    ) {
         ui.item.remove();
         $(this).sortable("cancel");
 
         // jQuery tries to reset the state but kills KO's bindings, so we'll force a re-render on the content type
         if (ui.item.length > 0 && typeof ko.dataFor(ui.item[0]) !== "undefined") {
-            const contentType = ko.dataFor(ui.item[0]).contentType as ContentTypeCollectionInterface;
+            const data = ko.dataFor(ui.item[0]);
+            const contentType = data.contentType && data.contentType.getChildren ?
+                data.contentType as ContentTypeCollectionInterface :
+                data.parentContentType as ContentTypeCollectionInterface;
+
             const children = contentType.getChildren()().splice(0);
             contentType.getChildren()([]);
             contentType.getChildren()(children);