Fix xlsx export was faulty when exporting results with exactly 0 or 1 result

Author: Phocacius

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.1
+* Fix xlsx export was faulty when exporting results with exactly 0 or 1 result
+
 ## 2.0.0
 * Update to Mapbender 4.1
 * Removed dataStores entry in `parameters.yaml`

Element/HttpHandler.php

@@ -99,17 +99,22 @@ protected function exportAction(Element $element, Request $request)
     {
         $query = $this->requireQuery($element, $request->request->get('id'));
         $rows = $this->executeQuery($element, $query);
+
         $exportFormat = match ($this->getSafeConfiguration($element)['export_format']) {
             'csv' => ExportResponse::TYPE_CSV,
             'xls' => ExportResponse::TYPE_XLS,
             default => ExportResponse::TYPE_XLSX,
         };
-        if ($exportFormat === ExportResponse::TYPE_XLSX && count($rows) > 1) {
+        if ($exportFormat === ExportResponse::TYPE_XLSX && count($rows) > 0) {
             // XLSX export does not automatically add title rows, so add them manually
             $keys = array_keys($rows[0]);
             $titleRow = array_combine($keys, $keys);
             $rows = array_merge([$titleRow], $rows);
         }
+        if (count($rows) === 0) {
+            // XLSX export does not allow empty files, so add a dummy row
+            $rows[] = [];
+        }
         return new ExportResponse($rows, 'export-list', $exportFormat);
     }
 

Resources/public/queryBuilder.element.js

@@ -84,7 +84,7 @@
         },
 
         /**
-         * Execute SQL and export als excel or data.
+         * Execute SQL and export as excel or data.
          * This fake the form POST method to get download export file.
          *
          * @returns jQuery form object