Merge branch hotfix/v2.2.5

roadiz · Feb 23, 2024 · 0909e86 · 0909e86
1 parent 7fdbe38
commit 0909e86
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 14 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.2.4'
+    roadiz_core.cms_version: '2.2.5'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/src/Form/Constraint/NodeTypeFieldValidator.php b/src/Form/Constraint/NodeTypeFieldValidator.php
@@ -4,6 +4,7 @@
 
 namespace RZ\Roadiz\CoreBundle\Form\Constraint;
 
+use Doctrine\Persistence\ManagerRegistry;
 use RZ\Roadiz\Core\AbstractEntities\PersistableInterface;
 use RZ\Roadiz\CoreBundle\Configuration\CollectionFieldConfiguration;
 use RZ\Roadiz\CoreBundle\Configuration\JoinNodeTypeFieldConfiguration;
@@ -19,23 +20,46 @@
 
 class NodeTypeFieldValidator extends ConstraintValidator
 {
+    public function __construct(
+        private readonly ManagerRegistry $registry,
+    ) {
+    }
+
     public function validate(mixed $value, Constraint $constraint): void
     {
-        if ($value instanceof NodeTypeFieldEntity) {
-            if ($value->isMarkdown()) {
-                $this->validateMarkdownOptions($value);
-            }
-            if ($value->isManyToMany() || $value->isManyToOne()) {
-                $this->validateJoinTypes($value, $constraint);
-            }
-            if ($value->isMultiProvider() || $value->isSingleProvider()) {
-                $this->validateProviderTypes($value, $constraint);
+        if (!$value instanceof NodeTypeFieldEntity) {
+            $this->context->buildViolation('Value is not a valid NodeTypeField.')->addViolation();
+            return;
+        }
+
+        $existingNodeTypeFieldsByName = $this->registry->getRepository(NodeTypeFieldEntity::class)->findBy([
+            'name' => $value->getName(),
+        ]);
+        foreach ($existingNodeTypeFieldsByName as $item) {
+            if ($item->getId() === $value->getId()) {
+                continue;
             }
-            if ($value->isCollection()) {
-                $this->validateCollectionTypes($value, $constraint);
+            if ($item->getDoctrineType() !== $value->getDoctrineType()) {
+                $this->context->buildViolation('field_with_same_name_already_exists_but_with_different_doctrine_type')
+                    ->setParameter('%name%', $item->getName())
+                    ->setParameter('%nodeTypeName%', $item->getNodeTypeName())
+                    ->setParameter('%type%', $item->getDoctrineType())
+                    ->atPath('name')
+                    ->addViolation();
             }
-        } else {
-            $this->context->buildViolation('Value is not a valid NodeTypeField.')->addViolation();
+        }
+
+        if ($value->isMarkdown()) {
+            $this->validateMarkdownOptions($value);
+        }
+        if ($value->isManyToMany() || $value->isManyToOne()) {
+            $this->validateJoinTypes($value, $constraint);
+        }
+        if ($value->isMultiProvider() || $value->isSingleProvider()) {
+            $this->validateProviderTypes($value, $constraint);
+        }
+        if ($value->isCollection()) {
+            $this->validateCollectionTypes($value, $constraint);
         }
     }
 

diff --git a/translations/validators.en.xlf b/translations/validators.en.xlf
@@ -10,6 +10,12 @@
                 <source>tagName.%name%.alreadyExists</source>
                 <target state="translated">Tag %name% already exists.</target>
             </trans-unit>
+
+
+        <trans-unit id="field_with_same_name_already_exists_but_with_different_doctrine_type" xml:space="preserve">
+            <source>field_with_same_name_already_exists_but_with_different_doctrine_type</source>
+            <target state="translated">There already is a "%name%" field inside "%nodeTypeName%" but with a different data-type: %type%.</target>
+        </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/translations/validators.fr.xlf b/translations/validators.fr.xlf
@@ -10,6 +10,11 @@
                 <source>tagName.%name%.alreadyExists</source>
                 <target state="translated">L'étiquette «%name%» existe déjà.</target>
             </trans-unit>
+
+        <trans-unit id="field_with_same_name_already_exists_but_with_different_doctrine_type" xml:space="preserve">
+            <source>field_with_same_name_already_exists_but_with_different_doctrine_type</source>
+            <target state="translated">Un champ « %name% » existe déjà pour « %nodeTypeName% » mais avec un type de données différent : %type%.</target>
+        </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/translations/validators.xlf b/translations/validators.xlf
@@ -10,6 +10,10 @@
                 <source>tagName.%name%.alreadyExists</source>
                 <target />
             </trans-unit>
+            <trans-unit id="field_with_same_name_already_exists_but_with_different_doctrine_type" xml:space="preserve">
+                <source>field_with_same_name_already_exists_but_with_different_doctrine_type</source>
+                <target />
+            </trans-unit>
         </body>
     </file>
 </xliff>