Skip to content

Commit 7f8c31d

Browse files
author
Lukasz Borowiec
committed
Merge branch '511_content-snapshot-product-admin-page' of github.com:magento/magento2-page-builder into 511_content-snapshot-product-admin-page
2 parents ba7d6b0 + 27c9b00 commit 7f8c31d

20 files changed

+342
-127
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminOpenPageBuilderFromContentPreviewOverlay">
10+
<actionGroup name="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup">
1111
<annotations>
12-
<description>Verifies Page Builder Full Screen is ready.</description>
12+
<description>Click Page Builder preview overlay to open Page Builder stage.</description>
1313
</annotations>
1414
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
1515
<click selector="{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidatePageBuilderPreview">
10+
<actionGroup name="ValidatePageBuilderPreviewActionGroup">
1111
<annotations>
12-
<description>Verifies Page Builder preview is ready.</description>
12+
<description>Verifies Page Builder preview has the 'Edit with Page Builder' button, has an overlay, does not have the Page Builder left panel, does not have the Page Builder template buttons, and does not open content type option menus.</description>
1313
</annotations>
1414
<arguments>
1515
<argument name="pageBuilderArea" defaultValue="" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForAttribute">
5757
<argument name="attributeCode" value="$$createWysiwygAttribute.attribute_code$$"/>
5858
</actionGroup>
59-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
59+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
6060
<argument name="contentType" value="PageBuilderRowContentType"/>
6161
</actionGroup>
6262
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
@@ -76,8 +76,9 @@
7676
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription">
7777
<argument name="attributeCode" value="description"/>
7878
</actionGroup>
79-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openDescriptionEditMenuOnStage">
79+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openDescriptionEditMenuOnStage">
8080
<argument name="contentType" value="PageBuilderRowContentType"/>
81+
<argument name="contentTypeIndex" value="2"/>
8182
</actionGroup>
8283
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterDescriptionRowBackgroundColor">
8384
<argument name="property" value="PageBuilderBackgroundColor_HSV_Orange"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForAttribute1">
6868
<argument name="attributeCode" value="$$createPageBuilderAttribute1.attribute_code$$"/>
6969
</actionGroup>
70-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
70+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
7171
<argument name="contentType" value="PageBuilderRowContentType"/>
7272
</actionGroup>
7373
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
@@ -86,8 +86,9 @@
8686
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForAttribute2">
8787
<argument name="attributeCode" value="$$createPageBuilderAttribute2.attribute_code$$"/>
8888
</actionGroup>
89-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
89+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
9090
<argument name="contentType" value="PageBuilderRowContentType"/>
91+
<argument name="contentTypeIndex" value="2"/>
9192
</actionGroup>
9293
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor1">
9394
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForAttribute1">
6161
<argument name="attributeCode" value="$$createPageBuilderAttribute.attribute_code$$"/>
6262
</actionGroup>
63-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
63+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
6464
<argument name="contentType" value="PageBuilderRowContentType"/>
6565
</actionGroup>
6666
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
@@ -83,8 +83,9 @@
8383
</actionGroup>
8484
<!-- Set background color of row -->
8585
<comment userInput="Set background color of row" stepKey="commentSetRowBackgroundColor"/>
86-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
86+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
8787
<argument name="contentType" value="PageBuilderRowContentType"/>
88+
<argument name="contentTypeIndex" value="2"/>
8889
</actionGroup>
8990
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor1">
9091
<argument name="property" value="PageBuilderBackgroundColorProperty_3C3C3C"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToRow">
113113
<argument name="contentType" value="PageBuilderButtonsContentType"/>
114114
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
115+
<argument name="containerTargetIndex" value="2"/>
115116
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
116117
</actionGroup>
117118
<!-- Edit Button Item -->
@@ -153,6 +154,7 @@
153154
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerIntoRow">
154155
<argument name="contentType" value="PageBuilderDividerContentType"/>
155156
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
157+
<argument name="containerTargetIndex" value="3"/>
156158
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('short_description')}}"/>
157159
</actionGroup>
158160
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForDivider">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToAPageWithPageBuilder">
2525
<argument name="Category" value="$$createPreReqCategory$$"/>
2626
</actionGroup>
27-
<actionGroup ref="expandAdminCategorySection" stepKey="switchToPageBuilderStage"/>
27+
<actionGroup ref="expandAdminCategorySection" stepKey="expandContentSection"/>
2828
</before>
2929
<after>
3030
<deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333
<!-- Verify Page Builder preview is ready -->
34-
<actionGroup ref="ValidatePageBuilderPreview" stepKey="verifyPageBuilderPreview"/>
34+
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreview"/>
3535
<!-- Verify Empty Row -->
36-
<actionGroup ref="verifyEmptyStage" stepKey="verifyStageEmptyRow"/>
37-
<!-- Verify Page Builder Full Screen -->
38-
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreen"/>
36+
<actionGroup ref="verifyEmptyStage" stepKey="verifyPreviewEmptyRow"/>
37+
<!-- Open Page Builder Full Screen -->
38+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3939
<!-- Verify Empty Row -->
4040
<actionGroup ref="verifyEmptyStage" stepKey="verifyFullScreenEmptyRow"/>
4141
<!-- Add Button to Row -->
@@ -53,10 +53,10 @@
5353
<!-- Verify PageBuilder Button Content Type is on Stage -->
5454
<waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('1', PageBuilderButtonItemText_OneCharacter.value)}}" stepKey="seePageBuilderButtonText"/>
5555
<!-- Verify no Empty Preview Message on Stage -->
56-
<dontSeeElementInDOM selector="{{RowOnStage.empty('1')}}" stepKey="dontSeeEmptyPreviewMessageOnStage"/>
56+
<dontSeeElementInDOM selector="{{RowOnStage.empty('1')}}" stepKey="dontSeeEmptyRowOnPreview"/>
5757
<!-- Verify Page Builder preview is ready -->
58-
<actionGroup ref="ValidatePageBuilderPreview" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
58+
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
5959
<!-- Verify Page Builder Full Screen -->
60-
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreenAfterFullScreen"/>
60+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen2"/>
6161
</test>
6262
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogProductContentSnapshotTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
2626
<argument name="product" value="$$createProduct$$"/>
2727
</actionGroup>
28-
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="switchToPageBuilderStage"/>
28+
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandContentSection"/>
2929
</before>
3030
<after>
3131
<deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct" after="deleteCreatedCategory"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesDisablePageBuilder.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@
2525
</before>
2626
<after>
2727
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
28+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
29+
<argument name="tags" value=""/>
30+
</actionGroup>
2831
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2932
</after>
3033
<!-- Verify Successful Navigation to Templates Page -->
3134
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage"/>
3235
<!-- Disabled Page Builder -->
3336
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
37+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
38+
<argument name="tags" value=""/>
39+
</actionGroup>
3440
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3541
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3642
<!-- Verify Unsuccessful Navigation to Templates Page -->

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,30 @@
4848
display: none !important;
4949
}
5050
}
51+
52+
//
53+
// Animations
54+
// _____________________________________________
55+
56+
.keyframes(
57+
@name;
58+
@arguments
59+
) {
60+
@-moz-keyframes @name {
61+
@arguments();
62+
}
63+
64+
@-webkit-keyframes @name {
65+
@arguments();
66+
}
67+
68+
@keyframes @name {
69+
@arguments();
70+
}
71+
}
72+
73+
.animation (@arguments) {
74+
-webkit-animation: @arguments;
75+
-moz-animation: @arguments;
76+
animation: @arguments;
77+
}

0 commit comments

Comments
 (0)