Delete index page import form hook and templates

Author: tautelis

spec/Controller/ImportDataControllerSpec.php

@@ -6,19 +6,25 @@
 
 use FriendsOfSylius\SyliusImportExportPlugin\Controller\ImportDataController;
 use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactoryInterface;
 use Sylius\Component\Registry\ServiceRegistryInterface;
+use Sylius\Component\Resource\Metadata\RegistryInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 
 class ImportDataControllerSpec extends ObjectBehavior
 {
     function let(
+        RequestConfigurationFactoryInterface $configurationFactory,
+        RegistryInterface $resourceRegistry,
         ServiceRegistryInterface $registry,
         FlashBagInterface $flashBag,
         FormFactoryInterface $formFactory,
         \Twig_Environment $twig
     ) {
         $this->beConstructedWith(
+            $configurationFactory,
+            $resourceRegistry,
             $registry,
             $flashBag,
             $formFactory,

spec/DependencyInjection/Compiler/RegisterImporterPassSpec.php

@@ -5,9 +5,9 @@
 namespace spec\FriendsOfSylius\SyliusImportExportPlugin\DependencyInjection\Compiler;
 
 use FriendsOfSylius\SyliusImportExportPlugin\DependencyInjection\Compiler\RegisterImporterPass;
+use FriendsOfSylius\SyliusImportExportPlugin\Listener\ImportButtonGridListener;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\UiBundle\Block\BlockEventListener;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -27,7 +27,7 @@ function it_is_initializable()
     function it_processes_the_importer_services(
         ContainerBuilder $container,
         Definition $importerRegistry,
-        Definition $blockEventDefinition
+        Definition $importButtonListenerDefinition
     ) {
         $importerType = 'csv';
         /**
@@ -47,8 +47,8 @@ function it_processes_the_importer_services(
         ]);
         $container->register(
             Argument::type('string'),
-            BlockEventListener::class
-        )->willReturn($blockEventDefinition)->shouldBeCalled();
+            ImportButtonGridListener::class
+        )->willReturn($importButtonListenerDefinition)->shouldBeCalled();
 
         /**
          * prepare the mock for the importerRegistry
@@ -61,23 +61,23 @@ function it_processes_the_importer_services(
         /**
          * prepare the mock for the definition of the sonata-event
          */
-        $blockEventDefinition->setAutowired(false)
+        $importButtonListenerDefinition->setAutowired(false)
             ->shouldBeCalled()
-            ->willReturn($blockEventDefinition);
+            ->willReturn($importButtonListenerDefinition);
 
-        $blockEventDefinition->addArgument(Argument::type('string'))
+        $importButtonListenerDefinition->addArgument(Argument::type('string'))
             ->shouldBeCalled()
-            ->willReturn($blockEventDefinition);
+            ->willReturn($importButtonListenerDefinition);
 
-        $blockEventDefinition->addTag(
-            'kernel.event_listener',
+        $importButtonListenerDefinition->addTag(
+                'kernel.event_listener',
                 [
-                    'event' => 'sonata.block.event.sylius.admin.' . $importerType . '.index.after_content',
-                    'method' => 'onBlockEvent',
+                    'event' => 'sylius.grid.admin_' . $importerType,
+                    'method' => 'onSyliusGridAdmin',
                 ]
-        )
+            )
             ->shouldBeCalled()
-            ->willReturn($blockEventDefinition);
+            ->willReturn($importButtonListenerDefinition);
 
         /**
          * run the test

src/Controller/ImportDataController.php

@@ -55,19 +55,6 @@ public function __construct(
         $this->flashBag = $flashBag;
     }
 
-    public function importFormAction(Request $request): Response
-    {
-        $importer = $request->attributes->get('resource');
-        $form = $this->getForm($importer);
-
-        $content = $this->twig->render(
-            '@FOSSyliusImportExportPlugin/Crud/import_form.html.twig',
-            ['form' => $form->createView(), 'resource' => $importer]
-        );
-
-        return new Response($content);
-    }
-
     public function importAction(Request $request, string $resource): Response
     {
         $configuration = $this->configurationFactory->create($this->resourceRegistry->get($resource), $request);
@@ -100,19 +87,15 @@ public function importAction(Request $request, string $resource): Response
         );
     }
 
-    private function getForm(string $importerType)
-    {
-        return $this->formFactory->create(ImportType::class, null, ['importer_type' => $importerType]);
-    }
-
     private function import(string $type, string $format, UploadedFile $file): void
     {
         $name = ImporterRegistry::buildServiceName($type, $format);
         /** @var ImporterInterface $service */
         $service = $this->registry->get($name);
-
+        /** @var string $path */
+        $path = $file->getRealPath();
         /** @var ImporterResult $result */
-        $result = $service->import($file->getRealPath());
+        $result = $service->import($path);
 
         $message = sprintf(
             'Imported via %s importer (Time taken in ms: %s, Imported %s, Skipped %s, Failed %s)',

src/DependencyInjection/Compiler/RegisterImporterPass.php

@@ -41,41 +41,11 @@ public function process(ContainerBuilder $container): void
 
             if ($container->getParameter('sylius.importer.web_ui') && !in_array($type, $typesWithImportButton)) {
                 $typesWithImportButton[] = $type;
-                $this->registerImportFormBlockEvent($container, $type);
                 $this->registerEventListenerForImportButton($container, $type);
             }
         }
     }
 
-    private function registerImportFormBlockEvent(ContainerBuilder $container, string $type): void
-    {
-        $eventHookName = ImporterRegistry::buildEventHookName($type) . '.import';
-
-        if ($container->has($eventHookName)) {
-            return;
-        }
-
-        if (strpos($type, '.') !== false) {
-            $type = substr($type, strpos($type, '.') + 1);
-        }
-
-        $container
-            ->register(
-                $eventHookName,
-                BlockEventListener::class
-            )
-            ->setAutowired(false)
-            ->addArgument('@FOSSyliusImportExportPlugin/Crud/import.html.twig')
-            ->addTag(
-                'kernel.event_listener',
-                [
-                    'event' => 'sonata.block.event.sylius.admin.' . $type . '.index.after_content',
-                    'method' => 'onBlockEvent',
-                ]
-            )
-        ;
-    }
-
     private function registerEventListenerForImportButton(ContainerBuilder $container, string $type): void
     {
         $serviceId = sprintf('fos_import_export.event_listener.%s_grid.import_button', $type);

src/Importer/ImporterRegistry.php

@@ -18,9 +18,4 @@ public static function buildServiceName(string $type, string $format): string
 
         return sprintf('%s.%s', $type, $format);
     }
-
-    public static function buildEventHookName(string $type): string
-    {
-        return sprintf('%s_%s', self::EVENT_HOOK_NAME_PREFIX_ADMIN_CRUD_AFTER_CONTENT, $type);
-    }
 }