Skip to content

Commit 1beb2c4

Browse files
anthoulaanthoula
committed
Merge branch 'MC-3895-banner-slide-opacity-field' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
2 parents 1a8f914 + f66d79d commit 1beb2c4

Some content is hidden

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

42 files changed

+177
-950
lines changed

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

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -228,39 +228,11 @@
228228
<data key="value">#ff0000</data>
229229
<data key="rgb">255, 0, 0</data>
230230
</entity>
231-
<!-- Overlay Transparency -->
232-
<entity name="PageBuilderBannerOverlayTransparencyProperty" type="pagebuilder_banner_overlayTransparency_property">
233-
<data key="name">Overlay Transparency</data>
234-
<data key="section">contents</data>
235-
<data key="fieldName">overlay_transparency</data>
236-
<data key="value">70</data>
237-
<data key="decimal">0.7</data>
238-
</entity>
239-
<entity name="PageBuilderBannerOverlayTransparencyDefaultProperty" type="pagebuilder_banner_overlayTransparencyDefault_property">
240-
<data key="name">Overlay Transparency</data>
241-
<data key="section">contents</data>
242-
<data key="fieldName">overlay_transparency</data>
243-
<data key="value">0</data>
244-
</entity>
245-
<entity name="PageBuilderBannerOverlayTransparencyInvalidMinProperty" type="pagebuilder_banner_overlayTransparency_property">
246-
<data key="name">Overlay Transparency</data>
247-
<data key="section">contents</data>
248-
<data key="fieldName">overlay_transparency</data>
249-
<data key="value">-1</data>
250-
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
251-
</entity>
252-
<entity name="PageBuilderBannerOverlayTransparencyInvalidMaxProperty" type="pagebuilder_banner_overlayTransparency_property">
253-
<data key="name">Overlay Transparency</data>
254-
<data key="section">contents</data>
255-
<data key="fieldName">overlay_transparency</data>
256-
<data key="value">101</data>
257-
<data key="errorMessage">Please enter a value less than or equal to 100.</data>
258-
</entity>
259-
<entity name="PageBuilderBannerOverlayTransparencyInvalidTypeProperty" type="pagebuilder_banner_overlayTransparency_property">
260-
<data key="name">Overlay Transparency</data>
231+
<entity name="PageBuilderBannerOverlayColor_Blue_Opaque" type="pagebuilder_banner_overlay_color_property">
232+
<data key="name">Overlay Color</data>
261233
<data key="section">contents</data>
262-
<data key="fieldName">overlay_transparency</data>
263-
<data key="value">abc</data>
264-
<data key="errorMessage">Please enter a valid number in this field.</data>
234+
<data key="fieldName">overlay_color</data>
235+
<data key="value">rgba(174, 198, 207, 0.7)</data>
236+
<data key="rgb">rgba(174, 198, 207, 0.7)</data>
265237
</entity>
266238
</entities>

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,26 +187,19 @@
187187
<data key="value">#ffffff</data>
188188
<data key="rgb">255, 255, 255</data>
189189
</entity>
190-
<entity name="PageBuilderSlideItemOverlayColor_FF0000" type="pagebuilder_banner_overlay_color_property">
190+
<entity name="PageBuilderSlideItemOverlayColor_FF0000" type="pagebuilder_slide_item_overlay_color_property">
191191
<data key="name">Overlay Color</data>
192192
<data key="section">general</data>
193193
<data key="fieldName">overlay_color</data>
194194
<data key="value">#ff0000</data>
195195
<data key="rgb">255, 0, 0</data>
196196
</entity>
197-
<!-- Overlay Transparency -->
198-
<entity name="PageBuilderSlideItemOverlayTransparency_70" type="pagebuilder_slide_item_overlay_transparency_property">
199-
<data key="name">Overlay Transparency</data>
200-
<data key="section">general</data>
201-
<data key="fieldName">overlay_transparency</data>
202-
<data key="value">70</data>
203-
<data key="decimal">0.7</data>
204-
</entity>
205-
<entity name="PageBuilderSlideItemOverlayTransparency_0" type="pagebuilder_slide_item_overlay_transparency_property">
206-
<data key="name">Overlay Transparency</data>
197+
<entity name="PageBuilderSlideItemOverlayColor_Blue_Opaque" type="pagebuilder_slide_item_overlay_color_property">
198+
<data key="name">Overlay Color</data>
207199
<data key="section">general</data>
208-
<data key="fieldName">overlay_transparency</data>
209-
<data key="value">0</data>
200+
<data key="fieldName">overlay_color</data>
201+
<data key="value">rgba(174, 198, 207, 0.7)</data>
202+
<data key="rgb">rgba(174, 198, 207, 0.7)</data>
210203
</entity>
211204
<!-- Message -->
212205
<entity name="PageBuilderSlideItemContent_Slide1" type="pagebuilder_slide_item_content_property">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<element name="buttonType" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
4747
<element name="buttonText" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button[.='{{arg2}}']" parameterized="true"/>
4848
<element name="showOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
49-
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
49+
<element name="overlayBackgroundColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
5050
<element name="transparentOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
5151
<!-- Advanced Configuration -->
5252
<element name="alignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -104,7 +104,7 @@
104104
<element name="buttonType" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//a[contains(@class,'{{arg2}}')]" parameterized="true"/>
105105
<element name="buttonText" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//a//span[.='{{arg2}}']" parameterized="true"/>
106106
<element name="showOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
107-
<element name="overlayColorAndTransparency" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
107+
<element name="overlayBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
108108
<element name="transparentOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
109109
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
110110
<!-- Advanced Configuration -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<element name="buttonType" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button'][contains(@class,'{{arg2}}')]" parameterized="true"/>
104104
<element name="buttonText" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button'][.='{{arg2}}']" parameterized="true"/>
105105
<element name="showOverlay" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
106-
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
106+
<element name="overlayBackgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
107107
<element name="transparentOverlay" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
108108
<!-- Advanced Configuration -->
109109
<element name="alignment" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -163,7 +163,7 @@
163163
<element name="buttonType" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button'][contains(@class,'{{arg2}}')]" parameterized="true"/>
164164
<element name="buttonText" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button']//span[.='{{arg2}}']" parameterized="true"/>
165165
<element name="showOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
166-
<element name="overlayColorAndTransparency" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
166+
<element name="overlayBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
167167
<element name="transparentOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
168168
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
169169
<!-- Advanced Configuration -->

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -937,10 +937,7 @@
937937
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
938938
</actionGroup>
939939
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
940-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
941-
</actionGroup>
942-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
943-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
940+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
944941
</actionGroup>
945942
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
946943
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -989,7 +986,7 @@
989986
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage"/>
990987
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage"/>
991988
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage"/>
992-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage"/>
989+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor"/>
993990
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
994991
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
995992
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
@@ -1021,7 +1018,7 @@
10211018
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage2"/>
10221019
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage2"/>
10231020
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage2"/>
1024-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage2"/>
1021+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor2"/>
10251022
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
10261023
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
10271024
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
@@ -1084,10 +1081,7 @@
10841081
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
10851082
</actionGroup>
10861083
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayColor">
1087-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
1088-
</actionGroup>
1089-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
1090-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
1084+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
10911085
</actionGroup>
10921086
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
10931087
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -1139,7 +1133,7 @@
11391133
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStorefront"/>
11401134
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
11411135
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStorefront"/>
1142-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStorefront"/>
1136+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundStorefront"/>
11431137
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
11441138
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStorefront"/>
11451139
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStorefront"/>
@@ -1166,7 +1160,7 @@
11661160
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeMobileButtonTypeStorefront"/>
11671161
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeMobileButtonTextStorefront"/>
11681162
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeMobileOverlayStateStorefront"/>
1169-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeMobileOverlayColorAndTransparencyStorefront"/>
1163+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeMobileOverlayBackgroundStorefront"/>
11701164
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeMobileAlignmentStorefront"/>
11711165
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeMobileBorderStorefront"/>
11721166
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeMobileBorderColorStorefront"/>

0 commit comments

Comments
 (0)