Fixed suffix generation by using chain-route-generator (#163)

* fixed suffix generation by using chain-route-generator * removed options
sulu · May 2, 2017 · 7014449 · 7014449
1 parent 3d0b59c
commit 7014449
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 44 deletions.
diff --git a/Content/PageTreeRouteContentType.php b/Content/PageTreeRouteContentType.php
@@ -11,13 +11,13 @@
 
 namespace Sulu\Bundle\ArticleBundle\Content;
 
-use Ferrandini\Urlizer;
 use PHPCR\ItemNotFoundException;
 use PHPCR\NodeInterface;
 use PHPCR\PropertyType;
-use Sulu\Bundle\DocumentManagerBundle\Bridge\PropertyEncoder;
+use Sulu\Bundle\RouteBundle\Generator\ChainRouteGeneratorInterface;
 use Sulu\Component\Content\Compat\PropertyInterface;
 use Sulu\Component\Content\SimpleContentType;
+use Sulu\Component\DocumentManager\DocumentRegistry;
 
 /**
  * Provides page_tree_route content-type.
@@ -32,20 +32,30 @@ class PageTreeRouteContentType extends SimpleContentType
     private $template;
 
     /**
-     * @var PropertyEncoder
+     * @var DocumentRegistry
      */
-    private $propertyEncoder;
+    private $documentRegistry;
+
+    /**
+     * @var ChainRouteGeneratorInterface
+     */
+    private $chainRouteGenerator;
 
     /**
      * @param string $template
-     * @param PropertyEncoder $propertyEncoder
+     * @param DocumentRegistry $documentRegistry
+     * @param ChainRouteGeneratorInterface $chainRouteGenerator
      */
-    public function __construct($template, PropertyEncoder $propertyEncoder)
-    {
+    public function __construct(
+        $template,
+        DocumentRegistry $documentRegistry,
+        ChainRouteGeneratorInterface $chainRouteGenerator
+    ) {
         parent::__construct('PageTreeRoute');
 
         $this->template = $template;
-        $this->propertyEncoder = $propertyEncoder;
+        $this->documentRegistry = $documentRegistry;
+        $this->chainRouteGenerator = $chainRouteGenerator;
     }
 
     /**
@@ -81,12 +91,13 @@ public function write(
             return $this->remove($node, $property, $webspaceKey, $languageCode, $segmentKey);
         }
 
-        $titlePropertyName = $this->propertyEncoder->localizedContentName('title', $languageCode);
-        $title = $node->getPropertyValueWithDefault($titlePropertyName, null);
-
         $path = $this->getAttribute('path', $value, '');
         $page = $this->getAttribute('page', $value, ['uuid' => null, 'path' => '/']);
-        $suffix = $this->getAttribute('suffix', $value, Urlizer::urlize($title));
+
+        $suffix = $this->getAttribute('suffix', $value);
+        if (!$suffix) {
+            $suffix = $this->generateSuffix($node, $languageCode);
+        }
 
         // generate url if not set
         if (!$path) {
@@ -175,4 +186,20 @@ private function getAttribute($name, array $value, $default = null)
 
         return $value[$name];
     }
+
+    /**
+     * Generate a new suffix for document.
+     *
+     * @param NodeInterface $node
+     * @param string $locale
+     *
+     * @return string
+     */
+    private function generateSuffix(NodeInterface $node, $locale)
+    {
+        $document = $this->documentRegistry->getDocumentForNode($node, $locale);
+        $route = $this->chainRouteGenerator->generate($document);
+
+        return ltrim($route->getPath(), '/');
+    }
 }
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -276,7 +276,8 @@
         <service id="sulu_article.content_types.page_tree_route"
                  class="Sulu\Bundle\ArticleBundle\Content\PageTreeRouteContentType">
             <argument>%sulu_article.content-type.page_tree_route.template%</argument>
-            <argument type="service" id="sulu_document_manager.property_encoder"/>
+            <argument type="service" id="sulu_document_manager.document_registry"/>
+            <argument type="service" id="sulu_route.chain_generator"/>
 
             <tag name="sulu.content.type" alias="page_tree_route"/>
         </service>

diff --git a/Resources/public/dist/components/page-tree-route/page-select/main.js b/Resources/public/dist/components/page-tree-route/page-select/main.js
diff --git a/Resources/public/js/components/page-tree-route/page-select/main.js b/Resources/public/js/components/page-tree-route/page-select/main.js
@@ -74,7 +74,6 @@ define(function() {
                         name: 'content-datasource@sulucontent',
                         options: {
                             el: $componentContainer,
-                            singleMarkable: true,
                             selected: this.options.selected,
                             locale: this.options.locale,
                             selectedUrl: '/admin/api/nodes/{datasource}?tree=true&language={locale}&fields=title,order,published,url&webspace-nodes=all',

diff --git a/Tests/Functional/Content/PageTreeRouteContentTypeTest.php b/Tests/Functional/Content/PageTreeRouteContentTypeTest.php
@@ -13,17 +13,24 @@
 
 use PHPCR\NodeInterface;
 use PHPCR\PropertyType;
-use Prophecy\Argument;
 use Sulu\Bundle\ArticleBundle\Content\PageTreeRouteContentType;
-use Sulu\Bundle\DocumentManagerBundle\Bridge\PropertyEncoder;
+use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
+use Sulu\Bundle\RouteBundle\Generator\ChainRouteGeneratorInterface;
+use Sulu\Bundle\RouteBundle\Model\RouteInterface;
 use Sulu\Component\Content\Compat\PropertyInterface;
+use Sulu\Component\DocumentManager\DocumentRegistry;
 
 class PageTreeRouteContentTypeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var PropertyEncoder
+     * @var DocumentRegistry
      */
-    private $propertyEncoder;
+    private $documentRegistry;
+
+    /**
+     * @var ChainRouteGeneratorInterface
+     */
+    private $chainRouteGenerator;
 
     /**
      * @var PageTreeRouteContentType
@@ -62,19 +69,18 @@ class PageTreeRouteContentTypeTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->propertyEncoder = $this->prophesize(PropertyEncoder::class);
+        $this->documentRegistry = $this->prophesize(DocumentRegistry::class);
+        $this->chainRouteGenerator = $this->prophesize(ChainRouteGeneratorInterface::class);
         $this->property = $this->prophesize(PropertyInterface::class);
         $this->node = $this->prophesize(NodeInterface::class);
 
         $this->property->getName()->willReturn($this->propertyName);
-        $this->node->getPropertyValueWithDefault('i18n:' . $this->locale . '-title', null)->willReturn('Test article');
-        $this->propertyEncoder->localizedContentName(Argument::type('string'), $this->locale)->will(
-            function ($arguments) {
-                return 'i18n:' . $arguments[1] . '-' . $arguments[0];
-            }
-        );
 
-        $this->contentType = new PageTreeRouteContentType($this->template, $this->propertyEncoder->reveal());
+        $this->contentType = new PageTreeRouteContentType(
+            $this->template,
+            $this->documentRegistry->reveal(),
+            $this->chainRouteGenerator->reveal()
+        );
     }
 
     public function testRead()
@@ -201,6 +207,14 @@ public function testWriteExistingPageRelation()
 
     public function testWriteGeneratePath()
     {
+        $route = $this->prophesize(RouteInterface::class);
+        $route->getPath()->willReturn('/test-article');
+
+        $document = $this->prophesize(ArticleDocument::class);
+        $this->chainRouteGenerator->generate($document->reveal())->willReturn($route->reveal());
+        $this->documentRegistry->getDocumentForNode($this->node->reveal(), $this->locale)
+            ->willReturn($document->reveal());
+
         $value = [
             'page' => [
                 'uuid' => '123-123-123',

diff --git a/Tests/Functional/Controller/ArticleControllerTest.php b/Tests/Functional/Controller/ArticleControllerTest.php
@@ -913,14 +913,14 @@ public function testPostPageTreeRouteGenerate()
                 'uuid' => $page->getUuid(),
                 'path' => $page->getResourceSegment(),
             ],
-            'suffix' => 'test-article',
-            'path' => '/test-page/test-article',
+            'suffix' => 'articles/test-article',
+            'path' => '/test-page/articles/test-article',
         ];
 
         $response = $this->postPageTreeRoute(['page' => $routePathData['page']]);
 
         $this->assertEquals('Test Article', $response['title']);
-        $this->assertEquals('/test-page/test-article', $response['route']);
+        $this->assertEquals('/test-page/articles/test-article', $response['route']);
         $this->assertEquals($routePathData, $response['routePath']);
     }
 
@@ -933,8 +933,8 @@ public function testPostPageTreeRouteGeneratePublishPage()
                 'uuid' => $page->getUuid(),
                 'path' => $page->getResourceSegment(),
             ],
-            'suffix' => 'test-article',
-            'path' => '/test-page/test-article',
+            'suffix' => 'articles/test-article',
+            'path' => '/test-page/articles/test-article',
         ];
 
         $article = $this->postPageTreeRoute(['page' => $routePathData['page']]);
@@ -953,15 +953,15 @@ public function testPostPageTreeRouteGeneratePublishPage()
         $response = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertEquals('Test Article', $response['title']);
-        $this->assertEquals('/test-page-2/test-article', $response['route']);
+        $this->assertEquals('/test-page-2/articles/test-article', $response['route']);
         $this->assertEquals(
             [
                 'page' => [
                     'uuid' => $page->getUuid(),
                     'path' => $page->getResourceSegment(),
                 ],
-                'suffix' => 'test-article',
-                'path' => '/test-page-2/test-article',
+                'suffix' => 'articles/test-article',
+                'path' => '/test-page-2/articles/test-article',
             ],
             $response['routePath']
         );
@@ -978,7 +978,7 @@ public function testPostPageTreeRouteGenerateMovePage()
                 'path' => $page1->getResourceSegment(),
             ],
             'suffix' => 'test-article',
-            'path' => '/test-page/test-article',
+            'path' => '/test-page/articles/test-article',
         ];
 
         $article = $this->postPageTreeRoute(['page' => $routePathData['page']]);
@@ -996,15 +996,15 @@ public function testPostPageTreeRouteGenerateMovePage()
         $response = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertEquals('Test Article', $response['title']);
-        $this->assertEquals('/page-2/page-1/test-article', $response['route']);
+        $this->assertEquals('/page-2/page-1/articles/test-article', $response['route']);
         $this->assertEquals(
             [
                 'page' => [
                     'uuid' => $page1->getUuid(),
                     'path' => $page1->getResourceSegment(),
                 ],
-                'suffix' => 'test-article',
-                'path' => '/page-2/page-1/test-article',
+                'suffix' => 'articles/test-article',
+                'path' => '/page-2/page-1/articles/test-article',
             ],
             $response['routePath']
         );
@@ -1019,8 +1019,8 @@ public function testPostPageTreeRouteGenerateRemovePage()
                 'uuid' => $page->getUuid(),
                 'path' => $page->getResourceSegment(),
             ],
-            'suffix' => 'test-article',
-            'path' => '/test-page/test-article',
+            'suffix' => 'articles/test-article',
+            'path' => '/test-page/articles/test-article',
         ];
 
         $article = $this->postPageTreeRoute($routePathData);
@@ -1036,12 +1036,12 @@ public function testPostPageTreeRouteGenerateRemovePage()
         $response = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertEquals('Test Article', $response['title']);
-        $this->assertEquals('/test-page/test-article', $response['route']);
+        $this->assertEquals('/test-page/articles/test-article', $response['route']);
         $this->assertEquals(
             [
                 'page' => null,
-                'suffix' => 'test-article',
-                'path' => '/test-page/test-article',
+                'suffix' => 'articles/test-article',
+                'path' => '/test-page/articles/test-article',
             ],
             $response['routePath']
         );