Merge pull request #66 from sitegeist/bugfix-translate-on-shutdown

BUGFIX: Snyc nodes on shutdown

Author: gradinarufelix

Classes/ContentRepository/NodeTranslationService.php

@@ -7,9 +7,10 @@
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Model\Workspace;
 use Neos\ContentRepository\Domain\Service\Context;
-use Neos\ContentRepository\Domain\Service\ContextFactory;
 use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Persistence\Doctrine\PersistenceManager;
+use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
 use Neos\Neos\Service\PublishingService;
 use Neos\Neos\Utility\NodeUriPathSegmentGenerator;
 use Sitegeist\LostInTranslation\Domain\TranslatableProperty\TranslatablePropertyNamesFactory;
@@ -109,6 +110,12 @@ class NodeTranslationService
      */
     protected $liveWorkspaceName = 'live';
 
+    /**
+     * @Flow\Inject
+     * @var PersistenceManager
+     */
+    protected $persistenceManager;
+
     /**
      * If nodes are moved in Neos, then it will move node variants in other dimensions
      * as well. As we already move nodes when we sync, we don't want this behaviour
@@ -118,6 +125,11 @@ class NodeTranslationService
      */
     protected bool $recursionPreventionEnabled = true;
 
+    /**
+     * @var array<string, array<string, array<string, NodeInterface>>>
+     */
+    protected array $nodesToBeTranslated = [];
+
     /**
      * @param NodeInterface $node
      * @param Context $context
@@ -162,11 +174,11 @@ public function afterAdoptNode(NodeInterface $node, Context $context, bool $recu
     }
 
     /**
-     * @param NodeInterface $node
-     * @param Workspace $workspace
+     * @param  NodeInterface  $node
+     * @param  Workspace  $workspace
      * @return void
      */
-    public function afterNodePublish(NodeInterface $node, Workspace $workspace): void
+    public function collectNodesToBeTranslated(NodeInterface $node, Workspace $workspace): void
     {
         if (!$this->enabled) {
             return;
@@ -184,13 +196,50 @@ public function afterNodePublish(NodeInterface $node, Workspace $workspace): voi
             }
         }
 
-        if ($this->skipAuthorizationChecks) {
-            $this->securityContext->withoutAuthorizationChecks(function () use ($node) {
-                $this->syncNode($node, $this->liveWorkspaceName);
-            });
-        } else {
-            $this->syncNode($node, $this->liveWorkspaceName);
+        $isAutomaticTranslationEnabledForNodeType = $node->getNodeType()->getConfiguration('options.automaticTranslation') ?? true;
+        if (!$isAutomaticTranslationEnabledForNodeType) {
+            return;
         }
+
+        $nodeSourceDimensionValue = $node->getContext()->getTargetDimensions()[$this->languageDimensionName];
+        $defaultPreset = $this->contentDimensionConfiguration[$this->languageDimensionName]['defaultPreset'];
+
+        if ($nodeSourceDimensionValue !== $defaultPreset) {
+            return;
+        }
+
+        $this->nodesToBeTranslated[$workspace->getName()][$nodeSourceDimensionValue][$node->getIdentifier()] = $node;
+    }
+
+    /**
+     * @return void
+     * @throws IllegalObjectTypeException|\Exception
+     */
+    public function translateNodes(): void
+    {
+        /**
+         * @var string $workspaceName
+         * @var array<string, array<string, NodeInterface>> $nodesByWorkspace
+         */
+        foreach ($this->nodesToBeTranslated as $workspaceName => $nodesByWorkspace) {
+            /**
+             * @var array<string, NodeInterface> $nodesByLanguageDimensionValue
+             */
+            foreach ($nodesByWorkspace as $nodesByLanguageDimensionValue) {
+                foreach ($nodesByLanguageDimensionValue as $node) {
+                    if ($this->skipAuthorizationChecks) {
+                        $this->securityContext->withoutAuthorizationChecks(function () use ($node, $workspaceName) {
+                            $this->syncNode($node, $workspaceName);
+                        });
+                    } else {
+                        $this->syncNode($node, $workspaceName);
+                    }
+                }
+            }
+        }
+
+        $this->nodesToBeTranslated = [];
+        $this->persistenceManager->persistAll();
     }
 
     /**

Classes/Package.php

@@ -8,6 +8,7 @@
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Package\Package as BasePackage;
 use Neos\ContentRepository\Domain\Service\Context;
+use Neos\Flow\Persistence\Doctrine\PersistenceManager;
 use Neos\Neos\Fusion\Cache\ContentCacheFlusher;
 use Sitegeist\LostInTranslation\ContentRepository\NodeTranslationService;
 
@@ -24,6 +25,7 @@ public function boot(Bootstrap $bootstrap)
     {
         $dispatcher = $bootstrap->getSignalSlotDispatcher();
         $dispatcher->connect(Context::class, 'afterAdoptNode', NodeTranslationService::class, 'afterAdoptNode', false);
-        $dispatcher->connect(Workspace::class, 'afterNodePublishing', NodeTranslationService::class, 'afterNodePublish', false);
+        $dispatcher->connect(Workspace::class, 'beforeNodePublishing', NodeTranslationService::class, 'collectNodesToBeTranslated', false);
+        $dispatcher->connect(PersistenceManager::class, 'allObjectsPersisted', NodeTranslationService::class, 'translateNodes', false);
     }
 }