Merge pull request #140 from magento-obsessive-owls/cms-team-1-delivery

[Owls] PageBuilder Bug Fixes

Author: davemacaulay

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest.xml

@@ -839,6 +839,7 @@
         <actionGroup ref="dragContentTypeToStage" stepKey="dragTabsIntoStage">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
+        <actionGroup ref="addTab" stepKey="addSecondTab"/>
         <!-- User sees tabs displayed with 1st default tab item created by default -->
         <comment userInput="User sees tabs displayed with 1st default tab item created by default" stepKey="AC1"/>
         <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel1">
@@ -859,9 +860,13 @@
             <argument name="property" value="PageBuilderTabBackgroundColorPink"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+        <seeElement selector="{{TabOnStage.tabHeaderItemActive('1')}}" stepKey="seeFirstTabActiveAdminPreview"/>
         <comment userInput="User updates tab settings and saves configuration" stepKey="saveBlock"/>
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Verify stage after save-->
+        <comment userInput="Verify stage after save" stepKey="commentVerifyStageAfterSave"/>
+        <seeElement selector="{{TabOnStage.tabHeaderItemActive('1')}}" stepKey="seeFirstTabActiveAdminPreviewAfterSave"/>
         <!--User goes to created CMS page-->
         <comment userInput="User goes to created CMS page" stepKey="NavigateToCMSPage"/>
         <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
@@ -883,6 +888,7 @@
         <!--Check that tab was rendered on the stage-->
         <comment userInput="Check that tab was rendered on the stage" stepKey="commentCheckingThatTabAreRenderedOnTHeStage"/>
         <see selector="{{TabOnStorefront.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleStorefront2"/>
+        <seeElement selector="{{TabOnStorefront.tabHeaderItemActive('1')}}" stepKey="seeFirstTabActiveStorefront2"/>
         <seeElement selector="{{TabOnStorefront.backgroundColor('1', PageBuilderTabBackgroundColorPink.rgb)}}" stepKey="seeTab1BackgroundColor2"/>
         <actionGroup ref="openOptionsMenu" stepKey="openEditMenuOnStage3">
             <argument name="contentType" value="PageBuilderBlockContentType"/>
@@ -894,6 +900,7 @@
         <comment userInput="Verify Block On Store front" stepKey="commentCheckingThatImageIsNotRenderedOnTheStoreFront"/>
         <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
         <see selector="{{TabOnStorefront.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleStorefront"/>
+        <seeElement selector="{{TabOnStorefront.tabHeaderItemActive('1')}}" stepKey="seeFirstTabActiveStorefront"/>
         <seeElement selector="{{TabOnStorefront.backgroundColor('1', PageBuilderTabBackgroundColorPink.rgb)}}" stepKey="seeTab1BackgroundColor"/>
         <see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage1"/>
     </test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests.xml

@@ -943,9 +943,6 @@
         <seeElement selector="{{SliderOnStage.padding('2', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
         <!-- Show Content -->
         <comment userInput="Show Content" stepKey="commentShowContent"/>
-        <!-- Must save since slide breaks after duplication -->
-        <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
-        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <actionGroup ref="showContentType" stepKey="showContentTypeFirstSlider">
             <argument name="section" value="SliderOnStage"/>
             <argument name="contentType" value="PageBuilderSliderContentType"/>

app/code/Magento/PageBuilder/docs/events.md

@@ -133,6 +133,7 @@ All events starting with `contentType:` can also be called for specific content
 {
     id: string;
     contentType: ContentTypeInterface & ContentTypeCollectionInterface;
+    expectedChildren: number;
 }
 ```
 
@@ -224,6 +225,7 @@ All events starting with `contentType:` can also be called for specific content
     originalContentType: ContentTypeInterface & ContentTypeCollectionInterface;
     duplicateContentType: ContentTypeInterface & ContentTypeCollectionInterface;
     index: number;
+    direct: boolean;
 }
 ```
 

app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js

@@ -4,35 +4,20 @@
  */
 
 var config = {
-    paths: {
-        'pagebuilder/async': 'Magento_PageBuilder/js/resource/requirejs/async',
-
-        /* Extra Resources Needed */
-        'pagebuilder/html2canvas': 'Magento_PageBuilder/js/resource/html2canvas',
-        'hyperscript': 'Magento_PageBuilder/js/resource/hyperscript/hyperscript',
-        'xyperscript': 'Magento_PageBuilder/js/resource/xyperscript/xyperscript',
-        'google-map': 'Magento_PageBuilder/js/utils/map',
-
-        /* Include our Knockout Sortable wrapper */
-        'pagebuilder/ko-dropzone': 'Magento_PageBuilder/js/resource/dropzone/knockout-dropzone',
-        'pagebuilder/ko-redactor': 'Magento_PageBuilder/js/resource/redactor/knockout-redactor',
-        'pagebuilder/ko-liveedit': 'Magento_PageBuilder/js/resource/live-edit/knockout-liveedit'
-    },
     map: {
         '*': {
-            /* Map the abstract widget to the input type widget */
-            'pagebuilder/widget/abstract': 'pagebuilder/field/abstract',
+            /* Include our Knockout Sortable wrapper */
+            'pagebuilder/ko-dropzone': 'Magento_PageBuilder/js/resource/dropzone/knockout-dropzone',
 
             /* Utilities */
-            'pagebuilder/utils': 'Magento_PageBuilder/js/utils',
-            'pagebuilder/config': 'Magento_PageBuilder/js/component/config'
+            'google-map': 'Magento_PageBuilder/js/utils/map'
         }
     },
     shim: {
         'pagebuilder/ko-sortable': {
-            deps: ['jquery', 'jquery/ui', 'Magento_PageBuilder/js/resource/jquery-ui/jquery.ui.touch-punch.min']
+            deps: ['jquery', 'jquery/ui', 'Magento_PageBuilder/js/resource/jquery-ui/jquery.ui.touch-punch']
         },
-        'Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch.min': {
+        'Magento_PageBuilder/js/resource/jquery/ui/jquery.ui.touch-punch': {
             deps: ['jquery/ui']
         }
     },

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less

@@ -177,7 +177,7 @@
         transition: opacity 200ms, top 200ms, visibility 200ms;
         visibility: hidden;
         width: 100%;
-        z-index: 15;
+        z-index: 20;
     }
 }
 

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less

@@ -154,8 +154,12 @@ div[data-role='tabs'],
             min-height: inherit;
             padding: 0;
 
-            > .pagebuilder-content-type-wrapper:not(:first-child) {
-                display: none;
+            > .pagebuilder-content-type-wrapper {
+                display: block;
+
+                ~ .pagebuilder-content-type-wrapper {
+                    display: none;
+                }
             }
         }
     }