From e4249bde8ca0e836df1b9474658c3bc5d0ee9c5e Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Mon, 22 Jun 2020 23:01:56 +0300
Subject: [PATCH] Remove list_name from API calls, use <ol> for listing
 signupees

---
 .../SignupQuestionsWidget/OptionsWidget.tsx     |  2 +-
 src/components/SignupQuestionsWidget/index.ts   |  1 +
 src/models/Signup.ts                            |  1 -
 src/pages/SignUpPage/SignUpPage.tsx             | 17 ++++++++++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/SignupQuestionsWidget/OptionsWidget.tsx b/src/components/SignupQuestionsWidget/OptionsWidget.tsx
index e90e17a..ef12d2e 100644
--- a/src/components/SignupQuestionsWidget/OptionsWidget.tsx
+++ b/src/components/SignupQuestionsWidget/OptionsWidget.tsx
@@ -32,7 +32,7 @@ class OptionsWidget extends React.Component<OptionsWidgetProps, OptionsWidgetSta
       throw new SignupQuestionError(`Question widget type "${type}" not in types array.`);
     }
 
-    if (type === "text") {
+    if (type === "text" || type === "email") {
       return null;
     }
 
diff --git a/src/components/SignupQuestionsWidget/index.ts b/src/components/SignupQuestionsWidget/index.ts
index 6922400..44bd04f 100644
--- a/src/components/SignupQuestionsWidget/index.ts
+++ b/src/components/SignupQuestionsWidget/index.ts
@@ -18,6 +18,7 @@ export const optionTypes = [
   "text",
   "radiobutton",
   "checkbox",
+  "email"
 ];
 
 export class SignupQuestionError extends Error { }
diff --git a/src/models/Signup.ts b/src/models/Signup.ts
index 100af16..dfb2510 100644
--- a/src/models/Signup.ts
+++ b/src/models/Signup.ts
@@ -6,7 +6,6 @@ export interface Signup {
   id?: number;
   signupForm_id: number;
   answer: string;
-  list_name: string;
 }
 
 export async function getSignup(id: number): Promise<Signup> {
diff --git a/src/pages/SignUpPage/SignUpPage.tsx b/src/pages/SignUpPage/SignUpPage.tsx
index 5c82604..e8668a8 100644
--- a/src/pages/SignUpPage/SignUpPage.tsx
+++ b/src/pages/SignUpPage/SignUpPage.tsx
@@ -75,6 +75,14 @@ class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState> {
         uniqueItems: true,
       };
     }
+    else if (question.type === "email") {
+      obj = {
+        type: "string",
+        title: question.name,
+        format: "email",
+        default: ""
+      }
+    }
     else {
       throw new Error(`No mapping to schema prop for question type ${question.type}`);
     }
@@ -151,7 +159,6 @@ class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState> {
         id: undefined,
         signupForm_id: signUpForm.id,
         answer: data.formData,
-        list_name: data.formData[signUpForm.questions[0].id]
       };
       if (payload.id === undefined) {
         const resp = await createSignup(payload);
@@ -204,11 +211,11 @@ class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState> {
   renderList() {
     const { signUpForm } = this.state;
     return (
-      <div>
-        {signUpForm.signups.map(s => (
-          <p key={s}>{s}</p>
+      <ol>
+        {signUpForm.signups.map((s, idx) => (
+          <li key={idx}>{s}</li>
         ))}
-      </div>
+      </ol>
     )
   }