Make passing quizId to widget work (and other minor updates), fixes #53

public/index.html

@@ -29,14 +29,14 @@ <h1>Sample Quiz</h1>
   quiz = new openPlatformQuiz.Widget({
     elemId: 'quizElem',
     openPlatformToken: '08396c0d40f002d48809f946f96d314c1e01bcf0',
-    quizId: 'ffdfa65b-4b14-4bec-a4bb-5f2938eca897',
+    quizId: '123f9078-045f-4d89-b870-4124b5bf3b98',
     onDone: function(result) { console.log("result", result); }
   });
 
   admin = new openPlatformQuiz.Admin({
     elemId: 'adminElem',
     openPlatformToken: '08396c0d40f002d48809f946f96d314c1e01bcf0',
-    quizId: 'ffdfa65b-4b14-4bec-a4bb-5f2938eca897',
+    quizId: '123f9078-045f-4d89-b870-4124b5bf3b98',
   });
 }
 

src/components/EditQuiz.js

@@ -146,6 +146,7 @@ function renderDescriptionSettings({classes, settings, updateSetting}) {
       <Typography variant="headline" gutterBottom>
         Quiz beskrivelse
       </Typography>
+      <Typography>Quiz id: {settings.get('_id')}</Typography>
       <FormControl fullWidth className={classes.margin}>
         <InputLabel htmlFor="title">Titel</InputLabel>
         <Input

src/index.js

@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
 import QuizWidget from './components/Widget';
 import QuizAdmin from './components/Admin';
 import store from './redux/store';
+import {init} from './redux/actions';
 import {} from './redux/autosave';
 import {Provider} from 'react-redux';
 import openplatform from './redux/openplatform';
@@ -17,11 +18,9 @@ window.addEventListener('load', () => {
   }
 });
 
-async function mount(Cls, {elemId, onDone, openPlatformToken}) {
-  if (onDone) {
-    store.dispatch({type: 'ONDONE_CALLBACK', fn: onDone});
-  }
+async function mount(Cls, {elemId, onDone, openPlatformToken, quizId}) {
   openPlatformToken && (await openplatform.connect(openPlatformToken));
+  store.dispatch(init({quizId, onDone}));
   ReactDOM.render(
     <Provider store={store}>
       <Cls />

src/redux/actions.js

@@ -100,13 +100,15 @@ export const deleteQuiz = quizId => async (dispatch, getState) => {
   await searchQuizzes()(dispatch, getState);
 };
 
-export const init = () => async (dispatch, getState) => {
+export const init = ({onDone, quizId}) => async (dispatch, getState) => {
   dispatch({type: 'LOADING_STARTED'});
 
   user = await getUser();
   if (!user) {
-    dispatch({type: 'LOADING_DONE'});
-    return;
+    return dispatch({type: 'LOADING_DONE'});
+  }
+  if (onDone) {
+    dispatch({type: 'ONDONE_CALLBACK', fn: onDone});
   }
 
   [[quizType], [quizImageType], [quizStatisticsType]] = await Promise.all([
@@ -141,6 +143,18 @@ export const init = () => async (dispatch, getState) => {
     }
   });
 
+  if (quizId) {
+    try {
+      const quiz = await storage.get({_id: quizId});
+      dispatch(setQuiz(quiz));
+      return dispatch({type: 'LOADING_DONE'});
+    } catch (e) {
+      if (e.statusCode === 404) {
+        // TODO handle 404
+      }
+      console.log(e);
+    }
+  }
   await searchQuizzes()(dispatch, getState);
-  dispatch({type: 'LOADING_DONE'});
+  return dispatch({type: 'LOADING_DONE'});
 };

src/redux/store.js

@@ -1,9 +1,7 @@
 import {createStore, applyMiddleware, compose} from 'redux';
 import {root} from './reducers';
 import thunk from 'redux-thunk';
-import * as actions from './actions';
 
 const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 const store = createStore(root, composeEnhancers(applyMiddleware(thunk)));
-store.dispatch(actions.init());
 export default store;