pimcore · Jonathon-Meney-Torq · Sep 1, 2026 · Sep 1, 2026
diff --git a/src/ExecutionEngine/Util/StepConfig.php b/src/ExecutionEngine/Util/StepConfig.php
@@ -37,6 +37,7 @@ enum StepConfig: string
     case CONFIG_COLUMNS = 'columns';
     case CONFIG_FILTERS = 'filters';
     case SETTINGS_DELIMITER = 'delimiter';
+    case SETTINGS_FILE_NAME = 'fileName';
     case SETTINGS_HEADER = 'header';
     case SETTINGS_HEADER_NO_HEADER = 'no_header';
     case SETTINGS_HEADER_TITLE = 'title';

diff --git a/src/Export/Attribute/Request/ExportDataRequestBody.php b/src/Export/Attribute/Request/ExportDataRequestBody.php
@@ -34,7 +34,11 @@ public function __construct(bool $addDelimiter = true)
             new Property(
                 property: StepConfig::SETTINGS_HEADER->value,
                 type: 'string',
-                enum: StepConfig::values(),
+                enum: [
+                    StepConfig::SETTINGS_HEADER_NO_HEADER->value,
+                    StepConfig::SETTINGS_HEADER_TITLE->value,
+                    StepConfig::SETTINGS_HEADER_NAME->value,
+                ],
                 example: StepConfig::SETTINGS_HEADER_TITLE->value
             ),
         ];
@@ -45,6 +49,12 @@ enum: StepConfig::values(),
                 example: ';'
             );
         }
+        $configProperties[] = new Property(
+            property: StepConfig::SETTINGS_FILE_NAME->value,
+            type: 'string',
+            example: $addDelimiter ? 'my-grid-export.csv' : 'my-grid-export.xlsx',
+            nullable: true
+        );
         parent::__construct(
             content: new JsonContent(
                 properties: [

diff --git a/src/Export/Attribute/Request/ExportFolderDataRequestBody.php b/src/Export/Attribute/Request/ExportFolderDataRequestBody.php
@@ -35,7 +35,11 @@ public function __construct(bool $addDelimiter = true)
             new Property(
                 property: StepConfig::SETTINGS_HEADER->value,
                 type: 'string',
-                enum: StepConfig::values(),
+                enum: [
+                    StepConfig::SETTINGS_HEADER_NO_HEADER->value,
+                    StepConfig::SETTINGS_HEADER_TITLE->value,
+                    StepConfig::SETTINGS_HEADER_NAME->value,
+                ],
                 example: StepConfig::SETTINGS_HEADER_TITLE->value
             ),
         ];
@@ -46,6 +50,12 @@ enum: StepConfig::values(),
                 example: ';'
             );
         }
+        $configProperties[] = new Property(
+            property: StepConfig::SETTINGS_FILE_NAME->value,
+            type: 'string',
+            example: $addDelimiter ? 'my-grid-export.csv' : 'my-grid-export.xlsx',
+            nullable: true
+        );
 
         parent::__construct(
             content: new JsonContent(

diff --git a/src/Export/Service/DownloadService.php b/src/Export/Service/DownloadService.php
@@ -62,9 +62,9 @@ public function downloadResourceByJobRunId(
     ): StreamedResponse {
         $this->executionEngineService->validateJobRun($jobRunId);
 
-        if ($downloadName === null) {
-            $downloadName = $this->resolveDownloadName($jobRunId);
-        }
+        $downloadName = $this->resolveDownloadName($jobRunId)
+            ?? $downloadName
+            ?? DownloadDefaults::DEFAULT_ZIP_FILENAME->value;
 
         $fileName = $this->getTempFileName($jobRunId, $tempFileName);
         $folderName = $this->getTempFileName($jobRunId, $tempFolderName);
@@ -157,16 +157,17 @@ public function downloadJSON(string $json, string $filename): Response
         return $response;
     }
 
-    private function resolveDownloadName(int $jobRunId): string
+    private function resolveDownloadName(int $jobRunId): ?string
     {
         try {
             $jobRun = $this->jobRunRepository->getJobRunById($jobRunId);
             $environmentData = $jobRun->getJob()?->getEnvironmentData() ?? [];
 
-            return $environmentData[ZipServiceInterface::ZIP_DOWNLOAD_FILENAME] ??
-                DownloadDefaults::DEFAULT_ZIP_FILENAME->value;
+            return $environmentData[DownloadServiceInterface::EXPORT_DOWNLOAD_FILENAME] ??
+                $environmentData[ZipServiceInterface::ZIP_DOWNLOAD_FILENAME] ??
+                null;
         } catch (Exception) {
-            return DownloadDefaults::DEFAULT_ZIP_FILENAME->value;
+            return null;
         }
     }
 

diff --git a/src/Export/Service/DownloadServiceInterface.php b/src/Export/Service/DownloadServiceInterface.php
@@ -25,6 +25,8 @@
  */
 interface DownloadServiceInterface
 {
+    public const EXPORT_DOWNLOAD_FILENAME = 'export_download_filename';
+
     /**
      * @throws EnvironmentException|ForbiddenException|NotFoundException|StreamResourceNotFoundException
      */

diff --git a/src/Export/Service/ExecutionEngine/ExportService.php b/src/Export/Service/ExecutionEngine/ExportService.php
@@ -30,11 +30,15 @@
 use Pimcore\Bundle\StudioBackendBundle\Export\ExecutionEngine\Util\JobSteps;
 use Pimcore\Bundle\StudioBackendBundle\Export\MappedParameter\ExportFolderParameter;
 use Pimcore\Bundle\StudioBackendBundle\Export\MappedParameter\ExportParameter;
+use Pimcore\Bundle\StudioBackendBundle\Export\Service\DownloadServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Export\Util\Constant\ExportFormat;
 use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Constant\ElementTypes;
 use Pimcore\Model\Element\ElementDescriptor;
 use Pimcore\Model\UserInterface;
+use function basename;
+use function is_string;
+use function trim;
 
 /**
  * @internal
@@ -91,7 +95,12 @@
             $user = $this->securityService->getCurrentUser();
         }
 
-        return $this->generateExportFileJob($jobSteps, $exportFormat, $user->getId());
+        return $this->generateExportFileJob(
+            $jobSteps,
+            $exportFormat,
+            $user->getId(),
+            downloadFileName: $this->getDownloadFileName($exportParameter->getConfig())
+        );
     }
 
     /**
@@ -127,7 +136,8 @@
             $exportFormat,
             $this->securityService->getCurrentUser()->getId(),
             [new ElementDescriptor($elementType, $folderId)],
-            true
+            true,
+            $this->getDownloadFileName($exportParameter->getConfig())
         );
     }
 
@@ -136,7 +146,8 @@
         string $exportFormat,
         int $ownerId,
         array $selectedElements = [],
-        bool $isFolder = false
+        bool $isFolder = false,
+        ?string $downloadFileName = null
     ): int {
         $name = $this->createJobNameByFormat($exportFormat);
         if ($isFolder) {
@@ -145,15 +156,32 @@
                 : Jobs::COLLECT_CSV_FOLDER_EXPORT_ELEMENTS->value;
         }
 
+        $environmentData = [];
+        if ($downloadFileName !== null) {
+            $environmentData[DownloadServiceInterface::EXPORT_DOWNLOAD_FILENAME] = $downloadFileName;
+        }
+
         $jobRun = $this->jobExecutionAgent->startJobExecution(
-            new Job($name, $jobSteps, $selectedElements),
+            new Job($name, $jobSteps, $selectedElements, $environmentData),
             $ownerId,
             Config::CONTEXT_STOP_ON_ERROR->value
         );
 
         return $jobRun->getId();
     }
 
+    private function getDownloadFileName(array $config): ?string
+    {
+        $fileName = $config[StepConfig::SETTINGS_FILE_NAME->value] ?? null;
+        if (!is_string($fileName) || trim($fileName) === '') {
+            return null;
+        }
+
+        $fileName = preg_replace('/[^\w\-. ]/', '_', basename(trim($fileName)));
+
+        return $fileName === '' ? null : $fileName;
+    }
+
     private function mapJobSteps(
         array $elements,
         array $collectionSettings,

diff --git a/tests/Unit/Export/Service/DownloadServiceTest.php b/tests/Unit/Export/Service/DownloadServiceTest.php
@@ -27,6 +27,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Exception\Api\EnvironmentException;
 use Pimcore\Bundle\StudioBackendBundle\ExecutionEngine\Service\ExecutionEngineServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Export\Service\DownloadService;
+use Pimcore\Bundle\StudioBackendBundle\Export\Service\DownloadServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Constant\Asset\MimeTypes;
 use Pimcore\Bundle\StudioBackendBundle\Util\Constant\HttpResponseHeaders;
 use Psr\Log\LoggerInterface;
@@ -453,6 +454,106 @@ public function testResolveDownloadNameFromJobRunEnvironmentData(): void
         );
     }
 
+    /**
+     * @throws Exception
+     */
+    public function testExportDownloadNameOverridesZipMetadataAndControllerFallback(): void
+    {
+        $stream = fopen('php://memory', 'rb+');
+        fwrite($stream, 'data');
+        rewind($stream);
+
+        $storage = $this->makeEmpty(FilesystemOperator::class, [
+            'readStream' => $stream,
+            'fileSize' => 4,
+        ]);
+
+        $job = new Job(
+            name: 'test-job',
+            steps: [new JobStep('step', 'SomeMessage', '', [])],
+            environmentData: [
+                DownloadServiceInterface::EXPORT_DOWNLOAD_FILENAME => 'Product_2026-09-01_14-32-10.csv',
+                ZipServiceInterface::ZIP_DOWNLOAD_FILENAME => 'my-folder.zip',
+            ],
+        );
+
+        $jobRun = $this->makeEmpty(JobRun::class, [
+            'getJob' => $job,
+        ]);
+
+        $service = $this->createService(
+            storageService: $this->makeEmpty(StorageServiceInterface::class, [
+                'getTempStorage' => $storage,
+                'tempFileExists' => true,
+            ]),
+            jobRunRepository: $this->makeEmpty(JobRunRepositoryInterface::class, [
+                'getJobRunById' => $jobRun,
+            ]),
+        );
+
+        $response = $service->downloadResourceByJobRunId(
+            jobRunId: 1,
+            tempFileName: 'download-csv-{id}.csv',
+            tempFolderName: 'download-csv-{id}',
+            mimeType: 'text/csv',
+            downloadName: 'export.csv',
+        );
+
+        $this->assertSame(
+            'attachment; filename="Product_2026-09-01_14-32-10.csv"',
+            $response->headers->get('Content-Disposition'),
+            'The export file name from the job environment data must override both the ZIP metadata and the controller-provided fallback'
+        );
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testControllerFallbackUsedWhenNoExportDownloadName(): void
+    {
+        $stream = fopen('php://memory', 'rb+');
+        fwrite($stream, 'data');
+        rewind($stream);
+
+        $storage = $this->makeEmpty(FilesystemOperator::class, [
+            'readStream' => $stream,
+            'fileSize' => 4,
+        ]);
+
+        $job = new Job(
+            name: 'test-job',
+            steps: [new JobStep('step', 'SomeMessage', '', [])],
+            environmentData: [],
+        );
+
+        $jobRun = $this->makeEmpty(JobRun::class, [
+            'getJob' => $job,
+        ]);
+
+        $service = $this->createService(
+            storageService: $this->makeEmpty(StorageServiceInterface::class, [
+                'getTempStorage' => $storage,
+                'tempFileExists' => true,
+            ]),
+            jobRunRepository: $this->makeEmpty(JobRunRepositoryInterface::class, [
+                'getJobRunById' => $jobRun,
+            ]),
+        );
+
+        $response = $service->downloadResourceByJobRunId(
+            jobRunId: 1,
+            tempFileName: 'download-csv-{id}.csv',
+            tempFolderName: 'download-csv-{id}',
+            mimeType: 'text/csv',
+            downloadName: 'export.csv',
+        );
+
+        $this->assertSame(
+            'attachment; filename="export.csv"',
+            $response->headers->get('Content-Disposition'),
+        );
+    }
+
     /**
      * @throws Exception
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ @@
      */
     interface DownloadServiceInterface
     {
+        public const EXPORT_DOWNLOAD_FILENAME = 'export_download_filename';
         /**
          * @throws EnvironmentException|ForbiddenException|NotFoundException|StreamResourceNotFoundException
          */
@@ Expand Down @@