From 54f3c290b341511ad99a5f35dd415f83b4b06b04 Mon Sep 17 00:00:00 2001
From: louis <louis@systemli.org>
Date: Sat, 30 Dec 2023 20:13:00 +0100
Subject: [PATCH] Load Users with Autocomplete

---
 CHANGELOG.md                             | 1 +
 config/packages/dev/nelmio_security.yaml | 5 +----
 src/Admin/AliasAdmin.php                 | 3 ++-
 src/Admin/VoucherAdmin.php               | 9 ++-------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e91cec4..ee1d0975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fix Filters in User Admin
 * Fix Filters in Alias Admin
 * Improve Performance for Alias and Voucher Admin
+* Use Autocomplete for loading Users in Alias and Voucher Admin
 
 # 3.3.1 (2023.11.12)
 
diff --git a/config/packages/dev/nelmio_security.yaml b/config/packages/dev/nelmio_security.yaml
index 07d79160..4557e96d 100644
--- a/config/packages/dev/nelmio_security.yaml
+++ b/config/packages/dev/nelmio_security.yaml
@@ -1,6 +1,3 @@
 nelmio_security:
     csp:
-        enabled: true
-        enforce:
-            default-src:
-              - 'self'
+        enabled: false
diff --git a/src/Admin/AliasAdmin.php b/src/Admin/AliasAdmin.php
index 4f3e3599..b8b1db66 100644
--- a/src/Admin/AliasAdmin.php
+++ b/src/Admin/AliasAdmin.php
@@ -9,6 +9,7 @@
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -29,7 +30,7 @@ protected function configureFormFields(FormMapper $form): void
     {
         $form
             ->add('source', EmailType::class)
-            ->add('user', EntityType::class, ['class' => User::class, 'required' => false])
+            ->add('user', ModelAutocompleteType::class, ['property' => 'email', 'required' => false])
             ->add('deleted', CheckboxType::class, ['disabled' => true]);
 
         if ($this->security->isGranted(Roles::ADMIN)) {
diff --git a/src/Admin/VoucherAdmin.php b/src/Admin/VoucherAdmin.php
index 6c6b22eb..def65358 100644
--- a/src/Admin/VoucherAdmin.php
+++ b/src/Admin/VoucherAdmin.php
@@ -6,17 +6,12 @@
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
 use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter;
 use Sonata\Form\Type\DateRangePickerType;
 
 class VoucherAdmin extends Admin
 {
-    protected array $datagridValues = [
-        '_page' => 1,
-        '_sort_order' => 'DESC',
-        '_sort_by' => 'creationTime',
-    ];
-
     protected function generateBaseRoutePattern(bool $isChildAdmin = false): string
     {
         return 'voucher';
@@ -42,7 +37,7 @@ protected function configureFormFields(FormMapper $form): void
         }
 
         $form
-            ->add('user', null, ['disabled' => $disabled])
+            ->add('user', ModelAutocompleteType::class, ['disabled' => $disabled, 'property' => 'email'])
             ->add('code', null, ['disabled' => !$this->isNewObject()]);
     }