Merge remote-tracking branch 'remotes/origin/MC-5232-prefix-field-names' into cms-team-1-delivery

Author: danmooney2

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

@@ -49,21 +49,44 @@ public function getFields($componentName) : array
             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 [
-                        $key => [
-                            'default' => (isset($elementConfig['default'])
-                                ? $elementConfig['default'] : '')
-                        ]
-                    ];
+                    $elementConfig = $item[Converter::DATA_ARGUMENTS_KEY]['data']['config'];
+                    // 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 $array
+     * @param string $path
+     * @param string|array $value
+     */
+    private function generateFieldArray(array &$array, string $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
      *
@@ -84,7 +107,7 @@ private function iterateComponents($config, $callback, $key = false) : array
             )
         ) {
             foreach ($config[Converter::DATA_COMPONENTS_KEY] as $key => $child) {
-                $values = array_merge(
+                $values = array_merge_recursive(
                     $values,
                     $this->iterateComponents($child, $callback, $key) ?: []
                 );

app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js

@@ -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: {