From 3de01bd6ac64c3dfefa5375f8226f3ee6fd9ab8d Mon Sep 17 00:00:00 2001
From: Mathieu De Keyzer <me@theus.be>
Date: Fri, 25 Oct 2024 07:56:43 +0200
Subject: [PATCH 1/3] feat: add _title in revision form

---
 EMS/core-bundle/src/Form/DataField/AssetFieldType.php     | 2 ++
 EMS/core-bundle/src/Form/Field/AssetType.php              | 3 +++
 EMS/core-bundle/src/Resources/views/form/fields.html.twig | 1 +
 3 files changed, 6 insertions(+)

diff --git a/EMS/core-bundle/src/Form/DataField/AssetFieldType.php b/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
index 1abfbccc8..815f9a26c 100644
--- a/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
+++ b/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
@@ -147,6 +147,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
      */
     public function generateMapping(FieldType $current): array
     {
+        $mapping = parent::generateMapping($current);
         return [
             $current->getName() => \array_merge([
                     'type' => 'nested',
@@ -160,6 +161,7 @@ public function generateMapping(FieldType $current): array
                         EmsFields::CONTENT_FILE_SIZE_FIELD => $this->elasticsearchService->getLongMapping(),
                         EmsFields::CONTENT_FILE_SIZE_FIELD_ => $this->elasticsearchService->getLongMapping(),
                         EmsFields::CONTENT_IMAGE_RESIZED_HASH_FIELD => $this->elasticsearchService->getKeywordMapping(),
+                        EmsFields::CONTENT_FILE_TITLE => $mapping[$current->getName()],
                     ],
             ], \array_filter($current->getMappingOptions())),
         ];
diff --git a/EMS/core-bundle/src/Form/Field/AssetType.php b/EMS/core-bundle/src/Form/Field/AssetType.php
index 0187da56e..15903a4dc 100644
--- a/EMS/core-bundle/src/Form/Field/AssetType.php
+++ b/EMS/core-bundle/src/Form/Field/AssetType.php
@@ -51,6 +51,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'name',
                 ],
                 'required' => $options['required'],
+            ])
+            ->add(EmsFields::CONTENT_FILE_TITLE, TextType::class, [
+                'required' => $options['required'],
             ]);
         }
     }
diff --git a/EMS/core-bundle/src/Resources/views/form/fields.html.twig b/EMS/core-bundle/src/Resources/views/form/fields.html.twig
index de9e6c127..3a27cabf9 100644
--- a/EMS/core-bundle/src/Resources/views/form/fields.html.twig
+++ b/EMS/core-bundle/src/Resources/views/form/fields.html.twig
@@ -983,6 +983,7 @@
 								{{- form_row(fileItem.sha1) -}}
 								{{- form_row(fileItem._image_resized_hash) -}}
 								{{- form_row(fileItem.mimetype) -}}
+								{{- form_row(fileItem._title) -}}
 							</div>
 						</div>
 						<div class="modal-footer">

From 6e285a91d1b11c595fc92e30923861c0a06ddeed Mon Sep 17 00:00:00 2001
From: Mathieu De Keyzer <me@theus.be>
Date: Fri, 25 Oct 2024 08:04:02 +0200
Subject: [PATCH 2/3] feat: as title in multifiles mode

---
 .../src/Resources/views/macros/data-field-type.html.twig        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EMS/core-bundle/src/Resources/views/macros/data-field-type.html.twig b/EMS/core-bundle/src/Resources/views/macros/data-field-type.html.twig
index 216a25f84..c5ca0c12d 100644
--- a/EMS/core-bundle/src/Resources/views/macros/data-field-type.html.twig
+++ b/EMS/core-bundle/src/Resources/views/macros/data-field-type.html.twig
@@ -144,7 +144,7 @@
 			{% elseif dataField.rawData.files is defined and dataField.rawData.files is iterable %}
 				<ul class="nav nav-stacked">
 					{% for item in dataField.rawData.files %}
-						<li><a href="{{ ems_asset_path(item) }}" target="_blank">{{ item.filename }}</a></li>
+						<li><a href="{{ ems_asset_path(item) }}" target="_blank"{% if item._title|default %} title="{{ item._title }}"{% endif %}>{{ item.filename }}</a></li>
 					{% endfor %}
 				</ul>
 			{% endif %}

From a512e618e50fe4878e4941004f93266cbc3e021f Mon Sep 17 00:00:00 2001
From: Mathieu De Keyzer <me@theus.be>
Date: Fri, 25 Oct 2024 08:56:09 +0200
Subject: [PATCH 3/3] chore: grrrr phpcs, almost there

---
 EMS/core-bundle/src/Form/DataField/AssetFieldType.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EMS/core-bundle/src/Form/DataField/AssetFieldType.php b/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
index 815f9a26c..9685ea778 100644
--- a/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
+++ b/EMS/core-bundle/src/Form/DataField/AssetFieldType.php
@@ -148,6 +148,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     public function generateMapping(FieldType $current): array
     {
         $mapping = parent::generateMapping($current);
+
         return [
             $current->getName() => \array_merge([
                     'type' => 'nested',