From eb21b9ef32221df3a61531ecaed2fdb36ee4e961 Mon Sep 17 00:00:00 2001
From: Michael Schramm <michael.schramm@gmail.com>
Date: Thu, 4 Jun 2020 15:49:41 +0200
Subject: [PATCH] fix https://github.com/ohmyform/ohmyform/issues/93

---
 pages/admin/forms/[id]/index.tsx | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/admin/forms/[id]/index.tsx b/pages/admin/forms/[id]/index.tsx
index 123a7b3..dda590e 100644
--- a/pages/admin/forms/[id]/index.tsx
+++ b/pages/admin/forms/[id]/index.tsx
@@ -46,6 +46,7 @@ const Index: NextPage = () => {
         }
       })
 
+      field.options = field.options.filter(option => !option.key)
       field.optionKeys = keys
       return field
     })
@@ -68,20 +69,25 @@ const Index: NextPage = () => {
     setSaving(true)
 
     formData.form.fields = formData.form.fields.filter(e => e && e.type).map(({optionKeys, ...field}) => {
+      const options = field.options
+
       if (optionKeys) {
-        //
-        return {
-          ...field,
-          options: Object.keys(optionKeys).map((key): AdminFormFieldOptionFragment => {
-            return {
-              value: optionKeys[key],
-              key,
-            }
-          }).filter(e => !!e.value)
-        }
+        Object.keys(optionKeys).forEach((key) => {
+          if (!optionKeys[key]) {
+            return
+          }
+
+          options.push({
+            value: optionKeys[key],
+            key,
+          })
+        })
       }
 
-      return field
+      return {
+        ...field,
+        options
+      }
     })
 
     try {