@coorpacademy/app-review 0.1.16 → 0.1.18

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

@@ -0,0 +1,473 @@
+import test from 'ava';
+import identity from 'lodash/fp/identity';
+import omit from 'lodash/fp/omit';
+import { mapStateToSlidesProps } from '..';
+import { freeTextSlide } from './fixtures/free-text';
+test('should create initial props when fetched slide is still not received', function (t) {
+    var state = {
+        data: {
+            progression: {
+                _id: '62b1d1087aa12f00253f40ee',
+                content: {
+                    ref: '_skillref',
+                    type: 'skill'
+                },
+                engine: {
+                    ref: 'review'
+                },
+                state: {
+                    allAnswers: [],
+                    isCorrect: true,
+                    nextContent: {
+                        ref: 'sli_N1XACJobn',
+                        type: 'slide'
+                    },
+                    pendingSlides: [],
+                    slides: [],
+                    step: {
+                        current: 1
+                    },
+                    stars: 0
+                }
+            },
+            skills: [],
+            slides: {
+                sli_N1XACJobn: null
+            },
+            token: '1234'
+        },
+        ui: {
+            currentSlideRef: '',
+            navigation: ['loader', 'slides'],
+            answers: [],
+            slide: {
+                validateButton: false
+            }
+        }
+    };
+    var 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: 'no-answer',
+                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'], props.stack), {
+        correctionPopinProps: undefined,
+        endReview: false,
+        slides: {
+            '0': {
+                hidden: false,
+                position: 0,
+                loading: true
+            },
+            '1': {
+                hidden: false,
+                position: 1,
+                loading: true
+            },
+            '2': {
+                hidden: false,
+                position: 2,
+                loading: true
+            },
+            '3': {
+                hidden: false,
+                position: 3,
+                loading: true
+            },
+            '4': {
+                hidden: false,
+                position: 4,
+                loading: true
+            }
+        }
+    });
+});
+test('should create initial props when the slide is on the state', function (t) {
+    var state = {
+        data: {
+            progression: {
+                _id: '62b1d1087aa12f00253f40ee',
+                content: {
+                    ref: '_skillref',
+                    type: 'skill'
+                },
+                engine: {
+                    ref: 'review'
+                },
+                state: {
+                    allAnswers: [],
+                    isCorrect: true,
+                    nextContent: {
+                        ref: 'sli_N1XACJobn',
+                        type: 'slide'
+                    },
+                    pendingSlides: [],
+                    slides: [],
+                    step: {
+                        current: 1
+                    },
+                    stars: 0
+                }
+            },
+            skills: [],
+            slides: {
+                sli_N1XACJobn: freeTextSlide
+            },
+            token: '1234'
+        },
+        ui: {
+            currentSlideRef: 'sli_N1XACJobn',
+            navigation: ['loader', 'slides'],
+            answers: ['My value'],
+            slide: {
+                validateButton: true
+            }
+        }
+    };
+    var 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: 'no-answer',
+                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'], props.stack), {
+        correctionPopinProps: undefined,
+        endReview: false
+    });
+    t.false(props.stack.validateButton.disabled);
+    t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        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(['0'], props.stack.slides), {
+        '1': {
+            hidden: false,
+            position: 1,
+            loading: true
+        },
+        '2': {
+            hidden: false,
+            position: 2,
+            loading: true
+        },
+        '3': {
+            hidden: false,
+            position: 3,
+            loading: true
+        },
+        '4': {
+            hidden: false,
+            position: 4,
+            loading: true
+        }
+    });
+});
+test('should create props when the next slide is on the state', function (t) {
+    var state = {
+        data: {
+            progression: {
+                _id: '62b1d1087aa12f00253f40ee',
+                content: {
+                    ref: '_skill-ref',
+                    type: 'skill'
+                },
+                engine: {
+                    ref: 'review'
+                },
+                state: {
+                    allAnswers: [
+                        {
+                            slideRef: 'sli_VJYjJnJhg',
+                            isCorrect: true,
+                            answer: ['Benchmark']
+                        }
+                    ],
+                    isCorrect: true,
+                    nextContent: {
+                        ref: 'sli_VkSQroQnx',
+                        type: 'slide'
+                    },
+                    content: {
+                        ref: 'sli_VJYjJnJhg',
+                        type: 'slide'
+                    },
+                    pendingSlides: [],
+                    slides: ['sli_VJYjJnJhg'],
+                    step: {
+                        current: 2
+                    },
+                    stars: 4
+                }
+            },
+            skills: [],
+            slides: {
+                sli_VJYjJnJhg: {
+                    question: {
+                        content: {
+                            media: {
+                                src: [],
+                                posters: [],
+                                subtitles: []
+                            },
+                            label: '',
+                            placeholder: 'Type here',
+                            id: 'sli_VJYjJnJhg.choice_1'
+                        },
+                        type: 'basic',
+                        header: 'Which term is used to describe the act of asking what the usual salary is for the position you are applying for?',
+                        explanation: 'Type your answer.'
+                    },
+                    klf: '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.',
+                    tips: 'According to Insee, Paris salaries are 20-25% higher compared with those of the provinces in 2015.',
+                    universalRef: 'sli_VJYjJnJhg',
+                    id: 'sli_VJYjJnJhg',
+                    parentContentTitle: {
+                        title: 'Developing the review app',
+                        type: 'course'
+                    }
+                },
+                sli_VkSQroQnx: {
+                    question: {
+                        content: {
+                            media: {
+                                src: [],
+                                posters: [],
+                                subtitles: []
+                            },
+                            choices: [
+                                {
+                                    media: {
+                                        src: [
+                                            {
+                                                _id: '624efd915948a7013083e986',
+                                                mimeType: 'image/jpeg',
+                                                url: '//static.coorpacademy.com/content/CoorpAcademy/content-partnerships/cockpit-partner-au-feminin/default/true-1512554153232.jpg',
+                                                id: '624efd915948a7013083e986'
+                                            }
+                                        ],
+                                        posters: [],
+                                        subtitles: [],
+                                        type: 'img'
+                                    },
+                                    items: [],
+                                    _id: '624efd915948a7013083e985',
+                                    label: 'Vrai',
+                                    value: 'sli_VkSQroQnx.choice_NJesyUo7nx',
+                                    id: '624efd915948a7013083e985'
+                                },
+                                {
+                                    media: {
+                                        src: [
+                                            {
+                                                _id: '624efd915948a7013083e988',
+                                                mimeType: 'image/jpeg',
+                                                url: '//static.coorpacademy.com/content/CoorpAcademy/content-partnerships/cockpit-partner-au-feminin/default/false-1512554160848.jpg',
+                                                id: '624efd915948a7013083e988'
+                                            }
+                                        ],
+                                        posters: [],
+                                        subtitles: [],
+                                        type: 'img'
+                                    },
+                                    items: [],
+                                    _id: '624efd915948a7013083e987',
+                                    label: 'Faux',
+                                    value: 'sli_VkSQroQnx.choice_VkgayLjX3e',
+                                    id: '624efd915948a7013083e987'
+                                }
+                            ]
+                        },
+                        type: 'qcmGraphic',
+                        header: 'Pour mener une bonne négociation, il ne faut ressentir aucune émotion. Vrai ou faux ?',
+                        explanation: 'Sélectionnez la bonne réponse.'
+                    },
+                    klf: "Il ne faut pas prendre la négociation comme une affaire personnelle, afin de rester centré sur son sujet. Mais cela ne signifie pas être dépourvu de toute émotion, car celles-ci peuvent être de vrais atouts. À condition de réussir à les exprimer sans accuser l'autre d'en être à l'origine.",
+                    tips: "Pour gérer ses émotions, il faut d'abord les identifier, notamment en analysant ses ressentis physiques et en trouvant l'élément déclencheur.",
+                    universalRef: 'sli_VkSQroQnx',
+                    id: 'sli_VkSQroQnx',
+                    parentContentTitle: {
+                        title: 'Developing the review app',
+                        type: 'course'
+                    }
+                }
+            },
+            token: 'undefined'
+        },
+        ui: {
+            currentSlideRef: 'sli_VJYjJnJhg',
+            navigation: ['loader', 'slides'],
+            answers: ['My value'],
+            slide: {
+                validateButton: false
+            }
+        }
+    };
+    var 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: 'right',
+                value: '1'
+            },
+            {
+                // FIX ME: update on PR -> https://trello.com/c/qOSDa8Fm/2715-app-review-props-dynamiques-pour-les-step-items-du-header-bas%C3%A9-sur-le-state
+                current: true,
+                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'], props.stack), {
+        correctionPopinProps: undefined,
+        endReview: false
+    });
+    t.true(props.stack.validateButton.disabled);
+    t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        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(['0', '1.answerUI.model.answers.0.onClick', '1.answerUI.model.answers.1.onClick'], props.stack.slides), {
+        '1': {
+            answerUI: {
+                help: 'Sélectionnez la bonne réponse.',
+                model: {
+                    answers: [
+                        {
+                            image: '//static.coorpacademy.com/content/CoorpAcademy/content-partnerships/cockpit-partner-au-feminin/default/true-1512554153232.jpg',
+                            selected: false,
+                            title: 'Vrai'
+                        },
+                        {
+                            image: '//static.coorpacademy.com/content/CoorpAcademy/content-partnerships/cockpit-partner-au-feminin/default/false-1512554160848.jpg',
+                            selected: false,
+                            title: 'Faux'
+                        }
+                    ],
+                    type: 'qcmGraphic'
+                }
+            },
+            hidden: false,
+            loading: false,
+            position: 1,
+            parentContentTitle: 'From "Developing the review app" course',
+            questionText: 'Pour mener une bonne négociation, il ne faut ressentir aucune émotion. Vrai ou faux ?'
+        },
+        '2': {
+            hidden: false,
+            position: 2,
+            loading: true
+        },
+        '3': {
+            hidden: false,
+            position: 3,
+            loading: true
+        },
+        '4': {
+            hidden: false,
+            position: 4,
+            loading: true
+        }
+    });
+});

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

@@ -16,8 +16,7 @@ import { qcmUISlide, qcmSlide } from './fixtures/qcm';
 import { qcmDragUISlide, qcmDragSlide } from './fixtures/qcm-drag';
 import { freeTextSlide, freeTextUISlide } from './fixtures/free-text';
 import { qcmGraphicUISlide, qcmGraphicSlide } from './fixtures/qcm-graphic';
-import { textTemplateSlide, textTemplateUISlide } from './fixtures/text-template';
-import { selectTemplateSlide, selectTemplateUISlide } from './fixtures/select-template';
+import { templateSlide, templateUISlide } from './fixtures/template';
 import { sliderSlide, sliderUISlide } from './fixtures/slider';
 var _mapApiSlideToUi = mapApiSlideToUi(identity);
 var macro = test.macro({
@@ -35,15 +34,10 @@ test('qcm graphic', macro, {
     answers: [],
     expectedUiSlide: qcmGraphicUISlide
 });
-test('text template', macro, {
-    slide: textTemplateSlide,
+test('template', macro, {
+    slide: templateSlide,
     answers: [],
-    expectedUiSlide: textTemplateUISlide
-});
-test('select template', macro, {
-    slide: selectTemplateSlide,
-    answers: [],
-    expectedUiSlide: selectTemplateUISlide
+    expectedUiSlide: templateUISlide
 });
 test('free text', macro, { slide: freeTextSlide, answers: [], expectedUiSlide: freeTextUISlide });
 test('slider', macro, { slide: sliderSlide, answers: [], expectedUiSlide: sliderUISlide });

package/lib/views/slides/test/slide.template.on-change.test.d.ts

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

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

@@ -0,0 +1,82 @@
+var _a;
+import test from 'ava';
+import omit from 'lodash/fp/omit';
+import get from 'lodash/fp/get';
+import { mapStateToSlidesProps } from '..';
+import { services } from '../../../test/util/services.mock';
+import { createTestStore } from '../../../actions/test/create-test-store';
+import { EDIT_TEMPLATE } from '../../../actions/ui/answers';
+import { templateSlide } from './fixtures/template';
+var progression = {
+    _id: '123456789123',
+    content: { type: 'skill', ref: '_skill-ref' },
+    engine: {
+        ref: 'review'
+    },
+    state: {
+        allAnswers: [],
+        isCorrect: true,
+        nextContent: {
+            ref: templateSlide.id,
+            type: 'slide'
+        },
+        pendingSlides: [],
+        slides: [],
+        step: {
+            current: 1
+        },
+        stars: 0
+    }
+};
+var initialState = {
+    data: {
+        progression: progression,
+        slides: (_a = {},
+            _a[templateSlide.id] = templateSlide,
+            _a),
+        skills: [],
+        token: '1234'
+    },
+    ui: {
+        currentSlideRef: templateSlide.id,
+        navigation: ['skills', 'slides'],
+        answers: [],
+        slide: {
+            validateButton: false
+        }
+    }
+};
+test('should dispatch EDIT_TEMPLATE action via the property onChange of a Template Text slide', function (t) {
+    var _a;
+    t.plan(2);
+    var expectedActions = [{ type: EDIT_TEMPLATE, payload: ['', 'test', ''] }];
+    var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
+    var props = mapStateToSlidesProps(getState(), dispatch);
+    t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        hidden: false,
+        position: 0,
+        loading: false,
+        parentContentTitle: 'From "Developing the review app" course',
+        questionText: 'Complétez la phrase ci-dessous.'
+    });
+    var SlideProps = (_a = props.stack.slides['0'].answerUI) === null || _a === void 0 ? void 0 : _a.model;
+    var onChange = get(['1', 'onChange'], SlideProps.answers);
+    onChange('test');
+});
+test('should dispatch EDIT_TEMPLATE action via the property onChange of a Template Select slide', function (t) {
+    var _a;
+    t.plan(2);
+    var expectedActions = [{ type: EDIT_TEMPLATE, payload: ['Catalogue', '', ''] }];
+    var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
+    var props = mapStateToSlidesProps(getState(), dispatch);
+    t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        hidden: false,
+        position: 0,
+        loading: false,
+        parentContentTitle: 'From "Developing the review app" course',
+        questionText: 'Complétez la phrase ci-dessous.'
+    });
+    var SlideProps = (_a = props.stack.slides['0'].answerUI) === null || _a === void 0 ? void 0 : _a.model;
+    var onChange = get(['0', 'onChange'], SlideProps.answers);
+    onChange('Catalogue');
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -18,7 +18,8 @@
     "clean:es": "rm -rf es",
     "clean": "concurrently \"npm run clean:commonjs\" \"npm run clean:es\"",
     "typecheck": "tsc --noEmit",
-    "test:unit": "ava",
+    "ava": "ava",
+    "test:unit": "nyc npm run ava",
     "lint": "eslint '**/*' --cache --ext .js --ext .jsx --ext .ts --ext .tsx --ext .json",
     "lint:fix": "npm run lint -- --fix",
     "test": "npm run lint && npm run typecheck && npm run test:unit"
@@ -40,7 +41,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.22.10",
+    "@coorpacademy/components": "10.22.12",
     "@coorpacademy/redux-task": "^1.1.5",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
@@ -74,8 +75,8 @@
     "nock": "^13.2.9",
     "postcss-modules-values-replace": "^3.4.0",
     "react-dom": "^17.0.2",
-    "ts-node": "^10.8.1",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
-  "gitHead": "508e3fdb30d727840bd9b13e9402c2970eb17731"
+  "gitHead": "2b9abf8c945cd56a6a47091836e4961917580782"
 }

package/src/actions/api/fetch-skills.ts

@@ -1,7 +1,8 @@
 import buildTask from '@coorpacademy/redux-task';
-import {Dispatch} from 'redux';
+import get from 'lodash/fp/get';
+import type {Dispatch} from 'redux';
 import type {StoreState} from '../../reducers';
-import {Options, Skill} from '../../types/common';
+import type {Options, Skill} from '../../types/common';
 
 export const SKILLS_FETCH_REQUEST = '@@skills/FETCH_REQUEST' as const;
 export const SKILLS_FETCH_SUCCESS = '@@skills/FETCH_SUCCESS' as const;
@@ -12,13 +13,19 @@ export type ReceivedSkills = {
   payload: Skill[];
 };
 
-export const fetchSkills =
-  (token: string) =>
-  async (dispatch: Dispatch, getState: () => StoreState, {services}: Options): Promise<void> => {
-    const action = buildTask({
-      types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
-      task: () => services.fetchSkills(token)
-    });
+export const fetchSkills = async (
+  dispatch: Dispatch,
+  getState: () => StoreState,
+  {services}: Options
+): Promise<void> => {
+  const action = buildTask({
+    types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
+    task: () => {
+      const state = getState();
+      const token = get('data.token', state);
+      return services.fetchSkills(token);
+    }
+  });
 
-    await dispatch(action);
-  };
+  await dispatch(action);
+};

package/src/actions/api/fetch-slide.ts

@@ -23,7 +23,7 @@ export type ReceivedSlide = {
 };
 
 export const fetchSlide =
-  (slideRef: string, token: string) =>
+  (slideRef: string) =>
   async (dispatch: Dispatch, getState: () => StoreState, {services}: Options): Promise<void> => {
     const action = buildTask({
       types: [SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS, SLIDE_FETCH_FAILURE],
@@ -31,6 +31,8 @@ export const fetchSlide =
         return has(`data.slide.${slideRef}`, state);
       },
       task: () => {
+        const state = getState();
+        const token = get('data.token', state);
         return services.fetchSlide(slideRef, token);
       },
       meta: {slideRef}