IBX-9060: Fixed notification query parameters to use arrays instead of strings

Author: tbialcz

src/bundle/Controller/NotificationController.php

@@ -8,6 +8,7 @@
 
 namespace Ibexa\Bundle\AdminUi\Controller;
 
+use DateTimeInterface;
 use Exception;
 use Ibexa\AdminUi\Form\Data\Notification\NotificationRemoveData;
 use Ibexa\AdminUi\Form\Factory\FormFactory;
@@ -79,16 +80,27 @@ public function getNotificationsAction(Request $request, int $offset, int $limit
 
     public function renderNotificationsPageAction(Request $request, int $page): Response
     {
-        $searchForm = $this->createSearchForm();
+        $notificationTypes = array_unique(
+            array_map(
+                fn($notification) => $notification->type,
+                $this->notificationService->loadNotifications(0, PHP_INT_MAX)->items
+            )
+        );
+        sort($notificationTypes);
+
+        $searchForm = $this->createForm(SearchType::class, null, [
+            'notification_types' => $notificationTypes,
+        ]);
         $searchForm->handleRequest($request);
 
+        $query = [];
         if ($searchForm->isSubmitted() && $searchForm->isValid()) {
             $data = $searchForm->getData();
             $query = $this->buildQuery($data);
         }
 
         $pagerfanta = new Pagerfanta(
-            new NotificationAdapter($this->notificationService, $query ?? null)
+            new NotificationAdapter($this->notificationService, $query)
         );
         $pagerfanta->setMaxPerPage($this->configResolver->getParameter('pagination.notification_limit'));
         $pagerfanta->setCurrentPage(min($page, $pagerfanta->getNbPages()));
@@ -116,16 +128,38 @@ public function renderNotificationsPageAction(Request $request, int $page): Resp
         ]);
     }
 
-    private function buildQuery(SearchQueryData $data): ?string
+    private function buildQuery(SearchQueryData $data): array
     {
-        return $data->getQuery();
-    }
+        $query = [];
 
-    private function createSearchForm(): FormInterface
-    {
-        return $this->createForm(SearchType::class);
+        if ($data->getType()) {
+            $query['type'] = $data->getType();
+        }
+
+        if (!empty($data->getStatuses())) {
+            $query['status'] = [];
+            if (in_array('read', $data->getStatuses(), true)) {
+                $query['status'][] = 'read';
+            }
+            if (in_array('unread', $data->getStatuses(), true)) {
+                $query['status'][] = 'unread';
+            }
+        }
+
+        $range = $data->getCreatedRange();
+        if ($range !== null) {
+            if ($range->getMin() instanceof DateTimeInterface) {
+                $query['created_from'] = $range->getMin()->getTimestamp();
+            }
+            if ($range->getMax() instanceof DateTimeInterface) {
+                $query['created_to'] = $range->getMax()->getTimestamp();
+            }
+        }
+
+        return $query;
     }
 
+
     private function createNotificationRemoveData(Pagerfanta $pagerfanta): NotificationRemoveData
     {
         $notificationIds = [];

src/bundle/Form/Data/SearchQueryData.php

@@ -8,17 +8,43 @@
 
 namespace Ibexa\Bundle\AdminUi\Form\Data;
 
+use Ibexa\AdminUi\Form\Data\DateRangeData;
+
 final class SearchQueryData
 {
-    private ?string $query = null;
+    private array $statuses = [];
+    private ?string $type = null;
+
+    private ?DateRangeData $createdRange = null;
+
+
+    public function getStatuses(): array
+    {
+        return $this->statuses;
+    }
+
+    public function setStatuses(array $statuses): void
+    {
+        $this->statuses = $statuses;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+
+    public function setType(?string $type): void
+    {
+        $this->type = $type;
+    }
 
-    public function getQuery(): ?string
+    public function getCreatedRange(): ?DateRangeData
     {
-        return $this->query;
+        return $this->createdRange;
     }
 
-    public function setQuery(?string $query): void
+    public function setCreatedRange(?DateRangeData $createdRange): void
     {
-        $this->query = $query;
+        $this->createdRange = $createdRange;
     }
 }

src/bundle/Form/Type/SearchType.php

@@ -8,19 +8,38 @@
 
 namespace Ibexa\Bundle\AdminUi\Form\Type;
 
+use Ibexa\AdminUi\Form\Type\DateRangeType;
 use Ibexa\Bundle\AdminUi\Form\Data\SearchQueryData;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class SearchType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->add('query', TextType::class, [
-            'required' => false,
-        ]);
+        $builder
+            ->add('type', ChoiceType::class, [
+                'required' => false,
+                'choices' => array_combine($options['notification_types'], $options['notification_types']),
+                'placeholder' => 'All types',
+                'label' => 'Type',
+            ])
+            ->add('statuses', ChoiceType::class, [
+                'choices' => [
+                    'Read' => 'read',
+                    'Unread' => 'unread',
+                ],
+                'expanded' => true,
+                'multiple' => true,
+                'required' => false,
+                'label' => 'Status',
+            ])
+            ->add('createdRange', DateRangeType::class, [
+                'required' => false,
+                'label' => 'Date and time',
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void
@@ -29,6 +48,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'method' => 'GET',
             'csrf_protection' => false,
             'data_class' => SearchQueryData::class,
+            'notification_types' => [],
         ]);
     }
 }

src/lib/Pagination/Pagerfanta/NotificationAdapter.php

@@ -19,13 +19,13 @@ class NotificationAdapter implements AdapterInterface
 {
     private NotificationService $notificationService;
 
-    private ?string $query;
+    private array $query;
 
     private int $nbResults;
 
     public function __construct(
         NotificationService $notificationService,
-        ?string $query = null
+        array $query = []
     ) {
         $this->notificationService = $notificationService;
         $this->query = $query;
@@ -53,9 +53,8 @@ public function getSlice($offset, $length): NotificationList
     {
         $notifications = $this->notificationService->loadNotifications($offset, $length, $this->query);
 
-        if (null === $this->nbResults) {
-            $this->nbResults = $notifications->totalCount;
-        }
+        $this->nbResults ??= $notifications->totalCount;
+
 
         return $notifications;
     }