Skip to content

Commit 1dbf2df

Browse files
anthoulaanthoula
committed
Merge branch 'MC-912-clean-config-fields' into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_row_form.xml
2 parents d9a5d08 + 1ebf0bc commit 1dbf2df

File tree

51 files changed

+131
-322
lines changed

Some content is hidden

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

51 files changed

+131
-322
lines changed

‎app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,25 @@
9494
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
9595
</entity>
9696
<entity name="PageBuilderSlideItemLinkURL1" type="pagebuilder_slide_property">
97-
<data key="name">Link URL</data>
97+
<data key="name">Link</data>
9898
<data key="section">general</data>
9999
<data key="fieldName">link_url</data>
100100
<data key="value">/slide1</data>
101101
</entity>
102102
<entity name="PageBuilderSlideItemLinkURL2" type="pagebuilder_slide_property">
103-
<data key="name">Link URL</data>
103+
<data key="name">Link</data>
104104
<data key="section">general</data>
105105
<data key="fieldName">link_url</data>
106106
<data key="value">/slide2</data>
107107
</entity>
108108
<entity name="PageBuilderSlideLinkExternalUrlProperty" type="pagebuilder_Slide_linkUrl_property">
109-
<data key="name">Link URL</data>
109+
<data key="name">Link</data>
110110
<data key="section">general</data>
111111
<data key="fieldName">link_url</data>
112112
<data key="value">http://url.magento/</data>
113113
</entity>
114114
<entity name="PageBuilderSlideLinkExternalUrlPropertyValidate" type="pagebuilder_Slide_linkUrl_property">
115-
<data key="name">Link URL</data>
115+
<data key="name">Link</data>
116116
<data key="section">general</data>
117117
<data key="fieldName">link_url[default]</data>
118118
<data key="value">http://url.magento/</data>
@@ -380,11 +380,11 @@
380380
<data key="paddingBottom">40</data>
381381
<data key="paddingLeft">40</data>
382382
</entity>
383-
<entity name="PageBuilderSlideWhiteOverlayColorProperty" type="pagebuilder_Slide_overlay_color_property">
383+
<entity name="PageBuilderSlideOverlayColorProperty_Empty" type="pagebuilder_Slide_overlay_color_property">
384384
<data key="name">Overlay Color</data>
385385
<data key="section">general</data>
386386
<data key="fieldName">overlay_color</data>
387-
<data key="value">#ffffff</data>
387+
<data key="value"/>
388388
</entity>
389389
<!-- Message -->
390390
<entity name="PageBuilderSlideMessageProperty" type="pagebuilder_banner_message_property">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
</entity>
2727
<entity name="PageBuilderTextContentTypeEmpty" type="pagebuilder_text_property">
2828
<data key="name">Text</data>
29-
<data key="section">General</data>
29+
<data key="section">general</data>
3030
<data key="fieldName">text</data>
3131
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
3232
<data key="value"/>
33+
<data key="errorMessage">This is a required field.</data>
3334
</entity>
3435
<!-- Variables -->
3536
<entity name="TinyMCEVariableBaseURL" type="pagebuilder_text_variable_property">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<element name="tinyMCE3" type="text" selector="#pagebuilder_text_form_content_tbl"/>
5656
<element name="tinyMCE3VariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable"/>
5757
<element name="tinyMCE3WidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
58+
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__control-wysiwig')]//..//../label[.='{{arg2}}']" parameterized="true"/>
5859
<!-- WYSIWYG Disabled -->
5960
<element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
6061
<element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>

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

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

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,6 @@
670670
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
671671
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
672672
</actionGroup>
673-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
674673
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
675674
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
676675
</actionGroup>
@@ -710,7 +709,6 @@
710709
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
711710
<argument name="contentType" value="PageBuilderBannerContentType"/>
712711
</actionGroup>
713-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
714712
<!-- Validate Edit Panel -->
715713
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
716714
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -754,7 +752,6 @@
754752
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
755753
<argument name="contentType" value="PageBuilderBannerContentType"/>
756754
</actionGroup>
757-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection3"/>
758755
<!-- Validate Edit Panel After Save -->
759756
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
760757
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -903,7 +900,6 @@
903900
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
904901
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
905902
</actionGroup>
906-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
907903
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
908904
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
909905
</actionGroup>
@@ -1050,7 +1046,6 @@
10501046
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
10511047
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
10521048
</actionGroup>
1053-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
10541049
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
10551050
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10561051
</actionGroup>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,6 @@
670670
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
671671
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
672672
</actionGroup>
673-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
674673
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
675674
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
676675
</actionGroup>
@@ -710,7 +709,6 @@
710709
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
711710
<argument name="contentType" value="PageBuilderBannerContentType"/>
712711
</actionGroup>
713-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
714712
<!-- Validate Edit Panel -->
715713
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
716714
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -754,7 +752,6 @@
754752
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
755753
<argument name="contentType" value="PageBuilderBannerContentType"/>
756754
</actionGroup>
757-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection3"/>
758755
<!-- Validate Edit Panel After Save -->
759756
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
760757
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -903,7 +900,6 @@
903900
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
904901
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
905902
</actionGroup>
906-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
907903
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
908904
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
909905
</actionGroup>
@@ -1050,7 +1046,6 @@
10501046
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
10511047
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
10521048
</actionGroup>
1053-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
10541049
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
10551050
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10561051
</actionGroup>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,6 @@
670670
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
671671
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
672672
</actionGroup>
673-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
674673
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
675674
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
676675
</actionGroup>
@@ -710,7 +709,6 @@
710709
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
711710
<argument name="contentType" value="PageBuilderBannerContentType"/>
712711
</actionGroup>
713-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
714712
<!-- Validate Edit Panel -->
715713
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
716714
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -754,7 +752,6 @@
754752
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
755753
<argument name="contentType" value="PageBuilderBannerContentType"/>
756754
</actionGroup>
757-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection3"/>
758755
<!-- Validate Edit Panel After Save -->
759756
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
760757
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -903,7 +900,6 @@
903900
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
904901
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
905902
</actionGroup>
906-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
907903
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
908904
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
909905
</actionGroup>
@@ -1050,7 +1046,6 @@
10501046
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
10511047
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
10521048
</actionGroup>
1053-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
10541049
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
10551050
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10561051
</actionGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@
687687
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
688688
<argument name="contentType" value="PageBuilderBannerContentType"/>
689689
</actionGroup>
690-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
691690
<!-- Validate Default Values -->
692691
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
693692
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -740,7 +739,6 @@
740739
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
741740
<argument name="contentType" value="PageBuilderBannerContentType"/>
742741
</actionGroup>
743-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
744742
<!-- Validate Edit Panel After Save -->
745743
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
746744
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -1635,7 +1633,6 @@
16351633
</actionGroup>
16361634
<!-- Update Advanced Section -->
16371635
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
1638-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
16391636
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
16401637
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
16411638
</actionGroup>
@@ -1813,7 +1810,6 @@
18131810
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
18141811
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
18151812
</actionGroup>
1816-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
18171813
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
18181814
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
18191815
</actionGroup>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,6 @@
735735
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
736736
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
737737
</actionGroup>
738-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
739738
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
740739
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
741740
</actionGroup>
@@ -775,7 +774,6 @@
775774
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
776775
<argument name="contentType" value="PageBuilderBannerContentType"/>
777776
</actionGroup>
778-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
779777
<!-- Validate Edit Panel -->
780778
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
781779
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -821,7 +819,6 @@
821819
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
822820
<argument name="contentType" value="PageBuilderBannerContentType"/>
823821
</actionGroup>
824-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection3"/>
825822
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
826823
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
827824
</actionGroup>
@@ -966,7 +963,6 @@
966963
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
967964
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
968965
</actionGroup>
969-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
970966
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
971967
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
972968
</actionGroup>
@@ -1113,7 +1109,6 @@
11131109
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
11141110
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
11151111
</actionGroup>
1116-
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
11171112
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
11181113
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
11191114
</actionGroup>

0 commit comments

Comments
 (0)