@coorpacademy/app-review 0.1.17 → 0.1.18

package/es/actions/api/post-answer.d.ts

@@ -1,5 +1,5 @@
 import type { Dispatch } from 'redux';
-import type { Options } from '../../types/common';
+import type { Options, ProgressionFromAPI } from '../../types/common';
 import type { StoreState } from '../../reducers';
 export declare const POST_ANSWER_REQUEST: "@@answer/POST_REQUEST";
 export declare const POST_ANSWER_SUCCESS: "@@answer/POST_SUCCESS";
@@ -7,4 +7,8 @@ export declare const POST_ANSWER_FAILURE: "@@answer/POST_FAILURE";
 export declare type PostAnswerRequestAction = {
     type: typeof POST_ANSWER_REQUEST;
 };
+export declare type PostAnswerSuccessAction = {
+    type: typeof POST_ANSWER_SUCCESS;
+    payload: ProgressionFromAPI;
+};
 export declare const postAnswer: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => Promise<void>;

package/es/actions/ui/answers.d.ts

@@ -18,4 +18,4 @@ export declare type EditAnswerAction = {
     type: typeof EDIT_QCM | typeof EDIT_QCM_GRAPHIC | typeof EDIT_QCM_DRAG | typeof EDIT_TEMPLATE | typeof EDIT_BASIC | typeof EDIT_SLIDER;
     payload: string[];
 };
-export declare const editAnswer: (answer: string) => (dispatch: Dispatch, getState: () => StoreState) => EditAnswerAction;
+export declare const editAnswer: (answer: string[]) => (dispatch: Dispatch, getState: () => StoreState) => EditAnswerAction;

package/es/actions/ui/answers.js

@@ -18,13 +18,15 @@ const buildAnswer = (userAnswers, questionType, newValue) => {
         case 'qcm':
         case 'qcmGraphic':
         case 'qcmDrag': {
-            return includes(newValue, userAnswers)
-                ? pull(newValue, userAnswers)
-                : flatten([...userAnswers, newValue]);
+            const firstValue = newValue[0];
+            return includes(firstValue, userAnswers)
+                ? pull(firstValue, userAnswers)
+                : flatten([...userAnswers, firstValue]);
         }
         case 'basic':
         case 'slider':
-            return [newValue];
+        case 'template':
+            return newValue;
         default:
             return [];
     }

package/es/actions/ui/test/answers.test.js

@@ -8,6 +8,7 @@ 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';
 import { editAnswer, ANSWER_EDIT } from '../answers';
 const initialState = {
     data: {
@@ -55,14 +56,14 @@ 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 { dispatch } = createTestStore(t, state, services, expectedActions);
-    await dispatch(editAnswer('My Answer'));
+    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 { dispatch } = createTestStore(t, state, services, expectedActions);
-    await dispatch(editAnswer('My Second Answer'));
+    await dispatch(editAnswer(['My Second Answer']));
 });
 test('should dispatch EDIT_QCM_GRAPHIC action when editAnswer is called', async (t) => {
     let state = buildInitialState(initialState, qcmGraphicSlide);
@@ -71,7 +72,7 @@ test('should dispatch EDIT_QCM_GRAPHIC action when editAnswer is called', async
         { type: ANSWER_EDIT.qcmGraphic, payload: ['My First Answer', 'My Third Answer'] }
     ];
     const { dispatch } = createTestStore(t, state, services, expectedActions);
-    await dispatch(editAnswer('My Second Answer'));
+    await dispatch(editAnswer(['My Second Answer']));
 });
 test('should dispatch EDIT_QCM_DRAG action when editAnswer is called', async (t) => {
     let state = buildInitialState(initialState, qcmDragSlide);
@@ -80,11 +81,20 @@ test('should dispatch EDIT_QCM_DRAG action when editAnswer is called', async (t)
         { type: ANSWER_EDIT.qcmDrag, payload: ['My First Answer', 'My Second Answer', 'My Third Answer'] }
     ];
     const { dispatch } = createTestStore(t, state, services, expectedActions);
-    await dispatch(editAnswer('My Third Answer'));
+    await dispatch(editAnswer(['My Third Answer']));
 });
 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 { dispatch } = createTestStore(t, state, services, expectedActions);
-    await dispatch(editAnswer('5'));
+    await dispatch(editAnswer(['5']));
+});
+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'] }
+    ];
+    const { dispatch } = createTestStore(t, state, services, expectedActions);
+    await dispatch(editAnswer(['Catalogue', 'My Answer', 'étoiles']));
 });

package/es/reducers/data/index.d.ts

@@ -14,5 +14,5 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     skills: SkillsState;
     slides: SlidesState;
     token: TokenState;
-}>, import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
+}>, import("../../actions/api/post-answer").PostAnswerSuccessAction | import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
 export default _default;

package/es/reducers/data/progression.d.ts

@@ -1,5 +1,6 @@
+import { PostAnswerSuccessAction } from '../../actions/api/post-answer';
 import { ReceivedProgression } from '../../actions/api/post-progression';
 import { ProgressionFromAPI } from '../../types/common';
 export declare type ProgressionState = ProgressionFromAPI | null;
-declare const reducer: (state: ProgressionState | undefined, action: ReceivedProgression) => ProgressionState;
+declare const reducer: (state: ProgressionState | undefined, action: ReceivedProgression | PostAnswerSuccessAction) => ProgressionState;
 export default reducer;

package/es/reducers/data/progression.js

@@ -1,8 +1,10 @@
+import { POST_ANSWER_SUCCESS } from '../../actions/api/post-answer';
 import { POST_PROGRESSION_SUCCESS } from '../../actions/api/post-progression';
 const reducer = (
 // eslint-disable-next-line default-param-last
 state = null, action) => {
     switch (action.type) {
+        case POST_ANSWER_SUCCESS:
         case POST_PROGRESSION_SUCCESS: {
             const progression = action.payload;
             return progression;

package/es/reducers/data/test/progression.test.js

@@ -1,38 +1,23 @@
 import test from 'ava';
 import reducer from '../progression';
 import { POST_PROGRESSION_SUCCESS } from '../../../actions/api/post-progression';
+import { POST_ANSWER_SUCCESS } from '../../../actions/api/post-answer';
+import { postAnswerResponse, postProgressionResponse } from '../../../test/util/services.mock';
 test('should have initial value', t => {
     const state = reducer(undefined, {});
     t.is(state, null);
 });
 test('should set the value of POST_PROGRESSION_SUCCESS action', t => {
-    const progression = {
-        _id: '62b1d1087aa12f00253f40ee',
-        content: {
-            ref: '_skill-ref',
-            type: 'skill'
-        },
-        engine: {
-            ref: 'review'
-        },
-        state: {
-            allAnswers: [],
-            isCorrect: true,
-            nextContent: {
-                ref: 'sli_N1XACJobn',
-                type: 'slide'
-            },
-            pendingSlides: [],
-            slides: [],
-            step: {
-                current: 1
-            },
-            stars: 0
-        }
-    };
     const state = reducer(null, {
         type: POST_PROGRESSION_SUCCESS,
-        payload: progression
+        payload: postProgressionResponse
     });
-    t.deepEqual(state, progression);
+    t.deepEqual(state, postProgressionResponse);
+});
+test('should set the value of POST_ANSWER_SUCCESS action', t => {
+    const state = reducer(null, {
+        type: POST_ANSWER_SUCCESS,
+        payload: postAnswerResponse
+    });
+    t.deepEqual(state, postAnswerResponse);
 });

package/es/reducers/index.d.ts

@@ -17,5 +17,5 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         answers: import("./ui/answers").AnswerState;
         slide: import("./ui/slide").UISlideState;
     }>;
-}>, import("../actions/ui/slides").SetCurrentSlide | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/answers").EditAnswerAction | import("../actions/api/post-answer").PostAnswerRequestAction>;
+}>, import("../actions/ui/slides").SetCurrentSlide | import("../actions/api/post-answer").PostAnswerRequestAction | import("../actions/api/post-answer").PostAnswerSuccessAction | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/answers").EditAnswerAction>;
 export default _default;

package/es/reducers/ui/index.d.ts

@@ -13,5 +13,5 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     navigation: NavigationState;
     answers: AnswerState;
     slide: UISlideState;
-}>, import("../../actions/ui/slides").SetCurrentSlide | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/answers").EditAnswerAction | import("../../actions/api/post-answer").PostAnswerRequestAction>;
+}>, import("../../actions/ui/slides").SetCurrentSlide | import("../../actions/api/post-answer").PostAnswerRequestAction | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/answers").EditAnswerAction>;
 export default _default;

package/es/reducers/ui/test/answers.test.js

@@ -25,3 +25,7 @@ test('should set the value of EDIT_SLIDER action', t => {
     const state = reducer([], { type: ANSWER_EDIT.slider, payload: ['5'] });
     t.deepEqual(state, ['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']);
+});

package/es/test/util/services.mock.d.ts

@@ -1,3 +1,4 @@
 import { ProgressionFromAPI, Services } from '../../types/common';
+export declare const postProgressionResponse: ProgressionFromAPI;
 export declare const postAnswerResponse: ProgressionFromAPI;
 export declare const services: Services;

package/es/test/util/services.mock.js

@@ -2,6 +2,7 @@ import { qcmSlide } from '../../views/slides/test/fixtures/qcm';
 import { qcmGraphicSlide } from '../../views/slides/test/fixtures/qcm-graphic';
 import { freeTextSlide } from '../../views/slides/test/fixtures/free-text';
 import { sliderSlide } from '../../views/slides/test/fixtures/slider';
+import { templateSlide } from '../../views/slides/test/fixtures/template';
 const getSlideFixture = (ref) => {
     switch (ref) {
         case qcmSlide.universalRef:
@@ -10,6 +11,8 @@ const getSlideFixture = (ref) => {
             return qcmGraphicSlide;
         case freeTextSlide.universalRef:
             return freeTextSlide;
+        case templateSlide.universalRef:
+            return templateSlide;
         default:
             return sliderSlide;
     }
@@ -28,7 +31,7 @@ const fetchSkillsResponse = [
         custom: true
     }
 ];
-const postProgressionResponse = {
+export const postProgressionResponse = {
     _id: '62b1d1087aa12f00253f40ee',
     content: {
         ref: '_skill-ref',

package/es/views/slides/index.js

@@ -44,7 +44,7 @@ export const initialState = {
 const getProgressionSlidesRefs = (progression) => {
     if (progression.state.step.current < 5) {
         const slideRef = progression.state.nextContent.ref;
-        return concat([slideRef], progression.state.slides);
+        return concat(progression.state.slides, [slideRef]);
     }
     return slice(0, 5, progression.state.slides);
 };

package/es/views/slides/map-api-slide-to-ui.js

@@ -1,4 +1,4 @@
-import { concat, divide, get, getOr, head, includes, indexOf, isEmpty, map, multiply, pipe, rangeStep, round, size, toInteger, toString as _toString, __ } from 'lodash/fp';
+import { concat, constant, divide, get, getOr, head, includes, indexOf, isEmpty, isNil, map, multiply, pipe, rangeStep, round, set, size, times, toInteger, toString as _toString, __ } from 'lodash/fp';
 import { editAnswer } from '../../actions/ui/answers';
 const qcmProps = (dispatch) => (answers, question) => {
     return {
@@ -9,7 +9,7 @@ const qcmProps = (dispatch) => (answers, question) => {
                 title: label,
                 selected: includes(label, answers),
                 onClick: () => {
-                    dispatch(editAnswer(label));
+                    dispatch(editAnswer([label]));
                 },
                 ariaLabel: choice.label
             };
@@ -27,7 +27,7 @@ const qcmDragProps = (dispatch) => (answers, question) => {
                 selected: includes(label, answers),
                 order: indexInAnswer,
                 onClick: () => {
-                    dispatch(editAnswer(label));
+                    dispatch(editAnswer([label]));
                 }
             };
         }, question.content.choices)
@@ -43,28 +43,29 @@ const qcmGraphicProps = (dispatch) => (answers, question) => {
                 image: get('media.src.0.url', choice),
                 selected: includes(label, answers),
                 onClick: () => {
-                    dispatch(editAnswer(label));
+                    dispatch(editAnswer([label]));
                 }
             };
         }, question.content.choices)
     };
 };
-const templateTextProps = (choice, index) => {
-    // TODO: EDIT_CHOICES -> getAnswerValues
-    const answers = [];
+const updateTemplateAnswer = (text, _answers, index, max) => {
+    const answers = isEmpty(_answers) ? times(constant(undefined), max) : _answers;
+    return map(a => (isNil(a) ? '' : a), set(index, text, answers));
+};
+const templateTextProps = (dispatch, answers, choice, index, maxLength) => {
     return {
         type: 'text',
         name: getOr('', 'name', choice),
         placeholder: 'Type here',
         value: get(index, answers),
-        // TODO: EDIT_CHOICES
-        // eslint-disable-next-line no-console
-        onChange: () => console.log('TODO: on choice change')
+        onChange: (text) => {
+            const newAnswers = updateTemplateAnswer(text, answers, index, maxLength);
+            dispatch(editAnswer(newAnswers));
+        }
     };
 };
-const templateSelectProps = (choice, index) => {
-    // TODO: EDIT_CHOICES -> getAnswerValues
-    const answers = [];
+const templateSelectProps = (dispatch, answers, choice, index, maxLength) => {
     const answer = get(index, answers);
     const temporaryOption = {
         name: 'Select an answer',
@@ -84,19 +85,22 @@ const templateSelectProps = (choice, index) => {
     return {
         type: 'select',
         name: getOr('', 'name', choice),
-        // TODO: EDIT_CHOICES
-        // eslint-disable-next-line no-console
-        onChange: () => console.log('TODO: on choice change'),
+        onChange: (text) => {
+            const newAnswers = updateTemplateAnswer(text, answers, index, maxLength);
+            dispatch(editAnswer(newAnswers));
+        },
         options: isEmpty(answer) ? concat([temporaryOption], selectOptions) : selectOptions
     };
 };
-const templateProps = (question) => {
-    // TODO: EDIT_CHOICES -> getChoices
+const templateProps = (dispatch) => (answers, question) => {
     const choices = question.content.choices;
+    const maxLength = size(choices);
     return {
         type: 'template',
         template: get('content.template', question),
-        answers: choices.map((choice, index) => choice.type === 'text' ? templateTextProps(choice, index) : templateSelectProps(choice, index))
+        answers: choices.map((choice, index) => choice.type === 'text'
+            ? templateTextProps(dispatch, answers, choice, index, maxLength)
+            : templateSelectProps(dispatch, answers, choice, index, maxLength))
     };
 };
 const basicProps = (dispatch) => (answers, question) => {
@@ -105,7 +109,7 @@ const basicProps = (dispatch) => (answers, question) => {
         placeholder: question.content.placeholder || '',
         value: answers[0] || '',
         onChange: (text) => {
-            dispatch(editAnswer(text));
+            dispatch(editAnswer([text]));
         }
     };
 };
@@ -128,7 +132,7 @@ const sliderProps = (dispatch) => (answers, question) => {
         value: sliderPosition,
         onChange: (position) => {
             const newValue = pipe(multiply(maxValue), round, get(__, values), _toString)(position);
-            dispatch(editAnswer(newValue));
+            dispatch(editAnswer([newValue]));
         }
     };
 };
@@ -146,7 +150,7 @@ const getAnswerUIModel = (question, answers, dispatch) => {
         case 'basic':
             return basicProps(dispatch)(answers, question);
         case 'template':
-            return templateProps(question);
+            return templateProps(dispatch)(answers, question);
         case 'slider':
             return sliderProps(dispatch)(answers, question);
         default:

package/es/views/slides/test/fixtures/template.d.ts

@@ -0,0 +1,4 @@
+import { UISlide } from '../..';
+import { SlideFromAPI } from '../../../../types/common';
+export declare const templateSlide: SlideFromAPI;
+export declare const templateUISlide: Partial<UISlide>;

package/es/views/slides/test/fixtures/{select-template.js → template.js}

@@ -1,8 +1,8 @@
 import noop from 'lodash/fp/noop';
-export const selectTemplateSlide = {
+export const templateSlide = {
     question: {
         content: {
-            template: 'La vue {{sel80495}} présente la liste des utilisateurs ayant le plus grand nombre d’étoiles cumulées.',
+            template: 'La vue {{sel80495}} présente la liste des   {{inp58402}}   ayant le plus grand nombre d’{{sel80496}} cumulées.',
             choices: [
                 {
                     items: [
@@ -30,6 +30,45 @@ export const selectTemplateSlide = {
                     _id: '5b57464e3b594d002e8829f3',
                     name: 'sel80495',
                     type: 'select'
+                },
+                {
+                    media: {
+                        src: [],
+                        posters: [],
+                        subtitles: []
+                    },
+                    items: [],
+                    _id: '62433c2c58920f02c4950de0',
+                    type: 'text',
+                    name: 'inp58402',
+                    id: '62433c2c58920f02c4950de0'
+                },
+                {
+                    items: [
+                        {
+                            _id: '5b57464e3b594d002e8829f7',
+                            value: 'sli_N13-hG3kX.choice_NJgC3aznJm',
+                            text: 'étoiles'
+                        },
+                        {
+                            _id: '5b57464e3b594d002e8829f6',
+                            value: 'sli_N13-hG3kX.choice_EJZ02aMny7',
+                            text: 'idées'
+                        },
+                        {
+                            _id: '5b57464e3b594d002e8829f5',
+                            value: 'sli_N13-hG3kX.choice_4keCaf21Q',
+                            text: 'envies'
+                        },
+                        {
+                            _id: '5b57464e3b594d002e8829f4',
+                            value: 'sli_N13-hG3kX.choice_NkbJAMn17',
+                            text: 'images'
+                        }
+                    ],
+                    _id: '5b57464e3b594d002e8829f3',
+                    name: 'sel80496',
+                    type: 'select'
                 }
             ]
         },
@@ -46,13 +85,13 @@ export const selectTemplateSlide = {
         type: 'course'
     }
 };
-export const selectTemplateUISlide = {
+export const templateUISlide = {
     questionText: 'Complétez la phrase ci-dessous.',
     answerUI: {
         help: 'Saisissez votre réponse ou sélectionnez la bonne réponse dans le(s) menu(s) déroulant(s).',
         model: {
             type: 'template',
-            template: 'La vue {{sel80495}} présente la liste des utilisateurs ayant le plus grand nombre d’étoiles cumulées.',
+            template: 'La vue {{sel80495}} présente la liste des   {{inp58402}}   ayant le plus grand nombre d’{{sel80496}} cumulées.',
             answers: [
                 {
                     type: 'select',
@@ -85,6 +124,45 @@ export const selectTemplateUISlide = {
                             selected: false
                         }
                     ]
+                },
+                {
+                    type: 'text',
+                    name: 'inp58402',
+                    placeholder: 'Type here',
+                    value: undefined,
+                    onChange: noop
+                },
+                {
+                    type: 'select',
+                    name: 'sel80496',
+                    onChange: noop,
+                    options: [
+                        { name: 'Select an answer', value: '', validOption: false, selected: true },
+                        {
+                            name: 'étoiles',
+                            value: 'étoiles',
+                            validOption: true,
+                            selected: false
+                        },
+                        {
+                            name: 'idées',
+                            value: 'idées',
+                            validOption: true,
+                            selected: false
+                        },
+                        {
+                            name: 'envies',
+                            value: 'envies',
+                            validOption: true,
+                            selected: false
+                        },
+                        {
+                            name: 'images',
+                            value: 'images',
+                            validOption: true,
+                            selected: false
+                        }
+                    ]
                 }
             ]
         }