Skip to content

Commit c098e8b

Browse files
anthoulaanthoula
committed
MC-3880: Minimum Height & Vertical Alignment Is In Inconsistent Sections On Edit Panel for Each Content Type
- update mftf data sections - clean up section comments
1 parent eb69af9 commit c098e8b

File tree

7 files changed

+44
-48
lines changed

7 files changed

+44
-48
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,72 @@
1111
<!-- Min Height -->
1212
<entity name="PageBuilderMinHeightProperty_Empty" type="pagebuilder_min_height_property">
1313
<data key="name">Minimum Height</data>
14-
<data key="section">layout</data>
14+
<data key="section">appearance_fieldset</data>
1515
<data key="fieldName">min_height</data>
1616
<data key="value"/>
1717
</entity>
1818
<entity name="PageBuilderMinHeightProperty_0" type="pagebuilder_min_height_property">
1919
<data key="name">Minimum Height</data>
20-
<data key="section">layout</data>
20+
<data key="section">appearance_fieldset</data>
2121
<data key="fieldName">min_height</data>
2222
<data key="value">0</data>
2323
<data key="style">min-height: 0px</data>
2424
</entity>
2525
<entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
2626
<data key="name">Minimum Height</data>
27-
<data key="section">layout</data>
27+
<data key="section">appearance_fieldset</data>
2828
<data key="fieldName">min_height</data>
2929
<data key="value">500</data>
3030
<data key="style">min-height: 500px</data>
3131
</entity>
3232
<entity name="PageBuilderMinHeightProperty_300" type="pagebuilder_min_height_property">
3333
<data key="name">Minimum Height</data>
34-
<data key="section">layout</data>
34+
<data key="section">appearance_fieldset</data>
3535
<data key="fieldName">min_height</data>
3636
<data key="value">300</data>
3737
<data key="style">min-height: 300px</data>
3838
</entity>
3939
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
4040
<data key="name">Minimum Height</data>
41-
<data key="section">layout</data>
41+
<data key="section">appearance_fieldset</data>
4242
<data key="fieldName">min_height</data>
4343
<data key="value">200</data>
4444
<data key="style">min-height: 200px</data>
4545
</entity>
4646
<entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
4747
<data key="name">Minimum Height</data>
48-
<data key="section">layout</data>
48+
<data key="section">appearance_fieldset</data>
4949
<data key="fieldName">min_height</data>
5050
<data key="value">a</data>
5151
<data key="errorMessage">Please enter a valid number in this field.</data>
5252
</entity>
5353
<entity name="PageBuilderMinHeightProperty_Negative1" type="pagebuilder_min_height_property">
5454
<data key="name">Minimum Height</data>
55-
<data key="section">layout</data>
55+
<data key="section">appearance_fieldset</data>
5656
<data key="fieldName">min_height</data>
5757
<data key="value">-1</data>
5858
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
5959
</entity>
6060
<!-- Vertical Alignment -->
6161
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">
6262
<data key="name">Vertical alignment</data>
63-
<data key="section">layout</data>
63+
<data key="section">appearance_fieldset</data>
6464
<data key="fieldName">justify_content</data>
6565
<data key="value">flex-start</data>
6666
<data key="optionsList">[Top, Center, Bottom]</data>
6767
<data key="style">justify-content: flex-start</data>
6868
</entity>
6969
<entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
7070
<data key="name">Vertical alignment</data>
71-
<data key="section">layout</data>
71+
<data key="section">appearance_fieldset</data>
7272
<data key="fieldName">justify_content</data>
7373
<data key="value">center</data>
7474
<data key="optionsList">[Top, Center, Bottom]</data>
7575
<data key="style">justify-content: center</data>
7676
</entity>
7777
<entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
7878
<data key="name">Vertical alignment</data>
79-
<data key="section">layout</data>
79+
<data key="section">appearance_fieldset</data>
8080
<data key="fieldName">justify_content</data>
8181
<data key="value">flex-end</data>
8282
<data key="optionsList">[Top, Center, Bottom]</data>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -807,38 +807,38 @@
807807
<!-- Height -->
808808
<entity name="PageBuilderMapHeightDefaultProperty" type="pagebuilder_map_height_property">
809809
<data key="name">Map Height</data>
810-
<data key="section">map_settings</data>
810+
<data key="section">appearance_fieldset</data>
811811
<data key="fieldName">height</data>
812812
<data key="value">300</data>
813813
</entity>
814814
<entity name="PageBuilderMapHeight_Empty" type="pagebuilder_map_height_property">
815815
<data key="name">Height</data>
816-
<data key="section">map_settings</data>
816+
<data key="section">appearance_fieldset</data>
817817
<data key="fieldName">height</data>
818818
<data key="value"/>
819819
</entity>
820820
<entity name="PageBuilderMapHeightProperty350" type="pagebuilder_map_height_property">
821821
<data key="name">Height</data>
822-
<data key="section">map_settings</data>
822+
<data key="section">appearance_fieldset</data>
823823
<data key="fieldName">height</data>
824824
<data key="value">350</data>
825825
</entity>
826826
<entity name="PageBuilderMapHeightProperty500px" type="pagebuilder_map_height_property">
827827
<data key="name">Height</data>
828-
<data key="section">map_settings</data>
828+
<data key="section">appearance_fieldset</data>
829829
<data key="fieldName">height</data>
830830
<data key="value">500</data>
831831
</entity>
832832
<entity name="PageBuilderMapHeight_Percentage" type="pagebuilder_map_height_property">
833833
<data key="name">Height</data>
834-
<data key="section">map_settings</data>
834+
<data key="section">appearance_fieldset</data>
835835
<data key="fieldName">height</data>
836836
<data key="value">50%</data>
837837
<data key="errorMessage">Please enter a valid number in this field.</data>
838838
</entity>
839839
<entity name="PageBuilderMapHeight_NonNumeric" type="pagebuilder_map_height_property">
840840
<data key="name">Height</data>
841-
<data key="section">map_settings</data>
841+
<data key="section">appearance_fieldset</data>
842842
<data key="fieldName">height</data>
843843
<data key="value">a</data>
844844
<data key="errorMessage">Please enter a valid number in this field.</data>

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,97 +11,97 @@
1111
<!-- AutoPlay -->
1212
<entity name="PageBuilderSliderAutoPlay_Disabled" type="pagebuilder_slider_autoplay_property">
1313
<data key="name">Autoplay</data>
14-
<data key="section">settings</data>
14+
<data key="section">slider_settings</data>
1515
<data key="fieldName">autoplay</data>
1616
<data key="value">false</data>
1717
</entity>
1818
<entity name="PageBuilderSliderAutoPlay_Enabled" type="pagebuilder_slider_autoplay_property">
1919
<data key="name">Autoplay</data>
20-
<data key="section">settings</data>
20+
<data key="section">slider_settings</data>
2121
<data key="fieldName">autoplay</data>
2222
<data key="value">true</data>
2323
</entity>
2424
<!-- AutoPlay Speed -->
2525
<entity name="PageBuilderSliderAutoPlaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
2626
<data key="name">Autoplay Speed</data>
27-
<data key="section">settings</data>
27+
<data key="section">slider_settings</data>
2828
<data key="fieldName">autoplay_speed</data>
2929
<data key="value">4000</data>
3030
</entity>
3131
<entity name="PageBuilderSliderAutoPlaySpeed_50000" type="pagebuilder_slider_autoplay_speed_property">
3232
<data key="name">Autoplay Speed</data>
33-
<data key="section">settings</data>
33+
<data key="section">slider_settings</data>
3434
<data key="fieldName">autoplay_speed</data>
3535
<data key="value">50000</data>
3636
</entity>
3737
<!-- Fade -->
3838
<entity name="PageBuilderSliderFade_Enabled" type="pagebuilder_slider_fade_property">
3939
<data key="name">Fade</data>
40-
<data key="section">settings</data>
40+
<data key="section">slider_settings</data>
4141
<data key="fieldName">fade</data>
4242
<data key="value">true</data>
4343
</entity>
4444
<entity name="PageBuilderSliderFade_Disabled" type="pagebuilder_slider_fade_property">
4545
<data key="name">Fade</data>
46-
<data key="section">settings</data>
46+
<data key="section">slider_settings</data>
4747
<data key="fieldName">fade</data>
4848
<data key="value">false</data>
4949
</entity>
5050
<!-- Infinite Loop -->
5151
<entity name="PageBuilderSliderInfiniteLoop_Enabled" type="pagebuilder_slider_infinite_loop_property">
5252
<data key="name">Is Infinite</data>
53-
<data key="section">settings</data>
53+
<data key="section">slider_settings</data>
5454
<data key="fieldName">is_infinite</data>
5555
<data key="value">true</data>
5656
</entity>
5757
<entity name="PageBuilderSliderInfiniteLoop_Disabled" type="pagebuilder_slider_infinite_loop_property">
5858
<data key="name">Is Infinite</data>
59-
<data key="section">settings</data>
59+
<data key="section">slider_settings</data>
6060
<data key="fieldName">is_infinite</data>
6161
<data key="value">false</data>
6262
</entity>
6363
<!-- Show Arrows -->
6464
<entity name="PageBuilderSliderShowArrows_Enabled" type="pagebuilder_slider_show_arrows_property">
6565
<data key="name">Show Arrows</data>
66-
<data key="section">settings</data>
66+
<data key="section">slider_settings</data>
6767
<data key="fieldName">show_arrows</data>
6868
<data key="value">true</data>
6969
</entity>
7070
<entity name="PageBuilderSliderShowArrows_Disabled" type="pagebuilder_slider_show_arrows_property">
7171
<data key="name">Show Arrows</data>
72-
<data key="section">settings</data>
72+
<data key="section">slider_settings</data>
7373
<data key="fieldName">show_arrows</data>
7474
<data key="value">false</data>
7575
</entity>
7676
<!-- Show Dots -->
7777
<entity name="PageBuilderSliderShowDots_Disabled" type="pagebuilder_slider_show_dots_property">
7878
<data key="name">Show dots</data>
79-
<data key="section">settings</data>
79+
<data key="section">slider_settings</data>
8080
<data key="fieldName">show_dots</data>
8181
<data key="value">false</data>
8282
</entity>
8383
<entity name="PageBuilderSliderShowDots_Enabled" type="pagebuilder_slider_show_dots_property">
8484
<data key="name">Show dots</data>
85-
<data key="section">settings</data>
85+
<data key="section">slider_settings</data>
8686
<data key="fieldName">show_dots</data>
8787
<data key="value">true</data>
8888
</entity>
8989
<!-- Minimum Height -->
9090
<entity name="PageBuilderSliderMinHeight_500" type="pagebuilder_slider_min_height_property">
9191
<data key="name">Minimum Height</data>
92-
<data key="section">settings</data>
92+
<data key="section">appearance_fieldset</data>
9393
<data key="fieldName">min_height</data>
9494
<data key="value">500</data>
9595
</entity>
9696
<entity name="PageBuilderSliderMinHeight_Default" type="pagebuilder_slider_min_height_property">
9797
<data key="name">Minimum Height</data>
98-
<data key="section">settings</data>
98+
<data key="section">appearance_fieldset</data>
9999
<data key="fieldName">min_height</data>
100100
<data key="value">300</data>
101101
</entity>
102102
<entity name="PageBuilderSliderMinHeight_100" type="pagebuilder_slider_min_height_property">
103103
<data key="name">Minimum Height</data>
104-
<data key="section">settings</data>
104+
<data key="section">appearance_fieldset</data>
105105
<data key="fieldName">min_height</data>
106106
<data key="value">100</data>
107107
</entity>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@
6060
<!-- Minimum Height -->
6161
<entity name="PageBuilderTabMinimumHeightDefaultProperty" type="pagebuilder_tab_property">
6262
<data key="name">Minimum Height</data>
63-
<data key="section">layout</data>
63+
<data key="section">appearance_fieldset</data>
6464
<data key="fieldName">min_height</data>
6565
<data key="value">300</data>
6666
</entity>
6767
<entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
6868
<data key="name">Minimum Height</data>
69-
<data key="section">layout</data>
69+
<data key="section">appearance_fieldset</data>
7070
<data key="fieldName">min_height</data>
7171
<data key="value">200</data>
7272
</entity>
7373
<entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
7474
<data key="name">Minimum Height</data>
75-
<data key="section">layout</data>
75+
<data key="section">appearance_fieldset</data>
7676
<data key="fieldName">min_height</data>
7777
<data key="value">600</data>
7878
</entity>
7979
<entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
8080
<data key="name">Minimum Height</data>
81-
<data key="section">layout</data>
81+
<data key="section">appearance_fieldset</data>
8282
<data key="fieldName">min_height</data>
8383
<data key="value">1000</data>
8484
</entity>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<element name="gridSizeTooltipWithMax" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-tooltip')][1]//span//p//span[text()='{{arg2}}']" parameterized="true"/>
3535
<element name="gridSizeError" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'admin__field-error') and contains(text(), '{{arg2}}')]" parameterized="true"/>
3636
<element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
37+
<element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
38+
<element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}]/div[contains(@class,'column-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
3739
<!-- Background Configuration -->
3840
<element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
3941
<element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -43,9 +45,6 @@
4345
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
4446
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
4547
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
46-
<!-- Layout Configuration -->
47-
<element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
48-
<element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}]/div[contains(@class,'column-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
4948
<!-- Advanced Configuration -->
5049
<element name="alignment" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'text-align: {{arg3}};')]" parameterized="true"/>
5150
<element name="border" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-style: {{arg3}};')]" parameterized="true"/>
@@ -100,6 +99,8 @@
10099
<element name="columnPadding" type="button" selector="[data-content-type='column']:first-child[style*='padding: 5px;']"/>
101100
<element name="columnClass" type="button" selector="[data-content-type='column']:first-child.first-class.second-class.third-class"/>
102101
<element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
102+
<element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
103+
<element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
103104
<!-- Background Configuration -->
104105
<element name="backgroundPosition" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
105106
<element name="backgroundSize" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -110,8 +111,5 @@
110111
<element name="backgroundImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
111112
<element name="noBackgroundImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
112113
<element name="backgroundMobileImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
113-
<!-- Layout Configuration -->
114-
<element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
115-
<element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
116114
</section>
117115
</sections>

0 commit comments

Comments
 (0)