Skip to content

Commit efc37a6

Browse files
raith-hamzahraith-hamzah
committed
Merge branch 'MC-3162-panel-regroup' of github.com:magento-obsessive-owls/bluefoot into MC-3162-panel-regroup
2 parents c32dd54 + 230874e commit efc37a6

File tree

8 files changed

+81
-78
lines changed

8 files changed

+81
-78
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<see userInput="Divider" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupDivider"/>
3636
<see userInput="Newsletter" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupNewsletter"/>
3737
<see userInput="Anchor" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupAnchor"/>
38-
<see userInput="Html" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHtml"/>
38+
<see userInput="HTML Code" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHtml"/>
3939
<click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
4040
<see userInput="Media" selector="{{PageBuilderPanel.mediaGroup}}" stepKey="seeMediaGroup"/>
4141
<see userInput="Image" selector="{{PageBuilderPanel.mediaGroupContentType}}" stepKey="seeMediaGroupImage"/>
@@ -46,6 +46,6 @@
4646
<click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
4747
<see userInput="Add Content" selector="{{PageBuilderPanel.addContentGroup}}" stepKey="seeAddContentGroup"/>
4848
<see userInput="Block" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupBlock"/>
49-
<see userInput="Product" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupProduct"/>
49+
<see userInput="Products" selector="{{PageBuilderPanel.addContentGroupContentType}}" stepKey="seeAddContentGroupProducts"/>
5050
</actionGroup>
5151
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Text -->
12-
<entity name="PageBuilderTextContentType" type="pagebuilder_text_property">
12+
<entity name="PageBuilderTextProperty" type="pagebuilder_text_property">
1313
<data key="name">Text</data>
14-
<data key="section">Elements</data>
14+
<data key="section">General</data>
1515
<data key="fieldName">text</data>
1616
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
1717
<data key="value">test string</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest.xml

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTests.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,9 +1552,6 @@
15521552
</actionGroup>
15531553
<!-- Add Buttons to Stage -->
15541554
<comment userInput="Add Buttons to Stage" stepKey="addButtonsToStage"/>
1555-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
1556-
<argument name="group" value="PageBuilderButtonsContentType"/>
1557-
</actionGroup>
15581555
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
15591556
<argument name="group" value="PageBuilderButtonsContentType"/>
15601557
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
<actionGroup ref="dragContentTypeToStage" stepKey="dragAccordionIntoStage">
4242
<argument name="contentType" value="PageBuilderAccordionContentType"/>
4343
</actionGroup>
44-
<click selector="{{PageBuilderPanel.elementsGroup}}" stepKey="clickElementsGroup"/>
44+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
45+
<argument name="group" value="PageBuilderTextContentType"/>
46+
</actionGroup>
4547
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
4648
<argument name="contentType" value="PageBuilderTextContentType"/>
4749
</actionGroup>
@@ -66,7 +68,9 @@
6668
<actionGroup ref="dragContentTypeToStage" stepKey="dragHtmlIntoStage">
6769
<argument name="contentType" value="PageBuilderHtmlContentType"/>
6870
</actionGroup>
69-
<click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
71+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupMedia">
72+
<argument name="group" value="PageBuilderImageContentType"/>
73+
</actionGroup>
7074
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
7175
<argument name="contentType" value="PageBuilderImageContentType"/>
7276
</actionGroup>
@@ -82,7 +86,9 @@
8286
<actionGroup ref="dragContentTypeToStage" stepKey="dragMapIntoStage">
8387
<argument name="contentType" value="PageBuilderMapContentType"/>
8488
</actionGroup>
85-
<click selector="{{PageBuilderPanel.addContentGroup}}" stepKey="clickAddContentGroup"/>
89+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupAddContent">
90+
<argument name="group" value="PageBuilderBlockContentType"/>
91+
</actionGroup>
8692
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
8793
<argument name="contentType" value="PageBuilderBlockContentType"/>
8894
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
<comment userInput="Clear input field using backspace to show all content types on Pagebuilder panel" stepKey="commentDeleteSearch"/>
196196
<pressKey selector="{{PageBuilderPanel.searchPanel}}" parameterArray="[\WebDriverKeys::BACKSPACE]" stepKey="enterSearchInput"/>
197197
<dontSee userInput="r" selector="{{PageBuilderPanel.searchPanel}}" stepKey="validateInputClearedAfterRemoveCharacters"/>
198-
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
199198
<actionGroup ref="validateGroupsAndContentTypes" stepKey="validateGroupsAndContentTypesAfterClearField"/>
200199
</test>
201200
<test name="SearchContentTypeAndAddToStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@
125125
<argument name="page" value="text{{PageBuilderPageTitle.pageName}}"/>
126126
</actionGroup>
127127
<actionGroup ref="addTextToTinyMCE" stepKey="enterText">
128-
<argument name="property" value="PageBuilderTextContentType"/>
128+
<argument name="property" value="PageBuilderTextProperty"/>
129129
</actionGroup>
130130
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
131131
<!-- Validate Stage -->
132132
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
133133
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.stageValue)}}" stepKey="waitForVariableStage"/>
134134
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.stageValue)}}" stepKey="waitForWidgetStage"/>
135-
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStage"/>
135+
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStage"/>
136136
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
137137
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
138138
<argument name="contentType" value="PageBuilderTextContentType"/>
@@ -141,7 +141,7 @@
141141
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
142142
<waitForElementVisible selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="waitForVariableStorefront"/>
143143
<waitForElementVisible selector="div.block-cms-link a[href='{{_ENV.MAGENTO_BASE_URL}}text{{PageBuilderPageTitle.pageName}}']" stepKey="waitForWidgetStorefront"/>
144-
<waitForElementVisible selector="{{TextOnStorefront.text('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStorefront"/>
144+
<waitForElementVisible selector="{{TextOnStorefront.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStorefront"/>
145145
</test>
146146
<test name="TextDelete">
147147
<annotations>
@@ -207,7 +207,7 @@
207207
<argument name="contentType" value="PageBuilderTextContentType"/>
208208
</actionGroup>
209209
<actionGroup ref="addTextToTinyMCE" stepKey="enterText">
210-
<argument name="property" value="PageBuilderTextContentType"/>
210+
<argument name="property" value="PageBuilderTextProperty"/>
211211
</actionGroup>
212212
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
213213
<!-- Validate Edit Panel -->
@@ -335,7 +335,7 @@
335335
<argument name="contentType" value="PageBuilderTextContentType"/>
336336
</actionGroup>
337337
<actionGroup ref="addTextToTinyMCE" stepKey="enterText">
338-
<argument name="property" value="PageBuilderTextContentType"/>
338+
<argument name="property" value="PageBuilderTextProperty"/>
339339
</actionGroup>
340340
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
341341
<!-- Update Values -->
@@ -509,7 +509,7 @@
509509
<!-- Fill All Fields -->
510510
<comment userInput="Fill All Fields" stepKey="commentEdit"/>
511511
<actionGroup ref="addTextToTinyMCE" stepKey="enterText">
512-
<argument name="property" value="PageBuilderTextContentType"/>
512+
<argument name="property" value="PageBuilderTextProperty"/>
513513
</actionGroup>
514514
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
515515
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
@@ -555,15 +555,15 @@
555555
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
556556
<argument name="index" value="2"/>
557557
</actionGroup>
558-
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStage"/>
558+
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStage"/>
559559
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
560560
<argument name="contentType" value="PageBuilderTextContentType"/>
561561
<argument name="contentTypeIndex" value="2"/>
562562
</actionGroup>
563563
<!-- Validate Edit Panel For Duplicate -->
564564
<comment userInput="Validate Edit Panel For Duplicate" stepKey="commentValidateEdit"/>
565565
<actionGroup ref="validateTextInTinyMCE" stepKey="validateTextInTinyMCE1">
566-
<argument name="property" value="PageBuilderTextContentType"/>
566+
<argument name="property" value="PageBuilderTextProperty"/>
567567
</actionGroup>
568568
<actionGroup ref="expandConfigurationSection" stepKey="expandAdvancedSection2"/>
569569
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -607,15 +607,15 @@
607607
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
608608
<argument name="index" value="2"/>
609609
</actionGroup>
610-
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStage2"/>
610+
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStage2"/>
611611
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
612612
<argument name="contentType" value="PageBuilderTextContentType"/>
613613
<argument name="contentTypeIndex" value="2"/>
614614
</actionGroup>
615615
<!-- Validate Edit Panel For Duplicate After Save -->
616616
<comment userInput="Validate Edit Panel For Duplicate After Save" stepKey="commentValidateEdit2"/>
617617
<actionGroup ref="validateTextInTinyMCE" stepKey="validateTextInTinyMCE2">
618-
<argument name="property" value="PageBuilderTextContentType"/>
618+
<argument name="property" value="PageBuilderTextProperty"/>
619619
</actionGroup>
620620
<actionGroup ref="expandConfigurationSection" stepKey="expandAdvancedSection3"/>
621621
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -659,7 +659,7 @@
659659
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
660660
<argument name="index" value="2"/>
661661
</actionGroup>
662-
<waitForElementVisible selector="{{TextOnStorefront.text('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStorefront"/>
662+
<waitForElementVisible selector="{{TextOnStorefront.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStorefront"/>
663663
</test>
664664
<test name="TextValidateGeneralDefaultSettings">
665665
<annotations>
@@ -794,37 +794,37 @@
794794
<argument name="contentType" value="PageBuilderTextContentType"/>
795795
</actionGroup>
796796
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel"/>
797-
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextContentType.value}}" stepKey="fillTextField"/>
797+
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="fillTextField"/>
798798
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
799799
<!-- Validate Stage -->
800800
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
801-
<waitForElementVisible selector="{{TextOnStage.textAreaText('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStage"/>
801+
<waitForElementVisible selector="{{TextOnStage.textAreaText('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStage"/>
802802
<!-- Validate Edit Panel -->
803803
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
804804
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
805805
<argument name="contentType" value="PageBuilderTextContentType"/>
806806
</actionGroup>
807807
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel2"/>
808-
<seeInField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextContentType.value}}" stepKey="seeInField"/>
808+
<seeInField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="seeInField"/>
809809
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
810810
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
811811
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
812812
<!-- Validate Stage After Save -->
813813
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
814-
<waitForElementVisible selector="{{TextOnStage.textAreaText('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStage2"/>
814+
<waitForElementVisible selector="{{TextOnStage.textAreaText('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStage2"/>
815815
<!-- Validate Edit Panel -->
816816
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
817817
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
818818
<argument name="contentType" value="PageBuilderTextContentType"/>
819819
</actionGroup>
820820
<waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel3"/>
821-
<seeInField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextContentType.value}}" stepKey="seeInField2"/>
821+
<seeInField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="seeInField2"/>
822822
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
823823
<argument name="contentType" value="PageBuilderTextContentType"/>
824824
</actionGroup>
825825
<!-- Validate Storefront -->
826826
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
827-
<waitForElementVisible selector="{{TextOnStorefront.textAreaText('1', PageBuilderTextContentType.value)}}" stepKey="waitForTextStorefront"/>
827+
<waitForElementVisible selector="{{TextOnStorefront.textAreaText('1', PageBuilderTextProperty.value)}}" stepKey="waitForTextStorefront"/>
828828
</test>
829829
<test name="TextDisabledWYSIWYGAddWidget">
830830
<annotations>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
z-index: 800;
3434

3535
.pagebuilder-header {
36-
background: linear-gradient(to bottom, white 80%, rgba(255, 255, 255, 0) 100%);
36+
background: linear-gradient(to bottom, @color-white 80%, rgba(255, 255, 255, 0) 100%);
3737
left: 150px;
3838
padding: 20px 3rem 10px 10px;
3939
position: fixed;
@@ -72,6 +72,7 @@
7272
}
7373

7474
.pagebuilder-stage {
75+
margin-left: 150px;
7576
margin-top: 60px;
7677
}
7778
}

0 commit comments

Comments
 (0)