Skip to content

Commit 05e0c80

Browse files
krissyhiserotekrissyhiserote
committed
MAGETWO-90998: Extension developer has to specify all fields in order to extend content type.
- change var to name and name to source in content type configuration
1 parent 9c50244 commit 05e0c80

File tree

26 files changed

+500
-500
lines changed

26 files changed

+500
-500
lines changed

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ private function convertProperties(\DOMElement $elementNode): array
274274
if ($propertiesNode) {
275275
foreach ($propertiesNode->getElementsByTagName('property') as $propertyNode) {
276276
$propertiesData[] = [
277-
'var' => $this->getAttributeValue($propertyNode, 'var'),
278-
'name' => $this->getAttributeValue($propertyNode, 'name'),
277+
'var' => $this->getAttributeValue($propertyNode, 'name'),
278+
'name' => $this->getAttributeValue($propertyNode, 'source'),
279279
'converter' => $this->getAttributeValue($propertyNode, 'converter'),
280280
'preview_converter' => $this->getAttributeValue($propertyNode, 'preview_converter'),
281281
'virtual' => $this->getAttributeValue($propertyNode, 'virtual'),
@@ -284,7 +284,7 @@ private function convertProperties(\DOMElement $elementNode): array
284284
}
285285
foreach ($propertiesNode->getElementsByTagName('complex_property') as $propertyNode) {
286286
$propertiesData[] = [
287-
'var' => $this->getAttributeValue($propertyNode, 'var'),
287+
'var' => $this->getAttributeValue($propertyNode, 'name'),
288288
'reader' => $this->getAttributeValue($propertyNode, 'reader'),
289289
'converter' => $this->getAttributeValue($propertyNode, 'converter'),
290290
'preview_converter' => $this->getAttributeValue($propertyNode, 'preview_converter'),
@@ -294,7 +294,7 @@ private function convertProperties(\DOMElement $elementNode): array
294294
}
295295
foreach ($propertiesNode->getElementsByTagName('static_property') as $propertyNode) {
296296
$propertiesData[] = [
297-
'name' => $this->getAttributeValue($propertyNode, 'name'),
297+
'name' => $this->getAttributeValue($propertyNode, 'source'),
298298
'value' => $this->getAttributeValue($propertyNode, 'value'),
299299
'static' => true
300300
];
@@ -316,8 +316,8 @@ private function convertAttributes(\DOMElement $elementNode): array
316316
if ($attributesNode) {
317317
foreach ($attributesNode->getElementsByTagName('attribute') as $attributeNode) {
318318
$attributesData[] = [
319-
'var' => $this->getAttributeValue($attributeNode, 'var'),
320-
'name' => $this->getAttributeValue($attributeNode, 'name'),
319+
'var' => $this->getAttributeValue($attributeNode, 'name'),
320+
'name' => $this->getAttributeValue($attributeNode, 'source'),
321321
'converter' => $this->getAttributeValue($attributeNode, 'converter'),
322322
'preview_converter' => $this->getAttributeValue($attributeNode, 'preview_converter'),
323323
'virtual' => $this->getAttributeValue($attributeNode, 'virtual'),
@@ -326,14 +326,14 @@ private function convertAttributes(\DOMElement $elementNode): array
326326
}
327327
foreach ($attributesNode->getElementsByTagName('static_attribute') as $attributeNode) {
328328
$attributesData[] = [
329-
'name' => $this->getAttributeValue($attributeNode, 'name'),
329+
'name' => $this->getAttributeValue($attributeNode, 'source'),
330330
'value' => $this->getAttributeValue($attributeNode, 'value'),
331331
'static' => true
332332
];
333333
}
334334
foreach ($attributesNode->getElementsByTagName('complex_attribute') as $attributeNode) {
335335
$attributesData[] = [
336-
'var' => $this->getAttributeValue($attributeNode, 'var'),
336+
'var' => $this->getAttributeValue($attributeNode, 'name'),
337337
'reader' => $this->getAttributeValue($attributeNode, 'reader'),
338338
'converter' => $this->getAttributeValue($attributeNode, 'converter'),
339339
'preview_converter' => $this->getAttributeValue($attributeNode, 'preview_converter'),
@@ -357,7 +357,7 @@ private function convertHtml(\DOMElement $elementNode): array
357357
$htmlData = [];
358358
$htmlNode = $elementNode->getElementsByTagName('html')->item(0);
359359
if ($htmlNode) {
360-
$htmlData['var']= $this->getAttributeValue($htmlNode, 'var');
360+
$htmlData['var']= $this->getAttributeValue($htmlNode, 'name');
361361
$htmlData['converter'] = $this->getAttributeValue($htmlNode, 'converter');
362362
$htmlData['preview_converter'] = $this->getAttributeValue($htmlNode, 'preview_converter');
363363
}
@@ -375,13 +375,13 @@ private function convertCss(\DOMElement $elementNode): array
375375
$cssData = [];
376376
$cssNode = $elementNode->getElementsByTagName('css')->item(0);
377377
if ($cssNode) {
378-
$cssData['var'] = $this->getAttributeValue($cssNode, 'var');
378+
$cssData['var'] = $this->getAttributeValue($cssNode, 'name');
379379
$cssData['converter'] = $this->getAttributeValue($cssNode, 'converter');
380380
$filterClasses = [];
381381
$filterNode = $cssNode->getElementsByTagName('filter')->item(0);
382382
if ($filterNode) {
383383
foreach ($filterNode->getElementsByTagName('class') as $classNode) {
384-
$filterClasses[] = $this->getAttributeValue($classNode, 'name');
384+
$filterClasses[] = $this->getAttributeValue($classNode, 'source');
385385
}
386386
}
387387
$cssData['filter'] = $filterClasses;
@@ -400,7 +400,7 @@ private function convertTag(\DOMElement $elementNode): array
400400
$tagData = [];
401401
$tagNode = $elementNode->getElementsByTagName('tag')->item(0);
402402
if ($tagNode) {
403-
$tagData['var'] = $this->getAttributeValue($tagNode, 'var');
403+
$tagData['var'] = $this->getAttributeValue($tagNode, 'name');
404404
$tagData['converter'] = $this->getAttributeValue($tagNode, 'converter');
405405
}
406406
return $tagData;

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
2424
self::TYPE_PATH . '/appearances/appearance/data' => 'name',
2525
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element' => 'name',
2626
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/style_properties/property'
27-
=> 'var',
27+
=> 'name',
2828
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/style_properties/complex_property'
29-
=> 'var',
30-
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/style_properties/static_property'
3129
=> 'name',
30+
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/style_properties/static_property'
31+
=> 'source',
3232
self::TYPE_PATH . '/additional_data/arguments' => 'name',
33-
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/attributes/attribute' => 'var',
33+
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/attributes/attribute' => 'name',
3434
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/attributes/complex_attribute'
35-
=> 'var',
36-
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/attributes/static_attribute'
3735
=> 'name',
38-
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/css/filter/class' => 'name',
36+
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/attributes/static_attribute'
37+
=> 'source',
38+
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/css/filter/class' => 'source',
3939
self::TYPE_PATH . '/appearances/appearance/data_mapping/converters/converter' => 'name',
4040
self::TYPE_PATH . '/appearances/appearance/data_mapping/converters/converter/config/item' => 'name',
4141
self::TYPE_PATH . '/appearances/appearance/readers/reader' => 'name'

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,22 @@
144144
</xs:choice>
145145
</xs:complexType>
146146
<xs:complexType name="property">
147-
<xs:attribute type="xs:string" name="var" use="required"/>
148-
<xs:attribute type="xs:string" name="name" use="optional"/>
147+
<xs:attribute type="xs:string" name="name" use="required"/>
148+
<xs:attribute type="xs:string" name="source" use="optional"/>
149149
<xs:attribute type="xs:string" name="converter" use="optional"/>
150150
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
151151
<xs:attribute type="xs:string" name="virtual" use="optional"/>
152152
<xs:attribute type="xs:string" name="persist" use="optional"/>
153153
</xs:complexType>
154154
<xs:complexType name="complex_property">
155-
<xs:attribute type="xs:string" name="var" use="required"/>
155+
<xs:attribute type="xs:string" name="name" use="required"/>
156156
<xs:attribute type="xs:string" name="reader" use="optional"/>
157157
<xs:attribute type="xs:string" name="converter" use="optional"/>
158158
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
159159
<xs:attribute type="xs:string" name="virtual" use="optional"/>
160160
</xs:complexType>
161161
<xs:complexType name="static_property">
162-
<xs:attribute type="xs:string" name="name" use="required"/>
162+
<xs:attribute type="xs:string" name="source" use="required"/>
163163
<xs:attribute type="xs:string" name="value" use="optional"/>
164164
</xs:complexType>
165165
<xs:complexType name="attributes">
@@ -170,35 +170,35 @@
170170
</xs:choice>
171171
</xs:complexType>
172172
<xs:complexType name="attribute">
173-
<xs:attribute type="xs:string" name="var" use="required"/>
174-
<xs:attribute type="xs:string" name="name" use="optional"/>
173+
<xs:attribute type="xs:string" name="name" use="required"/>
174+
<xs:attribute type="xs:string" name="source" use="optional"/>
175175
<xs:attribute type="xs:string" name="converter" use="optional"/>
176176
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
177177
<xs:attribute type="xs:string" name="virtual" use="optional"/>
178178
<xs:attribute type="xs:boolean" name="persist" use="optional"/>
179179
</xs:complexType>
180180
<xs:complexType name="complex_attribute">
181-
<xs:attribute type="xs:string" name="var" use="required"/>
181+
<xs:attribute type="xs:string" name="name" use="required"/>
182182
<xs:attribute type="xs:string" name="reader" use="optional"/>
183183
<xs:attribute type="xs:string" name="converter" use="optional"/>
184184
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
185185
<xs:attribute type="xs:string" name="virtual" use="optional"/>
186186
<xs:attribute type="xs:boolean" name="persist" use="optional"/>
187187
</xs:complexType>
188188
<xs:complexType name="static_attribute">
189-
<xs:attribute type="xs:string" name="name" use="required"/>
189+
<xs:attribute type="xs:string" name="source" use="required"/>
190190
<xs:attribute type="xs:string" name="value" use="optional"/>
191191
</xs:complexType>
192192
<xs:complexType name="html">
193-
<xs:attribute type="xs:string" name="var" use="required"/>
193+
<xs:attribute type="xs:string" name="name" use="required"/>
194194
<xs:attribute type="xs:string" name="converter" use="optional"/>
195195
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
196196
</xs:complexType>
197197
<xs:complexType name="css">
198198
<xs:sequence>
199199
<xs:element type="filter" name="filter" minOccurs="0" maxOccurs="1"/>
200200
</xs:sequence>
201-
<xs:attribute type="xs:string" name="var" use="required"/>
201+
<xs:attribute type="xs:string" name="name" use="required"/>
202202
<xs:attribute type="xs:string" name="converter" use="optional"/>
203203
</xs:complexType>
204204
<xs:complexType name="filter">
@@ -207,10 +207,10 @@
207207
</xs:sequence>
208208
</xs:complexType>
209209
<xs:complexType name="class">
210-
<xs:attribute type="xs:string" name="name" use="required"/>
210+
<xs:attribute type="xs:string" name="source" use="required"/>
211211
</xs:complexType>
212212
<xs:complexType name="tag">
213-
<xs:attribute type="xs:string" name="var" use="required"/>
213+
<xs:attribute type="xs:string" name="name" use="required"/>
214214
<xs:attribute type="xs:string" name="converter" use="optional"/>
215215
</xs:complexType>
216216
</xs:schema>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,22 @@
144144
</xs:choice>
145145
</xs:complexType>
146146
<xs:complexType name="property">
147-
<xs:attribute type="xs:string" name="var" use="required"/>
148147
<xs:attribute type="xs:string" name="name" use="required"/>
148+
<xs:attribute type="xs:string" name="source" use="required"/>
149149
<xs:attribute type="xs:string" name="converter" use="optional"/>
150150
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
151151
<xs:attribute type="xs:string" name="virtual" use="optional"/>
152152
<xs:attribute type="xs:string" name="persist" use="optional"/>
153153
</xs:complexType>
154154
<xs:complexType name="complex_property">
155-
<xs:attribute type="xs:string" name="var" use="required"/>
155+
<xs:attribute type="xs:string" name="name" use="required"/>
156156
<xs:attribute type="xs:string" name="reader" use="required"/>
157157
<xs:attribute type="xs:string" name="converter" use="optional"/>
158158
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
159159
<xs:attribute type="xs:string" name="virtual" use="optional"/>
160160
</xs:complexType>
161161
<xs:complexType name="static_property">
162-
<xs:attribute type="xs:string" name="name" use="required"/>
162+
<xs:attribute type="xs:string" name="source" use="required"/>
163163
<xs:attribute type="xs:string" name="value" use="required"/>
164164
</xs:complexType>
165165
<xs:complexType name="attributes">
@@ -170,35 +170,35 @@
170170
</xs:choice>
171171
</xs:complexType>
172172
<xs:complexType name="attribute">
173-
<xs:attribute type="xs:string" name="var" use="required"/>
174173
<xs:attribute type="xs:string" name="name" use="required"/>
174+
<xs:attribute type="xs:string" name="source" use="required"/>
175175
<xs:attribute type="xs:string" name="converter" use="optional"/>
176176
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
177177
<xs:attribute type="xs:string" name="virtual" use="optional"/>
178178
<xs:attribute type="xs:boolean" name="persist" use="optional"/>
179179
</xs:complexType>
180180
<xs:complexType name="complex_attribute">
181-
<xs:attribute type="xs:string" name="var" use="required"/>
181+
<xs:attribute type="xs:string" name="name" use="required"/>
182182
<xs:attribute type="xs:string" name="reader" use="required"/>
183183
<xs:attribute type="xs:string" name="converter" use="optional"/>
184184
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
185185
<xs:attribute type="xs:string" name="virtual" use="optional"/>
186186
<xs:attribute type="xs:boolean" name="persist" use="optional"/>
187187
</xs:complexType>
188188
<xs:complexType name="static_attribute">
189-
<xs:attribute type="xs:string" name="name" use="required"/>
189+
<xs:attribute type="xs:string" name="source" use="required"/>
190190
<xs:attribute type="xs:string" name="value" use="required"/>
191191
</xs:complexType>
192192
<xs:complexType name="html">
193-
<xs:attribute type="xs:string" name="var" use="required"/>
193+
<xs:attribute type="xs:string" name="name" use="required"/>
194194
<xs:attribute type="xs:string" name="converter" use="optional"/>
195195
<xs:attribute type="xs:string" name="preview_converter" use="optional"/>
196196
</xs:complexType>
197197
<xs:complexType name="css">
198198
<xs:sequence>
199199
<xs:element type="filter" name="filter" minOccurs="0" maxOccurs="1"/>
200200
</xs:sequence>
201-
<xs:attribute type="xs:string" name="var" use="required"/>
201+
<xs:attribute type="xs:string" name="name" use="required"/>
202202
<xs:attribute type="xs:string" name="converter" use="optional"/>
203203
</xs:complexType>
204204
<xs:complexType name="filter">
@@ -207,10 +207,10 @@
207207
</xs:sequence>
208208
</xs:complexType>
209209
<xs:complexType name="class">
210-
<xs:attribute type="xs:string" name="name" use="required"/>
210+
<xs:attribute type="xs:string" name="source" use="required"/>
211211
</xs:complexType>
212212
<xs:complexType name="tag">
213-
<xs:attribute type="xs:string" name="var" use="required"/>
213+
<xs:attribute type="xs:string" name="name" use="required"/>
214214
<xs:attribute type="xs:string" name="converter" use="optional"/>
215215
</xs:complexType>
216216
</xs:schema>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
<elements>
2525
<element name="main" path=".">
2626
<style_properties>
27-
<property name="text_align" var="text_align"/>
28-
<property converter="Magento_PageBuilder/js/converter/style/border-style" var="border" name="border_style"/>
29-
<property converter="Magento_PageBuilder/js/converter/style/color" name="border_color" var="border_color"/>
30-
<property converter="Magento_PageBuilder/js/converter/style/remove-px" name="border_width" var="border_width"/>
31-
<property converter="Magento_PageBuilder/js/converter/style/remove-px" name="border_radius" var="border_radius"/>
32-
<complex_property converter="Magento_PageBuilder/js/converter/style/margins-and-paddings" reader="Magento_PageBuilder/js/property/margins-and-paddings" var="margins_and_padding"/>
27+
<property name="text_align" source="text_align"/>
28+
<property name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
29+
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
30+
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
31+
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
32+
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
3333
</style_properties>
3434
<attributes>
35-
<attribute name="data-role" var="name"/>
36-
<attribute name="data-appearance" var="appearance"/>
37-
<attribute name="id" var="id"/>
35+
<attribute name="name" source="data-role"/>
36+
<attribute name="appearance" source="data-appearance"/>
37+
<attribute name="id" source="id"/>
3838
</attributes>
39-
<css var="css_classes"/>
39+
<css name="css_classes"/>
4040
</element>
4141
</elements>
4242
</data_mapping>

0 commit comments

Comments
 (0)