@coorpacademy/app-review 0.2.12 → 0.3.1-alpha.1

package/src/actions/api/test/post-answer.test.ts

@@ -65,19 +65,26 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: freeTextSlide._id,
     navigation: ['skills', 'slides'],
-    answers: answer,
+    answers: {
+      [freeTextSlide._id]: answer
+    },
     slide: {
-      validateButton: false
+      [freeTextSlide._id]: {
+        validateButton: true,
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false
+      }
     }
   }
 };
 
 test('should dispatch post-answer, fetch-slide and fetch-correction and fetch-start-rank actions when the answer is submitted and when the slide ref is not "successExitNode"', async t => {
-  t.plan(10);
+  t.plan(9);
   const expectedActions = [
-    {type: POST_ANSWER_REQUEST},
+    {type: POST_ANSWER_REQUEST, meta: {slideRef: freeTextSlide._id}},
     {
       type: POST_ANSWER_SUCCESS,
+      meta: {slideRef: freeTextSlide._id},
       payload: postAnswerResponses[freeTextSlide._id]
     },
     {
@@ -114,12 +121,15 @@ test('should dispatch post-answer, fetch-slide and fetch-correction and fetch-st
 
   const state = getState();
 
-  t.false(state.ui.slide.validateButton);
-  t.true(state.ui.slide.animateCorrectionPopin);
+  t.deepEqual(state.ui.slide[freeTextSlide._id], {
+    validateButton: false,
+    animateCorrectionPopin: true,
+    showCorrectionPopin: true
+  });
 });
 
 test('should dispatch post-answer, fetch-correction and fetch-end-rank actions when the answer is submitted and when the slide ref is "successExitNode"', async t => {
-  t.plan(8);
+  t.plan(7);
 
   const stateBeforeExitNode: StoreState = {
     data: {
@@ -138,17 +148,42 @@ test('should dispatch post-answer, fetch-correction and fetch-end-rank actions w
     ui: {
       currentSlideRef: templateSlide._id,
       navigation: ['skills', 'slides'],
-      answers: ['Leaderboard', 'utilisateurs', 'étoiles'],
+      answers: {
+        [freeTextSlide._id]: answer,
+        [qcmGraphicSlide._id]: ['qcm-graphic answer'],
+        [qcmSlide._id]: ['qcm-slide answer'],
+        [sliderSlide._id]: ['Leaderboard', 'utilisateurs', 'étoiles']
+      },
       slide: {
-        validateButton: false
+        [freeTextSlide._id]: {
+          validateButton: false,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        },
+        [qcmGraphicSlide._id]: {
+          validateButton: false,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        },
+        [qcmSlide._id]: {
+          validateButton: false,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        },
+        [sliderSlide._id]: {
+          validateButton: true,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        }
       }
     }
   };
 
   const expectedActions = [
-    {type: POST_ANSWER_REQUEST},
+    {type: POST_ANSWER_REQUEST, meta: {slideRef: templateSlide._id}},
     {
       type: POST_ANSWER_SUCCESS,
+      meta: {slideRef: templateSlide._id},
       payload: postAnswerResponses[templateSlide._id]
     },
     {type: CORRECTION_FETCH_REQUEST, meta: {slideRef: templateSlide._id}},
@@ -172,16 +207,20 @@ test('should dispatch post-answer, fetch-correction and fetch-end-rank actions w
 
   const state = getState();
 
-  t.false(state.ui.slide.validateButton);
-  t.true(state.ui.slide.animateCorrectionPopin);
+  t.deepEqual(state.ui.slide[templateSlide._id], {
+    validateButton: false,
+    animateCorrectionPopin: true,
+    showCorrectionPopin: true
+  });
 });
 
 test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_FAILURE on error', async t => {
   t.plan(3);
   const expectedActions = [
-    {type: POST_ANSWER_REQUEST},
+    {type: POST_ANSWER_REQUEST, meta: {slideRef: freeTextSlide._id}},
     {
       type: POST_ANSWER_FAILURE,
+      meta: {slideRef: freeTextSlide._id},
       payload: new Error('unexpected'),
       error: true
     }

package/src/actions/api/test/post-progression.test.ts

@@ -25,10 +25,8 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: '',
     navigation: [],
-    answers: [],
-    slide: {
-      validateButton: false
-    }
+    answers: {},
+    slide: {}
   }
 };
 

package/src/actions/data/test/token.test.ts

@@ -16,10 +16,8 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: '',
     navigation: [],
-    answers: [],
-    slide: {
-      validateButton: false
-    }
+    answers: {},
+    slide: {}
   }
 };
 

package/src/actions/ui/answers.ts

@@ -1,5 +1,6 @@
 import flatten from 'lodash/fp/flatten';
 import get from 'lodash/fp/get';
+import getOr from 'lodash/fp/getOr';
 import includes from 'lodash/fp/includes';
 import pull from 'lodash/fp/pull';
 import {Dispatch} from 'redux';
@@ -29,6 +30,7 @@ export type EditAnswerAction = {
     | typeof EDIT_TEMPLATE
     | typeof EDIT_BASIC
     | typeof EDIT_SLIDER;
+  meta: {slideRef: string};
   payload: string[];
 };
 
@@ -56,7 +58,7 @@ export const editAnswer =
   (dispatch: Dispatch, getState: () => StoreState): EditAnswerAction => {
     const state = getState();
     const currentSlideRef = get(['ui', 'currentSlideRef'], state);
-    const userAnswers = get(['ui', 'answers'], state);
+    const userAnswers = getOr([], ['ui', 'answers', currentSlideRef], state);
     const slide = get(['data', 'slides', currentSlideRef], state);
 
     if (!slide) throw new Error('No slide was found');
@@ -69,6 +71,7 @@ export const editAnswer =
 
     return dispatch({
       type,
+      meta: {slideRef: currentSlideRef},
       payload: buildAnswer(userAnswers, questionType, answer)
     });
   };

package/src/actions/ui/test/answers.test.ts

@@ -1,4 +1,5 @@
 import test from 'ava';
+import get from 'lodash/fp/get';
 import pipe from 'lodash/fp/pipe';
 import set from 'lodash/fp/set';
 import omit from 'lodash/fp/omit';
@@ -50,10 +51,8 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: '',
     navigation: [],
-    answers: [],
-    slide: {
-      validateButton: false
-    }
+    answers: {},
+    slide: {}
   }
 };
 
@@ -67,7 +66,7 @@ const buildInitialState = (state: StoreState, question: SlideFromAPI): StoreStat
 
 test('editAnswer should throw an Error if the slide is not found', async t => {
   const state = buildInitialState(initialState, freeTextSlide);
-  const expectedActions = [{type: undefined, payload: []}];
+  const expectedActions = [{type: undefined, meta: {slideRef: ''}, payload: []}];
   const {dispatch} = createTestStore(
     t,
     omit(['data', 'slides'], state) as StoreState,
@@ -96,24 +95,38 @@ test('editAnswer should throw an Error for unsupported questions', async t => {
 
 test('should dispatch EDIT_BASIC action when editAnswer is called', async t => {
   const state = buildInitialState(initialState, freeTextSlide);
-  const expectedActions = [{type: ANSWER_EDIT.basic, payload: ['My Answer']}];
+  const expectedActions = [
+    {type: ANSWER_EDIT.basic, meta: {slideRef: freeTextSlide.universalRef}, payload: ['My Answer']}
+  ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['My Answer']));
 });
 
 test('should dispatch EDIT_QCM action when editAnswer is called', async t => {
   let state = buildInitialState(initialState, qcmSlide);
-  state = set(['ui', 'answers'], ['My First Answer', 'My Second Answer'], state);
-  const expectedActions = [{type: ANSWER_EDIT.qcm, payload: ['My First Answer']}];
+  const currentSlideRef = get(['ui', 'currentSlideRef'], state);
+  state = set(['ui', 'answers', currentSlideRef], ['My First Answer', 'My Second Answer'], state);
+  const expectedActions = [
+    {type: ANSWER_EDIT.qcm, meta: {slideRef: qcmSlide.universalRef}, payload: ['My First Answer']}
+  ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['My Second Answer']));
 });
 
 test('should dispatch EDIT_QCM_GRAPHIC action when editAnswer is called', async t => {
   let state = buildInitialState(initialState, qcmGraphicSlide);
-  state = set(['ui', 'answers'], ['My First Answer', 'My Second Answer', 'My Third Answer'], state);
+  const currentSlideRef = get(['ui', 'currentSlideRef'], state);
+  state = set(
+    ['ui', 'answers', currentSlideRef],
+    ['My First Answer', 'My Second Answer', 'My Third Answer'],
+    state
+  );
   const expectedActions = [
-    {type: ANSWER_EDIT.qcmGraphic, payload: ['My First Answer', 'My Third Answer']}
+    {
+      type: ANSWER_EDIT.qcmGraphic,
+      meta: {slideRef: qcmGraphicSlide.universalRef},
+      payload: ['My First Answer', 'My Third Answer']
+    }
   ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['My Second Answer']));
@@ -121,9 +134,14 @@ test('should dispatch EDIT_QCM_GRAPHIC action when editAnswer is called', async
 
 test('should dispatch EDIT_QCM_DRAG action when editAnswer is called', async t => {
   let state = buildInitialState(initialState, qcmDragSlide);
-  state = set(['ui', 'answers'], ['My First Answer', 'My Second Answer'], state);
+  const currentSlideRef = get(['ui', 'currentSlideRef'], state);
+  state = set(['ui', 'answers', currentSlideRef], ['My First Answer', 'My Second Answer'], state);
   const expectedActions = [
-    {type: ANSWER_EDIT.qcmDrag, payload: ['My First Answer', 'My Second Answer', 'My Third Answer']}
+    {
+      type: ANSWER_EDIT.qcmDrag,
+      meta: {slideRef: qcmDragSlide.universalRef},
+      payload: ['My First Answer', 'My Second Answer', 'My Third Answer']
+    }
   ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['My Third Answer']));
@@ -131,7 +149,9 @@ test('should dispatch EDIT_QCM_DRAG action when editAnswer is called', async t =
 
 test('should dispatch EDIT_SLIDER action when editAnswer is called', async t => {
   const state = buildInitialState(initialState, sliderSlide);
-  const expectedActions = [{type: ANSWER_EDIT.slider, payload: ['5']}];
+  const expectedActions = [
+    {type: ANSWER_EDIT.slider, meta: {slideRef: sliderSlide.universalRef}, payload: ['5']}
+  ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['5']));
 });
@@ -140,7 +160,11 @@ test('should dispatch EDIT_TEMPLATE action when editAnswer is called', async t =
   let state = buildInitialState(initialState, templateSlide);
   state = set(['ui', 'answers'], ['Catalogue', '', 'étoiles'], state);
   const expectedActions = [
-    {type: ANSWER_EDIT.template, payload: ['Catalogue', 'My Answer', 'étoiles']}
+    {
+      type: ANSWER_EDIT.template,
+      meta: {slideRef: templateSlide.universalRef},
+      payload: ['Catalogue', 'My Answer', 'étoiles']
+    }
   ];
   const {dispatch} = createTestStore(t, state, services, expectedActions);
   await dispatch(editAnswer(['Catalogue', 'My Answer', 'étoiles']));

package/src/actions/ui/test/next-slide.test.ts

@@ -31,11 +31,15 @@ const state: StoreState = {
   ui: {
     currentSlideRef: freeTextSlide._id,
     navigation: ['loader', 'slides'],
-    answers: answer,
+    answers: {
+      [freeTextSlide._id]: answer
+    },
     slide: {
-      validateButton: false,
-      animateCorrectionPopin: true,
-      showCorrectionPopin: true
+      [freeTextSlide._id]: {
+        validateButton: false,
+        animateCorrectionPopin: true,
+        showCorrectionPopin: true
+      }
     }
   }
 };

package/src/actions/ui/test/slides.test.ts

@@ -17,10 +17,8 @@ const initialState: StoreState = {
   ui: {
     currentSlideRef: '',
     navigation: [],
-    answers: [],
-    slide: {
-      validateButton: false
-    }
+    answers: {},
+    slide: {}
   }
 };
 

package/src/reducers/data/test/progression.test.ts

@@ -21,6 +21,7 @@ test('should set the value of POST_PROGRESSION_SUCCESS action', t => {
 test('should set the value of POST_ANSWER_SUCCESS action', t => {
   const state = reducer(null, {
     type: POST_ANSWER_SUCCESS,
+    meta: {slideRef: freeTextSlide.universalRef},
     payload: postAnswerResponses[freeTextSlide.universalRef]
   });
   t.deepEqual(state, postAnswerResponses[freeTextSlide.universalRef]);

package/src/reducers/ui/answers.ts

@@ -1,15 +1,21 @@
-import {includes, values} from 'lodash/fp';
+import {includes, set, values} from 'lodash/fp';
 import {EditAnswerAction, ANSWER_EDIT} from '../../actions/ui/answers';
 
-export type AnswerState = string[];
+export type UISlideAnswer = string[];
 const ANSWER_EDIT_ACTIONS = values(ANSWER_EDIT);
 
+export type UIAnswerState = Record<string, UISlideAnswer>;
+
+export const initialState: UIAnswerState = {};
+
 const reducer = (
   // eslint-disable-next-line default-param-last
-  state: AnswerState = [],
+  state: UIAnswerState = initialState,
   action: EditAnswerAction
-): AnswerState => {
-  return includes(action.type, ANSWER_EDIT_ACTIONS) ? action.payload : state;
+): UIAnswerState => {
+  return includes(action.type, ANSWER_EDIT_ACTIONS)
+    ? set(action.meta.slideRef, action.payload, initialState)
+    : state;
 };
 
 export default reducer;

package/src/reducers/ui/index.ts

@@ -2,13 +2,13 @@ import {combineReducers} from 'redux';
 
 import currentSlideRef, {CurrentSlideRefState} from './current-slide-ref';
 import navigation, {NavigationState} from './navigation';
-import answers, {AnswerState} from './answers';
+import answers, {UIAnswerState} from './answers';
 import slide, {UISlideState} from './slide';
 
 export type UIState = {
   currentSlideRef: CurrentSlideRefState;
   navigation: NavigationState;
-  answers: AnswerState;
+  answers: UIAnswerState;
   slide: UISlideState;
 };
 

package/src/reducers/ui/slide.ts

@@ -12,35 +12,56 @@ import {
   EDIT_TEMPLATE
 } from '../../actions/ui/answers';
 import {PostAnswerRequestAction, POST_ANSWER_REQUEST} from '../../actions/api/post-answer';
-import {CORRECTION_FETCH_SUCCESS, ReceivedCorrection} from '../../actions/api/fetch-correction';
+import {ReceivedCorrection, CORRECTION_FETCH_SUCCESS} from '../../actions/api/fetch-correction';
+import {FetchSlide, SLIDE_FETCH_REQUEST} from '../../actions/api/fetch-slide';
 
-export type UISlideState = {
+export type UISlide = {
   validateButton: boolean;
-  animateCorrectionPopin?: boolean;
-  showCorrectionPopin?: boolean;
+  animateCorrectionPopin: boolean;
+  showCorrectionPopin: boolean;
 };
 
-export const initialState: UISlideState = {validateButton: false};
+export type UISlideState = Record<string, UISlide>;
+
+export const initialState: UISlideState = {};
 
 const reducer = (
   // eslint-disable-next-line default-param-last
   state: UISlideState = initialState,
-  action: PostAnswerRequestAction | EditAnswerAction | ReceivedCorrection
+  action: FetchSlide | PostAnswerRequestAction | EditAnswerAction | ReceivedCorrection
 ): UISlideState => {
   switch (action.type) {
+    case SLIDE_FETCH_REQUEST: {
+      return set(
+        [action.meta.slideRef],
+        {
+          validateButton: false,
+          animateCorrectionPopin: false,
+          showCorrectionPopin: false
+        },
+        state
+      );
+    }
     case EDIT_QCM:
     case EDIT_QCM_GRAPHIC:
     case EDIT_QCM_DRAG:
     case EDIT_TEMPLATE:
     case EDIT_BASIC:
     case EDIT_SLIDER: {
-      return pipe(compact, isEmpty)(action.payload) ? initialState : {validateButton: true};
+      return set(
+        [action.meta.slideRef, 'validateButton'],
+        !pipe(compact, isEmpty)(action.payload),
+        state
+      );
     }
     case POST_ANSWER_REQUEST: {
-      return initialState;
+      return set([action.meta.slideRef, 'validateButton'], false, state);
     }
     case CORRECTION_FETCH_SUCCESS: {
-      return pipe(set(['animateCorrectionPopin'], true), set(['showCorrectionPopin'], true))(state);
+      return pipe(
+        set([action.meta.slideRef, 'animateCorrectionPopin'], true),
+        set([action.meta.slideRef, 'showCorrectionPopin'], true)
+      )(state);
     }
     default:
       return state;

package/src/reducers/ui/test/answers.test.ts

@@ -1,38 +1,86 @@
 import test from 'ava';
 import reducer from '../answers';
 import {EditAnswerAction, ANSWER_EDIT} from '../../../actions/ui/answers';
+import {freeTextSlide} from '../../../views/slides/test/fixtures/free-text';
+import {qcmDragSlide} from '../../../views/slides/test/fixtures/qcm-drag';
+import {qcmSlide} from '../../../views/slides/test/fixtures/qcm';
+import {qcmGraphicSlide} from '../../../views/slides/test/fixtures/qcm-graphic';
+import {sliderSlide} from '../../../views/slides/test/fixtures/slider';
+import {templateSlide} from '../../../views/slides/test/fixtures/template';
 
 test('should have initial value', t => {
   const state = reducer(undefined, {} as EditAnswerAction);
-  t.deepEqual(state, []);
+  t.deepEqual(state, {});
 });
 
 test('should set the value of EDIT_BASIC action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.basic, payload: ['value']});
-  t.deepEqual(state, ['value']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.basic,
+      meta: {slideRef: freeTextSlide.universalRef},
+      payload: ['value']
+    }
+  );
+  t.deepEqual(state, {[freeTextSlide.universalRef]: ['value']});
 });
 
 test('should set the value of EDIT_QCM action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.qcm, payload: ['value1', 'value2']});
-  t.deepEqual(state, ['value1', 'value2']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.qcm,
+      meta: {slideRef: qcmSlide.universalRef},
+      payload: ['value1', 'value2']
+    }
+  );
+  t.deepEqual(state, {[qcmSlide.universalRef]: ['value1', 'value2']});
 });
 
 test('should set the value of EDIT_QCM_GRAPHIC action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.qcmGraphic, payload: ['True', 'False']});
-  t.deepEqual(state, ['True', 'False']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.qcmGraphic,
+      meta: {slideRef: qcmGraphicSlide.universalRef},
+      payload: ['True', 'False']
+    }
+  );
+  t.deepEqual(state, {[qcmGraphicSlide.universalRef]: ['True', 'False']});
 });
 
 test('should set the value of EDIT_QCM_DRAG action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.qcmDrag, payload: ['value1', 'value2']});
-  t.deepEqual(state, ['value1', 'value2']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.qcmDrag,
+      meta: {slideRef: qcmDragSlide.universalRef},
+      payload: ['value1', 'value2']
+    }
+  );
+  t.deepEqual(state, {[qcmDragSlide.universalRef]: ['value1', 'value2']});
 });
 
 test('should set the value of EDIT_SLIDER action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.slider, payload: ['5']});
-  t.deepEqual(state, ['5']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.slider,
+      meta: {slideRef: sliderSlide.universalRef},
+      payload: ['5']
+    }
+  );
+  t.deepEqual(state, {[sliderSlide.universalRef]: ['5']});
 });
 
 test('should set the value of EDIT_TEMPLATE action', t => {
-  const state = reducer([], {type: ANSWER_EDIT.template, payload: ['value1', 'value2']});
-  t.deepEqual(state, ['value1', 'value2']);
+  const state = reducer(
+    {},
+    {
+      type: ANSWER_EDIT.template,
+      meta: {slideRef: templateSlide.universalRef},
+      payload: ['value1', 'value2']
+    }
+  );
+  t.deepEqual(state, {[templateSlide.universalRef]: ['value1', 'value2']});
 });

package/src/reducers/ui/test/slide.test.ts

@@ -1,14 +1,44 @@
 import test from 'ava';
 import reducer, {initialState} from '../slide';
 import {EDIT_BASIC} from '../../../actions/ui/answers';
-import {PostAnswerRequestAction} from '../../../actions/api/post-answer';
+import {PostAnswerRequestAction, POST_ANSWER_REQUEST} from '../../../actions/api/post-answer';
 import {CORRECTION_FETCH_SUCCESS} from '../../../actions/api/fetch-correction';
+import {SLIDE_FETCH_REQUEST} from '../../../actions/api/fetch-slide';
 
-test('should use initial state if no answers are found when an EditAnswerAction is received', t => {
-  const state = reducer(undefined, {type: EDIT_BASIC, payload: ['']});
+test('should set validateButton, animateCorrectionPopin and showCorrectionPopin to false if SLIDE_FETCH_REQUEST is received', t => {
+  const state = reducer(undefined, {
+    type: SLIDE_FETCH_REQUEST,
+    meta: {slideRef: '1234'}
+  });
+  t.truthy(state);
+  t.deepEqual(state, {
+    '1234': {validateButton: false, animateCorrectionPopin: false, showCorrectionPopin: false}
+  });
+});
+
+test('should set validateButton to false if no answers are found when an EditAnswerAction is received', t => {
+  const state = reducer(undefined, {type: EDIT_BASIC, meta: {slideRef: '1234'}, payload: ['']});
+  t.truthy(state);
+  t.deepEqual(state, {'1234': {validateButton: false}});
+});
+
+test('should set validateButton to true if answers are found when an EditAnswerAction is received', t => {
+  const state = reducer(undefined, {
+    type: EDIT_BASIC,
+    meta: {slideRef: '1234'},
+    payload: ['answer']
+  });
+  t.truthy(state);
+  t.deepEqual(state, {'1234': {validateButton: true}});
+});
+
+test('should set validateButton to false if POST_ANSWER_REQUEST is received', t => {
+  const state = reducer(undefined, {
+    type: POST_ANSWER_REQUEST,
+    meta: {slideRef: '1234'}
+  });
   t.truthy(state);
-  t.false(state.validateButton);
-  t.falsy(state.animateCorrectionPopin);
+  t.deepEqual(state, {'1234': {validateButton: false}});
 });
 
 test('should set animateCorrectionPopin to true if CORRECTION_FETCH_SUCCESS is received', t => {
@@ -18,8 +48,7 @@ test('should set animateCorrectionPopin to true if CORRECTION_FETCH_SUCCESS is r
     meta: {slideRef: '1234'}
   });
   t.truthy(state);
-  t.false(state.validateButton);
-  t.true(state.animateCorrectionPopin);
+  t.deepEqual(state, {'1234': {animateCorrectionPopin: true, showCorrectionPopin: true}});
 });
 
 test('should return state directly when there is no corresponding action handler + have an initial state', t => {

package/src/views/skills/test/skills.test.ts

@@ -17,10 +17,8 @@ test('should create initial props when there are no skills on the state', t => {
     ui: {
       currentSlideRef: '',
       navigation: ['loader', 'skills'],
-      answers: [],
-      slide: {
-        validateButton: false
-      }
+      answers: {},
+      slide: {}
     }
   };
 
@@ -63,10 +61,8 @@ test('should create initial props when skills on the state', t => {
     ui: {
       currentSlideRef: '',
       navigation: ['loader', 'skills'],
-      answers: [],
-      slide: {
-        validateButton: false
-      }
+      answers: {},
+      slide: {}
     }
   };
 

package/src/views/slides/index.ts

@@ -165,16 +165,16 @@ const buildStackSlides = (state: StoreState, dispatch: Dispatch): SlidesStack =>
       const slideFromAPI = get(slideRef, state.data.slides);
       if (!slideFromAPI) return set(index, uiSlide, acc);
 
-      const answers = state.ui.answers;
+      const answers = getOr([], ['ui', 'answers', slideRef], state);
       const {questionText, answerUI} = mapApiSlideToUi(dispatch)(slideFromAPI, answers);
       const parentContentTitle = getOr('', 'parentContentTitle.title', slideFromAPI);
       const parentContentType = getOr('', 'parentContentTitle.type', slideFromAPI);
 
       const isCurrentSlideRef = currentSlideRef === slideRef;
       const animateCorrectionPopin =
-        isCurrentSlideRef && getOr(false, ['ui', 'slide', 'animateCorrectionPopin'], state);
+        isCurrentSlideRef && get(['ui', 'slide', slideRef, 'animateCorrectionPopin'], state);
       const showCorrectionPopin =
-        isCurrentSlideRef && getOr(false, ['ui', 'slide', 'showCorrectionPopin'], state);
+        isCurrentSlideRef && get(['ui', 'slide', slideRef, 'showCorrectionPopin'], state);
 
       const updatedUiSlide = pipe(
         set('showCorrectionPopin', showCorrectionPopin),
@@ -320,7 +320,7 @@ export const mapStateToSlidesProps = (state: StoreState, dispatch: Dispatch): Sl
       slides: buildStackSlides(state, dispatch),
       validateButton: {
         label: '__validate',
-        disabled: !get('ui.slide.validateButton', state),
+        disabled: !get(['ui', 'slide', currentSlideRef, 'validateButton'], state),
         onClick: /* istanbul ignore next */ (): void => {
           dispatch(postAnswer);
         }