Fixed errors with EntityFilterType

Kreyu · Apr 3, 2023 · 1ffe011 · 1ffe011
1 parent aa4159c
commit 1ffe011
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Filter/Type/EntityFilterType.php b/src/Bridge/Doctrine/Orm/Filter/Type/EntityFilterType.php
@@ -21,7 +21,7 @@ class EntityFilterType extends AbstractFilterType
     public function apply(ProxyQueryInterface $query, FilterData $data, FilterInterface $filter, array $options): void
     {
         $operator = $data->getOperator() ?? Operator::EQUALS;
-        $value = (array) $data->getValue();
+        $value = $data->getValue();
 
         try {
             $expressionBuilderMethodName = $this->getExpressionBuilderMethodName($operator);

diff --git a/src/Filter/FiltrationData.php b/src/Filter/FiltrationData.php
@@ -10,10 +10,8 @@
 class FiltrationData
 {
     /**
-     * @var array<FilterData>
+     * @param array<FilterData> $filters
      */
-//    private array $filters = [];
-
     public function __construct(private array $filters = [])
     {
         foreach ($filters as $filter) {

diff --git a/src/Filter/Form/Type/FiltrationDataType.php b/src/Filter/Form/Type/FiltrationDataType.php
@@ -11,12 +11,13 @@
 use Kreyu\Bundle\DataTableBundle\Filter\FiltrationData;
 use Kreyu\Bundle\DataTableBundle\Filter\Type\SearchFilterTypeInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class FiltrationDataType extends AbstractType
+class FiltrationDataType extends AbstractType implements DataMapperInterface
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -36,6 +37,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'empty_data' => new FilterData,
             ]));
         }
+
+        $builder->setDataMapper($this);
     }
 
     public function finishView(FormView $view, FormInterface $form, array $options): void
@@ -103,4 +106,34 @@ public function configureOptions(OptionsResolver $resolver): void
             ->setAllowedTypes('filters', FilterInterface::class . '[]')
         ;
     }
+
+    public function mapDataToForms(mixed $viewData, \Traversable $forms): void
+    {
+        if (null === $viewData) {
+            return;
+        }
+
+        $forms = iterator_to_array($forms);
+
+        foreach ($forms as $name => $form) {
+            $filterData = $viewData->getFilterData($name);
+
+            if ($filterData && $filterData->hasValue()) {
+                $form->setData($filterData);
+            }
+        }
+    }
+
+    public function mapFormsToData(\Traversable $forms, mixed &$viewData): void
+    {
+        if (null === $viewData) {
+            $viewData = new FiltrationData();
+        }
+
+        $forms = iterator_to_array($forms);
+
+        foreach ($forms as $name => $form) {
+            $viewData->setFilterData($name, $form->getData());
+        }
+    }
 }