add deeplink option to file upload field

.github/workflows/codeception.yml

@@ -45,7 +45,7 @@ jobs:
                     -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
                 with:
                     path: lib/test-bundle
 
@@ -108,10 +108,10 @@ jobs:
             -   name: Get Composer Cache Directory
                 id: composer-cache
                 run: |
-                    echo "::set-output name=dir::$(composer config cache-files-dir)"
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             -   name: Cache Composer Downloads
-                uses: actions/cache@v1
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -136,7 +136,7 @@ jobs:
                     vendor/bin/codecept run --env github -c ${{ github.workspace }}/lib/test-bundle
 
             -   name: Log Output
-                uses: actions/upload-artifact@v2
+                uses: actions/upload-artifact@v4
                 if: failure()
                 with:
                     name: "Logs (PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Symfony ${{ matrix.symfony }})"

.github/workflows/ecs.yml

@@ -44,7 +44,7 @@ jobs:
                     -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
                 with:
                     path: lib/test-bundle
 
@@ -88,10 +88,10 @@ jobs:
             -   name: Get Composer Cache Directory
                 id: composer-cache
                 run: |
-                    echo "::set-output name=dir::$(composer config cache-files-dir)"
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             -   name: Cache Composer Downloads
-                uses: actions/cache@v1
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/php-stan.yml

@@ -44,7 +44,7 @@ jobs:
                     -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
                 with:
                     path: lib/test-bundle
 
@@ -88,10 +88,10 @@ jobs:
             -   name: Get Composer Cache Directory
                 id: composer-cache
                 run: |
-                    echo "::set-output name=dir::$(composer config cache-files-dir)"
+                    echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
             -   name: Cache Composer Downloads
-                uses: actions/cache@v1
+                uses: actions/cache@v4
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

UPGRADE.md

@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 5.1.1
+- **[IMPROVEMENT]** [File Upload] Add Deeplink Option to file upload field [#475](https://github.com/dachcom-digital/pimcore-formbuilder/issues/475)
+
 ## 5.1.1
 - **[BUGFIX]** Fix Migration and Installer
 

config/install/translations/admin.csv

@@ -99,6 +99,8 @@
 "form_builder_type_field.max_file_size_desc","Max file size will be calculated in MB. Empty or Zero means no Limit!","Maximale Dateigröße wird in MB verarbeitet. Leer oder 0 bedeutet kein Limit!"
 "form_builder_type_field.submit_as_attachment","Send Files as Attachment","Daten als Anhang versenden"
 "form_builder_type_field.submit_as_attachment_desc","All Files will be stored in your pimcore asset structure (/formdata) by default. If you check this option, the files will be attached to the mail instead of adding a download link.","Daten werden stets im Asset-Verzeichnis (/formdata) abgelegt und via Link im Mail versendet. Ist diese Option aktiviert, werden die Daten als Anhang versendet."
+"form_builder_type_field.submit_as_admin_deep_link","Send Links as Admin Deeplink","Links als Admin-Deeplink versenden"
+"form_builder_type_field.submit_as_admin_deep_link_desc","Generate admin deeplink to attachment asset instead of frontend asset links.","Admin-Deeplink zum Asset anstelle eines Frontend-Asset-Links erstellen."
 "form_builder_type_field.date_seconds","Seconds","Sekunden"
 "form_builder_type_field.date_minutes","Minutes","Minuten"
 "form_builder_type_field.date_hours","Hours","Stunden"

config/types/type/dynamic_multi_file.yaml

@@ -48,4 +48,13 @@ form_builder:
                     options.submit_as_attachment_label:
                         display_group_id: attributes
                         type: label
-                        label: 'form_builder_type_field.submit_as_attachment_desc'
+                        label: 'form_builder_type_field.submit_as_attachment_desc'
+                    options.submit_as_admin_deep_link:
+                        display_group_id: attributes
+                        type: checkbox
+                        label: 'form_builder_type_field.submit_as_admin_deep_link'
+                        config: ~
+                    options.submit_as_admin_deep_link_label:
+                        display_group_id: attributes
+                        type: label
+                        label: 'form_builder_type_field.submit_as_admin_deep_link_desc'

docs/DynamicMultiFile/99_CustomAdapter.md

@@ -89,10 +89,11 @@ class MyUploaderType extends AbstractType
         // these options are required to support!
 
         $resolver->setDefaults([
-            'max_file_size'        => null,
-            'allowed_extensions'   => [],
-            'item_limit'           => null,
-            'submit_as_attachment' => false
+            'max_file_size'             => null,
+            'allowed_extensions'        => [],
+            'item_limit'                => null,
+            'submit_as_attachment'      => false,
+            'submit_as_admin_deep_link' => false
         ]);
     }
 

src/Form/Type/DynamicMultiFile/DropZoneType.php

@@ -42,10 +42,11 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'max_file_size'        => null,
-            'allowed_extensions'   => [],
-            'item_limit'           => null,
-            'submit_as_attachment' => false
+            'max_file_size'             => null,
+            'allowed_extensions'        => [],
+            'item_limit'                => null,
+            'submit_as_attachment'      => false,
+            'submit_as_admin_deep_link' => false,
         ]);
     }
 

src/Form/Type/DynamicMultiFile/FineUploaderType.php

@@ -41,10 +41,11 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'max_file_size'        => 0,
-            'allowed_extensions'   => [],
-            'item_limit'           => 0,
-            'submit_as_attachment' => false
+            'max_file_size'             => 0,
+            'allowed_extensions'        => [],
+            'item_limit'                => 0,
+            'submit_as_attachment'      => false,
+            'submit_as_admin_deep_link' => false,
         ]);
     }
 

src/Form/Type/DynamicMultiFileType.php

@@ -27,11 +27,12 @@ public function __construct(
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'compound'             => true,
-            'max_file_size'        => 0,
-            'allowed_extensions'   => [],
-            'item_limit'           => 0,
-            'submit_as_attachment' => false
+            'compound'                  => true,
+            'max_file_size'             => 0,
+            'allowed_extensions'        => [],
+            'item_limit'                => 0,
+            'submit_as_attachment'      => false,
+            'submit_as_admin_deep_link' => false,
         ]);
     }
 

src/Migrations/Version20240916132702.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FormBuilderBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use FormBuilderBundle\Tool\Install;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+final class Version20240916132702 extends AbstractMigration implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $installer = $this->container->get(Install::class);
+        $installer->updateTranslations();
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+}

src/OutputWorkflow/Channel/Email/Parser/MailParser.php

@@ -99,7 +99,7 @@ protected function parseSubject(Email $mailTemplate, array $fieldValues = []): v
 
         preg_match_all('/\%(.+?)\%/', $realSubject, $matches);
 
-        if (!isset($matches[1]) || count($matches[1]) === 0) {
+        if (count($matches[1]) === 0) {
             return;
         }
 
@@ -164,7 +164,7 @@ protected function extractPlaceHolder(string $str, array $fieldValues): mixed
 
         preg_match_all('/\%(.+?)\%/', $str, $matches);
 
-        if (!isset($matches[1]) || count($matches[1]) === 0) {
+        if (count($matches[1]) === 0) {
             return $str;
         }
 

src/Transformer/Output/DynamicMultiFileTransformer.php

@@ -8,11 +8,13 @@
 use Pimcore\Model\Asset;
 use FormBuilderBundle\Model\FormFieldDefinitionInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DynamicMultiFileTransformer implements OutputTransformerInterface
 {
     public function __construct(
+        protected RouterInterface $router,
         protected TranslatorInterface $translator,
         protected AttachmentStreamInterface $attachmentStream
     ) {
@@ -44,13 +46,19 @@ public function getValue(FieldDefinitionInterface $fieldDefinition, FormInterfac
         $asset = $this->attachmentStream->createAttachmentAsset($attachmentData, $fieldDefinition->getName(), $rootFormData->getFormDefinition()->getName());
 
         if ($asset instanceof Asset) {
-            $path = $asset->getFrontendFullPath();
 
+            $hostUrl = \Pimcore\Tool::getHostUrl();
+
+            if (isset($options['submit_as_admin_deep_link']) && $options['submit_as_admin_deep_link'] === true) {
+                return sprintf('%s%s?%s_%d_%s', $hostUrl, $this->router->generate('pimcore_admin_login_deeplink'), 'asset', $asset->getId(), $asset->getType());
+            }
+
+            $path = $asset->getFrontendFullPath();
             if (str_starts_with($path, 'http')) {
                 return $path;
             }
 
-            return sprintf('%s%s', \Pimcore\Tool::getHostUrl(), $asset->getRealFullPath());
+            return sprintf('%s%s', $hostUrl, $asset->getRealFullPath());
         }
 
         return null;