MC-2219: Execute Script and Resolve Issues

- update content type configs

Author: krissyhiserote

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/accordion.xml

@@ -7,23 +7,14 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="accordion" sortOrder="10" translate="label">
-            <label>Accordion</label>
-            <icon>icon-pagebuilder-accordian</icon>
-            <component>Magento_PageBuilder/js/content-type-collection</component>
-            <preview_component>Magento_PageBuilder/js/content-type/accordion/preview</preview_component>
-            <master_component>Magento_PageBuilder/js/content-type/accordion/master</master_component>
-            <form>pagebuilder_accordion_form</form>
-            <group>interactive</group>
+        <type name="accordion" sortOrder="10" translate="label" label="Accordion" icon="icon-pagebuilder-accordian" component="Magento_PageBuilder/js/content-type-collection" preview_component="Magento_PageBuilder/js/content-type/accordion/preview" master_component="Magento_PageBuilder/js/content-type/accordion/master" form="pagebuilder_accordion_form" group="interactive">
             <allowed_parents>
                 <parent name="row"/>
                 <parent name="column"/>
                 <parent name="tab-item"/>
             </allowed_parents>
             <appearances>
-                <appearance default="true" name="default">
-                    <preview_template>Magento_PageBuilder/content-type/accordion/default/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/accordion/default/master</render_template>
+                <appearance default="true" name="default" preview_template="Magento_PageBuilder/content-type/accordion/default/preview" render_template="Magento_PageBuilder/content-type/accordion/default/master">
                     <readers>
                         <reader component="Magento_PageBuilder/js/master-format/read/default" name="default"/>
                         <reader component="Magento_PageBuilder/js/master-format/read/accordion" name="accordion"/>

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/anchor.xml

@@ -7,19 +7,14 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="anchor" sortOrder="1" translate="label">
-            <label>Anchor</label>
-            <icon>icon-pagebuilder-anchor</icon>
-            <component>Magento_PageBuilder/js/content-type</component>
-            <form>pagebuilder_anchor_form</form>
-            <group>other</group>
+        <type name="anchor" sortOrder="1" translate="label" label="Anchor" icon="icon-pagebuilder-anchor" component="Magento_PageBuilder/js/content-type" form="pagebuilder_anchor_form" group="other">
             <allowed_parents>
                 <parent name="row"/>
                 <parent name="column"/>
                 <parent name="tab-item"/>
             </allowed_parents>
             <appearances>
-                <appearance default="true" name="default">
+                <appearance default="true" name="default" preview_template="Magento_PageBuilder/content-type/anchor/default/preview" render_template="Magento_PageBuilder/content-type/anchor/default/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -40,9 +35,6 @@
                             </element>
                         </elements>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/anchor/default/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/anchor/default/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
             </appearances>
         </type>

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

@@ -7,20 +7,14 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="banner" sortOrder="1" translate="label">
-            <label>Banner</label>
-            <icon>icon-pagebuilder-image</icon>
-            <component>Magento_PageBuilder/js/content-type</component>
-            <preview_component>Magento_PageBuilder/js/content-type/banner/preview</preview_component>
-            <form>pagebuilder_banner_form</form>
-            <group>media</group>
+        <type name="banner" sortOrder="1" translate="label" label="Banner" icon="icon-pagebuilder-image" component="Magento_PageBuilder/js/content-type" preview_component="Magento_PageBuilder/js/content-type/banner/preview" form="pagebuilder_banner_form" group="media">
             <allowed_parents>
                 <parent name="row"/>
                 <parent name="column"/>
                 <parent name="tab-item"/>
             </allowed_parents>
             <appearances>
-                <appearance name="collage-left">
+                <appearance name="collage-left" preview_template="Magento_PageBuilder/content-type/banner/collage-left/preview" render_template="Magento_PageBuilder/content-type/banner/collage-left/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -108,11 +102,8 @@
                             </converter>
                         </converters>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/banner/collage-left/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/banner/collage-left/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
-                <appearance name="collage-centered">
+                <appearance name="collage-centered" preview_template="Magento_PageBuilder/content-type/banner/collage-centered/preview" render_template="Magento_PageBuilder/content-type/banner/collage-centered/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -200,11 +191,8 @@
                             </converter>
                         </converters>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/banner/collage-centered/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/banner/collage-centered/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
-                <appearance name="collage-right">
+                <appearance name="collage-right" preview_template="Magento_PageBuilder/content-type/banner/collage-right/preview" render_template="Magento_PageBuilder/content-type/banner/collage-right/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -292,11 +280,8 @@
                             </converter>
                         </converters>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/banner/collage-right/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/banner/collage-right/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
-                <appearance default="true" name="poster">
+                <appearance default="true" name="poster" preview_template="Magento_PageBuilder/content-type/banner/poster/preview" render_template="Magento_PageBuilder/content-type/banner/poster/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -382,13 +367,10 @@
                             </converter>
                         </converters>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/banner/poster/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/banner/poster/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
             </appearances>
             <additional_data>
-                <arguments name="uploaderConfig" xsi:type="array">
+                <items name="uploaderConfig" xsi:type="array">
                     <item name="isShowImageUploadInstructions" xsi:type="boolean">false</item>
                     <item name="isShowImageUploadOptions" xsi:type="boolean">true</item>
                     <item name="maxFileSize" xsi:type="object">Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader\MaxFileSize</item>
@@ -414,7 +396,7 @@
                     <item name="validation" xsi:type="array">
                         <item name="required-entry" xsi:type="boolean">true</item>
                     </item>
-                </arguments>
+                </items>
             </additional_data>
         </type>
     </content_types>

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

@@ -7,21 +7,15 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="block" sortOrder="1" translate="label">
-            <label>Block</label>
-            <icon>icon-pagebuilder-block</icon>
-            <component>Magento_PageBuilder/js/content-type</component>
-            <preview_component>Magento_PageBuilder/js/content-type/block/preview</preview_component>
-            <form>pagebuilder_block_form</form>
-            <group>magento</group>
+        <type name="block" sortOrder="1" translate="label" label="Block" icon="icon-pagebuilder-block" component="Magento_PageBuilder/js/content-type" preview_component="Magento_PageBuilder/js/content-type/block/preview" form="pagebuilder_block_form" group="magento">
             <backend_block>Magento\PageBuilder\Block\ContentType\Block</backend_block>
             <allowed_parents>
                 <parent name="row"/>
                 <parent name="column"/>
                 <parent name="tab-item"/>
             </allowed_parents>
             <appearances>
-                <appearance default="true" name="default">
+                <appearance default="true" name="default" preview_template="Magento_PageBuilder/content-type/block/default/preview" render_template="Magento_PageBuilder/content-type/block/default/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -43,9 +37,6 @@
                             </element>
                         </elements>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/block/default/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/block/default/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
             </appearances>
         </type>

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

@@ -7,20 +7,13 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="button-item" translate="label">
-            <label>Button</label>
-            <icon>icon-pagebuilder-button</icon>
-            <component>Magento_PageBuilder/js/content-type-collection</component>
-            <preview_component>Magento_PageBuilder/js/content-type/button-item/preview</preview_component>
-            <master_component>Magento_PageBuilder/js/content-type/master</master_component>
-            <form>pagebuilder_button_item_form</form>
-            <group>general</group>
+        <type name="button-item" translate="label" label="Button" icon="icon-pagebuilder-button" component="Magento_PageBuilder/js/content-type-collection" preview_component="Magento_PageBuilder/js/content-type/button-item/preview" master_component="Magento_PageBuilder/js/content-type/master" form="pagebuilder_button_item_form" group="general">
             <allowed_parents>
                 <parent name="buttons"/>
             </allowed_parents>
             <is_visible>false</is_visible>
             <appearances>
-                <appearance default="true" name="default">
+                <appearance default="true" name="default" preview_template="Magento_PageBuilder/content-type/button-item/default/preview" render_template="Magento_PageBuilder/content-type/button-item/default/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -54,9 +47,6 @@
                             </element>
                         </elements>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/button-item/default/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/button-item/default/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
             </appearances>
         </type>

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

@@ -7,21 +7,14 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
     <content_types>
-        <type name="buttons" sortOrder="40" translate="label">
-            <label>Buttons</label>
-            <icon>icon-pagebuilder-button</icon>
-            <component>Magento_PageBuilder/js/content-type-collection</component>
-            <preview_component>Magento_PageBuilder/js/content-type/buttons/preview</preview_component>
-            <master_component>Magento_PageBuilder/js/content-type/master-collection</master_component>
-            <form>pagebuilder_buttons_form</form>
-            <group>general</group>
+        <type name="buttons" sortOrder="40" translate="label" label="Buttons" icon="icon-pagebuilder-button" component="Magento_PageBuilder/js/content-type-collection" preview_component="Magento_PageBuilder/js/content-type/buttons/preview" master_component="Magento_PageBuilder/js/content-type/master-collection" form="pagebuilder_buttons_form" group="general">
             <allowed_parents>
                 <parent name="row"/>
                 <parent name="column"/>
                 <parent name="tab-item"/>
             </allowed_parents>
             <appearances>
-                <appearance default="true" name="inline">
+                <appearance default="true" name="inline" preview_template="Magento_PageBuilder/content-type/buttons/inline/preview" render_template="Magento_PageBuilder/content-type/buttons/inline/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -42,11 +35,8 @@
                             </element>
                         </elements>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/buttons/inline/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/buttons/inline/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
-                <appearance name="stacked">
+                <appearance name="stacked" preview_template="Magento_PageBuilder/content-type/buttons/inline/preview" render_template="Magento_PageBuilder/content-type/buttons/inline/master" reader="Magento_PageBuilder/js/master-format/read/configurable">
                     <data_mapping>
                         <elements>
                             <element name="main" path=".">
@@ -68,9 +58,6 @@
                             </element>
                         </elements>
                     </data_mapping>
-                    <preview_template>Magento_PageBuilder/content-type/buttons/inline/preview</preview_template>
-                    <render_template>Magento_PageBuilder/content-type/buttons/inline/master</render_template>
-                    <reader>Magento_PageBuilder/js/master-format/read/configurable</reader>
                 </appearance>
             </appearances>
         </type>