Merge tag v2.3.16 into develop

composer.json

@@ -42,7 +42,7 @@
         "ramsey/uuid": "^4.7",
         "rezozero/intervention-request-bundle": "~3.0.0",
         "rezozero/liform-bundle": "^0.19",
-        "rezozero/tree-walker": "^1.3.0",
+        "rezozero/tree-walker": "^1.5.0",
         "roadiz/doc-generator": "2.4.x-dev",
         "roadiz/documents": "2.4.x-dev",
         "roadiz/dts-generator": "2.4.x-dev",

migrations/Version20240702205419.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240702205419 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Added autocomplete field to custom_form_fields table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE custom_form_fields ADD autocomplete VARCHAR(18) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE custom_form_fields DROP autocomplete');
+    }
+}

src/Entity/CustomFormField.php

@@ -8,16 +8,18 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
+use RZ\Roadiz\CoreBundle\Repository\CustomFormFieldRepository;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 use RZ\Roadiz\Core\AbstractEntities\AbstractField;
+use Symfony\Component\Validator\Constraints\Choice;
 
 /**
  * CustomFormField entities are used to create CustomForms with
  * custom data structure.
  */
 #[
-    ORM\Entity(repositoryClass: "RZ\Roadiz\CoreBundle\Repository\CustomFormFieldRepository"),
+    ORM\Entity(repositoryClass: CustomFormFieldRepository::class),
     ORM\Table(name: "custom_form_fields"),
     ORM\UniqueConstraint(columns: ["name", "custom_form_id"]),
     ORM\Index(columns: ["position"]),
@@ -73,6 +75,43 @@ class CustomFormField extends AbstractField
     ]
     private bool $required = false;
 
+    /**
+     * @var string|null https://developer.mozilla.org/fr/docs/Web/HTML/Attributes/autocomplete
+     */
+    #[
+        ORM\Column(name: "autocomplete", type: 'string', length:18, nullable: true),
+        Serializer\Groups(["custom_form"]),
+        SymfonySerializer\Groups(["custom_form"]),
+        Choice([
+            'off',
+            'name',
+            'honorific-prefix',
+            'honorific-suffix',
+            'given-name',
+            'additional-name',
+            'family-name',
+            'nickname',
+            'email',
+            'username',
+            'organization-title',
+            'organization',
+            'street-address',
+            'country',
+            'country-name',
+            'postal-code',
+            'bday',
+            'bday-day',
+            'bday-month',
+            'bday-year',
+            'sex',
+            'tel',
+            'tel-national',
+            'url',
+            'photo',
+        ])
+    ]
+    private ?string $autocomplete = null;
+
     public function __construct()
     {
         parent::__construct();
@@ -132,6 +171,17 @@ public function setRequired(bool $required): CustomFormField
         return $this;
     }
 
+    public function getAutocomplete(): ?string
+    {
+        return $this->autocomplete;
+    }
+
+    public function setAutocomplete(?string $autocomplete): CustomFormField
+    {
+        $this->autocomplete = $autocomplete;
+        return $this;
+    }
+
     /**
      * @return string
      */

src/Entity/NodesTags.php

@@ -9,10 +9,11 @@
 use JMS\Serializer\Annotation as Serializer;
 use RZ\Roadiz\Core\AbstractEntities\PositionedInterface;
 use RZ\Roadiz\Core\AbstractEntities\PositionedTrait;
+use RZ\Roadiz\CoreBundle\Repository\NodesTagsRepository;
 use Symfony\Component\Serializer\Annotation as SymfonySerializer;
 
 #[
-    ORM\Entity,
+    ORM\Entity(repositoryClass: NodesTagsRepository::class),
     ORM\Table(name: "nodes_tags"),
     ORM\Index(columns: ['node_id', 'position'], name: 'nodes_tags_node_id_position'),
     ORM\Index(columns: ['tag_id', 'position'], name: 'nodes_tags_tag_id_position'),

src/Form/CustomFormsType.php

@@ -173,10 +173,14 @@ protected function getOptionsForField(CustomFormField $field, array $formOptions
             ],
         ];
 
-        if ($field->getPlaceholder() !== '') {
+        if (!empty($field->getPlaceholder())) {
             $option['attr']['placeholder'] = $field->getPlaceholder();
         }
 
+        if ($field->getAutocomplete() !== null) {
+            $option['attr']['autocomplete'] = $field->getAutocomplete();
+        }
+
         if ($field->isRequired()) {
             $option['required'] = true;
             $option['constraints'] = [
@@ -198,7 +202,7 @@ protected function getOptionsForField(CustomFormField $field, array $formOptions
                 $option["format"] = DateType::HTML5_FORMAT;
                 break;
             case AbstractField::ENUM_T:
-                if ($field->getPlaceholder() !== '') {
+                if (!empty($field->getPlaceholder())) {
                     $option['placeholder'] = $field->getPlaceholder();
                 }
                 $option["choices"] = $this->getChoices($field);
@@ -212,7 +216,7 @@ protected function getOptionsForField(CustomFormField $field, array $formOptions
                 }
                 break;
             case AbstractField::MULTIPLE_T:
-                if ($field->getPlaceholder() !== '') {
+                if (!empty($field->getPlaceholder())) {
                     $option['placeholder'] = $field->getPlaceholder();
                 }
                 $option["choices"] = $this->getChoices($field);
@@ -255,7 +259,7 @@ protected function getOptionsForField(CustomFormField $field, array $formOptions
                 break;
             case AbstractField::COUNTRY_T:
                 $option["expanded"] = $field->isExpanded();
-                if ($field->getPlaceholder() !== '') {
+                if (!empty($field->getPlaceholder())) {
                     $option['placeholder'] = $field->getPlaceholder();
                 }
                 if (!empty($field->getDefaultValues())) {

src/Repository/CustomFormFieldRepository.php

@@ -5,6 +5,7 @@
 namespace RZ\Roadiz\CoreBundle\Repository;
 
 use Doctrine\Persistence\ManagerRegistry;
+use RZ\Roadiz\CoreBundle\Entity\CustomForm;
 use RZ\Roadiz\CoreBundle\Entity\CustomFormField;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -17,4 +18,15 @@ public function __construct(ManagerRegistry $registry, EventDispatcherInterface
     {
         parent::__construct($registry, CustomFormField::class, $dispatcher);
     }
+
+    public function findDistinctGroupNamesInCustomForm(CustomForm $customForm): array
+    {
+        $qb = $this->createQueryBuilder('o');
+        $qb->select('DISTINCT o.groupName')
+            ->andWhere($qb->expr()->eq('o.customForm', ':customForm'))
+            ->setParameter('customForm', $customForm);
+
+        $result = $qb->getQuery()->getResult();
+        return array_map(fn (array $row) => $row['groupName'], $result);
+    }
 }

src/Repository/NodesTagsRepository.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RZ\Roadiz\CoreBundle\Repository;
+
+use Doctrine\Persistence\ManagerRegistry;
+use RZ\Roadiz\CoreBundle\Entity\NodesTags;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * @extends EntityRepository<NodesTags>
+ */
+class NodesTagsRepository extends EntityRepository
+{
+    public function __construct(
+        ManagerRegistry $registry,
+        EventDispatcherInterface $dispatcher
+    ) {
+        parent::__construct($registry, NodesTags::class, $dispatcher);
+    }
+}