Merge pull request #177 from DBCDK/164-delete-quiz

delete quiz, fixes #164
DBCDK · Oct 6, 2018 · 857f3a1 · 857f3a1
2 parents 3bf6f4b + dfc102b
commit 857f3a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/components/QuizList.js b/src/components/QuizList.js
@@ -20,11 +20,11 @@ import style from './style';
 import {withStyles} from '@material-ui/core/styles';
 
 import {searchResults} from '../redux/selectors';
-import {addQuiz, setQuiz} from '../redux/actions';
+import {addQuiz, setQuiz, deleteQuiz} from '../redux/actions';
 
 export class QuizList extends Component {
   render() {
-    const {classes, searchResults, newQuiz, setQuiz} = this.props;
+    const {classes, searchResults, newQuiz, setQuiz, deleteQuiz} = this.props;
     return (
       <Grid container spacing={16}>
         <Grid item xs={12}>
@@ -72,7 +72,10 @@ export class QuizList extends Component {
                   <IconButton aria-label="Search" onClick={() => {}}>
                     <FileCopyIcon />
                   </IconButton>
-                  <IconButton aria-label="Search" onClick={() => {}}>
+                  <IconButton
+                    aria-label="Search"
+                    onClick={() => deleteQuiz(o.get('_id'))}
+                  >
                     <DeleteIcon />
                   </IconButton>
                 </ListItemSecondaryAction>
@@ -92,6 +95,7 @@ export function mapStateToProps(state, ownProps) {
 export function mapDispatchToProps(dispatch) {
   return {
     setQuiz: quiz => dispatch(setQuiz(quiz)),
+    deleteQuiz: quiz => dispatch(deleteQuiz(quiz)),
     newQuiz: () => dispatch(addQuiz)
   };
 }

diff --git a/src/redux/actions.js b/src/redux/actions.js
@@ -1,12 +1,14 @@
 import {getUser, storage, findOrCreateType} from './openplatform';
 import sampleQuiz from '../sampleQuizData';
 
-export const adminQuizList = () => {
+export const adminQuizList = () => async dispatch => {
   // TODO sync quiz to store
-  return {
+  await searchQuizzes({})(dispatch);
+  dispatch({
     type: 'ADMIN_QUIZ_LIST'
-  };
+  });
 };
+
 export const addDispatch = screen => {
   return {
     type: 'ADD_DISPATCH',
@@ -59,7 +61,7 @@ export const editScreen = ({screen}) => ({type: 'ADMIN_EDIT_SCREEN', screen});
 export const screenAction = action => ({type: 'PAGE_ACTION', action});
 
 let quizType, quizImageType, user;
-export const searchQuizzes = async ({query, own, tags, title}) => {
+export const searchQuizzes = ({query, own, tags, title}) => async dispatch => {
   let result = await storage.scan({
     reverse: true,
     _type: quizType,
@@ -68,19 +70,25 @@ export const searchQuizzes = async ({query, own, tags, title}) => {
     //limit: 10
   });
   result = await Promise.all(result.map(o => storage.get({_id: o.val})));
+  dispatch({type: 'SEARCH_RESULTS', searchResults: result});
   return result;
 };
 
 export const addQuiz = async dispatch => {
   const {_id} = await storage.put(
     Object.assign({}, sampleQuiz, {_type: quizType, _id: undefined})
   );
+  await searchQuizzes({})(dispatch);
   dispatch({
     type: 'SET_QUIZ',
     quiz: await storage.get({_id})
   });
 };
 export const setQuiz = quiz => ({type: 'SET_QUIZ', quiz});
+export const deleteQuiz = quizId => async dispatch => {
+  await storage.delete({_id: quizId});
+  await searchQuizzes({})(dispatch);
+};
 
 export const init = () => async dispatch => {
   dispatch({type: 'LOADING_STARTED'});
@@ -130,7 +138,6 @@ export const init = () => async dispatch => {
     }
   });
 
-  const searchResults = await searchQuizzes({query: '', own: true});
-  dispatch({type: 'SEARCH_RESULTS', searchResults});
+  await searchQuizzes({query: '', own: true})(dispatch);
   dispatch({type: 'LOADING_DONE'});
 };