Skip to content

Commit bf40803

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-4075-alignment-attribute-not-working-product-map-divider-video' into cms-team-1-delivery
2 parents 1a9d3bd + e6988c0 commit bf40803

File tree

10 files changed

+27
-35
lines changed

10 files changed

+27
-35
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,13 @@
348348
</arguments>
349349
<dontSeeElementInDOM selector="{{EditPanelForm.panelFieldNoAfterLabelText(property.fieldName)}}" stepKey="dontSeeElementInDOM"/>
350350
</actionGroup>
351+
<actionGroup name="validateSlideOutPanelFieldNotPresent">
352+
<arguments>
353+
<argument name="property"/>
354+
</arguments>
355+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
356+
<dontSee selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="dontSeeField"/>
357+
</actionGroup>
351358
<actionGroup name="validateAlignmentFieldIsNotDisabled">
352359
<arguments>
353360
<argument name="property"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//hr[contains(@style,'width: {{arg2}};')]" parameterized="true"/>
2121
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//hr[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
2222
<!-- Advanced Configuration -->
23-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
23+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'text-align: {{arg2}};')]//hr[contains(@style,'display: inline-block;')]" parameterized="true"/>
2424
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[not(contains(@style,'text-align:'))]" parameterized="true"/>
2525
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
2626
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
@@ -44,7 +44,7 @@
4444
<element name="width" type="text" selector="(//div[@data-role='divider'])[{{arg1}}]//hr[contains(@style,'width: {{arg2}};')]" parameterized="true"/>
4545
<element name="noWidth" type="text" selector="(//div[@data-role='divider'])[{{arg1}}]//hr[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
4646
<!-- Advanced Configuration -->
47-
<element name="alignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
47+
<element name="alignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]//hr[contains(@style,'display: inline-block;')]" parameterized="true"/>
4848
<element name="noAlignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
4949
<element name="border" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
5050
<element name="borderWidth" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'max-width: {{arg2}}px;')]" parameterized="true"/>
2323
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]" parameterized="true"/>
2424
<!-- Advanced Configuration -->
25-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
26-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[not(contains(@style,'justify-content:'))]" parameterized="true"/>
25+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@style, 'text-align: {{arg2}};')]" parameterized="true"/>
26+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[not(contains(@style,'text-align:'))]" parameterized="true"/>
2727
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
2828
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
2929
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
@@ -46,8 +46,8 @@
4646
<element name="width" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
4747
<element name="noWidth" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
4848
<!-- Advanced Configuration -->
49-
<element name="alignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
50-
<element name="noAlignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(contains(@style,'justify-content'))]" parameterized="true"/>
49+
<element name="alignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
50+
<element name="noAlignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(contains(@style,'text-align'))]" parameterized="true"/>
5151
<element name="border" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
5252
<element name="borderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
5353
<element name="noBorderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</actionGroup>
253253
<!-- Validate Default Values -->
254254
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
255-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
255+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignmentField">
256256
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
257257
</actionGroup>
258258
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
@@ -1090,7 +1090,7 @@
10901090
</actionGroup>
10911091
<!-- Update Advanced Section -->
10921092
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
1093-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1093+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
10941094
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
10951095
</actionGroup>
10961096
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
<!-- Update Values -->
415415
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
416416
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
417-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
417+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
418418
</actionGroup>
419419
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
420420
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -442,7 +442,7 @@
442442
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
443443
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
444444
<argument name="page" value="VideoOnStage"/>
445-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
445+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyRight"/>
446446
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
447447
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
448448
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -458,7 +458,7 @@
458458
<!-- Validate Edit Panel -->
459459
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
460460
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
461-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
461+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
462462
</actionGroup>
463463
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
464464
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -488,7 +488,7 @@
488488
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
489489
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
490490
<argument name="page" value="VideoOnStage"/>
491-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
491+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyRight"/>
492492
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
493493
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
494494
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -504,7 +504,7 @@
504504
<!-- Validate Edit Panel After Save -->
505505
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
506506
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
507-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
507+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
508508
</actionGroup>
509509
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
510510
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -534,7 +534,7 @@
534534
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
535535
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
536536
<argument name="page" value="VideoOnStorefront"/>
537-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
537+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyRight"/>
538538
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
539539
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
540540
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/divider.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<style name="line_width" source="width"/>
4040
<style name="line_thickness" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
4141
<style name="line_color" source="border_color"/>
42+
<static_style source="display" value="inline-block"/>
4243
</element>
4344
</elements>
4445
</appearance>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
reader="Magento_PageBuilder/js/master-format/read/configurable">
2525
<elements>
2626
<element name="main">
27-
<style name="text_align" source="justify_content"/>
27+
<style name="text_align" source="text_align"/>
2828
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
2929
<attribute name="name" source="data-role"/>
3030
<attribute name="appearance" source="data-appearance"/>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_video_form.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,4 @@
9595
</settings>
9696
</field>
9797
</fieldset>
98-
<fieldset name="advanced">
99-
<field name="text_align">
100-
<formElements>
101-
<select>
102-
<settings>
103-
<options class="Magento\PageBuilder\Model\Source\VideoAlignmentSource"/>
104-
</settings>
105-
</select>
106-
</formElements>
107-
</field>
108-
</fieldset>
10998
</form>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
}
2121
div[data-role='video'],
2222
.pagebuilder-video {
23-
display: flex;
24-
2523
> div:first-child,
2624
.pagebuilder-video-wrapper,
2725
.pagebuilder-video-container {
28-
display: flex;
29-
flex-grow: 1;
26+
display: inline-block;
27+
width: 100%;
3028
}
3129
.pagebuilder-video-container {
3230
padding-top: 56.25%;

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88
// _____________________________________________
99

1010
div[data-role='video'] {
11-
display: flex;
12-
1311
.pagebuilder-video-wrapper,
1412
.pagebuilder-video-container {
15-
display: flex;
16-
flex-grow: 1;
17-
height: 100%;
13+
display: inline-block;
14+
width: 100%;
1815
}
1916
.pagebuilder-video-container {
2017
padding-top: 56.25%;

0 commit comments

Comments
 (0)