@coorpacademy/app-review 0.2.7 → 0.2.9-alpha.5

package/es/views/slides/test/index.test.js

@@ -2,13 +2,39 @@ import test from 'ava';
 import identity from 'lodash/fp/identity';
 import omit from 'lodash/fp/omit';
 import set from 'lodash/fp/set';
-import { postProgressionResponse as createdProgression, postAnswerResponses, progressionSlideWithPendingSlide } from '../../../test/util/services.mock';
+import { postProgressionResponse as createdProgression, postAnswerResponses, progressionSlideWithPendingSlide, getChoicesCorrection, incorrectFreeTextPostAnswerResponse } from '../../../test/util/services.mock';
 import { mapStateToSlidesProps } from '..';
 import { freeTextSlide } from './fixtures/free-text';
 import { qcmGraphicSlide } from './fixtures/qcm-graphic';
 import { templateSlide } from './fixtures/template';
 import { qcmSlide } from './fixtures/qcm';
 import { sliderSlide } from './fixtures/slider';
+const popinPropsRightAnswer = {
+    resultLabel: '_right',
+    information: {
+        label: '_klf',
+        message: 'To negotiate your salary when being hired, you have to establish a benchmark beforehand. In other words, you should assess the salary to which you aspire by enquiring about the remuneration paid in the same industry, the same region and the same position.'
+    },
+    klf: undefined,
+    next: {
+        ariaLabel: '_correctionNextAriaLabel',
+        label: '_correctionNextLabel'
+    },
+    type: 'right'
+};
+const popinPropsWrongAnswer = {
+    ...popinPropsRightAnswer,
+    klf: {
+        label: '_klf',
+        tooltip: 'To negotiate your salary when being hired, you have to establish a benchmark beforehand. In other words, you should assess the salary to which you aspire by enquiring about the remuneration paid in the same industry, the same region and the same position.'
+    },
+    type: 'wrong',
+    resultLabel: '_wrong',
+    information: {
+        label: '_correctAnswer',
+        message: 'Benchmark'
+    }
+};
 test('should create initial props when fetched slide is not still received', t => {
     // SCENARIO : @@progression/POST_SUCCESS ok and @@slides/FETCH_REQUEST, (the slide is being fetched)
     const state = {
@@ -19,7 +45,8 @@ test('should create initial props when fetched slide is not still received', t =
                 sli_N1XACJobn: null
             },
             token: '1234',
-            corrections: {}
+            corrections: {},
+            rank: {}
         },
         ui: {
             currentSlideRef: '',
@@ -107,7 +134,8 @@ test('should create props when first slide is on the state', t => {
                 sli_VJYjJnJhg: freeTextSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {},
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VJYjJnJhg',
@@ -158,6 +186,8 @@ test('should create props when first slide is on the state', t => {
         endReview: false
     });
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
@@ -206,7 +236,8 @@ test('should create props when slide is on the state and user has selected answe
                 sli_VJYjJnJhg: freeTextSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {},
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VJYjJnJhg',
@@ -257,6 +288,8 @@ test('should create props when slide is on the state and user has selected answe
         endReview: false
     });
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
@@ -306,7 +339,8 @@ test('should verify props when first slide was answered correctly and next slide
                 sli_VkSQroQnx: null
             },
             token: '1234',
-            corrections: {}
+            corrections: {},
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VJYjJnJhg',
@@ -357,6 +391,8 @@ test('should verify props when first slide was answered correctly and next slide
         endReview: false
     });
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
@@ -406,7 +442,8 @@ test('should verify props when first slide was answered with error and next slid
                 sli_VkSQroQnx: null
             },
             token: '1234',
-            corrections: {}
+            corrections: {},
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VJYjJnJhg',
@@ -453,7 +490,7 @@ test('should verify props when first slide was answered with error and next slid
         ]
     });
 });
-test('should verify props when first slide was answered and next slide is fecthed', t => {
+test('should verify props when first slide was answered, next slide is fetched & correction is fetched', t => {
     // Scenario: after POST_ANSWER_SUCCESS and SLIDE_FETCH_SUCCESS for the nextContent.ref slide
     const state = {
         data: {
@@ -464,14 +501,19 @@ test('should verify props when first slide was answered and next slide is fecthe
                 sli_VkSQroQnx: qcmGraphicSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id)
+            },
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VJYjJnJhg',
             navigation: ['loader', 'slides'],
             answers: ['My value'],
             slide: {
-                validateButton: false
+                validateButton: false,
+                animateCorrectionPopin: true,
+                showCorrectionPopin: true
             }
         }
     };
@@ -510,11 +552,13 @@ test('should verify props when first slide was answered and next slide is fecthe
             }
         ]
     });
-    t.deepEqual(omit(['validateButton', 'slides'], props.stack), {
-        correctionPopinProps: undefined,
+    t.deepEqual(omit(['validateButton', 'slides', 'correctionPopinProps.klf.onClick'], props.stack), {
+        correctionPopinProps: popinPropsRightAnswer,
         endReview: false
     });
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: true,
+        showCorrectionPopin: true,
         hidden: false,
         position: 0,
         loading: false,
@@ -530,11 +574,13 @@ test('should verify props when first slide was answered and next slide is fecthe
         }
     });
     t.deepEqual(omit('answerUI', props.stack.slides['1']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 1,
         loading: false,
         parentContentTitle: 'From "Developing the review app" course',
-        questionText: 'Pour mener une bonne négociation, il ne faut ressentir aucune émotion. Vrai ou faux ?'
+        questionText: 'Quels sont les 4 piliers de l’apprentissage ?'
     });
     t.is(props.stack.validateButton.disabled, true);
     t.deepEqual(omit(['0', '1'], props.stack.slides), {
@@ -555,7 +601,118 @@ test('should verify props when first slide was answered and next slide is fecthe
         }
     });
 });
-test('should verify props when currentSlideRef has changed to nextContent of progression after first asnwered question', t => {
+test('should verify props when first slide was answered incorrectly, next slide is fetched & correction is fetched', t => {
+    // Scenario: after POST_ANSWER_SUCCESS and SLIDE_FETCH_SUCCESS for the nextContent.ref slide
+    const state = {
+        data: {
+            progression: incorrectFreeTextPostAnswerResponse,
+            skills: [],
+            slides: {
+                sli_VJYjJnJhg: freeTextSlide,
+                sli_VkSQroQnx: qcmGraphicSlide
+            },
+            token: '1234',
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id, true)
+            },
+            rank: {}
+        },
+        ui: {
+            currentSlideRef: 'sli_VJYjJnJhg',
+            navigation: ['loader', 'slides'],
+            answers: ['My value'],
+            slide: {
+                validateButton: false,
+                animateCorrectionPopin: true,
+                showCorrectionPopin: true
+            }
+        }
+    };
+    const props = mapStateToSlidesProps(state, identity);
+    t.is(props.congratsProps, undefined);
+    t.deepEqual(omit(['onQuitClick'], props.header), {
+        'aria-label': 'aria-header-wrapper',
+        closeButtonAriaLabel: 'aria-close-button',
+        mode: '__revision_mode',
+        skillName: '__agility',
+        steps: [
+            {
+                current: true,
+                icon: 'wrong',
+                value: '1'
+            },
+            {
+                current: false,
+                icon: 'no-answer',
+                value: '2'
+            },
+            {
+                current: false,
+                icon: 'no-answer',
+                value: '3'
+            },
+            {
+                current: false,
+                icon: 'no-answer',
+                value: '4'
+            },
+            {
+                current: false,
+                icon: 'no-answer',
+                value: '5'
+            }
+        ]
+    });
+    t.deepEqual(omit(['validateButton', 'slides', 'correctionPopinProps.klf.onClick'], props.stack), {
+        correctionPopinProps: popinPropsWrongAnswer,
+        endReview: false
+    });
+    t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: true,
+        showCorrectionPopin: true,
+        hidden: false,
+        position: 0,
+        loading: false,
+        parentContentTitle: 'From "Developing the review app" course',
+        questionText: 'Which term is used to describe the act of asking what the usual salary is for the position you are applying for?'
+    });
+    t.deepEqual(omit('model.onChange', props.stack.slides['0'].answerUI), {
+        help: 'Type your answer.',
+        model: {
+            placeholder: 'Type here',
+            type: 'freeText',
+            value: 'My value'
+        }
+    });
+    t.deepEqual(omit('answerUI', props.stack.slides['1']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
+        hidden: false,
+        position: 1,
+        loading: false,
+        parentContentTitle: 'From "Developing the review app" course',
+        questionText: 'Quels sont les 4 piliers de l’apprentissage ?'
+    });
+    t.is(props.stack.validateButton.disabled, true);
+    t.deepEqual(omit(['0', '1'], props.stack.slides), {
+        '2': {
+            hidden: false,
+            position: 2,
+            loading: true
+        },
+        '3': {
+            hidden: false,
+            position: 3,
+            loading: true
+        },
+        '4': {
+            hidden: false,
+            position: 4,
+            loading: true
+        }
+    });
+});
+test('should verify props when currentSlideRef has changed to nextContent of progression after first answered question', t => {
     // state after click on NEXT_SLIDE
     const state = {
         data: {
@@ -566,7 +723,10 @@ test('should verify props when currentSlideRef has changed to nextContent of pro
                 sli_VkSQroQnx: qcmGraphicSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id)
+            },
+            rank: {}
         },
         ui: {
             currentSlideRef: 'sli_VkSQroQnx',
@@ -628,7 +788,14 @@ test('should verify props when progression is in success', t => {
                 [templateSlide.universalRef]: templateSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id),
+                [qcmGraphicSlide.universalRef]: getChoicesCorrection(qcmGraphicSlide._id),
+                [qcmSlide.universalRef]: getChoicesCorrection(qcmSlide._id),
+                [sliderSlide.universalRef]: getChoicesCorrection(sliderSlide._id),
+                [templateSlide.universalRef]: getChoicesCorrection(templateSlide._id)
+            },
+            rank: {}
         },
         ui: {
             currentSlideRef: templateSlide.universalRef,
@@ -676,7 +843,7 @@ test('should verify props when progression is in success', t => {
     });
     // TODO update test with props.stack validations when NEXT_SLIDE implemented
 });
-test('should verify props when progression has answered a current pendingslide', t => {
+test('should verify props when progression has answered a current pendingSlide', t => {
     // Scenario, freeTextSlide and qcmSlide are pending slides, freeTextSlide was answered correctly, qcmSlide remains but not yet the currentSlideRef
     const state = {
         data: {
@@ -690,7 +857,14 @@ test('should verify props when progression has answered a current pendingslide',
                 [templateSlide.universalRef]: templateSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id),
+                [qcmGraphicSlide.universalRef]: getChoicesCorrection(qcmGraphicSlide._id),
+                [qcmSlide.universalRef]: getChoicesCorrection(qcmSlide._id, true),
+                [sliderSlide.universalRef]: getChoicesCorrection(sliderSlide._id),
+                [templateSlide.universalRef]: getChoicesCorrection(templateSlide._id)
+            },
+            rank: {}
         },
         ui: {
             currentSlideRef: freeTextSlide.universalRef,
@@ -736,7 +910,7 @@ test('should verify props when progression has answered a current pendingslide',
         ]
     });
 });
-test('should verify props when progression has still pendingslide', t => {
+test('should verify props when progression still has a pendingSlide', t => {
     // Scenario, freeTextSlide and qcmSlide are pending slides, freeTextSlide was answered correctly, qcmSlide remains and it is the currentSlideRef
     const state = {
         data: {
@@ -750,7 +924,14 @@ test('should verify props when progression has still pendingslide', t => {
                 [templateSlide.universalRef]: templateSlide
             },
             token: '1234',
-            corrections: {}
+            corrections: {
+                [freeTextSlide._id]: getChoicesCorrection(freeTextSlide._id),
+                [qcmGraphicSlide.universalRef]: getChoicesCorrection(qcmGraphicSlide._id),
+                [qcmSlide.universalRef]: getChoicesCorrection(qcmSlide._id, true),
+                [sliderSlide.universalRef]: getChoicesCorrection(sliderSlide._id),
+                [templateSlide.universalRef]: getChoicesCorrection(templateSlide._id)
+            },
+            rank: {}
         },
         ui: {
             currentSlideRef: qcmSlide.universalRef,

package/es/views/slides/test/slide.free-text.on-change.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: freeTextSlide._id,
@@ -57,6 +58,8 @@ test('should dispatch EDIT_BASIC action via the property onChange of a Free Text
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/es/views/slides/test/slide.qcm-drag.on-click.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmDragSlide._id,
@@ -57,6 +58,8 @@ test('should dispatch EDIT_QCM_DRAG action via the property onClick of a QCM Dra
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/es/views/slides/test/slide.qcm-graphic.on-click.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmGraphicSlide._id,
@@ -51,17 +52,19 @@ test('should dispatch EDIT_QCM_GRAPHIC action via the property onClick of a QCM
     const expectedActions = [
         {
             type: EDIT_QCM_GRAPHIC,
-            payload: ['Faux']
+            payload: ['Le retour d’information']
         }
     ];
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
         parentContentTitle: 'From "Developing the review app" course',
-        questionText: 'Pour mener une bonne négociation, il ne faut ressentir aucune émotion. Vrai ou faux ?'
+        questionText: 'Quels sont les 4 piliers de l’apprentissage ?'
     });
     const SlideProps = props.stack.slides['0'].answerUI?.model;
     const onClick = get(['1', 'onClick'], SlideProps.answers);

package/es/views/slides/test/slide.qcm.on-click.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmSlide._id,
@@ -59,6 +60,8 @@ test('should dispatch EDIT_QCM action via the property onClick of a QCM slide',
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/es/views/slides/test/slide.slider.on-change.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: sliderSlide._id,
@@ -57,6 +58,8 @@ test('should dispatch EDIT_SLIDER action via the property onChange of a Slider s
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/es/views/slides/test/slide.template.on-change.test.js

@@ -35,7 +35,8 @@ const initialState = {
         },
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: templateSlide._id,
@@ -52,6 +53,8 @@ test('should dispatch EDIT_TEMPLATE action via the property onChange of a Templa
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
@@ -68,6 +71,8 @@ test('should dispatch EDIT_TEMPLATE action via the property onChange of a Templa
     const { dispatch, getState } = createTestStore(t, initialState, services, expectedActions);
     const props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/lib/actions/api/fetch-rank.d.ts

@@ -0,0 +1,32 @@
+import type { Dispatch } from 'redux';
+import type { StoreState } from '../../reducers';
+import type { Rank, Services, Options } from '../../types/common';
+export declare const RANK_FETCH_START_REQUEST: "@@rank/FETCH_START_REQUEST";
+export declare const RANK_FETCH_START_SUCCESS: "@@rank/FETCH_START_SUCCESS";
+export declare const RANK_FETCH_START_FAILURE: "@@rank/FETCH_START_FAILURE";
+export declare const RANK_FETCH_END_REQUEST: "@@rank/FETCH_END_REQUEST";
+export declare const RANK_FETCH_END_SUCCESS: "@@rank/FETCH_END_SUCCESS";
+export declare const RANK_FETCH_END_FAILURE: "@@rank/FETCH_END_FAILURE";
+declare type RankFetchStartRequestType = typeof RANK_FETCH_START_REQUEST;
+declare type RankFetchStartSuccessType = typeof RANK_FETCH_START_SUCCESS;
+declare type RankFetchStartFailureType = typeof RANK_FETCH_START_FAILURE;
+declare type RankFetchEndRequestType = typeof RANK_FETCH_END_REQUEST;
+declare type RankFetchEndSuccessType = typeof RANK_FETCH_END_SUCCESS;
+declare type RankFetchEndFailureType = typeof RANK_FETCH_END_FAILURE;
+export declare type RankRequestAction = {
+    type: RankFetchStartRequestType | RankFetchEndRequestType;
+};
+export declare type RankSuccessAction = {
+    type: RankFetchStartSuccessType | RankFetchEndSuccessType;
+    payload: Rank;
+};
+export declare type RankFailureAction = {
+    type: RankFetchStartFailureType | RankFetchEndFailureType;
+};
+export declare type RankAction = RankRequestAction | RankSuccessAction | RankFailureAction;
+declare type RankStart = [RankFetchStartRequestType, RankFetchStartSuccessType, RankFetchStartFailureType];
+declare type RankEnd = [RankFetchEndRequestType, RankFetchEndSuccessType, RankFetchEndFailureType];
+export declare const fetchRank: (dispatch: Dispatch, getState: () => StoreState, services: Services, types: RankStart | RankEnd, path?: string) => RankAction;
+export declare const fetchStartRank: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => RankAction;
+export declare const fetchEndRank: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => RankAction;
+export {};

package/lib/actions/api/fetch-rank.js

@@ -0,0 +1,32 @@
+import buildTask from '@coorpacademy/redux-task';
+import get from 'lodash/fp/get';
+export var RANK_FETCH_START_REQUEST = '@@rank/FETCH_START_REQUEST';
+export var RANK_FETCH_START_SUCCESS = '@@rank/FETCH_START_SUCCESS';
+export var RANK_FETCH_START_FAILURE = '@@rank/FETCH_START_FAILURE';
+export var RANK_FETCH_END_REQUEST = '@@rank/FETCH_END_REQUEST';
+export var RANK_FETCH_END_SUCCESS = '@@rank/FETCH_END_SUCCESS';
+export var RANK_FETCH_END_FAILURE = '@@rank/FETCH_END_FAILURE';
+export var fetchRank = function (dispatch, getState, services, types, path) {
+    var action = buildTask({
+        types: types,
+        task: function () {
+            var state = getState();
+            var token = get(['data', 'token'], state);
+            return services.fetchRank(token);
+        },
+        bailout: path ? function (state) { return !!get(path, state); } : undefined
+    });
+    return dispatch(action);
+};
+export var fetchStartRank = function (dispatch, getState, _a) {
+    var services = _a.services;
+    return fetchRank(dispatch, getState, services, [RANK_FETCH_START_REQUEST, RANK_FETCH_START_SUCCESS, RANK_FETCH_START_FAILURE], 'data.rank.start');
+};
+export var fetchEndRank = function (dispatch, getState, _a) {
+    var services = _a.services;
+    return fetchRank(dispatch, getState, services, [
+        RANK_FETCH_END_REQUEST,
+        RANK_FETCH_END_SUCCESS,
+        RANK_FETCH_END_FAILURE
+    ]);
+};

package/lib/actions/api/test/fetch-correction.test.js

@@ -64,7 +64,8 @@ var initialState = {
             _a),
         skills: [{ skillRef: skillRef, custom: false, name: skillRef, slidesToReview: 5 }],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: freeTextSlide._id,

package/lib/actions/api/test/fetch-rank.test.d.ts

@@ -0,0 +1 @@
+export {};