From 06238c83558f60ad7c2e1d5c07ee6b88898c5cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 24 Jan 2023 15:47:39 +0100
Subject: [PATCH] DX: more portable PickAsideActivityCategory

The label and required configuration options are set in the form type which calls the new type PickAsideActivityCategoryType
---
 .../src/Form/AsideActivityFormType.php                       | 5 ++++-
 .../src/Form/Type/PickAsideActivityCategoryType.php          | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 6fbef0fd7..c02e53c23 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -74,7 +74,10 @@ final class AsideActivityFormType extends AbstractType
                     'required' => true,
                 ]
             )
-            ->add('type', PickAsideActivityCategoryType::class)
+            ->add('type', PickAsideActivityCategoryType::class, [
+                'label' => 'Type',
+                'required' => true,
+            ])
             ->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
index ddf8246f9..3ee392517 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
@@ -32,8 +32,6 @@ final class PickAsideActivityCategoryType extends AbstractType
     {
         $resolver
             ->setDefaults([
-                'label' => 'Type',
-                'required' => true,
                 'class' => AsideActivityCategory::class,
                 'placeholder' => 'Choose the activity category',
                 'query_builder' => static function (EntityRepository $er) {
@@ -45,6 +43,7 @@ final class PickAsideActivityCategoryType extends AbstractType
                 },
                 'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
                     $options = [];
+
                     return $this->categoryRender->renderString($asideActivityCategory, $options);
                 },
                 'attr' => ['class' => 'select2'],
@@ -56,4 +55,3 @@ final class PickAsideActivityCategoryType extends AbstractType
         return EntityType::class;
     }
 }
-