MC-5232: Prefix field names with section name to avoid field name collision

- Revert some code to prefix all field names
- Add object-path for better object value getting and setting
- Introduce support for dataScope

Author: davemacaulay

app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php

@@ -46,53 +46,69 @@ public function getFields($componentName) : array
 
         $fields = $this->iterateComponents(
             $componentConfig,
-            function ($item, $fieldset, $key) {
+            function ($item, $key) {
                 // Determine if this item has a formElement key
                 if (isset($item[Converter::DATA_ARGUMENTS_KEY]['data']['config']['formElement'])) {
                     $elementConfig = $item[Converter::DATA_ARGUMENTS_KEY]['data']['config'];
-                    return [
-                        $fieldset => [
-                            $key => [
-                                'default' => (isset($elementConfig['default']) ? $elementConfig['default'] : '')
-                            ]
-                        ]
-                    ];
+                    // If the field has a dataScope use that for the key instead of the name
+                    if (isset($elementConfig['dataScope'])) {
+                        $key = $elementConfig['dataScope'];
+                    }
+                    $field = [];
+                    // Generate our nested field array with defaults supporting dot notation within the key
+                    $this->generateFieldArray(
+                        $field,
+                        $key . ".default",
+                        (isset($elementConfig['default']) ? $elementConfig['default'] : '')
+                    );
+                    return $field;
                 }
             }
         );
 
         return $fields;
     }
 
+    /**
+     * Recursively generate our field array, allowing for dot notation within the key
+     *
+     * @param $array
+     * @param $path
+     * @param $value
+     */
+    private function generateFieldArray(array &$array, $path, $value) {
+        $keys = explode(".", $path);
+
+        foreach ($keys as $key) {
+            $array = &$array[$key];
+        }
+
+        $array = $value;
+    }
+
     /**
      * Iterate over components within the configuration and run a defined callback function
      *
      * @param array $config
      * @param \Closure $callback
-     * @param bool $fieldset
      * @param bool $key
      *
      * @return array
      */
-    private function iterateComponents($config, $callback, $fieldset = false, $key = false) : array
+    private function iterateComponents($config, $callback, $key = false) : array
     {
-        $values = $callback($config, $fieldset, $key) ?: [];
+        $values = $callback($config, $key) ?: [];
         if (isset($config[Converter::DATA_COMPONENTS_KEY])
             && !empty($config[Converter::DATA_COMPONENTS_KEY])
             && (!isset($config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'])
                 || isset($config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'])
                 && $config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'] !== 'dynamicRows'
             )
         ) {
-            // Retrieve the fieldset name from the configuration
-            if ($config[Converter::DATA_ATTRIBUTES_KEY]['class'] === \Magento\Ui\Component\Form\Fieldset::class) {
-                $fieldset = $config[Converter::DATA_ATTRIBUTES_KEY]['name'];
-            }
-
             foreach ($config[Converter::DATA_COMPONENTS_KEY] as $key => $child) {
                 $values = array_merge_recursive(
                     $values,
-                    $this->iterateComponents($child, $callback, $fieldset, $key) ?: []
+                    $this->iterateComponents($child, $callback, $key) ?: []
                 );
             }
         }

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

@@ -10,7 +10,8 @@ var config = {
             'pagebuilder/ko-dropzone': 'Magento_PageBuilder/js/resource/dropzone/knockout-dropzone',
 
             /* Utilities */
-            'google-map': 'Magento_PageBuilder/js/utils/map'
+            'google-map': 'Magento_PageBuilder/js/utils/map',
+            'object-path': 'Magento_PageBuilder/js/resource/object-path',
         }
     },
     shim: {