bug EasyCorp#3194 Fixed some issues in SelectField (javiereguiluz)

javiereguiluz · javiereguiluz · commit 2cd317df2268 · 2020-05-09T12:37:08.000+02:00
This PR was squashed before being merged into the 3.0.x-dev branch. Discussion ---------- Fixed some issues in SelectField Fixes EasyCorp#3185. Commits ------- 66d7e9b Fixed some issues in SelectField
diff --git a/src/Field/Configurator/SelectConfigurator.php b/src/Field/Configurator/SelectConfigurator.php
@@ -35,17 +35,29 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
 
         $translatedChoices = [];
         $translationParameters = $context->getI18n()->getTranslationParameters();
-        foreach ($choices as $key => $value) {
-            $translatedKey = $this->translator->trans($key, $translationParameters);
-            $translatedChoices[$translatedKey] = $value;
+        foreach ($choices as $choiceLabel => $choiceValue) {
+            $translatedChoiceLabel = $this->translator->trans((string) $choiceLabel, $translationParameters);
+            $translatedChoices[$translatedChoiceLabel] = $choiceValue;
         }
         $field->setFormTypeOptionIfNotSet('choices', $translatedChoices);
 
         if (null !== $value = $field->getValue()) {
-            $selectedChoice = array_flip($choices)[$value];
-            $field->setFormattedValue($this->translator->trans($selectedChoice, $translationParameters));
+            // needed to be compatible with fields that allow selecting multiple values
+            $selectedChoices = [];
+            $flippedChoices = array_flip($choices);
+            // $value is a scalar for single selections and an array for multiple selections
+            foreach (array_values((array) $value) as $selectedValue) {
+                if (null !== $selectedChoice = $flippedChoices[$selectedValue] ?? null) {
+                    $selectedChoices[] = $this->translator->trans($selectedChoice, $translationParameters);
+                }
+            }
+
+            $field->setFormattedValue(implode(', ', $selectedChoices));
         }
 
+        $field->setFormTypeOptionIfNotSet('multiple', $field->getCustomOption(SelectField::OPTION_ALLOW_MULTIPLE_SELECT));
+        $field->setFormTypeOptionIfNotSet('expanded', $field->getCustomOption(SelectField::OPTION_RENDER_EXPANDED));
+
         if (true === $field->getCustomOption(SelectField::OPTION_AUTOCOMPLETE)) {
             $field->setFormTypeOptionIfNotSet('attr.data-widget', 'select2');
         }
diff --git a/src/Field/SelectField.php b/src/Field/SelectField.php
@@ -12,8 +12,10 @@ final class SelectField implements FieldInterface
 {
     use FieldTrait;
 
+    public const OPTION_ALLOW_MULTIPLE_SELECT = 'allowMultipleSelect';
     public const OPTION_AUTOCOMPLETE = 'autocomplete';
     public const OPTION_CHOICES = 'choices';
+    public const OPTION_RENDER_EXPANDED = 'renderExpanded';
 
     public static function new(string $propertyName, ?string $label = null): self
     {
@@ -23,7 +25,16 @@ public static function new(string $propertyName, ?string $label = null): self
             ->setTemplateName('crud/field/select')
             ->setFormType(ChoiceType::class)
             ->addCssClass('field-select')
-            ->setCustomOption(self::OPTION_CHOICES, null);
+            ->setCustomOption(self::OPTION_ALLOW_MULTIPLE_SELECT, false)
+            ->setCustomOption(self::OPTION_CHOICES, null)
+            ->setCustomOption(self::OPTION_RENDER_EXPANDED, false);
+    }
+
+    public function allowMultipleSelect(bool $allow = true): self
+    {
+        $this->setCustomOption(self::OPTION_ALLOW_MULTIPLE_SELECT, $allow);
+
+        return $this;
     }
 
     public function autocomplete(): self
@@ -43,4 +54,11 @@ public function setChoices(array $keyValueChoices): self
 
         return $this;
     }
+
+    public function renderExpanded(bool $expanded = true): self
+    {
+        $this->setCustomOption(self::OPTION_RENDER_EXPANDED, $expanded);
+
+        return $this;
+    }
 }
