CC-13272: Fixed creation of product attributes. (#8331)

CC-13272: Fixed creation of product attributes.

Author: vol4onok

src/Spryker/Zed/ProductAttributeGui/Communication/Form/AttributeForm.php

@@ -14,6 +14,8 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraint;
@@ -51,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired([
             self::OPTION_ATTRIBUTE_TYPE_CHOICES,
-            self::OPTION_VALUES_CHOICES,
+            static::OPTION_VALUES_CHOICES,
         ]);
 
         $resolver->setDefaults([
@@ -66,7 +68,7 @@ public function configureOptions(OptionsResolver $resolver)
                     !isset($submittedData[self::FIELD_ALLOW_INPUT]) || !$submittedData[self::FIELD_ALLOW_INPUT] ||
                     (isset($submittedData[self::FIELD_IS_SUPER]) && $submittedData[self::FIELD_IS_SUPER])
                 ) {
-                    $groups[] = self::GROUP_VALUES;
+                    $groups[] = static::GROUP_VALUES;
                 }
 
                 if (!isset($originalData[self::FIELD_KEY]) || $submittedData[self::FIELD_KEY] !== $originalData[self::FIELD_KEY]) {
@@ -188,22 +190,56 @@ protected function addIsSuperField(FormBuilderInterface $builder, array $options
      */
     protected function addValuesField(FormBuilderInterface $builder, array $options)
     {
-        $builder->add(self::FIELD_VALUES, Select2ComboBoxType::class, [
+        $builder->add(static::FIELD_VALUES, Select2ComboBoxType::class, [
             'label' => 'Predefined Values',
-            'choices' => $options[self::OPTION_VALUES_CHOICES],
+            'choices' => $options[static::OPTION_VALUES_CHOICES],
             'multiple' => true,
             'constraints' => [
                 new NotBlank([
-                    'groups' => self::GROUP_VALUES,
+                    'groups' => static::GROUP_VALUES,
                 ]),
             ],
         ]);
 
-        $builder->get(self::FIELD_VALUES)->resetViewTransformers();
+        $builder->addEventListener(
+            FormEvents::PRE_SUBMIT,
+            function (FormEvent $event) use ($options) {
+                $this->addValuesFieldChoices($event, $options);
+            }
+        );
 
         return $this;
     }
 
+    /**
+     * @param \Symfony\Component\Form\FormEvent $event
+     * @param array $options
+     *
+     * @return void
+     */
+    protected function addValuesFieldChoices(FormEvent $event, array $options): void
+    {
+        $form = $event->getForm();
+        $data = $event->getData();
+        $data = $data[static::FIELD_VALUES] ?? [];
+        $choices = $options[static::OPTION_VALUES_CHOICES];
+
+        foreach ($data as $choice) {
+            $choices[$choice] = $choice;
+        }
+
+        $form->add(static::FIELD_VALUES, Select2ComboBoxType::class, [
+            'label' => 'Predefined Values',
+            'choices' => $choices,
+            'multiple' => true,
+            'constraints' => [
+                new NotBlank([
+                    'groups' => static::GROUP_VALUES,
+                ]),
+            ],
+        ]);
+    }
+
     /**
      * @param \Symfony\Component\Form\FormBuilderInterface $builder
      * @param array $options