Add a slugger when creating terms

Setono · Feb 16, 2024 · cf57877 · cf57877
1 parent 3126bb9
commit cf57877
Show file tree

Hide file tree

Showing 10 changed files with 306 additions and 53 deletions.
diff --git a/src/DependencyInjection/SetonoSyliusTermsExtension.php b/src/DependencyInjection/SetonoSyliusTermsExtension.php
@@ -90,5 +90,17 @@ public function prepend(ContainerBuilder $container): void
                 ],
             ],
         ]);
+
+        $container->prependExtensionConfig('sylius_ui', [
+            'events' => [
+                'setono_sylius_terms.admin.terms.create.javascripts' => [
+                    'blocks' => [
+                        'javascripts' => [
+                            'template' => '@SetonoSyliusTermsPlugin/Admin/Terms/_javascripts.html.twig',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
     }
 }
diff --git a/src/Fixture/Factory/TermsExampleFactory.php b/src/Fixture/Factory/TermsExampleFactory.php
@@ -9,7 +9,6 @@
 use DateTimeInterface;
 use Faker\Factory as FakerFactory;
 use Faker\Generator as FakerGenerator;
-use Setono\SyliusTermsPlugin\Generator\TermSlugGeneratorInterface;
 use Setono\SyliusTermsPlugin\Model\TermsInterface;
 use Setono\SyliusTermsPlugin\Repository\TermsRepositoryInterface;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\AbstractExampleFactory;
@@ -21,6 +20,7 @@
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\String\Slugger\AsciiSlugger;
 
 class TermsExampleFactory extends AbstractExampleFactory
 {
@@ -33,7 +33,6 @@ public function __construct(
         private readonly TermsRepositoryInterface $termsRepository,
         private readonly RepositoryInterface $localeRepository,
         private readonly ChannelRepositoryInterface $channelRepository,
-        private readonly TermSlugGeneratorInterface $termsSlugGenerator,
     ) {
         $this->faker = FakerFactory::create();
         $this->optionsResolver = new OptionsResolver();
@@ -84,7 +83,7 @@ protected function createTranslation(TermsInterface $terms, string $localeCode,
         $terms->setName($options['name']);
         $terms->setLabel($options['label']);
         $terms->setContent($options['content']);
-        $terms->setSlug($options['slug'] ?? $this->termsSlugGenerator->generate($terms, $localeCode));
+        $terms->setSlug($options['slug'] ?? (new AsciiSlugger())->slug($options['name'])->toString());
     }
 
     protected function configureOptions(OptionsResolver $resolver): void

diff --git a/src/Generator/TermSlugGenerator.php b/src/Generator/TermSlugGenerator.php
diff --git a/src/Generator/TermSlugGeneratorInterface.php b/src/Generator/TermSlugGeneratorInterface.php
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -7,7 +7,6 @@
         <import resource="services/event_subscriber.xml"/>
         <import resource="services/fixture.xml"/>
         <import resource="services/form.xml"/>
-        <import resource="services/generator.xml"/>
         <import resource="services/provider.xml"/>
         <import resource="services/renderer.xml"/>
     </imports>

diff --git a/src/Resources/config/services/fixture.xml b/src/Resources/config/services/fixture.xml
@@ -10,7 +10,6 @@
             <argument type="service" id="setono_sylius_terms.repository.terms"/>
             <argument type="service" id="sylius.repository.locale"/>
             <argument type="service" id="sylius.repository.channel"/>
-            <argument type="service" id="setono_sylius_terms.generator.term_slug"/>
         </service>
 
         <service id="setono_sylius_terms.fixture.terms"

diff --git a/src/Resources/config/services/generator.xml b/src/Resources/config/services/generator.xml