fix field sort in excel submission export

ohmyform · Mar 13, 2022 · 30ff2c9 · ccoenen · Mar 13, 2022 · wodka
1 parent 23e67c8
commit 30ff2c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ Template for next version
 
 ### Fixed
 
+- field sort in excel submission export (https://github.com/ohmyform/ohmyform/issues/163)
+
 ### Security
 
 ## [1.0.1] - 2022-03-01

diff --git a/components/form/admin/export.submission.action.tsx b/components/form/admin/export.submission.action.tsx
@@ -36,6 +36,9 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
       workbook.created = new Date()
       workbook.modified = new Date()
 
+      const orderedFields = form.data.form.fields
+        .sort((a, b) => (a.idx ?? 0) - (b.idx ?? 0))
+
       const sheet = workbook.addWorksheet('Submissions')
       sheet.getRow(1).values = [
         'Submission ID',
@@ -45,7 +48,7 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
         'City',
         'User Agent',
         'Device',
-        ...form.data.form.fields.map((field) => `${field.title} (${field.type})`),
+        ...orderedFields.map((field) => `${field.title} (${field.type})`),
       ]
 
       const firstPage = await getSubmissions({
@@ -65,7 +68,9 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
           data.device.name,
         ]
 
-        data.fields.forEach((field) => {
+        orderedFields.forEach((formField) => {
+          const field = data.fields.find(field => field.id === formField.id)
+
           try {
             fieldTypes[field.type]?.stringifyValue(field.value)