Skip to content

Commit fadc684

Browse files
MC-3479: Remove Accordion
- remove deprecated readers functionality
1 parent 036b7a9 commit fadc684

File tree

13 files changed

+50
-333
lines changed

13 files changed

+50
-333
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@ private function convertAppearanceData(\DOMElement $appearanceNode): array
124124
$appearanceData,
125125
$this->convertAppearanceProperties($appearanceNode)
126126
);
127-
$readerNode = $appearanceNode->getElementsByTagName('reader')->item(0);
128-
if ($readerNode && $readerNode->nodeValue) {
129-
$appearanceData['readers'] = [$readerNode->nodeValue];
130-
} else {
131-
$appearanceData['readers'] = $this->convertAppearanceReaders($appearanceNode);
132-
}
133127
$dataMappingNode = $appearanceNode->getElementsByTagName('data_mapping')->item(0);
134128
if ($dataMappingNode) {
135129
$appearanceData['data_mapping'] = $this->convertDataMapping($dataMappingNode);
@@ -161,24 +155,6 @@ private function convertAppearanceProperties(\DOMElement $elementNode): array
161155
return $data;
162156
}
163157

164-
/**
165-
* Convert appearance readers
166-
*
167-
* @param \DOMElement $elementNode
168-
* @return array
169-
*/
170-
private function convertAppearanceReaders(\DOMElement $elementNode): array
171-
{
172-
$readersNode = $elementNode->getElementsByTagName('readers')->item(0);
173-
$readers = [];
174-
if ($readersNode) {
175-
foreach ($readersNode->getElementsByTagName('reader') as $readerNode) {
176-
$readers[] = $this->getAttributeValue($readerNode, 'component');
177-
}
178-
}
179-
return $readers;
180-
}
181-
182158
/**
183159
* Validate that configuration appearances has default appearance
184160
*

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
3939
self::TYPE_PATH . '/appearances/appearance/data_mapping/elements/element/css/filter/class' => 'source',
4040
self::TYPE_PATH . '/appearances/appearance/data_mapping/converters/converter' => 'name',
4141
self::TYPE_PATH . '/appearances/appearance/data_mapping/converters/converter/config/item' => 'name',
42-
self::TYPE_PATH . '/appearances/appearance/readers/reader' => 'name'
4342
];
4443

4544
/**

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
</xs:complexType>
6464
</xs:element>
6565
<xs:element type="data_mapping" name="data_mapping" minOccurs="0"/>
66-
<xs:element type="readers" name="readers" minOccurs="0" maxOccurs="1"/>
6766
<xs:element type="xs:string" name="form" minOccurs="0" maxOccurs="1"/>
6867
</xs:choice>
6968
<xs:attribute type="xs:string" name="name" use="required"/>
@@ -92,15 +91,6 @@
9291
<xs:attribute type="xs:string" name="name" use="required"/>
9392
<xs:attribute type="xs:string" name="policy" use="optional"/>
9493
</xs:complexType>
95-
<xs:complexType name="readers">
96-
<xs:sequence>
97-
<xs:element type="reader" name="reader" minOccurs="1" maxOccurs="unbounded"/>
98-
</xs:sequence>
99-
</xs:complexType>
100-
<xs:complexType name="reader">
101-
<xs:attribute type="xs:string" name="name" use="required"/>
102-
<xs:attribute type="xs:string" name="component" use="optional"/>
103-
</xs:complexType>
10494
<xs:complexType name="data_mapping">
10595
<xs:sequence>
10696
<xs:element type="elements" name="elements" minOccurs="0" maxOccurs="1"/>

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
</xs:complexType>
6464
</xs:element>
6565
<xs:element type="data_mapping" name="data_mapping" minOccurs="0"/>
66-
<xs:element type="readers" name="readers" minOccurs="0" maxOccurs="1"/>
6766
<xs:element type="xs:string" name="form" minOccurs="0" maxOccurs="1"/>
6867
</xs:choice>
6968
<xs:attribute type="xs:string" name="name" use="required"/>
@@ -92,15 +91,6 @@
9291
<xs:attribute type="xs:string" name="name" use="required"/>
9392
<xs:attribute type="xs:string" name="policy" use="required"/>
9493
</xs:complexType>
95-
<xs:complexType name="readers">
96-
<xs:sequence>
97-
<xs:element type="reader" name="reader" minOccurs="1" maxOccurs="unbounded"/>
98-
</xs:sequence>
99-
</xs:complexType>
100-
<xs:complexType name="reader">
101-
<xs:attribute type="xs:string" name="name" use="required"/>
102-
<xs:attribute type="xs:string" name="component" use="required"/>
103-
</xs:complexType>
10494
<xs:complexType name="data_mapping">
10595
<xs:sequence>
10696
<xs:element type="elements" name="elements" minOccurs="1" maxOccurs="1"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/composite.js

Lines changed: 0 additions & 76 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/default.js

Lines changed: 0 additions & 66 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js

Lines changed: 27 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default interface ContentTypeConfigInterface {
3030
}
3131

3232
export interface ContentTypeConfigAppearanceInterface {
33-
readers: string[];
33+
reader: string;
3434
data_mapping: DataMappingInterface;
3535
preview_template: string;
3636
render_template: string;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/composite.ts

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)