Skip to content

Commit eb69af9

Browse files
anthoulaanthoula
committed
MC-3880: Minimum Height & Vertical Alignment Is In Inconsistent Sections On Edit Panel for Each Content Type
- update forms: row, column, map, slider, tabs, tab-item
1 parent 7bb9a1b commit eb69af9

File tree

6 files changed

+106
-131
lines changed

6 files changed

+106
-131
lines changed

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,7 @@
8080
</select>
8181
</formElements>
8282
</field>
83-
</fieldset>
84-
<fieldset name="background" sortOrder="20" />
85-
<fieldset name="layout" sortOrder="30">
86-
<settings>
87-
<label translate="true">Layout</label>
88-
<collapsible>true</collapsible>
89-
<opened>true</opened>
90-
</settings>
91-
<field name="min_height" sortOrder="10" formElement="input">
83+
<field name="min_height" sortOrder="20" formElement="input">
9284
<settings>
9385
<label translate="true">Minimum Height</label>
9486
<additionalClasses>
@@ -101,7 +93,7 @@
10193
</validation>
10294
</settings>
10395
</field>
104-
<field name="justify_content" sortOrder="20" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
96+
<field name="justify_content" sortOrder="30" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
10597
<argument name="data" xsi:type="array">
10698
<item name="config" xsi:type="array">
10799
<item name="default" xsi:type="string">flex-start</item>
@@ -122,6 +114,7 @@
122114
</formElements>
123115
</field>
124116
</fieldset>
117+
<fieldset name="background" sortOrder="20" />
125118
<fieldset name="advanced">
126119
<field name="margins_and_padding">
127120
<argument name="data" xsi:type="array">

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

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -26,46 +26,7 @@
2626
</settings>
2727
</dataProvider>
2828
</dataSource>
29-
<fieldset name="appearance_fieldset" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
30-
<settings>
31-
<label translate="true">Appearance</label>
32-
<additionalClasses>
33-
<class name="admin__fieldset-visual-select-large">true</class>
34-
</additionalClasses>
35-
<collapsible>false</collapsible>
36-
<opened>true</opened>
37-
<imports>
38-
<link name="hideFieldset">${$.name}.appearance:options</link>
39-
<link name="hideLabel">${$.name}.appearance:options</link>
40-
</imports>
41-
</settings>
42-
<field name="appearance" formElement="select" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-visual-select">
43-
<argument name="data" xsi:type="array">
44-
<item name="config" xsi:type="array">
45-
<item name="default" xsi:type="string">default</item>
46-
</item>
47-
</argument>
48-
<settings>
49-
<additionalClasses>
50-
<class name="admin__field-wide">true</class>
51-
<class name="admin__field-visual-select-container">true</class>
52-
</additionalClasses>
53-
<dataType>text</dataType>
54-
<validation>
55-
<rule name="required-entry" xsi:type="boolean">true</rule>
56-
</validation>
57-
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
58-
</settings>
59-
<formElements>
60-
<select>
61-
<settings>
62-
<options class="AppearanceSourceMap" />
63-
</settings>
64-
</select>
65-
</formElements>
66-
</field>
67-
</fieldset>
68-
<container sortOrder="20" name="google_map_api_key_check" component="Magento_Ui/js/form/components/html" class="Magento\PageBuilder\Component\GoogleMapsApiKeyValidationContainer">
29+
<container sortOrder="10" name="google_map_api_key_check" component="Magento_Ui/js/form/components/html" class="Magento\PageBuilder\Component\GoogleMapsApiKeyValidationContainer">
6930
<argument name="data" xsi:type="array">
7031
<item name="config" xsi:type="array">
7132
<item name="additionalClasses" xsi:type="string">message message-warning</item>
@@ -75,7 +36,7 @@
7536
</item>
7637
</argument>
7738
</container>
78-
<fieldset name="general" sortOrder="30">
39+
<fieldset name="general" sortOrder="20">
7940
<settings>
8041
<label/>
8142
<additionalClasses>
@@ -247,13 +208,45 @@
247208
</container>
248209
</dynamicRows>
249210
</fieldset>
250-
<fieldset name="map_settings" sortOrder="40">
211+
<fieldset name="appearance_fieldset" sortOrder="30" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
251212
<settings>
252-
<label translate="true">Map Settings</label>
253-
<collapsible>true</collapsible>
213+
<label translate="true">Appearance</label>
214+
<additionalClasses>
215+
<class name="admin__fieldset-visual-select-large">true</class>
216+
</additionalClasses>
217+
<collapsible>false</collapsible>
254218
<opened>true</opened>
219+
<imports>
220+
<link name="hideFieldset">${$.name}.appearance:options</link>
221+
<link name="hideLabel">${$.name}.appearance:options</link>
222+
</imports>
255223
</settings>
256-
<field name="height" sortOrder="10" formElement="input">
224+
<field name="appearance" formElement="select" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-visual-select">
225+
<argument name="data" xsi:type="array">
226+
<item name="config" xsi:type="array">
227+
<item name="default" xsi:type="string">default</item>
228+
</item>
229+
</argument>
230+
<settings>
231+
<additionalClasses>
232+
<class name="admin__field-wide">true</class>
233+
<class name="admin__field-visual-select-container">true</class>
234+
</additionalClasses>
235+
<dataType>text</dataType>
236+
<validation>
237+
<rule name="required-entry" xsi:type="boolean">true</rule>
238+
</validation>
239+
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
240+
</settings>
241+
<formElements>
242+
<select>
243+
<settings>
244+
<options class="AppearanceSourceMap" />
245+
</settings>
246+
</select>
247+
</formElements>
248+
</field>
249+
<field name="height" sortOrder="20" formElement="input">
257250
<argument name="data" xsi:type="array">
258251
<item name="config" xsi:type="array">
259252
<item name="source" xsi:type="string">block</item>
@@ -273,6 +266,13 @@
273266
</validation>
274267
</settings>
275268
</field>
269+
</fieldset>
270+
<fieldset name="map_settings" sortOrder="40">
271+
<settings>
272+
<label translate="true">Map Settings</label>
273+
<collapsible>true</collapsible>
274+
<opened>true</opened>
275+
</settings>
276276
<field name="show_controls" sortOrder="20" formElement="checkbox">
277277
<argument name="data" xsi:type="array">
278278
<item name="config" xsi:type="array">

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

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,39 @@
6969
</select>
7070
</formElements>
7171
</field>
72+
<field name="min_height" sortOrder="20" formElement="input">
73+
<settings>
74+
<label translate="true">Minimum Height</label>
75+
<addAfter translate="true">px</addAfter>
76+
<additionalClasses>
77+
<class name="admin__field-small">true</class>
78+
</additionalClasses>
79+
<validation>
80+
<rule name="validate-number" xsi:type="boolean">true</rule>
81+
<rule name="greater-than-equals-to" xsi:type="number">0</rule>
82+
</validation>
83+
</settings>
84+
</field>
85+
<field name="justify_content" sortOrder="30" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
86+
<argument name="data" xsi:type="array">
87+
<item name="config" xsi:type="array">
88+
<item name="default" xsi:type="string">flex-start</item>
89+
</item>
90+
</argument>
91+
<settings>
92+
<dataType>text</dataType>
93+
<label translate="true">Vertical Alignment</label>
94+
<notice translate="true">Vertical alignment controls how the child blocks of this container will be positioned. Set minimum height in order to use vertical alignment.</notice>
95+
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
96+
</settings>
97+
<formElements>
98+
<select>
99+
<settings>
100+
<options class="Magento\PageBuilder\Model\Source\VerticalAlignment"/>
101+
</settings>
102+
</select>
103+
</formElements>
104+
</field>
72105
</fieldset>
73106
<fieldset name="background" sortOrder="20" />
74107
<fieldset name="parallax_background" sortOrder="30">
@@ -139,46 +172,6 @@
139172
</settings>
140173
</field>
141174
</fieldset>
142-
<fieldset name="layout" sortOrder="40">
143-
<settings>
144-
<label translate="true">Layout</label>
145-
<collapsible>true</collapsible>
146-
<opened>true</opened>
147-
</settings>
148-
<field name="min_height" sortOrder="10" formElement="input">
149-
<settings>
150-
<label translate="true">Minimum Height</label>
151-
<addAfter translate="true">px</addAfter>
152-
<additionalClasses>
153-
<class name="admin__field-small">true</class>
154-
</additionalClasses>
155-
<validation>
156-
<rule name="validate-number" xsi:type="boolean">true</rule>
157-
<rule name="greater-than-equals-to" xsi:type="number">0</rule>
158-
</validation>
159-
</settings>
160-
</field>
161-
<field name="justify_content" sortOrder="20" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
162-
<argument name="data" xsi:type="array">
163-
<item name="config" xsi:type="array">
164-
<item name="default" xsi:type="string">flex-start</item>
165-
</item>
166-
</argument>
167-
<settings>
168-
<dataType>text</dataType>
169-
<label translate="true">Vertical Alignment</label>
170-
<notice translate="true">Vertical alignment controls how the child blocks of this container will be positioned. Set minimum height in order to use vertical alignment.</notice>
171-
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
172-
</settings>
173-
<formElements>
174-
<select>
175-
<settings>
176-
<options class="Magento\PageBuilder\Model\Source\VerticalAlignment"/>
177-
</settings>
178-
</select>
179-
</formElements>
180-
</field>
181-
</fieldset>
182175
<fieldset name="advanced">
183176
<field name="margins_and_padding">
184177
<argument name="data" xsi:type="array">

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,27 @@
6969
</select>
7070
</formElements>
7171
</field>
72+
<field name="min_height" sortOrder="20" formElement="input">
73+
<argument name="data" xsi:type="array">
74+
<item name="config" xsi:type="array">
75+
<item name="default" xsi:type="number">300</item>
76+
</item>
77+
</argument>
78+
<settings>
79+
<label translate="true">Minimum Height</label>
80+
<additionalClasses>
81+
<class name="admin__field-small">true</class>
82+
</additionalClasses>
83+
<addAfter translate="true">px</addAfter>
84+
<validation>
85+
<rule name="validate-number" xsi:type="boolean">true</rule>
86+
</validation>
87+
</settings>
88+
</field>
7289
</fieldset>
73-
<fieldset name="settings" sortOrder="20">
90+
<fieldset name="slider_settings" sortOrder="20">
7491
<settings>
75-
<label translate="true">Settings</label>
92+
<label translate="true">Slider Settings</label>
7693
<collapsible>true</collapsible>
7794
<opened>true</opened>
7895
</settings>
@@ -206,22 +223,5 @@
206223
</checkbox>
207224
</formElements>
208225
</field>
209-
<field name="min_height" sortOrder="60" formElement="input">
210-
<argument name="data" xsi:type="array">
211-
<item name="config" xsi:type="array">
212-
<item name="default" xsi:type="number">300</item>
213-
</item>
214-
</argument>
215-
<settings>
216-
<label translate="true">Minimum Height</label>
217-
<additionalClasses>
218-
<class name="admin__field-small">true</class>
219-
</additionalClasses>
220-
<addAfter translate="true">px</addAfter>
221-
<validation>
222-
<rule name="validate-number" xsi:type="boolean">true</rule>
223-
</validation>
224-
</settings>
225-
</field>
226226
</fieldset>
227227
</form>

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,17 @@
7272
</fieldset>
7373
<fieldset name="general" sortOrder="20">
7474
<settings>
75-
<label translate="true">General</label>
76-
<collapsible>true</collapsible>
77-
<opened>true</opened>
75+
<label />
7876
</settings>
79-
<field name="tab_name" sortOrder="20" formElement="input">
77+
<field name="tab_name" sortOrder="10" formElement="input">
8078
<settings>
8179
<label translate="true">Tab Name</label>
8280
<validation>
8381
<rule name="validate-string" xsi:type="boolean">true</rule>
8482
</validation>
8583
</settings>
8684
</field>
87-
</fieldset>
88-
<fieldset name="background" sortOrder="30"/>
89-
<fieldset name="layout" sortOrder="40">
90-
<settings>
91-
<label translate="true">Layout</label>
92-
<collapsible>true</collapsible>
93-
<opened>true</opened>
94-
</settings>
95-
<field name="min_height" sortOrder="10" formElement="input">
85+
<field name="min_height" sortOrder="20" formElement="input">
9686
<settings>
9787
<label translate="true">Minimum Height</label>
9888
<addAfter translate="true">px</addAfter>
@@ -105,7 +95,7 @@
10595
</validation>
10696
</settings>
10797
</field>
108-
<field name="justify_content" sortOrder="20" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
98+
<field name="justify_content" sortOrder="30" formElement="select" component="Magento_PageBuilder/js/form/element/visual-select">
10999
<argument name="data" xsi:type="array">
110100
<item name="config" xsi:type="array">
111101
<item name="default" xsi:type="string">flex-start</item>
@@ -126,6 +116,7 @@
126116
</formElements>
127117
</field>
128118
</fieldset>
119+
<fieldset name="background" sortOrder="30"/>
129120
<fieldset name="advanced">
130121
<field name="border" sortOrder="20" formElement="select">
131122
<argument name="data" xsi:type="array">

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272
</fieldset>
7373
<fieldset name="general" sortOrder="20">
7474
<settings>
75-
<label translate="true">General</label>
76-
<collapsible>true</collapsible>
77-
<opened>true</opened>
75+
<label/>
7876
</settings>
7977
<field name="default_active" formElement="select" sortOrder="20">
8078
<settings>

0 commit comments

Comments
 (0)