MAGETWO-92335: Architecture Review

- Revert name to locaation_name

Author: Michael Yu

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

@@ -36,69 +36,69 @@
     <entity name="PageBuilderMapLocationName_Default" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value"/>
     </entity>
     <entity name="PageBuilderMapLocationName_TestLocation" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">Test Location 1</data>
     </entity>
     <entity name="PageBuilderMapLocationName_TestLocationEdit" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">Test Location 1 Edit</data>
     </entity>
     <entity name="PageBuilderMapLocationName_Empty" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value"/>
         <data key="errorMessage">Please enter the location name.</data>
     </entity>
     <entity name="PageBuilderMapLocationName_Space" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value"> </data>
         <data key="errorMessage">Please enter the location name.</data>
     </entity>
     <entity name="PageBuilderMapLocationName_CommonCharacters" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</data>
     </entity>
     <entity name="PageBuilderMapLocationName_SpecialCharacters" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">./;[]\-=&lt;&gt;?:"{}|_+!@#$%^&amp;*()`~Ω≈ç√∫˜µ≤≥÷åß∂ƒ©˙∆˚¬…æœ∑´®†¥¨ˆøπ“‘¡™£¢∞§¶•ªº–≠¸˛Ç◊ı˜Â¯˘¿ÅÍÎÏ˝ÓÔÒÚÆ☃Œ„´‰ˇÁ¨ˆØ∏”’`⁄€‹›fifl‡°·‚—±⅛⅜⅝⅞ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя٠١٢٣٤٥٦٧٨٩ヽ</data>
     </entity>
     <entity name="PageBuilderMapLocationName_a" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">a</data>
     </entity>
     <entity name="PageBuilderMapLocationName_B" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">B</data>
     </entity>
     <entity name="PageBuilderMapLocationName_z" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">z</data>
     </entity>
     <entity name="PageBuilderMapLocationName_0" type="pagebuilder_map_location_name_property">
         <data key="name">Location Name</data>
         <data key="section">general</data>
-        <data key="fieldName">name</data>
+        <data key="fieldName">location_name</data>
         <data key="value">0</data>
     </entity>
     <!-- Latitude -->

app/code/Magento/PageBuilder/docs/master-format.md

@@ -899,7 +899,7 @@ Inline styles
             "latitude": 30.243475338635417,
             "longitude": -97.73760683593753
         },
-        "name": "Location Name 1",
+        "location_name": "Location Name 1",
         "phone": "512-111-1111",
         "address": "11501 Domain Dr #150",
         "city": "Austin",
@@ -914,7 +914,7 @@ Inline styles
             "latitude": 29.404737046411704,
             "longitude": -98.48467714843753
         },
-        "name": "Location Name 2",
+        "location_name": "Location Name 2",
         "phone": "512-222-2222",
         "address": "849 E Commerce St",
         "city": "San Antonio",

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

@@ -150,6 +150,7 @@
                     <class name="admin__field-wide">true</class>
                 </additionalClasses>
                 <componentType>dynamicRows</componentType>
+                <dataScope>location</dataScope>
             </settings>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
                 <argument name="data" xsi:type="array">
@@ -160,11 +161,6 @@
                     </item>
                 </argument>
                 <field name="location_name" component="Magento_Ui/js/form/element/text" formElement="input" >
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">name</item>
-                        </item>
-                    </argument>
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Location Name</label>
@@ -173,12 +169,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_phone" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">phone</item>
-                        </item>
-                    </argument>
+                <field name="phone" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Phone Number</label>
@@ -187,12 +178,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_address" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">address</item>
-                        </item>
-                    </argument>
+                <field name="address" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Street Address</label>
@@ -201,12 +187,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_city" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">city</item>
-                        </item>
-                    </argument>
+                <field name="city" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">City</label>
@@ -215,12 +196,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_state" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">state</item>
-                        </item>
-                    </argument>
+                <field name="state" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Region/State</label>
@@ -229,12 +205,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_zipcode" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">zipcode</item>
-                        </item>
-                    </argument>
+                <field name="zipcode" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Zip/Postal Code</label>
@@ -243,12 +214,7 @@
                         <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                     </settings>
                 </field>
-                <field name="location_country" component="Magento_Ui/js/form/element/text" formElement="input">
-                    <argument name="data" xsi:type="array">
-                        <item name="config" xsi:type="array">
-                            <item name="sortBy" xsi:type="string">country</item>
-                        </item>
-                    </argument>
+                <field name="country" component="Magento_Ui/js/form/element/text" formElement="input">
                     <settings>
                         <dataType>text</dataType>
                         <label translate="true">Country</label>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_location_form.xml

@@ -48,7 +48,7 @@
                 <notice translate="true">You can move the pin by clicking or dragging it where you want. To alter the zoom please use the controls.</notice>
             </settings>
         </field>
-        <field name="name" sortOrder="20" formElement="input">
+        <field name="location_name" sortOrder="20" formElement="input">
             <settings>
                 <dataType>text</dataType>
                 <label translate="true">Location Name</label>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-factory.js

@@ -48,31 +48,6 @@ define([
             return this;
         },
 
-        /**
-         * Init header elements
-         */
-        initHeader: function () {
-            var labels = [],
-                data;
-
-            if (!this.labels().length) {
-                _.each(this.childTemplate.children, function (cell) {
-                    data = this.createHeaderTemplate(cell.config);
-                    cell.config.labelVisible = false;
-                    _.extend(data, {
-                        label: cell.config.label,
-                        name: cell.name,
-                        required: !!cell.config.validation,
-                        columnsHeaderClasses: cell.config.columnsHeaderClasses,
-                        sortOrder: cell.config.sortOrder,
-                        sortBy: cell.config.sortBy
-                    });
-                    labels.push(data);
-                }, this);
-                this.labels(_.sortBy(labels, 'sortOrder'));
-            }
-        },
-
         /**
          * Open the location modal and insert form with the data from selected record
          *
@@ -140,7 +115,7 @@ define([
                 allLabels = this.labels().slice();
                 allLabels.forEach(function (label) {
 
-                    if (label.sortBy === property().sortBy) {
+                    if (label.name === property().name) {
                         label.columnsHeaderClasses = '_ascend';
                     } else {
                         label.columnsHeaderClasses = '';
@@ -154,7 +129,7 @@ define([
                 placeholder = this.emptyContentPlaceholder;
 
                 this.emptyContentPlaceholder = false;
-                this.sortRecord(property().sortBy, ascend);
+                this.sortRecord(property().name, ascend);
                 this.reload();
                 this.emptyContentPlaceholder = placeholder;
             }

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/components/dynamic-rows.js

@@ -5,4 +5,4 @@
  */
 -->
 
-<div attr="data.main.attributes" ko-style="Object.assign({}, { display: data.main.attributes()['data-locations'] !== '[]' ? 'inline-block' : 'none' }, data.main.style())" css="data.main.css"></div>
+<div attr="data.main.attributes" data-bind="afterRender: function(){console.log(data.main.attributes())}" ko-style="Object.assign({}, { display: data.main.attributes()['data-locations'] !== '[]' ? 'inline-block' : 'none' }, data.main.style())" css="data.main.css"></div>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/master.html

@@ -48,6 +48,7 @@ export default function createContentType(
                 const [previewComponent, contentComponent] = resolvedPromises;
                 contentType.preview = previewComponent;
                 contentType.content = contentComponent;
+                debugger;
                 contentType.dataStore.update(
                     prepareData(config, data),
                 );

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

@@ -6,11 +6,11 @@
 import ko from "knockout";
 import mageUtils from "mageUtils";
 import events from "uiEvents";
-import Content from "./content";
+import Content from "./content-type/content";
 import ContentTypeConfigInterface from "./content-type-config.d";
 import ContentTypeInterface from "./content-type.d";
 import DataStore from "./data-store";
-import Preview from "./preview";
+import Preview from "./content-type/preview";
 
 export default class ContentType implements ContentTypeInterface {
     public id: string = mageUtils.uniqueid();