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

- Update return types
- Typehint string in UIComponentConfig
- Utilise underscore for isUndefined check

Author: davemacaulay

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

@@ -74,9 +74,9 @@ function ($item, $key) {
      *
      * @param array $array
      * @param string $path
-     * @param string $value
+     * @param string|array $value
      */
-    private function generateFieldArray(array &$array, $path, $value)
+    private function generateFieldArray(array &$array, string $path, $value)
     {
         $keys = explode(".", $path);
 

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

@@ -4,6 +4,7 @@
  */
 
 import events from "Magento_PageBuilder/js/events";
+import _ from "underscore";
 import ContentTypeInterface from "../content-type.d";
 import DataStore, {DataObject} from "../data-store";
 
@@ -50,7 +51,7 @@ export default class Edit {
         let formNamespace = this.instance.config.form;
 
         // Use the default form unless a custom one is defined
-        if (undefined !== this.instance.config.appearances[appearance].form) {
+        if (!_.isUndefined(this.instance.config.appearances[appearance].form)) {
             formNamespace = this.instance.config.appearances[appearance].form;
         }
 

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

@@ -12,8 +12,8 @@ interface ConverterInterface {
     /**
      * Convert value to internal format
      *
-     * @param value any
-     * @returns {string | object}
+     * @param value
+     * @returns {any}
      */
     fromDom(value: any): any;
 
@@ -22,7 +22,7 @@ interface ConverterInterface {
      *
      * @param {string} name
      * @param {DataObject} data
-     * @returns {string | object}
+     * @returns {any}
      */
     toDom(name: string, data: DataObject): any;
 }