Fix CSV exports (missing data, add id, column name clash)

app/Exports/FormSubmissionExport.php

@@ -16,7 +16,7 @@ class FormSubmissionExport implements FromArray, WithHeadingRow
         $contentRow = [];
         foreach ($submissionData as $i => $row) {
             if($i==0){
-                $headingRow[] = array_keys($row);
+                $headingRow[] = $this->cleanColumnNames(array_keys($row));
             }
             $contentRow[] = array_values($row);
         }
@@ -27,6 +27,13 @@ class FormSubmissionExport implements FromArray, WithHeadingRow
         ];
     }
 
+    private function cleanColumnNames(array $columnNames): array
+    {
+        return collect($columnNames)->map(function ($columnName) {
+            return preg_replace('/\s\(.*\)/', '', $columnName);
+        })->toArray();
+    }
+
     public function array(): array
     {
         return $this->submissionData;

app/Http/Controllers/Forms/FormSubmissionController.php

@@ -14,6 +14,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
+use Vinkla\Hashids\Facades\Hashids;
 
 class FormSubmissionController extends Controller
 {
@@ -56,10 +57,13 @@ class FormSubmissionController extends Controller
                 ->outputStringsOnly()
                 ->setEmptyForNoValue()
                 ->showRemovedFields()
+                ->showHiddenFields()
                 ->useSignedUrlForFiles();
-            $tmp = $formatter->getCleanKeyValue();
+            $allRows[] = [
-            $tmp['Create Date'] = date("Y-m-d H:i", strtotime($row['created_at']));
+                'id' => Hashids::encode($row['id']),
-            $allRows[] = $tmp;
+                'created_at' => date("Y-m-d H:i", strtotime($row['created_at'])),
+                ...$formatter->getCleanKeyValue()
+            ];
         }
         $csvExport = (new FormSubmissionExport($allRows));
         return Excel::download(

app/Service/Forms/FormSubmissionFormatter.php

@@ -85,15 +85,35 @@ class FormSubmissionFormatter
     public function getCleanKeyValue()
     {
         $data = $this->formData;
-        $fields = ($this->showRemovedFields) ? array_merge($this->form->properties, $this->form->removed_properties) : $this->form->properties;
+
+        $fields = collect($this->form->properties);
+        $removeFields = collect($this->form->removed_properties)->map(function ($field) {
+            return [
+                ...$field,
+                'removed' => true
+            ];
+        });
+        if ($this->showRemovedFields) {
+            $fields = $fields->merge($removeFields);
+        }
+        $fields = $fields->filter(function ($field) {
+            return !in_array($field['type'],['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image']);
+        })->values();
 
         $returnArray = [];
-        foreach ($fields as &$field) {
+        foreach ($fields as $field) {
-            $isRemoved = in_array($field['id'], array_column($this->form->removed_properties, 'id')) ?? false;
+
-            if($isRemoved){
+            if (in_array($field['id'],['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image'])) {
+                continue;
+            }
+
+            if($field['removed'] ?? false) {
                 $field['name'] = $field['name']." (deleted)";
             }
 
+            // Add ID to avoid name clashes
+            $field['name'] = $field['name'].' ('.\Str::of($field['id']).')';
+
             // If not present skip
             if (!isset($data[$field['id']])) {
                 if ($this->setEmptyForNoValue) {

client/components/open/forms/components/FormSubmissions.vue

@@ -71,9 +71,10 @@
               >Display columns</a>
             </p>
             <p class="text-right cursor-pointer text-xs uppercase">
-              <a
+              <a v-if="!exportLoading"
                 @click.prevent="downloadAsCsv" href="#"
               >Export as CSV</a>
+              <p v-else><loader class="w-3 h-3 text-blue-500" /></p>
             </p>
           </div>
         </div>
@@ -136,6 +137,7 @@ export default {
       properties: [],
       removed_properties: [],
       displayColumns: {},
+      exportLoading: false,
       searchForm: useForm({
         search: ''
       }),
@@ -184,6 +186,9 @@ export default {
   watch: {
     'form.id'() {
       this.onFormChange()
+    },
+    'searchForm.search'() {
+      this.dataChanged()
     }
   },
   mounted() {
@@ -271,6 +276,10 @@ export default {
       this.dataChanged()
     },
     downloadAsCsv() {
+      if (this.exportLoading) {
+        return
+      }
+      this.exportLoading = true
       opnFetch(this.exportUrl, {responseType: "blob"})
         .then(blob => {
           const filename = `${this.form.slug}-${Date.now()}-submissions.csv`
@@ -284,6 +293,8 @@ export default {
           window.URL.revokeObjectURL(url)
         }).catch((error) => {
         console.error(error)
+      }).finally(() => {
+        this.exportLoading = false
       })
     }
   }