Add Webspace select to Settings Tab

sulu · Oct 14, 2021 · cf98c55 · cf98c55
1 parent 0343c4c
commit cf98c55
Show file tree

Hide file tree

Showing 21 changed files with 422 additions and 13 deletions.
diff --git a/Content/Application/ContentDataMapper/DataMapper/WebspaceDataMapper.php b/Content/Application/ContentDataMapper/DataMapper/WebspaceDataMapper.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) Sulu GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ContentBundle\Content\Application\ContentDataMapper\DataMapper;
+
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\DimensionContentInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\WebspaceInterface;
+
+class WebspaceDataMapper implements DataMapperInterface
+{
+    public function map(
+        DimensionContentInterface $unlocalizedDimensionContent,
+        DimensionContentInterface $localizedDimensionContent,
+        array $data
+    ): void {
+        if (!$localizedDimensionContent instanceof WebspaceInterface) {
+            return;
+        }
+
+        $this->setWebspaceData($localizedDimensionContent, $data);
+    }
+
+    /**
+     * @param mixed[] $data
+     */
+    private function setWebspaceData(WebspaceInterface $dimensionContent, array $data): void
+    {
+        if (\array_key_exists('mainWebspace', $data)) {
+            $dimensionContent->setMainWebspace($data['mainWebspace']);
+        }
+
+        if (\array_key_exists('additionalWebspaces', $data)) {
+            $dimensionContent->setAdditionalWebspaces($data['additionalWebspaces'] ?: []);
+        }
+    }
+}
diff --git a/Content/Domain/Model/WebspaceInterface.php b/Content/Domain/Model/WebspaceInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) Sulu GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ContentBundle\Content\Domain\Model;
+
+interface WebspaceInterface
+{
+    public function getMainWebspace(): ?string;
+
+    public function setMainWebspace(?string $mainWebspace): void;
+
+    public function getAdditionalWebspaces(): array;
+
+    public function setAdditionalWebspaces(array $additionalWebspaces): void;
+}
diff --git a/Content/Domain/Model/WebspaceTrait.php b/Content/Domain/Model/WebspaceTrait.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) Sulu GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ContentBundle\Content\Domain\Model;
+
+trait WebspaceTrait
+{
+    /**
+     * @var string|null
+     */
+    protected $mainWebspace;
+
+    /**
+     * @var string[]|null
+     */
+    protected $additionalWebspaces;
+
+    public function getMainWebspace(): ?string
+    {
+        return $this->mainWebspace;
+    }
+
+    public function setMainWebspace(?string $mainWebspace): void
+    {
+        $this->mainWebspace = $mainWebspace;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAdditionalWebspaces(): array
+    {
+        return $this->additionalWebspaces ?: [];
+    }
+
+    /**
+     * @param string[]
+     */
+    public function setAdditionalWebspaces(array $additionalWebspaces): void
+    {
+        $this->additionalWebspaces = $additionalWebspaces;
+    }
+}
diff --git a/Content/Infrastructure/Doctrine/MetadataLoader.php b/Content/Infrastructure/Doctrine/MetadataLoader.php
@@ -25,6 +25,7 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\ExcerptInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\SeoInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\WebspaceInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowInterface;
 use Sulu\Bundle\MediaBundle\Entity\MediaInterface;
 use Sulu\Bundle\TagBundle\Tag\TagInterface;
@@ -94,6 +95,11 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event): void
             $this->addManyToMany($event, $metadata, 'excerptCategories', CategoryInterface::class, 'category_id');
         }
 
+        if ($reflection->implementsInterface(WebspaceInterface::class)) {
+            $this->addField($metadata, 'mainWebspace', 'string', ['nullable' => true]);
+            $this->addField($metadata, 'additionalWebspaces', 'json', ['nullable' => true]);
+        }
+
         if ($reflection->implementsInterface(AuthorInterface::class)) {
             $this->addField($metadata, 'authored', 'datetime_immutable', ['nullable' => true]);
             $this->addManyToOne($event, $metadata, 'author', ContactInterface::class, true);

diff --git a/Content/Infrastructure/Sulu/Page/Select/WebspaceSelect.php b/Content/Infrastructure/Sulu/Page/Select/WebspaceSelect.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) Sulu GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Page\Select;
+
+use Sulu\Component\Webspace\Manager\WebspaceManagerInterface;
+
+class WebspaceSelect
+{
+    /**
+     * @var WebspaceManagerInterface
+     */
+    private $webspaceManager;
+
+    public function __construct(WebspaceManagerInterface $webspaceManager)
+    {
+        $this->webspaceManager = $webspaceManager;
+    }
+
+    public function getValues(): array
+    {
+        $values = [];
+        foreach ($this->webspaceManager->getWebspaceCollection() as $webspace) {
+            $values[] = [
+                'name' => $webspace->getKey(),
+                'title' => $webspace->getName(),
+            ];
+        }
+
+        return $values;
+    }
+}
diff --git a/Resources/config/data-mapper.xml b/Resources/config/data-mapper.xml
@@ -23,6 +23,10 @@
         </service>
 
         <service id="sulu_content.workflow_data_mapper" class="Sulu\Bundle\ContentBundle\Content\Application\ContentDataMapper\DataMapper\WorkflowDataMapper">
+            <tag name="sulu_content.data_mapper" priority="24"/>
+        </service>
+
+        <service id="sulu_content.webspace_data_mapper" class="Sulu\Bundle\ContentBundle\Content\Application\ContentDataMapper\DataMapper\WebspaceDataMapper">
             <tag name="sulu_content.data_mapper" priority="16"/>
         </service>
 

diff --git a/Resources/config/forms/content_settings_author.xml b/Resources/config/forms/content_settings_author.xml
@@ -5,7 +5,7 @@
 >
     <key>content_settings_author</key>
 
-   <tag name="sulu_content.content_settings_form" instanceOf="Sulu\Bundle\ContentBundle\Content\Domain\Model\AuthorInterface" priority="50"/>
+    <tag name="sulu_content.content_settings_form" instanceOf="Sulu\Bundle\ContentBundle\Content\Domain\Model\AuthorInterface" priority="50"/>
 
     <properties>
         <section name="author">
@@ -18,6 +18,7 @@
                         <title>sulu_content.authored_date</title>
                     </meta>
                 </property>
+
                 <property name="author" type="single_contact_selection" colspan="6">
                     <meta>
                         <title>sulu_content.author</title>

diff --git a/Resources/config/forms/content_settings_webspace.xml b/Resources/config/forms/content_settings_webspace.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<form xmlns="http://schemas.sulu.io/template/template"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://schemas.sulu.io/template/template http://schemas.sulu.io/template/form-1.0.xsd"
+>
+    <key>content_settings_webspace</key>
+
+    <tag name="sulu_content.content_settings_form" instanceOf="Sulu\Bundle\ContentBundle\Content\Domain\Model\WebspaceInterface" priority="10"/>
+
+    <properties>
+        <section name="webspace">
+            <meta>
+                <title>sulu_content.main_webspace</title>
+            </meta>
+
+            <properties>
+                <property name="mainWebspace" type="single_select" colspan="6">
+                    <meta>
+                        <title>sulu_content.main_webspace</title>
+                    </meta>
+
+                    <params>
+                        <param
+                            name="values"
+                            type="expression"
+                            value="service('sulu_content.webspace_select').getValues()"
+                        />
+                    </params>
+                </property>
+
+                <property name="additionalWebspaces" type="select" colspan="6">
+                    <meta>
+                        <title>sulu_content.additional_webspaces</title>
+                    </meta>
+
+                    <params>
+                        <param
+                            name="values"
+                            type="expression"
+                            value="service('sulu_content.webspace_select').getValues()"
+                        />
+                    </params>
+                </property>
+            </properties>
+        </section>
+    </properties>
+</form>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -26,6 +26,13 @@
         </service>
 
         <service id="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Admin\ContentViewBuilderFactoryInterface" alias="sulu_content.content_view_builder_factory"/>
+        <service
+            id="sulu_content.webspace_select"
+            class="Sulu\Bundle\ContentBundle\Content\Infrastructure\Sulu\Page\Select\WebspaceSelect"
+            public="true"
+        >
+            <argument type="service" id="sulu_core.webspace.webspace_manager"/>
+        </service>
 
         <!-- ContentMerger -->
         <service id="sulu_content.content_merger" class="Sulu\Bundle\ContentBundle\Content\Application\ContentMerger\ContentMerger">

diff --git a/Resources/translations/admin.de.json b/Resources/translations/admin.de.json
@@ -3,6 +3,8 @@
     "sulu_content.excerpt": "Auszug & Taxonomien",
     "sulu_content.content": "Inhalt",
     "sulu_content.published": "Veröffentlicht am",
-    "sulu_content.author": "Author",
-    "sulu_page.authored_date": "Authored Date"
+    "sulu_content.author": "Autor",
+    "sulu_content.authored_date": "Verfasst am",
+    "sulu_content.main_webspace": "Hauptwebspace",
+    "sulu_content.additional_webspaces": "Weitere Webspaces"
 }
diff --git a/Resources/translations/admin.en.json b/Resources/translations/admin.en.json
@@ -3,6 +3,8 @@
     "sulu_content.excerpt": "Excerpt & Taxonomies",
     "sulu_content.content": "Content",
     "sulu_content.published": "Published on",
-    "sulu_content.author": "Autor",
-    "sulu_content.authored_date": "Verfasst am"
+    "sulu_content.author": "Author",
+    "sulu_content.authored_date": "Authored Date",
+    "sulu_content.main_webspace": "Main Webspace",
+    "sulu_content.additional_webspaces": "Weitere Webspaces"
 }
diff --git a/Tests/Application/ExampleTestBundle/Entity/ExampleDimensionContent.php b/Tests/Application/ExampleTestBundle/Entity/ExampleDimensionContent.php
@@ -26,10 +26,12 @@
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\SeoTrait;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\TemplateTrait;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\WebspaceInterface;
+use Sulu\Bundle\ContentBundle\Content\Domain\Model\WebspaceTrait;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowInterface;
 use Sulu\Bundle\ContentBundle\Content\Domain\Model\WorkflowTrait;
 
-class ExampleDimensionContent implements DimensionContentInterface, ExcerptInterface, SeoInterface, TemplateInterface, RoutableInterface, WorkflowInterface, AuthorInterface
+class ExampleDimensionContent implements DimensionContentInterface, ExcerptInterface, SeoInterface, TemplateInterface, RoutableInterface, WorkflowInterface, AuthorInterface, WebspaceInterface
 {
     use AuthorTrait;
     use DimensionContentTrait;
@@ -39,6 +41,7 @@ class ExampleDimensionContent implements DimensionContentInterface, ExcerptInter
     use TemplateTrait {
         setTemplateData as parentSetTemplateData;
     }
+    use WebspaceTrait;
     use WorkflowTrait;
 
     /**

diff --git a/Tests/Functional/Integration/ExampleControllerTest.php b/Tests/Functional/Integration/ExampleControllerTest.php
@@ -66,6 +66,8 @@ public function testPostPublish(): int
             'excerptMedia' => null,
             'author' => null,
             'authored' => '2020-05-08T00:00:00+00:00',
+            'mainWebspace' => null,
+            'additionalWebspaces' => [],
         ]) ?: null);
 
         $response = $this->client->getResponse();
@@ -114,7 +116,6 @@ public function testPost(): int
         self::purgeDatabase();
 
         $this->client->request('POST', '/admin/api/examples?locale=en', [], [], [], \json_encode([
-            'authored' => '2020-05-08T00:00:00+00:00',
             'template' => 'example-2',
             'title' => 'Test Example',
             'url' => '/my-example',
@@ -133,6 +134,9 @@ public function testPost(): int
             'excerptCategories' => [],
             'excerptIcon' => null,
             'excerptMedia' => null,
+            'mainWebspace' => 'sulu-io',
+            'additionalWebspaces' => [],
+            'authored' => '2020-05-08T00:00:00+00:00',
         ]) ?: null);
 
         $response = $this->client->getResponse();
@@ -190,6 +194,9 @@ public function testPut(int $id): void
             'excerptCategories' => [],
             'excerptIcon' => null,
             'excerptMedia' => null,
+            'authored' => '2020-06-09T00:00:00+00:00',
+            'mainWebspace' => 'sulu-io2',
+            'additionalWebspaces' => ['sulu-io', 'sulu-io2'],
         ]) ?: null);
 
         $response = $this->client->getResponse();

diff --git a/Tests/Functional/Integration/responses/example_get.json b/Tests/Functional/Integration/responses/example_get.json
@@ -27,5 +27,7 @@
     "template": "example-2",
     "title": "Test Example",
     "url": "/my-example",
-    "workflowPlace": "unpublished"
+    "workflowPlace": "unpublished",
+    "mainWebspace": "sulu-io",
+    "additionalWebspaces": []
 }
diff --git a/Tests/Functional/Integration/responses/example_post.json b/Tests/Functional/Integration/responses/example_post.json
@@ -27,5 +27,7 @@
     "template": "example-2",
     "title": "Test Example",
     "url": "/my-example",
-    "workflowPlace": "unpublished"
+    "workflowPlace": "unpublished",
+    "mainWebspace": "sulu-io",
+    "additionalWebspaces": []
 }
diff --git a/Tests/Functional/Integration/responses/example_post_publish.json b/Tests/Functional/Integration/responses/example_post_publish.json
@@ -27,5 +27,7 @@
     "template": "example-2",
     "title": "Test Example",
     "url": "/my-example",
-    "workflowPlace": "published"
+    "workflowPlace": "published",
+    "mainWebspace": "sulu-io",
+    "additionalWebspaces": []
 }
diff --git a/Tests/Functional/Integration/responses/example_post_trigger_unpublish.json b/Tests/Functional/Integration/responses/example_post_trigger_unpublish.json
@@ -27,5 +27,7 @@
     "template": "example-2",
     "title": "Test Example",
     "url": "\/my-example",
-    "workflowPlace": "unpublished"
+    "workflowPlace": "unpublished",
+    "mainWebspace": "sulu-io",
+    "additionalWebspaces": []
 }