From a32d20e320b7f85576018e2def4c7c8b61981e76 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 8 Dec 2022 15:00:45 +0100
Subject: [PATCH] Fixed: [form] improve Aside Activity category form selector

---
 .../src/Form/AsideActivityFormType.php        | 34 +----------
 .../Type/PickAsideActivityCategoryType.php    | 59 +++++++++++++++++++
 2 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 5c438bd0a..6fbef0fd7 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -12,8 +12,7 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\AsideActivityBundle\Form\Type\PickAsideActivityCategoryType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
@@ -21,8 +20,6 @@ use DateInterval;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeZone;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -37,20 +34,16 @@ use function in_array;
 
 final class AsideActivityFormType extends AbstractType
 {
-    private CategoryRender $categoryRender;
-
     private TokenStorageInterface $storage;
 
     private array $timeChoices;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
-        TokenStorageInterface $storage,
-        CategoryRender $categoryRender
+        TokenStorageInterface $storage
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
         $this->storage = $storage;
-        $this->categoryRender = $categoryRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -81,28 +74,7 @@ final class AsideActivityFormType extends AbstractType
                     'required' => true,
                 ]
             )
-            ->add(
-                'type',
-                EntityType::class,
-                [
-                    'label' => 'Type',
-                    'required' => true,
-                    'class' => AsideActivityCategory::class,
-                    'placeholder' => 'Choose the activity category',
-                    'query_builder' => static function (EntityRepository $er) {
-                        $qb = $er->createQueryBuilder('ac');
-                        $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
-                            ->addOrderBy('ac.ordering', 'ASC');
-
-                        return $qb;
-                    },
-                    'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
-                        $options = [];
-
-                        return $this->categoryRender->renderString($asideActivityCategory, $options);
-                    },
-                ]
-            )
+            ->add('type', PickAsideActivityCategoryType::class)
             ->add('duration', ChoiceType::class, $durationTimeOptions)
             ->add('note', ChillTextareaType::class, [
                 'label' => 'Note',
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
new file mode 100644
index 000000000..ddf8246f9
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Form\Type;
+
+use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
+use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class PickAsideActivityCategoryType extends AbstractType
+{
+    private CategoryRender $categoryRender;
+
+    public function __construct(
+        CategoryRender $categoryRender
+    ) {
+        $this->categoryRender = $categoryRender;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefaults([
+                'label' => 'Type',
+                'required' => true,
+                'class' => AsideActivityCategory::class,
+                'placeholder' => 'Choose the activity category',
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('ac');
+                    $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
+                        ->addOrderBy('ac.ordering', 'ASC');
+
+                    return $qb;
+                },
+                'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
+                    $options = [];
+                    return $this->categoryRender->renderString($asideActivityCategory, $options);
+                },
+                'attr' => ['class' => 'select2'],
+            ]);
+    }
+
+    public function getParent(): string
+    {
+        return EntityType::class;
+    }
+}
+