Merge pull request #1129 from Victoire/feature/add-permalink

Feature/add permalink
Victoire · Jun 3, 2019 · 116b109 · 116b109
2 parents b4fc68b + 01d80ae
commit 116b109
Show file tree

Hide file tree

Showing 25 changed files with 278 additions and 31 deletions.
diff --git a/Bundle/BlogBundle/Builder/BlogReferenceBuilder.php b/Bundle/BlogBundle/Builder/BlogReferenceBuilder.php
@@ -22,6 +22,7 @@ public function buildReference(View $view, EntityManager $em)
         $viewReference->setName($view->getName());
         $viewReference->setViewId($view->getId());
         $viewReference->setSlug($view->getSlug());
+        $viewReference->setPermalink($view->getPermalink());
         $viewReference->setViewNamespace($em->getClassMetadata(get_class($view))->name);
         if ($parent = $view->getParent()) {
             $viewReference->setParent(ViewReferenceHelper::generateViewReferenceId($parent));

diff --git a/Bundle/BusinessPageBundle/Builder/BusinessPageReferenceBuilder.php b/Bundle/BusinessPageBundle/Builder/BusinessPageReferenceBuilder.php
@@ -31,6 +31,7 @@ public function buildReference(View $businessPage, EntityManager $em)
         $businessPageReference->setViewId($businessPage->getId());
         $businessPageReference->setTemplateId($businessPage->getTemplate()->getId());
         $businessPageReference->setSlug($businessPage->getSlug());
+        $businessPageReference->setPermalink($businessPage->getPermalink());
         $businessPageReference->setEntityId($businessPage->getBusinessEntity()->getId());
         $businessPageReference->setEntityNamespace($em->getClassMetadata(get_class($businessPage->getBusinessEntity()))->name);
         $businessPageReference->setViewNamespace($em->getClassMetadata(get_class($businessPage))->name);

diff --git a/Bundle/CoreBundle/Entity/View.php b/Bundle/CoreBundle/Entity/View.php
@@ -10,6 +10,7 @@
 use Knp\DoctrineBehaviors\Model\Translatable\Translatable;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Victoire\Bundle\BusinessPageBundle\Entity\VirtualBusinessPage;
+use Victoire\Bundle\CoreBundle\Validator\Constraints as Assert;
 use Victoire\Bundle\ViewReferenceBundle\ViewReference\ViewReference;
 use Victoire\Bundle\WidgetMapBundle\Entity\WidgetMap;
 
@@ -25,6 +26,7 @@
  * )
  * @ORM\Table("vic_view")
  * @ORM\HasLifecycleCallbacks
+ * @Assert\UniquePermalink()
  */
 abstract class View
 {
@@ -766,6 +768,17 @@ public function setSlug($slug, $locale = null)
         $this->mergeNewTranslations();
     }
 
+    public function getPermalink()
+    {
+        return PropertyAccess::createPropertyAccessor()->getValue($this->translate(null, false), 'getPermalink');
+    }
+
+    public function setPermalink($permalink, $locale = null)
+    {
+        $this->translate($locale, false)->setPermalink($permalink);
+        $this->mergeNewTranslations();
+    }
+
     /**
      * @return array
      */

diff --git a/Bundle/CoreBundle/Entity/WebViewInterface.php b/Bundle/CoreBundle/Entity/WebViewInterface.php
@@ -54,4 +54,8 @@ public function isPublished();
     public function isHomepage();
 
     public function setHomepage($homepage);
+
+    public function getPermalink();
+
+    public function setPermalink($permalink);
 }
diff --git a/Bundle/CoreBundle/Form/ViewType.php b/Bundle/CoreBundle/Form/ViewType.php
@@ -119,6 +119,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'label'      => 'form.page.type.slug.label',
                         'field_type' => UrlvalidatedType::class,
                     ];
+                    $translationOptions['fields']['permalink'] = [
+                        'label'       => 'form.page.type.permalink.label',
+                        'field_type'  => UrlvalidatedType::class,
+                        'parentUrl'   => '',
+                        'allow_empty' => true,
+                    ];
                 }
                 $form->add('translations', TranslationsType::class, $translationOptions);
             }

diff --git a/Bundle/CoreBundle/Helper/UrlBuilder.php b/Bundle/CoreBundle/Helper/UrlBuilder.php
@@ -23,9 +23,13 @@ public function buildUrl(WebViewInterface $view)
         if (!(method_exists($view, 'isHomepage') && $view->isHomepage())) {
             $slug = [$view->getSlug()];
         }
-
-        //get the slug of the parents
-        $url = $this->getParentSlugs($view, $slug);
+        // if permalink is set
+        if ($view->getPermalink() != null && $view->getPermalink() != '') {
+            $url = [$view->getPermalink()];
+        } else {
+            //get the slug of the parents
+            $url = $this->getParentSlugs($view, $slug);
+        }
 
         //reorder the list of slugs
         $url = array_reverse($url);

diff --git a/Bundle/CoreBundle/Resources/config/services.yml b/Bundle/CoreBundle/Resources/config/services.yml
@@ -14,7 +14,17 @@ services:
         tags:
             - { name: doctrine.event_subscriber, connection: default }
 
+#  ==================  Validator ================== #
+    Victoire\Bundle\CoreBundle\Validator\UniquePermalinkValidator:
+        arguments:
+            - "@victoire_view_reference.repository"
+            - "@request_stack"
+            - "@victoire_core.url_builder"
+        tags:
+            - { name: 'validator.constraint_validator', alias: 'victoire.validator.view.permalink_unique' }
+
 #  ==================  MENU ================== #
+
     victoire_core.admin_menu_builder:
         class: Victoire\Bundle\CoreBundle\Menu\MenuBuilder
         arguments: [ '@knp_menu.factory', '@security.authorization_checker' ]

diff --git a/Bundle/CoreBundle/Resources/translations/validators.en.xliff b/Bundle/CoreBundle/Resources/translations/validators.en.xliff
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="not.available">
+    <body>
+      <trans-unit id="564432933783321f38899" resname="victoire.url.alreadyInUse">
+          <source>victoire.url.alreadyInUse</source>
+          <target>The url is already in use.</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/Bundle/CoreBundle/Resources/translations/validators.es.xliff b/Bundle/CoreBundle/Resources/translations/validators.es.xliff
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="es" datatype="plaintext" original="not.available">
+    <body>
+      <trans-unit id="564432933783321f38899" resname="victoire.url.alreadyInUse">
+          <source>victoire.url.alreadyInUse</source>
+          <target>La url ya está en uso.</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/Bundle/CoreBundle/Resources/translations/validators.fr.xliff b/Bundle/CoreBundle/Resources/translations/validators.fr.xliff
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+    <body>
+      <trans-unit id="564432933783321f38899" resname="victoire.url.alreadyInUse">
+          <source>victoire.url.alreadyInUse</source>
+          <target>L'url est déjà utilisée.</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/Bundle/CoreBundle/Validator/Constraints/UniquePermalink.php b/Bundle/CoreBundle/Validator/Constraints/UniquePermalink.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Victoire\Bundle\CoreBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Victoire\Bundle\CoreBundle\Validator\UniquePermalinkValidator;
+
+/**
+ * @Annotation
+ */
+class UniquePermalink extends Constraint
+{
+    public function validatedBy()
+    {
+        return UniquePermalinkValidator::class;
+    }
+
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/Bundle/CoreBundle/Validator/UniquePermalinkValidator.php b/Bundle/CoreBundle/Validator/UniquePermalinkValidator.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Victoire\Bundle\CoreBundle\Validator;
+
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Victoire\Bundle\CoreBundle\Entity\WebViewInterface;
+use Victoire\Bundle\CoreBundle\Helper\UrlBuilder;
+use Victoire\Bundle\ViewReferenceBundle\Connector\ViewReferenceRepository;
+
+class UniquePermalinkValidator extends ConstraintValidator
+{
+    private $viewReferenceRepository;
+    private $requestStack;
+    private $urlBuilder;
+
+    /**
+     * UniquePermalinkValidator constructor.
+     *
+     * @param ViewReferenceRepository $viewReferenceRepository
+     * @param RequestStack            $requestStack
+     * @param UrlBuilder              $urlBuilder
+     */
+    public function __construct(ViewReferenceRepository $viewReferenceRepository, RequestStack $requestStack, UrlBuilder $urlBuilder)
+    {
+        $this->viewReferenceRepository = $viewReferenceRepository;
+        $this->requestStack = $requestStack;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * @param View       $view
+     * @param Constraint $constraint
+     */
+    public function validate($view, Constraint $constraint)
+    {
+        if ($view instanceof WebViewInterface && ($url = $this->urlBuilder->buildUrl($view)) != '') {
+            $viewReference = $this->viewReferenceRepository->getReferenceByUrl(
+                $url,
+                $this->requestStack->getCurrentRequest()->getLocale()
+            );
+
+            if ($viewReference && $viewReference->getViewId() != $view->getId()) {
+                $this->context->buildViolation('victoire.url.alreadyInUse')
+                    ->atPath('permalink')
+                    ->addViolation();
+            }
+        }
+    }
+}
diff --git a/Bundle/FormBundle/Form/Type/UrlvalidatedType.php b/Bundle/FormBundle/Form/Type/UrlvalidatedType.php
@@ -41,6 +41,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
 
         $parentUrl = $page->getParent() ? $page->getParent()->getUrl() : '';
+        if (isset($options['parentUrl'])) {
+            $parentUrl = $options['parentUrl'];
+        }
         $url = $this->router->generate('victoire_core_page_show', ['url' => $parentUrl, '_locale' => $locale], Router::ABSOLUTE_URL);
         $view->vars['base_url'] = $url;
 
@@ -49,6 +52,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
+        $resolver->setDefined('parentUrl');
         parent::configureOptions($resolver);
     }
 

diff --git a/Bundle/FormBundle/Resources/public/js/slug.js b/Bundle/FormBundle/Resources/public/js/slug.js
@@ -22,7 +22,7 @@ function displaySlugIcons(inputSlug, slug, allowEmpty){
         }
     }else{
         if (allowEmpty && slug != 'undefined') {
-            correctSlugIcon.removeClass('v-hidden');
+            correctSlugIcon.addClass('v-hidden');
             notCorrectSlugIcon.addClass('v-hidden');
         } else {
             correctSlugIcon.addClass('v-hidden');

diff --git a/Bundle/FormBundle/Resources/views/Form/fields.html.twig b/Bundle/FormBundle/Resources/views/Form/fields.html.twig
@@ -723,15 +723,17 @@
                 }}
             {% endfor %}
         {% else %}
-            <span class="vic-help-{{ block('vic_error_type') }}">
-            {% for error in errors %}
-                {% set _errorMessage =
-                    error.messagePluralization is null
-                        ? error.messageTemplate|trans(error.messageParameters, 'validators')
-                        : error.messageTemplate|transchoice(error.messagePluralization, error.messageParameters, 'validators')
-                %}<span title="{{ _errorMessage|striptags }}">{{ _errorMessage|raw }}</span> <br>
-            {% endfor %}
-            </span>
+            {% embed "VictoireUIBundle:Bricks:alert.html.twig" with { theme: "danger" } %}
+                {% block body %}
+                    {% for error in errors %}
+                        {% set _errorMessage =
+                            error.messagePluralization is null
+                                ? error.messageTemplate|trans(error.messageParameters, 'validators')
+                                : error.messageTemplate|transchoice(error.messagePluralization, error.messageParameters, 'validators')
+                        %}<span title="{{ _errorMessage|striptags }}">{{ _errorMessage|raw }}</span> <br>
+                    {% endfor %}
+                {% endblock body %}
+            {% endembed %}
         {% endif %}
     {% endif %}
 {% endif %}

diff --git a/Bundle/I18nBundle/Entity/ViewTranslation.php b/Bundle/I18nBundle/Entity/ViewTranslation.php
@@ -32,6 +32,15 @@ class ViewTranslation
      */
     protected $name;
 
+    /**
+     * @var string
+     *
+     * @Assert\NotBlank()
+     * @ORM\Column(name="permalink", type="string", length=255, nullable=true)
+     * @Serializer\Groups({"search"})
+     */
+    protected $permalink;
+
     /**
      * @var string
      *
@@ -72,6 +81,30 @@ public function setName($name)
         return $this;
     }
 
+    /**
+     * Get permalink.
+     *
+     * @return string
+     */
+    public function getPermalink()
+    {
+        return $this->permalink;
+    }
+
+    /**
+     * Set permalink.
+     *
+     * @param string $permalink
+     *
+     * @return View
+     */
+    public function setPermalink($permalink)
+    {
+        $this->permalink = $permalink;
+
+        return $this;
+    }
+
     /**
      * Set slug.
      *

diff --git a/Bundle/PageBundle/Builder/PageReferenceBuilder.php b/Bundle/PageBundle/Builder/PageReferenceBuilder.php
@@ -29,6 +29,7 @@ public function buildReference(View $view, EntityManager $em)
         $viewReference->setName($view->getName());
         $viewReference->setViewId($view->getId());
         $viewReference->setSlug($view->isHomepage() ? '' : $view->getSlug());
+        $viewReference->setPermalink($view->getPermalink());
         $viewReference->setViewNamespace(ClassUtils::getClass($view));
         if ($parent = $view->getParent()) {
             $parent->translate($view->getCurrentLocale());

diff --git a/Bundle/PageBundle/Resources/translations/victoire.en.xliff b/Bundle/PageBundle/Resources/translations/victoire.en.xliff
@@ -38,9 +38,13 @@
             <source>modal.form.template.settings.title</source>
             <target><![CDATA[Template settings <strong>%templateName%</strong>]]></target>
         </trans-unit>
-        <trans-unit id="58893b99eaf9e" resname="form.page.type.slug.label">
+        <trans-unit id="58893b544f9e" resname="form.page.type.slug.label">
             <source>form.page.type.slug.label</source>
-            <target>URL</target>
+            <target>Slug</target>
+        </trans-unit>
+        <trans-unit id="58893b99eaf9e" resname="form.page.type.permalink.label">
+            <source>form.page.type.permalink.label</source>
+            <target>Permalink</target>
         </trans-unit>
         <trans-unit id="58893b99eb008" resname="form.page.type.status.label">
             <source>form.page.type.status.label</source>

diff --git a/Bundle/PageBundle/Resources/translations/victoire.es.xliff b/Bundle/PageBundle/Resources/translations/victoire.es.xliff
@@ -40,7 +40,11 @@
         </trans-unit>
         <trans-unit id="58893b99ecb6c" resname="form.page.type.slug.label">
             <source>form.page.type.slug.label</source>
-            <target>URL</target>
+            <target>Slug</target>
+        </trans-unit>
+        <trans-unit id="5889d329ecb6c" resname="form.page.type.permalink.label">
+            <source>form.page.type.permalink.label</source>
+            <target>Permalink</target>
         </trans-unit>
         <trans-unit id="58893b99ecb92" resname="form.page.type.status.label">
             <source>form.page.type.status.label</source>

diff --git a/Bundle/PageBundle/Resources/translations/victoire.fr.xliff b/Bundle/PageBundle/Resources/translations/victoire.fr.xliff
@@ -48,7 +48,11 @@
         </trans-unit>
         <trans-unit id="58893b99ed74d" resname="form.page.type.slug.label">
             <source>form.page.type.slug.label</source>
-            <target>URL</target>
+            <target>Slug</target>
+        </trans-unit>
+        <trans-unit id="58893322ed74d" resname="form.page.type.permalink.label">
+            <source>form.page.type.permalink.label</source>
+            <target>Permalink</target>
         </trans-unit>
         <trans-unit id="58893b99ed756" resname="form.page.type.status.label">
             <source>form.page.type.status.label</source>

diff --git a/Bundle/PageBundle/Resources/views/Page/settings.html.twig b/Bundle/PageBundle/Resources/views/Page/settings.html.twig
@@ -13,6 +13,9 @@
         <div class="vic-tab-pane vic-active" id="basics">
 
             <form method="POST" action="{{ path('victoire_core_page_settings_post', {'id': page.id} ) }}">
+
+                {{ form_errors(form) }}
+
                 <div class="v-grid">
                     <div class="v-col v-col--md-6">
                         {{ form_row(form.status) }}