From 8d1d1d67b0d5deb2af22334f063946fe8e72f225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Fri, 5 Mar 2021 13:34:34 +0100 Subject: [PATCH 1/2] IBX-2: Specified action path for search form for easier reuse --- src/bundle/Resources/config/services/views.yaml | 1 + src/lib/View/Filter/AdminSearchViewFilter.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bundle/Resources/config/services/views.yaml b/src/bundle/Resources/config/services/views.yaml index 22a312f321..c1e9f90756 100644 --- a/src/bundle/Resources/config/services/views.yaml +++ b/src/bundle/Resources/config/services/views.yaml @@ -56,5 +56,6 @@ services: $contentTypeService: '@ezpublish.api.service.content_type' $siteAccessGroups: '%ezpublish.siteaccess.groups%' $innerFilter: '@EzSystems\EzPlatformAdminUi\View\Filter\AdminSearchViewFilter.inner' + $router: '@router' tags: - { name: kernel.event_subscriber } diff --git a/src/lib/View/Filter/AdminSearchViewFilter.php b/src/lib/View/Filter/AdminSearchViewFilter.php index 367b82b573..ef60e9a580 100644 --- a/src/lib/View/Filter/AdminSearchViewFilter.php +++ b/src/lib/View/Filter/AdminSearchViewFilter.php @@ -21,6 +21,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\RouterInterface; class AdminSearchViewFilter implements EventSubscriberInterface { @@ -42,13 +43,17 @@ class AdminSearchViewFilter implements EventSubscriberInterface /** @var \Ibexa\Platform\Search\View\SearchViewFilter */ private $innerFilter; + /** @var \Symfony\Component\Routing\RouterInterface */ + private $router; + public function __construct( ConfigResolverInterface $configResolver, FormFactoryInterface $formFactory, SectionService $sectionService, ContentTypeService $contentTypeService, array $siteAccessGroups, - SearchViewFilter $innerFilter + SearchViewFilter $innerFilter, + RouterInterface $router ) { $this->configResolver = $configResolver; $this->formFactory = $formFactory; @@ -56,6 +61,7 @@ public function __construct( $this->contentTypeService = $contentTypeService; $this->siteAccessGroups = $siteAccessGroups; $this->innerFilter = $innerFilter; + $this->router = $router; } public static function getSubscribedEvents() @@ -134,6 +140,7 @@ public function handleSearchForm(FilterViewBuilderParametersEvent $event): void [ 'method' => Request::METHOD_GET, 'csrf_protection' => false, + 'action' => $this->router->generate('ezplatform.search'), ] ); From 1b4494f39ecc72a19a974e9b117e9b6b17076541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Mon, 8 Mar 2021 09:20:19 +0100 Subject: [PATCH 2/2] IBX-2: Replaced Router interface with urlGenerator --- src/bundle/Resources/config/services/views.yaml | 2 +- src/lib/View/Filter/AdminSearchViewFilter.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bundle/Resources/config/services/views.yaml b/src/bundle/Resources/config/services/views.yaml index c1e9f90756..7767b27438 100644 --- a/src/bundle/Resources/config/services/views.yaml +++ b/src/bundle/Resources/config/services/views.yaml @@ -56,6 +56,6 @@ services: $contentTypeService: '@ezpublish.api.service.content_type' $siteAccessGroups: '%ezpublish.siteaccess.groups%' $innerFilter: '@EzSystems\EzPlatformAdminUi\View\Filter\AdminSearchViewFilter.inner' - $router: '@router' + $urlGenerator: '@router' tags: - { name: kernel.event_subscriber } diff --git a/src/lib/View/Filter/AdminSearchViewFilter.php b/src/lib/View/Filter/AdminSearchViewFilter.php index ef60e9a580..5efeff2e22 100644 --- a/src/lib/View/Filter/AdminSearchViewFilter.php +++ b/src/lib/View/Filter/AdminSearchViewFilter.php @@ -21,7 +21,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\RouterInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; class AdminSearchViewFilter implements EventSubscriberInterface { @@ -43,8 +43,8 @@ class AdminSearchViewFilter implements EventSubscriberInterface /** @var \Ibexa\Platform\Search\View\SearchViewFilter */ private $innerFilter; - /** @var \Symfony\Component\Routing\RouterInterface */ - private $router; + /** @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface */ + private $urlGenerator; public function __construct( ConfigResolverInterface $configResolver, @@ -53,7 +53,7 @@ public function __construct( ContentTypeService $contentTypeService, array $siteAccessGroups, SearchViewFilter $innerFilter, - RouterInterface $router + UrlGeneratorInterface $urlGenerator ) { $this->configResolver = $configResolver; $this->formFactory = $formFactory; @@ -61,7 +61,7 @@ public function __construct( $this->contentTypeService = $contentTypeService; $this->siteAccessGroups = $siteAccessGroups; $this->innerFilter = $innerFilter; - $this->router = $router; + $this->urlGenerator = $urlGenerator; } public static function getSubscribedEvents() @@ -140,7 +140,7 @@ public function handleSearchForm(FilterViewBuilderParametersEvent $event): void [ 'method' => Request::METHOD_GET, 'csrf_protection' => false, - 'action' => $this->router->generate('ezplatform.search'), + 'action' => $this->urlGenerator->generate('ezplatform.search'), ] );