Resolve "Minor editor fixes/adds"

Closes #107 (closed)

client/src/pages/presentationEditor/components/SlideSettings.tsx

@@ -15,7 +15,6 @@ import { CheckboxProps } from '@material-ui/core/Checkbox'
 import { green, grey } from '@material-ui/core/colors'
 import { createStyles, makeStyles, Theme, withStyles } from '@material-ui/core/styles'
 import CloseIcon from '@material-ui/icons/Close'
-import MoreHorizOutlinedIcon from '@material-ui/icons/MoreHorizOutlined'
 import axios from 'axios'
 import React, { useEffect, useState } from 'react'
 import { useParams } from 'react-router-dom'
@@ -114,16 +113,47 @@ const SlideSettings: React.FC = () => {
   const [pictures, setPictures] = useState(pictureList)
 
   const updateSlideType = async (event: React.ChangeEvent<{ value: unknown }>) => {
-    // TODO: fixa if statement
-    if (activeSlide && activeSlide.questions[0]) {
-      await axios
-        .put(`/competitions/${id}/slides/${activeSlide.order}/questions/${activeSlide.questions[0].id}`, {
-          type_id: event.target.value,
-        })
-        .then(() => {
-          dispatch(getEditorCompetition(id))
-        })
-        .catch(console.log)
+    if (activeSlide) {
+      if (activeSlide.questions[0] && activeSlide.questions[0].type_id !== event.target.value) {
+        if (event.target.value === 0) {
+          // Change slide type from a question type to information
+          await axios
+            .delete(`/competitions/${id}/slides/${activeSlide.order}/questions/${activeSlide.questions[0].id}`)
+            .then(() => {
+              dispatch(getEditorCompetition(id))
+            })
+            .catch(console.log)
+        } else {
+          // Change slide type from question type to another question type
+          await axios
+            .delete(`/competitions/${id}/slides/${activeSlide.order}/questions/${activeSlide.questions[0].id}`)
+            .catch(console.log)
+          await axios
+            .post(`/competitions/${id}/slides/${activeSlide.order}/questions`, {
+              name: 'Ny fråga',
+              total_score: 0,
+              type_id: event.target.value,
+              slide_id: activeSlide.id,
+            })
+            .then(() => {
+              dispatch(getEditorCompetition(id))
+            })
+            .catch(console.log)
+        }
+      } else if (event.target.value !== 0) {
+        // Change slide type from information to a question type
+        await axios
+          .post(`/competitions/${id}/slides/${activeSlide.order}/questions`, {
+            name: 'Ny fråga',
+            total_score: 0,
+            type_id: event.target.value,
+            slide_id: activeSlide.id,
+          })
+          .then(() => {
+            dispatch(getEditorCompetition(id))
+          })
+          .catch(console.log)
+      }
     }
   }
 
@@ -264,7 +294,6 @@ const SlideSettings: React.FC = () => {
             <div key={text.id}>
               <ListItem divider>
                 <TextField className={classes.textInput} label={text.data.text} variant="outlined" />
-                <MoreHorizOutlinedIcon className={classes.clickableIcon} />
                 <CloseIcon className={classes.clickableIcon} />
               </ListItem>
             </div>