From dd45330a0f35059b8f00f6981f1cacce4c209916 Mon Sep 17 00:00:00 2001
From: Michael Schramm <michael.schramm@gmail.com>
Date: Mon, 14 Mar 2022 16:56:30 +0100
Subject: [PATCH] add todo and improve class names

---
 components/form/admin/export.submission.action.tsx |  4 +++-
 graphql/fragment/submission.fragment.ts            | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/form/admin/export.submission.action.tsx b/components/form/admin/export.submission.action.tsx
index 4c867f4..fb875e8 100644
--- a/components/form/admin/export.submission.action.tsx
+++ b/components/form/admin/export.submission.action.tsx
@@ -39,6 +39,8 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
       const orderedFields = form.data.form.fields
         .sort((a, b) => (a.idx ?? 0) - (b.idx ?? 0))
 
+      // TODO should go through deleted fields as well to have a complete overview!
+
       const sheet = workbook.addWorksheet('Submissions')
       sheet.getRow(1).values = [
         'Submission ID',
@@ -69,7 +71,7 @@ export const ExportSubmissionAction: React.FC<Props> = (props) => {
         ]
 
         orderedFields.forEach((formField) => {
-          const field = data.fields.find(field => field.id === formField.id)
+          const field = data.fields.find(submission => submission.field?.id === formField.id)
 
           try {
             fieldTypes[field.type]?.stringifyValue(field.value)
diff --git a/graphql/fragment/submission.fragment.ts b/graphql/fragment/submission.fragment.ts
index 86a174e..4091527 100644
--- a/graphql/fragment/submission.fragment.ts
+++ b/graphql/fragment/submission.fragment.ts
@@ -1,16 +1,17 @@
 import { gql } from '@apollo/client/core'
 
-interface SubmissionFragmentFormField {
+interface FormFieldSubmissionFragment {
+  id: string
   title: string
   required: boolean
 }
 
-export interface SubmissionFragmentField {
+export interface SubmissionFieldFragment {
   id: string
   value: string
   type: string
 
-  field?: SubmissionFragmentFormField
+  field?: FormFieldSubmissionFragment
 }
 
 export interface SubmissionFragment {
@@ -28,7 +29,7 @@ export interface SubmissionFragment {
     name: string
   }
 
-  fields: SubmissionFragmentField[]
+  fields: SubmissionFieldFragment[]
 }
 
 export const SUBMISSION_FRAGMENT = gql`
@@ -53,6 +54,7 @@ export const SUBMISSION_FRAGMENT = gql`
       type
 
       field {
+        id
         title
         required
       }