allow mf-adapter fields inside dynamic field container (#320)

* allow mf-adapter fields inside dynamic field container, fixes #316

Author: solverat

README.md

@@ -21,7 +21,7 @@
 
 ```json
 "require" : {
-    "dachcom-digital/formbuilder" : "~4.0.0"
+    "dachcom-digital/formbuilder" : "~4.1.0"
 }
 ```
 

UPGRADE.md

@@ -1,11 +1,12 @@
 # Upgrade Notes
 
-#### Version 4.1.0
+## Version 4.1.0
 - **[NEW FEATURE]**: API Output channel [#290](https://github.com/dachcom-digital/pimcore-formbuilder/issues/301)
-- **[NEW FEATURE]**: API Output channel Field Transformer
+- **[NEW FEATURE]**: API Output channel field transformer
 - **[BUGFIX]**: ensure migration of form configs will be symfony5 compatible [@grizzlydotweb](https://github.com/dachcom-digital/pimcore-formbuilder/pull/310)
 - **[BUGFIX]**: fix typo in translation [#312](https://github.com/dachcom-digital/pimcore-formbuilder/issues/312)
-- **[BUGFIX]**: disable selectOnFocus [#315](https://github.com/dachcom-digital/pimcore-formbuilder/issues/315)
+- **[BUGFIX]**: disable `selectOnFocus` [#315](https://github.com/dachcom-digital/pimcore-formbuilder/issues/315)
+- **[BUGFIX]**: ⚠️ multi file upload: hidden type `_data` not in form row. touched view: `form/theme/type/dynamic_multi_file.html.twig` [#316](https://github.com/dachcom-digital/pimcore-formbuilder/issues/316) 
 
 ## Version 4.0.2
 - [ENHANCEMENT] enable placeholder in cc and bcc field in email output workflow [@frithjof](https://github.com/dachcom-digital/pimcore-formbuilder/pull/305)

src/FormBuilderBundle/Form/Type/DynamicMultiFile/DropZoneType.php

@@ -18,11 +18,14 @@ public function __construct(Translator $translator)
         $this->translator = $translator;
     }
 
+    /**
+     * @throws \JsonException
+     */
     public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars = array_merge_recursive($view->vars, [
             'attr' => [
-                'data-field-id'       => $view->parent->vars['id'],
+                'data-field-id'       => $view->vars['id'],
                 'data-engine-options' => json_encode([
                     'translations'       => $this->getInterfaceTranslations(),
                     'instance_error'     => $this->translator->trans('form_builder.dynamic_multi_file.global.cannot_destroy_active_instance'),

src/FormBuilderBundle/Form/Type/DynamicMultiFileType.php

@@ -8,19 +8,21 @@
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DynamicMultiFileType extends AbstractType
 {
+    protected FormFactoryInterface $formFactory;
     protected Configuration $configuration;
     protected DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry;
 
     public function __construct(
+        FormFactoryInterface $formFactory,
         Configuration $configuration,
         DynamicMultiFileAdapterRegistry $dynamicMultiFileAdapterRegistry
     ) {
+        $this->formFactory = $formFactory;
         $this->configuration = $configuration;
         $this->dynamicMultiFileAdapterRegistry = $dynamicMultiFileAdapterRegistry;
     }
@@ -41,27 +43,24 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $dmfAdapterName = $this->configuration->getConfig('dynamic_multi_file_adapter');
         $dmfAdapter = $this->dynamicMultiFileAdapterRegistry->get($dmfAdapterName);
 
-        $options['mapped'] = false;
+        $options['compound'] = true;
         $options['label'] = empty($options['label']) ? false : $options['label'];
         $options['attr']['data-dynamic-multi-file-instance'] = 'true';
         $options['attr']['data-js-handler'] = $dmfAdapter->getJsHandler();
 
-        $builder->add('adapter', $dmfAdapter->getForm(), $options);
-        $builder->add('data', HiddenType::class, []);
+        $dmfForm = $this->formFactory->createNamedBuilder('adapter', $dmfAdapter->getForm(), null, $options);
 
-        $builder->get('data')->addModelTransformer(new CallbackTransformer(
+        $dmfForm->add('data', HiddenType::class, []);
+        $dmfForm->get('data')->addModelTransformer(new CallbackTransformer(
             function ($identifier) {
-                return $identifier === null ? null : json_encode($identifier);
+                return $identifier === null ? null : json_encode($identifier, JSON_THROW_ON_ERROR);
             },
             function ($identifier) {
-                return $identifier === null ? [] : json_decode($identifier, true);
+                return $identifier === null ? [] : json_decode($identifier, true, 512, JSON_THROW_ON_ERROR);
             }
         ));
-    }
 
-    public function buildView(FormView $view, FormInterface $form, array $options): void
-    {
-        $view->vars['attr']['id'] = $view->vars['id'];
+        $builder->add($dmfForm);
     }
 
     public function getBlockPrefix(): string

src/FormBuilderBundle/Resources/config/services/forms/forms.yml

@@ -17,6 +17,7 @@ services:
     FormBuilderBundle\Form\Type\DynamicMultiFileType:
         public: false
         arguments:
+            - '@Symfony\Component\Form\FormFactoryInterface'
             - '@FormBuilderBundle\Configuration\Configuration'
             - '@FormBuilderBundle\Registry\DynamicMultiFileAdapterRegistry'
         tags:

src/FormBuilderBundle/Resources/views/form/theme/type/dynamic_multi_file.html.twig

@@ -1,12 +1,6 @@
 {% block form_builder_dynamicmultifile_widget %}
     {%- for child in form %}
-        {% if child.vars.name == 'adapter' %}
-            {# pass row attributes to compount adapter form #}
-            {% set widget_attr = attr|merge({class: (child.vars.attr.class|default('') ~ ' ' ~ attr.class|default(''))|trim}) %}
-            {{- form_row(child, {compound: false, attr: widget_attr, id: id}) -}}
-        {% else %}
-            {{- form_row(child) -}}
-        {% endif %}
+        {{- form_row(child, {compound: false}) -}}
     {% endfor -%}
 {% endblock %}
 
@@ -19,6 +13,11 @@
                     {% include '@FormBuilder/form/elements/dynamic-multi-file/form.html.twig' %}
                 </div>
             </div>
+            {% for child in form -%}
+                {% if not child.rendered %}
+                    {{- form_row(child) -}}
+                {% endif %}
+            {%- endfor -%}
         </div>
     {% endapply %}
 {% endblock %}
@@ -30,6 +29,11 @@
             <div class="dropzone-template" style="display: none;">
                 {% include '@FormBuilder/form/elements/dynamic-multi-file/form-drop-zone.html.twig' %}
             </div>
+            {% for child in form -%}
+                {% if not child.rendered %}
+                    {{- form_row(child) -}}
+                {% endif %}
+            {%- endfor -%}
         </div>
     {% endapply %}
 {% endblock %}

src/FormBuilderBundle/Transformer/Output/DynamicMultiFileTransformer.php

@@ -27,12 +27,14 @@ public function getValue(FieldDefinitionInterface $fieldDefinition, FormInterfac
             return null;
         }
 
+        $attachmentData = $rawValue['adapter']['data'];
+
         $options = $fieldDefinition->getOptions();
         /** @var FormDataInterface $rootFormData */
         $rootFormData = $formField->getRoot()->getData();
 
         if (isset($options['submit_as_attachment']) && $options['submit_as_attachment'] === true) {
-            $attachmentLinks = $this->attachmentStream->createAttachmentLinks($rawValue['data'], $fieldDefinition->getName());
+            $attachmentLinks = $this->attachmentStream->createAttachmentLinks($attachmentData, $fieldDefinition->getName());
             foreach ($attachmentLinks as $attachmentLink) {
                 $rootFormData->addAttachment($attachmentLink);
             }
@@ -42,7 +44,7 @@ public function getValue(FieldDefinitionInterface $fieldDefinition, FormInterfac
             return null;
         }
 
-        $asset = $this->attachmentStream->createAttachmentAsset($rawValue['data'], $fieldDefinition->getName(), $rootFormData->getFormDefinition()->getName());
+        $asset = $this->attachmentStream->createAttachmentAsset($attachmentData, $fieldDefinition->getName(), $rootFormData->getFormDefinition()->getName());
 
         if ($asset instanceof Asset) {
             return sprintf('%s%s', \Pimcore\Tool::getHostUrl(), $asset->getRealFullPath());

src/FormBuilderBundle/Validator/Constraints/DynamicMultiFileNotBlankValidator.php

@@ -14,13 +14,17 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedTypeException($constraint, DynamicMultiFileNotBlank::class);
         }
 
-        if(!isset($value['data'])) {
+        if (!isset($value['adapter'])) {
             return;
         }
 
-        if (!is_array($value['data'])) {
+        if (!isset($value['adapter']['data'])) {
+            return;
+        }
+
+        if (!is_array($value['adapter']['data'])) {
             $this->context->buildViolation($constraint->message)->addViolation();
-        } elseif (count($value['data']) === 0) {
+        } elseif (count($value['adapter']['data']) === 0) {
             $this->context->buildViolation($constraint->message)->addViolation();
         }
     }