[Indexer] Fix product suppression propagation

Author: PierreGauthier

src/Indexer/AbstractIndexer.php

@@ -39,10 +39,58 @@ public function __construct(
     }
 
     public function reindex(array $documentIdsToReindex = []): void
+    {
+        $metadata = new Metadata($this->getEntityType());
+
+        foreach ($this->getActiveLocalizedCatalogs() as [$channel, $locale, $localizedCatalog]) {
+            if ([] === $documentIdsToReindex) {
+                $index = $this->indexOperation->createIndex($metadata, $localizedCatalog);
+            } else {
+                $index = $this->indexOperation->getIndexByName($metadata, $localizedCatalog);
+            }
+
+            $batchSize = $this->getBatchSize($this->getEntityType(), $channel);
+            $bulk = [];
+            /** @var array $document */
+            foreach ($this->getDocumentsToIndex($channel, $locale, $documentIdsToReindex) as $document) {
+                if (0 === \count($document)) {
+                    continue;
+                }
+                /** @var array{id: int|string} $document */
+                $bulk[$document['id']] = json_encode($document);
+                if (\count($bulk) >= $batchSize) {
+                    $this->indexOperation->executeBulk($index, $bulk);
+                    $bulk = [];
+                }
+            }
+            if (\count($bulk) > 0) {
+                $this->indexOperation->executeBulk($index, $bulk);
+            }
+
+            if ([] === $documentIdsToReindex) {
+                $this->indexOperation->refreshIndex($index);
+                $this->indexOperation->installIndex($index);
+            }
+        }
+    }
+
+    public function remove(array $documentIdsToRemove): void
+    {
+        $metadata = new Metadata($this->getEntityType());
+
+        foreach ($this->getActiveLocalizedCatalogs() as [, , $localizedCatalog]) {
+            $index = $this->indexOperation->getIndexByName($metadata, $localizedCatalog);
+            $this->indexOperation->deleteBulk($index, $documentIdsToRemove);
+        }
+    }
+
+    /**
+     * @return iterable<array{0: GallyChannelInterface, 1: LocaleInterface, 2: LocalizedCatalog}>
+     */
+    private function getActiveLocalizedCatalogs(): iterable
     {
         /** @var ChannelInterface[] $channels */
         $channels = $this->channelRepository->findAll();
-        $metadata = new Metadata($this->getEntityType());
 
         foreach ($channels as $channel) {
             if (($channel instanceof GallyChannelInterface) && $channel->getGallyActive()) {
@@ -53,34 +101,7 @@ public function reindex(array $documentIdsToReindex = []): void
                         throw new \InvalidArgumentException('No localized catalog found for channel ' . $channel->getCode() . ' and locale ' . $locale->getCode() . '. Try to synchronize your structure.');
                     }
 
-                    if ([] === $documentIdsToReindex) {
-                        $index = $this->indexOperation->createIndex($metadata, $localizedCatalog);
-                    } else {
-                        $index = $this->indexOperation->getIndexByName($metadata, $localizedCatalog);
-                    }
-
-                    $batchSize = $this->getBatchSize($this->getEntityType(), $channel);
-                    $bulk = [];
-                    /** @var array $document */
-                    foreach ($this->getDocumentsToIndex($channel, $locale, $documentIdsToReindex) as $document) {
-                        if (0 === \count($document)) {
-                            continue;
-                        }
-                        /** @var array{id: int|string} $document */
-                        $bulk[$document['id']] = json_encode($document);
-                        if (\count($bulk) >= $batchSize) {
-                            $this->indexOperation->executeBulk($index, $bulk);
-                            $bulk = [];
-                        }
-                    }
-                    if (\count($bulk) > 0) {
-                        $this->indexOperation->executeBulk($index, $bulk);
-                    }
-
-                    if ([] === $documentIdsToReindex) {
-                        $this->indexOperation->refreshIndex($index);
-                        $this->indexOperation->installIndex($index);
-                    }
+                    yield [$channel, $locale, $localizedCatalog];
                 }
             }
         }

src/Indexer/Subscriber/ProductSubscriber.php

@@ -22,17 +22,23 @@
 
 class ProductSubscriber implements EventSubscriberInterface
 {
+    /** @var array<int, int|string> */
+    private array $idsPendingDeletion = [];
+
     public function __construct(private ProductIndexer $productIndexer)
     {
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             'sylius.product.post_update' => 'onProductUpdate',
             'sylius.product.post_create' => 'onProductUpdate',
+            'sylius.product.pre_delete' => 'onProductPreDelete',
+            'sylius.product.post_delete' => 'onProductDelete',
             'sylius.product_variant.post_update' => 'onVariantUpdate',
             'sylius.product_variant.post_create' => 'onVariantUpdate',
+            'sylius.product_variant.post_delete' => 'onVariantUpdate',
         ];
     }
 
@@ -44,6 +50,32 @@ public function onProductUpdate(GenericEvent $event): void
         }
     }
 
+    /**
+     * Doctrine nulls out the identifier once the entity is actually removed, so the id
+     * has to be captured before deletion (pre_delete) to still be usable in post_delete.
+     */
+    public function onProductPreDelete(GenericEvent $event): void
+    {
+        $product = $event->getSubject();
+        if ($product instanceof ProductInterface && null !== $product->getId()) {
+            /** @var int|string $id */
+            $id = $product->getId();
+            $this->idsPendingDeletion[spl_object_id($product)] = $id;
+        }
+    }
+
+    public function onProductDelete(GenericEvent $event): void
+    {
+        $product = $event->getSubject();
+        if ($product instanceof ProductInterface) {
+            $productId = $this->idsPendingDeletion[spl_object_id($product)] ?? null;
+            unset($this->idsPendingDeletion[spl_object_id($product)]);
+            if (null !== $productId) {
+                $this->productIndexer->remove([(string) $productId]);
+            }
+        }
+    }
+
     public function onVariantUpdate(GenericEvent $event): void
     {
         $variant = $event->getSubject();

src/Resources/views/shop/product/index/content/body/sidebar/filters.html.twig

@@ -29,4 +29,7 @@
             </form>
         </div>
     </div>
+{% elseif app.request.attributes.has('slug') %}
+    {# Gally disabled: fall back to Sylius' own native taxonomy component and its default template. #}
+    {{ component('sylius_shop:product:show:taxonomy') }}
 {% endif %}