Skip to content

Commit 53b71dc

Browse files
author
Hwashiang Yu
committed
MC-5810: Improve naming of the critical variables/parameters in the code and configuration
- Renamed render_template to master_template - Renamed is_visible to is_system - Renamed renderChildTemplate to masterTemplate - Renamed previewChildTemplate to childTemplate - Renamed renderTemplate and previewTemplate to template
1 parent 547f282 commit 53b71dc

File tree

71 files changed

+181
-181
lines changed

Some content is hidden

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

71 files changed

+181
-181
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
<data key="is_required">false</data>
1717
<data key="is_unique">false</data>
1818
<data key="is_searchable">false</data>
19-
<data key="is_visible">true</data>
19+
<data key="is_system">true</data>
2020
<data key="backend_type">text</data>
2121
<data key="is_wysiwyg_enabled">false</data>
22-
<data key="is_visible_in_advanced_search">false</data>
23-
<data key="is_visible_on_front">true</data>
22+
<data key="is_system_in_advanced_search">false</data>
23+
<data key="is_system_on_front">true</data>
2424
<data key="is_filterable">false</data>
2525
<data key="is_filterable_in_search">false</data>
2626
<data key="used_in_product_listing">false</data>
2727
<data key="is_used_for_promo_rules">false</data>
2828
<data key="is_comparable">true</data>
2929
<data key="is_used_in_grid">false</data>
30-
<data key="is_visible_in_grid">false</data>
30+
<data key="is_system_in_grid">false</data>
3131
<data key="is_filterable_in_grid">false</data>
3232
<data key="used_for_sort_by">false</data>
3333
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,13 +498,13 @@
498498
<argument name="rootContainerConfig" xsi:type="array">
499499
<item name="label" xsi:type="string">Root Container</item>
500500
<item name="component" xsi:type="string">Magento_PageBuilder/js/content-type/root-container/content-type-collection</item>
501-
<item name="is_visible" xsi:type="string">false</item>
501+
<item name="is_system" xsi:type="string">false</item>
502502
<item name="appearances" xsi:type="array">
503503
<item name="default" xsi:type="array">
504504
<item name="default" xsi:type="string">true</item>
505505
<item name="reader" xsi:type="string">Magento_PageBuilder/js/master-format/read/configurable</item>
506506
<item name="preview_template" xsi:type="string">Magento_PageBuilder/content-type/preview-collection</item>
507-
<item name="render_template" xsi:type="string">Magento_PageBuilder/content-type/master-collection</item>
507+
<item name="master_template" xsi:type="string">Magento_PageBuilder/content-type/master-collection</item>
508508
</item>
509509
</item>
510510
</argument>

app/code/Magento/PageBuilder/etc/content_type.xsd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<xs:complexType>
1515
<xs:all>
1616
<xs:element type="xs:string" name="preview_template" minOccurs="0"/>
17-
<xs:element type="xs:string" name="render_template" minOccurs="0"/>
17+
<xs:element type="xs:string" name="master_template" minOccurs="0"/>
1818
<xs:element type="parents" name="parents" minOccurs="0" maxOccurs="1"/>
1919
<xs:element type="children" name="children" minOccurs="0" maxOccurs="1"/>
2020
<xs:element name="appearances" minOccurs="0" maxOccurs="1">
@@ -25,7 +25,7 @@
2525
</xs:complexType>
2626
</xs:element>
2727
<xs:element type="additional_data" name="additional_data" minOccurs="0" maxOccurs="1"/>
28-
<xs:element type="xs:string" name="is_visible" minOccurs="0"/>
28+
<xs:element type="xs:string" name="is_system" minOccurs="0"/>
2929
</xs:all>
3030
<xs:attribute type="xs:string" name="name" use="required"/>
3131
<xs:attribute type="xs:string" name="translate" use="optional"/>
@@ -60,7 +60,7 @@
6060
<xs:attribute type="xs:string" name="name" use="required"/>
6161
<xs:attribute type="xs:boolean" name="default" use="optional"/>
6262
<xs:attribute type="xs:string" name="preview_template" use="optional"/>
63-
<xs:attribute type="xs:string" name="render_template" use="optional"/>
63+
<xs:attribute type="xs:string" name="master_template" use="optional"/>
6464
<xs:attribute type="xs:string" name="reader" use="optional"/>
6565
</xs:complexType>
6666
<xs:complexType name="parents">

app/code/Magento/PageBuilder/etc/content_type_merged.xsd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<xs:complexType>
1515
<xs:all>
1616
<xs:element type="xs:string" name="preview_template" minOccurs="0"/>
17-
<xs:element type="xs:string" name="render_template" minOccurs="0"/>
17+
<xs:element type="xs:string" name="master_template" minOccurs="0"/>
1818
<xs:element type="parents" name="parents" minOccurs="0" maxOccurs="1"/>
1919
<xs:element type="children" name="children" minOccurs="0" maxOccurs="1"/>
2020
<xs:element name="appearances" minOccurs="0" maxOccurs="1">
@@ -25,7 +25,7 @@
2525
</xs:complexType>
2626
</xs:element>
2727
<xs:element type="additional_data" name="additional_data" minOccurs="0" maxOccurs="1"/>
28-
<xs:element type="xs:string" name="is_visible" minOccurs="0"/>
28+
<xs:element type="xs:string" name="is_system" minOccurs="0"/>
2929
</xs:all>
3030
<xs:attribute type="xs:string" name="name" use="required"/>
3131
<xs:attribute type="xs:string" name="translate" use="required"/>
@@ -60,7 +60,7 @@
6060
<xs:attribute type="xs:string" name="name" use="required"/>
6161
<xs:attribute type="xs:boolean" name="default" use="optional"/>
6262
<xs:attribute type="xs:string" name="preview_template" use="required"/>
63-
<xs:attribute type="xs:string" name="render_template" use="required"/>
63+
<xs:attribute type="xs:string" name="master_template" use="required"/>
6464
<xs:attribute type="xs:string" name="reader" use="optional"/>
6565
</xs:complexType>
6666
<xs:complexType name="parents">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<appearances>
2020
<appearance name="collage-left"
2121
preview_template="Magento_PageBuilder/content-type/banner/collage-left/preview"
22-
render_template="Magento_PageBuilder/content-type/banner/collage-left/master"
22+
master_template="Magento_PageBuilder/content-type/banner/collage-left/master"
2323
reader="Magento_PageBuilder/js/master-format/read/configurable">
2424
<elements>
2525
<element name="main">
@@ -84,7 +84,7 @@
8484
</appearance>
8585
<appearance name="collage-centered"
8686
preview_template="Magento_PageBuilder/content-type/banner/collage-centered/preview"
87-
render_template="Magento_PageBuilder/content-type/banner/collage-centered/master"
87+
master_template="Magento_PageBuilder/content-type/banner/collage-centered/master"
8888
reader="Magento_PageBuilder/js/master-format/read/configurable">
8989
<elements>
9090
<element name="main">
@@ -149,7 +149,7 @@
149149
</appearance>
150150
<appearance name="collage-right"
151151
preview_template="Magento_PageBuilder/content-type/banner/collage-right/preview"
152-
render_template="Magento_PageBuilder/content-type/banner/collage-right/master"
152+
master_template="Magento_PageBuilder/content-type/banner/collage-right/master"
153153
reader="Magento_PageBuilder/js/master-format/read/configurable">
154154
<elements>
155155
<element name="main">
@@ -215,7 +215,7 @@
215215
<appearance default="true"
216216
name="poster"
217217
preview_template="Magento_PageBuilder/content-type/banner/poster/preview"
218-
render_template="Magento_PageBuilder/content-type/banner/poster/master"
218+
master_template="Magento_PageBuilder/content-type/banner/poster/master"
219219
reader="Magento_PageBuilder/js/master-format/read/configurable">
220220
<elements>
221221
<element name="main">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<appearance default="true"
2121
name="default"
2222
preview_template="Magento_PageBuilder/content-type/block/default/preview"
23-
render_template="Magento_PageBuilder/content-type/block/default/master"
23+
master_template="Magento_PageBuilder/content-type/block/default/master"
2424
reader="Magento_PageBuilder/js/master-format/read/configurable">
2525
<elements>
2626
<element name="main">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/button_item.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<parent name="buttons" policy="allow"/>
2020
</parents>
2121
<children default_policy="deny"/>
22-
<is_visible>false</is_visible>
22+
<is_system>false</is_system>
2323
<appearances>
2424
<appearance default="true"
2525
name="default"
2626
preview_template="Magento_PageBuilder/content-type/button-item/default/preview"
27-
render_template="Magento_PageBuilder/content-type/button-item/default/master"
27+
master_template="Magento_PageBuilder/content-type/button-item/default/master"
2828
reader="Magento_PageBuilder/js/master-format/read/configurable">
2929
<elements>
3030
<element name="main">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/buttons.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<appearance default="true"
2424
name="inline"
2525
preview_template="Magento_PageBuilder/content-type/buttons/inline/preview"
26-
render_template="Magento_PageBuilder/content-type/buttons/inline/master"
26+
master_template="Magento_PageBuilder/content-type/buttons/inline/master"
2727
reader="Magento_PageBuilder/js/master-format/read/configurable">
2828
<elements>
2929
<element name="main">
@@ -44,7 +44,7 @@
4444
</appearance>
4545
<appearance name="stacked"
4646
preview_template="Magento_PageBuilder/content-type/buttons/stacked/preview"
47-
render_template="Magento_PageBuilder/content-type/buttons/stacked/master"
47+
master_template="Magento_PageBuilder/content-type/buttons/stacked/master"
4848
reader="Magento_PageBuilder/js/master-format/read/configurable">
4949
<elements>
5050
<element name="main">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<appearance default="true"
3030
name="full-height"
3131
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
32-
render_template="Magento_PageBuilder/content-type/column/full-height/master"
32+
master_template="Magento_PageBuilder/content-type/column/full-height/master"
3333
reader="Magento_PageBuilder/js/master-format/read/configurable">
3434
<elements>
3535
<element name="main">
@@ -77,7 +77,7 @@
7777
</appearance>
7878
<appearance name="align-top"
7979
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
80-
render_template="Magento_PageBuilder/content-type/column/full-height/master"
80+
master_template="Magento_PageBuilder/content-type/column/full-height/master"
8181
reader="Magento_PageBuilder/js/master-format/read/configurable">
8282
<elements>
8383
<element name="main">
@@ -125,7 +125,7 @@
125125
</appearance>
126126
<appearance name="align-center"
127127
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
128-
render_template="Magento_PageBuilder/content-type/column/full-height/master"
128+
master_template="Magento_PageBuilder/content-type/column/full-height/master"
129129
reader="Magento_PageBuilder/js/master-format/read/configurable">
130130
<elements>
131131
<element name="main">
@@ -173,7 +173,7 @@
173173
</appearance>
174174
<appearance name="align-bottom"
175175
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
176-
render_template="Magento_PageBuilder/content-type/column/full-height/master"
176+
master_template="Magento_PageBuilder/content-type/column/full-height/master"
177177
reader="Magento_PageBuilder/js/master-format/read/configurable">
178178
<elements>
179179
<element name="main">

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<children default_policy="deny">
2424
<child name="column" policy="allow"/>
2525
</children>
26-
<is_visible>false</is_visible>
26+
<is_system>false</is_system>
2727
<appearances>
2828
<appearance default="true"
2929
name="default"
3030
preview_template="Magento_PageBuilder/content-type/column-group/default/preview"
31-
render_template="Magento_PageBuilder/content-type/column-group/default/master"
31+
master_template="Magento_PageBuilder/content-type/column-group/default/master"
3232
reader="Magento_PageBuilder/js/master-format/read/configurable">
3333
<elements>
3434
<element name="main">

0 commit comments

Comments
 (0)