Allow fields in fieldcollections to be mapped individually (#355)

* Allow fields in fieldcollections to be mapped indiviually
* restrict repeater container in object mapping

Co-authored-by: Johannes Heimbach <j.heimbach@anymotion.de>
Co-authored-by: Stefan Hagspiel <shagspiel@dachcom.ch>

Author: 3 people

UPGRADE.md

@@ -1,10 +1,11 @@
 # Upgrade Notes
 
 ## Version 4.1.4
-- **[BUGFIX]**: Fix link to translation list
+- **[BUGFIX]**: Fix link to translation list [#359](https://github.com/dachcom-digital/pimcore-formbuilder/pull/359)
 - **[BUGFIX]**: skip dependency if document is null [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/354)
 - **[BUGFIX]**: Check for valid success management configuration [#299](https://github.com/dachcom-digital/pimcore-formbuilder/issues/299)
-- **[NEW FEATURE]**: Add Mail-Log Filter to Email Channel  [#297](https://github.com/dachcom-digital/pimcore-formbuilder/issues/297)
+- **[NEW FEATURE]**: Add Mail-Log Filter to Email Channel [#297](https://github.com/dachcom-digital/pimcore-formbuilder/issues/297)
+- **[NEW FEATURE]**: Allow mapping of elements in fieldset container in Object Chanel [@JHeimbach](https://github.com/dachcom-digital/pimcore-formbuilder/pull/355)
 
 ## Version 4.1.3
 - **[BUGFIX]**: Fix `ignoreFields` Assignment: Use `CollectionType` instead of `ChoiceType` [#352](https://github.com/dachcom-digital/pimcore-formbuilder/pull/352)

src/FormBuilderBundle/OutputWorkflow/Channel/Object/AbstractObjectResolver.php

@@ -178,7 +178,13 @@ protected function mapContainerField(DataObject\Concrete $object, array $contain
 
         // there could be more than just one data field assignment
         foreach ($fieldDefinition['childs'] as $formDefinitionChild) {
+
             if ($formDefinitionChild['type'] !== 'data_class_field') {
+
+                foreach ($containerFieldData['fields'] ?? [] as $field) {
+                    $this->processObjectData($object, $field);
+                }
+
                 continue;
             }
 

src/FormBuilderBundle/Resources/public/js/extjs/extensions/formObjectMappingEditor/formObjectTreeMapper.js

@@ -133,7 +133,7 @@ Formbuilder.extjs.extensions.formObjectMappingEditorConfigurator.formObjectTreeM
         var treeItems,
             _ = this;
 
-        var generateFields = function (fields, treeItems, parent) {
+        var generateFields = function (fields, treeItems) {
 
             Ext.Array.each(fields, function (field) {
 
@@ -191,19 +191,16 @@ Formbuilder.extjs.extensions.formObjectMappingEditorConfigurator.formObjectTreeM
                     }
                 };
 
-                if (fieldData.hasOwnProperty('fields') && Ext.isArray(fieldData.fields) && fieldData.type === 'container') {
+                // allow all container types except repeater!
+                if (fieldData.hasOwnProperty('fields') && Ext.isArray(fieldData.fields) && (fieldData.type === 'container' && fieldData.sub_type !== 'repeater')) {
                     item.omContainerFields = fieldData.fields;
+                    item.children = generateFields(fieldData.fields,[])
                 }
 
                 // do not add any data to form item, if it has been forced disabled
                 item = forcedDisabled ? item : _.resolveItemChildren(item);
 
-                if (parent) {
-                    parent.children.push(item);
-                } else {
-                    treeItems.push(item);
-                }
-
+                treeItems.push(item);
 
             }.bind(this));
 
@@ -298,7 +295,6 @@ Formbuilder.extjs.extensions.formObjectMappingEditorConfigurator.formObjectTreeM
                     }.bind(this),
                     handler: function (grid, rowIndex) {
 
-                        console.log(rowIndex);
                         var record = grid.getStore().getAt(rowIndex),
                             fieldData = this.buildFormFieldConfigFromNode(record);
 
@@ -548,7 +544,10 @@ Formbuilder.extjs.extensions.formObjectMappingEditorConfigurator.formObjectTreeM
             }
 
             if (fieldData.hasOwnProperty('childs') && Ext.isArray(fieldData.childs) && fieldData.childs.length > 0) {
-                return this.findStoredConfigNodeData(item, fieldData.childs);
+                d = this.findStoredConfigNodeData(item, fieldData.childs);
+                if (d !== null) {
+                    return false;
+                }
             }
         }.bind(this));
 
@@ -616,4 +615,4 @@ Formbuilder.extjs.extensions.formObjectMappingEditorConfigurator.formObjectTreeM
     getWorker: function (workerName, correspondingFieldName, data) {
         return new Formbuilder.extjs.extensions.formObjectMappingEditorWorker[workerName](this.formId, this.pimcoreClassId, correspondingFieldName, data);
     }
-});
+});