Skip to content

Commit 7f064a5

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #588 from magento/513_content-snapshot-dynamic-block
[Story] 513: User edits Dynamic Block content i…
2 parents 9721eab + 0c3a649 commit 7f064a5

File tree

77 files changed

+374
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+374
-163
lines changed

‎app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ public function __construct(
8282
$data['config']['template'] = 'ui/form/field';
8383
$data['config']['elementTmpl'] = 'Magento_PageBuilder/form/element/wysiwyg';
8484
$wysiwygConfigData = $stageConfig->getConfig();
85+
$wysiwygConfigData['pagebuilder_button'] = true;
86+
$wysiwygConfigData['pagebuilder_content_snapshot'] = true;
8587

8688
if ($overrideSnapshot) {
8789
$pageBuilderConfig = $pageBuilderConfig ?: ObjectManager::getInstance()->get(PageBuilderConfig::class);
@@ -91,7 +93,9 @@ public function __construct(
9193
// Add Classes for Page Builder Stage
9294
if (isset($wysiwygConfigData['pagebuilder_content_snapshot'])
9395
&& $wysiwygConfigData['pagebuilder_content_snapshot']) {
94-
$data['config']['additionalClasses'] = 'admin__field-wide admin__field-page-builder';
96+
$data['config']['additionalClasses'] = [
97+
'admin__field-wide admin__field-page-builder' => true
98+
];
9599
}
96100

97101
$data['config']['wysiwygConfigData'] = isset($config['wysiwygConfigData']) ?

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
<annotations>
1212
<description>Click Page Builder preview overlay to open Page Builder stage.</description>
1313
</annotations>
14-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
15-
<click selector="{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
14+
<arguments>
15+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
16+
</arguments>
17+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
1619
<waitForPageLoad stepKey="waitForPageLoadPageBuilder"/>
17-
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
20+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
1821
<waitForElementVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="waitForPageBuilderFullScreen"/>
1922
</actionGroup>
2023
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<dontSeeElement selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
2020
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="dontSeePageBuilderApplyTemplateButton"/>
2121
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.saveAsTemplateButton}}" stepKey="dontSeePageBuilderSaveAsTemplateButton"/>
22-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23-
<moveMouseOver selector="{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
22+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23+
<moveMouseOver selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
2525
<dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="dontSeeRowOptionMenu"/>
2626
</actionGroup>
2727
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<element name="stageSnapshot" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-wrapper') and contains(@class, 'pagebuilder-wysiwyg-snapshot')]"/>
2323
<element name="stagePreview" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper') and not(contains(@class, 'stage-full-screen'))]"/>
2424
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-is-active.stage-full-screen"/>
25-
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
26-
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
25+
<element name="stageOverlay" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay')]"/>
26+
<element name="stageOverlayOnHover" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay') and contains(@class, '_hover')]"/>
2727
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>
2828
<element name="modal" type="text" selector="aside.modal-popup._show"/>
2929
<element name="modalOk" type="button" selector="aside.modal-popup._show button.action-primary.action-accept"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/CheckStaticBlocksTest.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSPage">
2626
<argument name="CMSBlockPage" value="$$createCMSPage$$"/>
2727
</actionGroup>
28-
<remove keyForRemoval="switchToPageBuilderStage"/>
28+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
2929
</before>
3030
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate">
3131
<argument name="baseContent" value="{{BlockNewPagePageActionsSection.saveBlock}}"/>
@@ -34,7 +34,7 @@
3434
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSPage">
3535
<argument name="CMSBlockPage" value="$$createCMSPage$$"/>
3636
</actionGroup>
37-
<remove keyForRemoval="switchToPageBuilderStage"/>
37+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
3838
<actionGroup ref="confirmApplyFromPageBuilderApplyTemplateSlideOut" stepKey="confirmApplyFromPageBuilderApplyTemplateSlideOut">
3939
<argument name="baseContent" value="{{BlockNewPagePageActionsSection.saveBlock}}"/>
4040
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,16 @@
3232
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3333
</actionGroup>
3434
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
35-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
35+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3636
</before>
3737
<after>
3838
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3939
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
4040
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
4141
</after>
42-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4342
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4443
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
45-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
44+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4645
<!-- Go to CMS Page and choose Block -->
4746
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeBackgroundColorSlide2StageAfterSave"/>
4847
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
2727
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2828
</actionGroup>
29-
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
29+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
3030
</before>
3131
<after>
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35-
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3635
</test>
3736
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
2727
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2828
</actionGroup>
29-
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
29+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
3030
</before>
3131
<after>
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35-
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3635
</test>
3736
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@
3030
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3131
</actionGroup>
3232
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
33-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3737
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
3838
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
3939
</after>
40-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4140
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4241
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
43-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4443
<!-- Go to CMS Page and choose Block -->
4544
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="see2ButtonItemsStageAfterSave"/>
4645
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,16 @@
3030
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3131
</actionGroup>
3232
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
33-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3737
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
3838
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
3939
</after>
40-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4140
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4241
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
43-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
44-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreenAfterDelete"/>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4543
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProductAfterDelete"/>
4644
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSectionAfterDelete"/>
4745
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescriptionAfterDelete"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@
3030
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3131
</actionGroup>
3232
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
33-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3737
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
3838
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
3939
</after>
40-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4140
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4241
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
43-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
44-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreenAfterDelete"/>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4543
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProductAfterDelete"/>
4644
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSectionAfterDelete"/>
47-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescriptionAfterDelete"/>
45+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescriptionAfterDelete"/>
4846
<!-- Go to CMS Page and choose Block -->
4947
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="dontSeeDividerInStageAfterSave"/>
5048
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@
3030
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3131
</actionGroup>
3232
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
33-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3737
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
3838
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
3939
</after>
40-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4140
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4241
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
43-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4443
<!-- Go to CMS Page and choose Block -->
4544
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="closeEditPanel"/>
4645
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@
3030
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3131
</actionGroup>
3232
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
33-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
3737
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
3838
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
3939
</after>
40-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4140
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
4241
<comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
43-
<comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
4443
<!-- Go to CMS Page and choose Block -->
4544
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeBackgroundColorRow2StageAfterSave"/>
4645
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">

0 commit comments

Comments
 (0)