Added synchronize children between draft and live

Controller/ArticlePageController.php

@@ -208,11 +208,6 @@ public function deleteAction($articleUuid, $uuid, Request $request)
         $documentManager->remove($document);
         $documentManager->flush();
 
-        // FIXME this is a current hack which publishes article automatically when removing a single page
-        $document = $documentManager->find($articleUuid, $locale);
-        $documentManager->publish($document, $locale);
-        $documentManager->flush();
-
         return $this->handleView($this->view(null));
     }
 

Document/Behavior/PageBehavior.php

@@ -12,12 +12,13 @@
 namespace Sulu\Bundle\ArticleBundle\Document\Behavior;
 
 use Sulu\Component\DocumentManager\Behavior\Mapping\ParentBehavior;
+use Sulu\Component\DocumentManager\Behavior\Mapping\PathBehavior;
 use Sulu\Component\DocumentManager\Behavior\Mapping\UuidBehavior;
 
 /**
  * This behavior has to be attached to documents which should have a page-number property.
  */
-interface PageBehavior extends ParentBehavior, UuidBehavior
+interface PageBehavior extends ParentBehavior, UuidBehavior, PathBehavior
 {
     /**
      * Returns page-number.

Document/Subscriber/ArticlePageSubscriber.php

@@ -21,6 +21,7 @@
 use Sulu\Component\DocumentManager\DocumentManagerInterface;
 use Sulu\Component\DocumentManager\Event\MetadataLoadEvent;
 use Sulu\Component\DocumentManager\Event\PersistEvent;
+use Sulu\Component\DocumentManager\Event\RemoveEvent;
 use Sulu\Component\DocumentManager\Events;
 use Sulu\Component\DocumentManager\NameResolver;
 use Symfony\Cmf\Api\Slugifier\SlugifierInterface;
@@ -93,6 +94,7 @@ public static function getSubscribedEvents()
                 ['setStructureTypeToParent', -2000],
                 ['setWorkflowStageOnArticle', -2000],
             ],
+            Events::REMOVE => ['setWorkflowStageOnArticle'],
             Events::METADATA_LOAD => ['handleMetadataLoad'],
         ];
     }
@@ -115,9 +117,9 @@ public function setTitleOnPersist(PersistEvent $event)
     /**
      * Set workflow-stage to test for article.
      *
-     * @param PersistEvent $event
+     * @param PersistEvent|RemoveEvent $event
      */
-    public function setWorkflowStageOnArticle(PersistEvent $event)
+    public function setWorkflowStageOnArticle($event)
     {
         $document = $event->getDocument();
         if (!$document instanceof ArticlePageDocument
@@ -127,7 +129,11 @@ public function setWorkflowStageOnArticle(PersistEvent $event)
         }
 
         $document->getParent()->setWorkflowStage(WorkflowStage::TEST);
-        $this->documentManager->persist($document->getParent(), $event->getLocale(), $event->getOptions());
+        $this->documentManager->persist(
+            $document->getParent(),
+            $this->documentInspector->getLocale($document),
+            $event instanceof PersistEvent ? $event->getOptions() : []
+        );
     }
 
     /**
@@ -238,7 +244,7 @@ public function setStructureTypeToParent(PersistEvent $event)
     }
 
     /**
-     * Add page-title to metadata.
+     * Extend metadata for article-page.
      *
      * @param MetadataLoadEvent $event
      */
@@ -248,7 +254,9 @@ public function handleMetadataLoad(MetadataLoadEvent $event)
             return;
         }
 
-        $event->getMetadata()->addFieldMapping(
+        $metadata = $event->getMetadata();
+        $metadata->setSyncRemoveLive(false);
+        $metadata->addFieldMapping(
             'pageTitle',
             [
                 'encoding' => 'system_localized',

Document/Subscriber/ArticleSubscriber.php

@@ -11,6 +11,7 @@
 
 namespace Sulu\Bundle\ArticleBundle\Document\Subscriber;
 
+use PHPCR\NodeInterface;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticlePageDocument;
 use Sulu\Bundle\ArticleBundle\Document\Index\IndexerInterface;
@@ -115,6 +116,7 @@ public static function getSubscribedEvents()
             Events::PUBLISH => [
                 ['handleScheduleIndexLive', 0],
                 ['handleScheduleIndex', 0],
+                ['synchronizeChildren', 0],
                 ['publishChildren', 0],
                 ['persistPageData', -2000],
             ],
@@ -168,6 +170,47 @@ public function handleScheduleIndexLive(AbstractMappingEvent $event)
         ];
     }
 
+    /**
+     * Syncs children between live and draft.
+     *
+     * @param PublishEvent $event
+     */
+    public function synchronizeChildren(PublishEvent $event)
+    {
+        $document = $event->getDocument();
+        if (!$document instanceof ArticleDocument) {
+            return;
+        }
+
+        $liveNode = $event->getNode();
+        $draftNode = $this->documentInspector->getNode($document);
+
+        $liveChildren = $this->getChildren($liveNode);
+        $draftChildren = $this->getChildren($draftNode);
+        $removedChildrenIds = array_diff(array_keys($liveChildren), array_keys($draftChildren));
+
+        foreach ($removedChildrenIds as $removedChildrenId) {
+            $liveChildren[$removedChildrenId]->remove();
+        }
+    }
+
+    /**
+     * Returns children of given node.
+     *
+     * @param NodeInterface $node
+     *
+     * @return NodeInterface[]
+     */
+    private function getChildren(NodeInterface $node)
+    {
+        $result = [];
+        foreach ($node->getNodes() as $child) {
+            $result[$child->getIdentifier()] = $child;
+        }
+
+        return $result;
+    }
+
     /**
      * Publish pages when article will be published.
      *

Document/Subscriber/PageSubscriber.php

@@ -56,8 +56,8 @@ public static function getSubscribedEvents()
         return [
             Events::HYDRATE => ['handleHydrate'],
             Events::PERSIST => [['handlePersist', -1024]],
-            Events::PUBLISH => [['handlePublish', -1024]],
             Events::REMOVE => [['handleRemove', 5]],
+            Events::PUBLISH => [['handlePublishPageNumber', -1024]],
         ];
     }
 
@@ -117,7 +117,7 @@ public function handlePersist(PersistEvent $event)
      *
      * @param PublishEvent $event
      */
-    public function handlePublish(PublishEvent $event)
+    public function handlePublishPageNumber(PublishEvent $event)
     {
         $document = $event->getDocument();
         $node = $event->getNode();
@@ -141,10 +141,8 @@ public function handleRemove(RemoveEvent $event)
             return;
         }
 
-        $parentDocument = $document->getParent();
-
         $page = 1;
-        foreach ($parentDocument->getChildren() as $child) {
+        foreach ($document->getParent()->getChildren() as $child) {
             if (!$child instanceof PageBehavior || $child->getUuid() === $document->getUuid()) {
                 continue;
             }

Document/Subscriber/RoutableSubscriber.php

@@ -43,7 +43,7 @@ class RoutableSubscriber implements EventSubscriberInterface
     /**
      * @var ChainRouteGeneratorInterface
      */
-    private $routeGeneratorPool;
+    private $chainRouteGenerator;
 
     /**
      * @var RouteManagerInterface
@@ -76,7 +76,7 @@ class RoutableSubscriber implements EventSubscriberInterface
     private $documentInspector;
 
     /**
-     * @param ChainRouteGeneratorInterface $routeGeneratorPool
+     * @param ChainRouteGeneratorInterface $chainRouteGenerator
      * @param RouteManagerInterface $routeManager
      * @param RouteRepositoryInterface $routeRepository
      * @param EntityManagerInterface $entityManager
@@ -85,15 +85,15 @@ class RoutableSubscriber implements EventSubscriberInterface
      * @param DocumentInspector $documentInspector
      */
     public function __construct(
-        ChainRouteGeneratorInterface $routeGeneratorPool,
+        ChainRouteGeneratorInterface $chainRouteGenerator,
         RouteManagerInterface $routeManager,
         RouteRepositoryInterface $routeRepository,
         EntityManagerInterface $entityManager,
         PropertyEncoder $propertyEncoder,
         StructureMetadataFactoryInterface $metadataFactory,
         DocumentInspector $documentInspector
     ) {
-        $this->routeGeneratorPool = $routeGeneratorPool;
+        $this->chainRouteGenerator = $chainRouteGenerator;
         $this->routeManager = $routeManager;
         $this->routeRepository = $routeRepository;
         $this->entityManager = $entityManager;
@@ -158,7 +158,7 @@ public function handlePersist(AbstractMappingEvent $event)
 
         $document->setUuid($event->getNode()->getIdentifier());
 
-        $generatedRoute = $this->routeGeneratorPool->generate(
+        $generatedRoute = $this->chainRouteGenerator->generate(
             $document,
             $event->getOption('route_path') ?: $document->getRoutePath()
         );
@@ -208,7 +208,27 @@ public function handlePublish(PublishEvent $event)
      *
      * @return RouteInterface
      */
-    private function createOrUpdateRoute(RoutablePageBehavior $document, $locale)
+    private function createOrUpdatePageRoute(RoutablePageBehavior $document, $locale)
+    {
+        $route = $this->routeRepository->findByEntity($document->getClass(), $document->getUuid(), $locale);
+        if ($route) {
+            $document->setRoute($route);
+
+            return $this->routeManager->update($document);
+        }
+
+        return $this->routeManager->create($document);
+    }
+
+    /**
+     * Create or update for given document.
+     *
+     * @param RoutableBehavior $document
+     * @param string $locale
+     *
+     * @return RouteInterface
+     */
+    private function createOrUpdateRoute(RoutableBehavior $document, $locale)
     {
         $route = $this->routeRepository->findByEntity($document->getClass(), $document->getUuid(), $locale);
         if ($route) {
@@ -231,7 +251,7 @@ private function removeOldChildRoutes(SessionInterface $session, array $oldRoute
     {
         foreach ($oldRoutes as $oldRoute) {
             $oldRouteEntity = $this->routeRepository->findByPath($oldRoute, $locale);
-            if (!$this->nodeExists($session, $oldRouteEntity->getEntityId())) {
+            if ($oldRouteEntity && !$this->nodeExists($session, $oldRouteEntity->getEntityId())) {
                 $this->entityManager->remove($oldRouteEntity);
             }
         }
@@ -255,7 +275,7 @@ private function generateChildRoutes(ChildrenBehavior $document, $locale)
                 continue;
             }
 
-            $childRoute = $this->createOrUpdateRoute($child, $locale);
+            $childRoute = $this->createOrUpdatePageRoute($child, $locale);
             $this->entityManager->persist($childRoute);
 
             $child->setRoutePath($childRoute->getPath());

Resources/config/services.xml

@@ -123,6 +123,7 @@
                  class="Sulu\Bundle\ArticleBundle\Document\Subscriber\PageSubscriber">
             <argument type="service" id="sulu_document_manager.document_inspector"/>
             <argument type="service" id="sulu_document_manager.property_encoder"/>
+            <argument type="service" id="sulu_document_manager.live_session"/>
 
             <tag name="sulu_document_manager.event_subscriber"/>
         </service>

Resources/public/js/components/articles/edit/adapter/article-page.js

@@ -30,6 +30,10 @@ define([
 
         startPreview: function(component, data) {
             var pageData = getPage(component.options.page, data);
+            if (!pageData.id) {
+                return;
+            }
+
             if (!!pageData.type && pageData.type.name === 'ghost') {
                 pageData = {id: pageData.id};
             }

Resources/translations/sulu/backend.de.xlf

@@ -144,7 +144,7 @@
             </trans-unit>
             <trans-unit id="multi-page-02">
                 <source>sulu_article.edit.new-page</source>
-                <target>Neue Seite erstellen</target>
+                <target>Seite hinzufügen</target>
             </trans-unit>
         </body>
     </file>

Tests/Unit/Document/Subscriber/ArticlePageSubscriberTest.php

@@ -156,6 +156,7 @@ public function testSetWorkflowStageOnArticle()
         $this->document->getParent()->willReturn($this->parentDocument->reveal());
 
         $this->documentInspector->getLocalizationState($this->parentDocument->reveal())->willReturn(LocalizationState::LOCALIZED);
+        $this->documentInspector->getLocale($this->document->reveal())->willReturn($this->locale);
 
         $this->parentDocument->setWorkflowStage(WorkflowStage::TEST)->shouldBeCalled();
         $this->documentManager->persist($this->parentDocument->reveal(), $this->locale, Argument::any())->shouldBeCalled();