[Filter] Update to Live Component

Author: PierreGauthier

src/Controller/Shop/FilterController.php

@@ -29,15 +29,13 @@
 use Symfony\Component\Form\Extension\Core\Type\RangeType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class GallyDynamicFilterType extends AbstractType
 {
     /**
      * @param TaxonRepository<TaxonInterface> $taxonRepository
      */
     public function __construct(
-        private UrlGeneratorInterface $router,
         private RequestStack $requestStack,
         private TaxonRepository $taxonRepository,
         private LocaleContextInterface $localeContext,
@@ -53,6 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $isTaxonPage = $this->isTaxonPage();
         $categoryFieldAdded = false;
+        $facetContext = $this->buildFacetContext();
 
         if ($isTaxonPage && !$this->hasCategoryAggregation()) {
             // Gally doesn't always return a "category" aggregation on taxon listing pages (e.g. a
@@ -118,7 +117,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                             'choices' => $choices,
                             'expanded' => true,
                             'multiple' => true,
-                            'search_url' => $this->buildSearchUrl($aggregation->getField()),
+                            'facet_search' => $facetContext['search'],
+                            'facet_filters' => $facetContext['filters'],
+                            'facet_taxon_code' => $facetContext['taxonCode'],
                             'has_more' => $aggregation->hasMore(),
                         ]
                     );
@@ -225,7 +226,10 @@ private function getCurrentCategoryId(): ?string
         return \is_string($categoryId) && '' !== $categoryId ? $categoryId : null;
     }
 
-    private function buildSearchUrl(string $field): string
+    /**
+     * @return array{search: ?string, filters: array<string, mixed>, taxonCode: ?string}
+     */
+    private function buildFacetContext(): array
     {
         $request = $this->requestStack->getCurrentRequest();
         /** @var array<string, mixed> $queryParameters */
@@ -234,20 +238,18 @@ private function buildSearchUrl(string $field): string
         /** @var array<string, array<string, mixed>> $criteria */
         $criteria = $parameters->get('criteria', []);
         $query = $parameters->get('query', null);
-        $search = (\is_string($query) && '' !== $query) ? $query : ((isset($criteria['search'], $criteria['search']['value'])) ? $criteria['search']['value'] : '');
-        unset($criteria['search']);
+        $search = (\is_string($query) && '' !== $query) ? $query : ((isset($criteria['search'], $criteria['search']['value']) && \is_string($criteria['search']['value'])) ? $criteria['search']['value'] : null);
         /** @var string $slug */
         $slug = $request?->attributes->get('slug') ?? '';
         $taxon = $this->taxonRepository->findOneBySlug($slug, $this->localeContext->getLocaleCode());
 
-        return $this->router->generate(
-            'gally_filter_view_more_ajax',
-            [
-                'filterField' => $field,
-                'search' => $search,
-                'filters' => $criteria,
-                'taxon' => $taxon?->getId(),
-            ]
-        );
+        /** @var array<string, mixed> $filters */
+        $filters = \is_array($criteria['gally'] ?? null) ? $criteria['gally'] : [];
+
+        return [
+            'search' => $search,
+            'filters' => $filters,
+            'taxonCode' => $taxon?->getCode(),
+        ];
     }
 }

src/Form/Type/Filter/GallyDynamicFilterType.php

@@ -24,9 +24,11 @@ final class SelectFilterType extends AbstractType
 {
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefined(['has_more', 'search_url'])
+        $resolver->setDefined(['has_more', 'facet_search', 'facet_filters', 'facet_taxon_code'])
             ->addAllowedTypes('has_more', 'bool')
-            ->addAllowedTypes('search_url', 'string');
+            ->addAllowedTypes('facet_search', ['string', 'null'])
+            ->addAllowedTypes('facet_filters', 'array')
+            ->addAllowedTypes('facet_taxon_code', ['string', 'null']);
     }
 
     public function getParent(): string
@@ -39,6 +41,10 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         // @phpstan-ignore offsetAccess.nonOffsetAccessible
         $view->vars['has_more'] = \array_key_exists('has_more', $options) ? $options['has_more'] : false;
         // @phpstan-ignore offsetAccess.nonOffsetAccessible
-        $view->vars['search_url'] = \array_key_exists('search_url', $options) ? $options['search_url'] : null;
+        $view->vars['facet_search'] = \array_key_exists('facet_search', $options) ? $options['facet_search'] : null;
+        // @phpstan-ignore offsetAccess.nonOffsetAccessible
+        $view->vars['facet_filters'] = \array_key_exists('facet_filters', $options) ? $options['facet_filters'] : [];
+        // @phpstan-ignore offsetAccess.nonOffsetAccessible
+        $view->vars['facet_taxon_code'] = \array_key_exists('facet_taxon_code', $options) ? $options['facet_taxon_code'] : null;
     }
 }

src/Grid/Filter/Type/SelectFilterType.php

@@ -8,6 +8,7 @@
         <import resource="services/search.xml"/>
         <import resource="services/twig.xml"/>
         <import resource="services/twig/component/product.xml"/>
+        <import resource="services/twig/component/filter.xml"/>
         <import resource="services/tracking.xml"/>
     </imports>
 
@@ -39,20 +40,6 @@
             <tag name="controller.service_arguments" />
         </service>
 
-        <service id="Gally\SyliusPlugin\Controller\Shop\FilterController">
-            <argument type="service" id="Gally\SyliusPlugin\Indexer\Provider\CatalogProvider" />
-            <argument type="service" id="Gally\Sdk\Service\SearchManager" />
-            <argument type="service" id="sylius.context.channel" />
-            <argument type="service" id="sylius.context.locale" />
-            <argument type="service" id="sylius.repository.taxon" />
-            <argument type="service" id="form.factory" />
-            <argument type="service" id="Gally\SyliusPlugin\Search\FilterConverter" />
-            <call method="setContainer">
-                <argument type="service" id="service_container" />
-            </call>
-            <tag name="controller.service_arguments" />
-        </service>
-
         <service id="Gally\SyliusPlugin\Controller\Shop\SearchController">
             <argument type="service" id="Gally\SyliusPlugin\Search\Finder" />
             <argument type="service" id="sylius.context.channel" />

src/Resources/assets/shop/controllers/FacetOptionsController.js

@@ -50,7 +50,6 @@
         </service>
 
         <service id="Gally\SyliusPlugin\Form\Type\Filter\GallyDynamicFilterType" autoconfigure="true">
-            <argument type="service" id="router" />
             <argument type="service" id="request_stack" />
             <argument type="service" id="sylius.repository.taxon" />
             <argument type="service" id="sylius.context.locale" />