From 140314cd89f6866d93d83102c7c6db93503619ef Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Fri, 24 Jul 2020 23:05:05 +0300
Subject: [PATCH 1/5] Few form fixes

---
 src/pages/admin/EventCreatePage.tsx  | 12 +++++++-----
 src/pages/admin/SignupCreatePage.tsx |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx
index 8376577..9e30882 100644
--- a/src/pages/admin/EventCreatePage.tsx
+++ b/src/pages/admin/EventCreatePage.tsx
@@ -200,16 +200,18 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
           type: ["array"],
           title: "Signup forms",
           items: {
+            type: ["number", "null"],
             // TODO: A bug here, DB must have at least one SignupForm, otherwise cannot submit
-            enum: [...signupForm.map(form => form.id)],
-            enumNames: [...signupForm.map(form => form.title)],
+            enum: signupForm.map(form => form.id),
+            enumNames: signupForm.map(form => form.title),
           },
           uniqueItems: true,
         },
         image: {
-          "type": ["string", "null"],
-          "format": formData.image ? "uri-reference" : "data-url",
-          "title": "Override tag icon with image"
+          type: ["string", "null"],
+          format: formData.image ? "uri-reference" : "data-url",
+          title: "Override tag icon with image",
+          default: ""
         },
         finnish_section_divider: {
           title: "Finnish",
diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx
index fb12661..a3b807f 100644
--- a/src/pages/admin/SignupCreatePage.tsx
+++ b/src/pages/admin/SignupCreatePage.tsx
@@ -136,7 +136,7 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
           default: true,
         },
         quota: {
-          type: "integer",
+          type: ["integer", "null"],
           title: "Quota",
           minimum: 0,
           default: null,

From 0bc8af19803d0e7fee6da9348e62fe77b8459267 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Fri, 24 Jul 2020 23:13:19 +0300
Subject: [PATCH 2/5] Authentication params for form GET calls

---
 src/models/SignupForm.ts            | 14 ++++++++++----
 src/pages/admin/AdminSignupPage.tsx |  2 +-
 src/pages/admin/EventCreatePage.tsx |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/models/SignupForm.ts b/src/models/SignupForm.ts
index 4106731..b2e038b 100644
--- a/src/models/SignupForm.ts
+++ b/src/models/SignupForm.ts
@@ -20,9 +20,12 @@ export interface SignupForm {
   };
 }
 
-export async function getForms(): Promise<SignupForm[]> {
+export async function getForms(auth = false): Promise<SignupForm[]> {
   try {
-    const resp = await axios.get(url);
+    const headers = auth ? { "Authorization": getAuthHeader() } : null;
+    const resp = await axios.get(url, {
+      headers
+    });
     const { results } = resp.data;
     return results;
   } catch (err) {
@@ -31,9 +34,12 @@ export async function getForms(): Promise<SignupForm[]> {
   }
 }
 
-export async function getForm(id: number): Promise<SignupForm> {
+export async function getForm(id: number, auth = false): Promise<SignupForm> {
   try {
-    const resp = await axios.get(`${url}${id}/`);
+    const headers = auth ? { "Authorization": getAuthHeader() } : null;
+    const resp = await axios.get(`${url}${id}/`, {
+      headers
+    });
     return resp.data;
   } catch (err) {
     console.error(err);
diff --git a/src/pages/admin/AdminSignupPage.tsx b/src/pages/admin/AdminSignupPage.tsx
index b6846f9..8fca13d 100644
--- a/src/pages/admin/AdminSignupPage.tsx
+++ b/src/pages/admin/AdminSignupPage.tsx
@@ -47,7 +47,7 @@ class AdminSignupPage extends React.Component<AdminSignupPageProps, AdminSignupP
   }
 
   fetchSignupForms = async () => {
-    const getSignupFormsPromise = getForms();
+    const getSignupFormsPromise = getForms(true);
     try {
       const signupForms = await getSignupFormsPromise;
       this.setState({
diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx
index 9e30882..5be772d 100644
--- a/src/pages/admin/EventCreatePage.tsx
+++ b/src/pages/admin/EventCreatePage.tsx
@@ -84,7 +84,7 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
 
   fetchSignupForms = async () => {
     try {
-      const signupForm = await getForms();
+      const signupForm = await getForms(true);
       this.setState({
         signupForm
       })

From a867e7197dc8bd4316569c03df2e4d08c808933b Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Fri, 24 Jul 2020 23:59:04 +0300
Subject: [PATCH 3/5] Few more form fixes

---
 src/models/SignupForm.ts                | 1 +
 src/pages/admin/EventCreatePage.tsx     | 4 ++--
 src/pages/admin/SignupCreatePage.tsx    | 6 +++---
 src/views/SignUpPage/SignUpPageView.tsx | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/models/SignupForm.ts b/src/models/SignupForm.ts
index b2e038b..750f751 100644
--- a/src/models/SignupForm.ts
+++ b/src/models/SignupForm.ts
@@ -6,6 +6,7 @@ import { Question } from "@components/SignupQuestionsWidget";
 export interface SignupForm {
   id?: number;
   title: string;
+  visible: boolean;
   start_time: string;
   end_time: string;
   questions: Question[];
diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx
index 5be772d..e8f64fa 100644
--- a/src/pages/admin/EventCreatePage.tsx
+++ b/src/pages/admin/EventCreatePage.tsx
@@ -105,7 +105,7 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
 
     try {
       const payload = data.formData;
-      if (payload.image.startsWith("http")) payload.image = undefined;
+      if (typeof payload.image === "string" && payload.image.startsWith("http")) payload.image = undefined;
       payload.signup_id = payload.signupForm;
       payload.tag_id = payload.tags;
       if (payload.id === undefined) {
@@ -211,7 +211,7 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
           type: ["string", "null"],
           format: formData.image ? "uri-reference" : "data-url",
           title: "Override tag icon with image",
-          default: ""
+          default: undefined
         },
         finnish_section_divider: {
           title: "Finnish",
diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx
index a3b807f..3b3e2ac 100644
--- a/src/pages/admin/SignupCreatePage.tsx
+++ b/src/pages/admin/SignupCreatePage.tsx
@@ -133,13 +133,13 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
         visible: {
           type: "boolean",
           title: "Visible",
-          default: true,
+          default: false,
         },
         quota: {
-          type: ["integer", "null"],
+          type: ["integer"],
           title: "Quota",
           minimum: 0,
-          default: null,
+          default: 0,
         },
         start_time: {
           type: "string",
diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx
index 34f4b3f..92ea3e1 100644
--- a/src/views/SignUpPage/SignUpPageView.tsx
+++ b/src/views/SignUpPage/SignUpPageView.tsx
@@ -26,7 +26,7 @@ const renderList = (signUpForm: SignupForm) => {
   return (
     <>
       <h6>
-        Ilmoittautuneet {signUpForm.quota && (`(${signUpForm.signups.length}/${signUpForm.quota})`)}:
+        Ilmoittautuneet{signUpForm.quota > 0 && (` (${signUpForm.signups.length}/${signUpForm.quota})`)}:
       </h6>
       <ol>
         {signUpForm.signups.map((s, idx) => (

From dbefb353dcd7ae123264234f36792e54ab9037e4 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sat, 25 Jul 2020 00:18:11 +0300
Subject: [PATCH 4/5] Form field fixes

---
 src/pages/admin/EventCreatePage.tsx  | 9 +++------
 src/pages/admin/SignupCreatePage.tsx | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx
index e8f64fa..ed2682a 100644
--- a/src/pages/admin/EventCreatePage.tsx
+++ b/src/pages/admin/EventCreatePage.tsx
@@ -98,11 +98,7 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
   }
 
   onSubmit = async (data) => {
-    console.log("submitted, data:");
-    console.log(data.formData);
-
     const { history } = this.props;
-
     try {
       const payload = data.formData;
       if (typeof payload.image === "string" && payload.image.startsWith("http")) payload.image = undefined;
@@ -134,6 +130,7 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
 
   onError = (data) => {
     console.error("error, data:");
+    console.log(this.state.formData);
     console.log(data);
   }
 
@@ -197,10 +194,10 @@ class EventCreatePage extends React.Component<EventCreatePageProps, EventCreateP
           default: tomorrowDatetime,
         },
         signupForm: {
-          type: ["array"],
+          type: "array",
           title: "Signup forms",
           items: {
-            type: ["number", "null"],
+            type: "number",
             // TODO: A bug here, DB must have at least one SignupForm, otherwise cannot submit
             enum: signupForm.map(form => form.id),
             enumNames: signupForm.map(form => form.title),
diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx
index 3b3e2ac..fe937a1 100644
--- a/src/pages/admin/SignupCreatePage.tsx
+++ b/src/pages/admin/SignupCreatePage.tsx
@@ -44,7 +44,7 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
 
   fetchInitialFormData = async (id: number) => {
     try {
-      const data = await getForm(id);
+      const data = await getForm(id, true);
       this.setState({
         formData: {
           ...data,

From 952760e637601ecae792db0639331bdf6f8ad610 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sat, 25 Jul 2020 00:32:02 +0300
Subject: [PATCH 5/5] Minor cleaning

---
 src/pages/admin/EventCreatePage.tsx  | 3 ---
 src/pages/admin/SignupCreatePage.tsx | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx
index ed2682a..d2db532 100644
--- a/src/pages/admin/EventCreatePage.tsx
+++ b/src/pages/admin/EventCreatePage.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import { Helmet } from "react-helmet";
 import "./EventCreatePage.scss";
-import { isAuthenticated } from "@utils/auth";
 import Form from "react-jsonschema-form";
 import { Tag, getTags } from "@models/Tag";
 import { SignupForm, getForms } from "@models/SignupForm";
 import { createEvent, getEvent, updateEvent, Event } from "@models/Event";
 import DatetimeWidget from "@components/DatetimeWidget";
 import SectionDividerWidget from "@components/SectionDividerWidget";
-import Icon from "@components/Icon";
-import { IconType } from "@components/Icon/Icon";
 
 const widgets = {
   datetime: DatetimeWidget,
diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx
index fe937a1..0dab641 100644
--- a/src/pages/admin/SignupCreatePage.tsx
+++ b/src/pages/admin/SignupCreatePage.tsx
@@ -136,7 +136,7 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
           default: false,
         },
         quota: {
-          type: ["integer"],
+          type: "integer",
           title: "Quota",
           minimum: 0,
           default: 0,