@coorpacademy/app-review 0.1.15 → 0.1.16

package/lib/services/test/fetch-slide.test.js

@@ -0,0 +1,76 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import test from 'ava';
+import nock from 'nock';
+import { qcmDragSlide } from '../../views/slides/test/fixtures/qcm-drag';
+import { fetchSlide } from '../fetch-slide';
+test.before(function () {
+    nock('http://localhost:3000')
+        .get('/api/v2/slide/sli_123546/parentContentTitle')
+        .reply(200, qcmDragSlide);
+});
+test.after(function () {
+    nock.cleanAll();
+});
+test('should fetch a slide with the parentTitleContent info successfully', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var token, slide;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                token = process.env.API_TEST_TOKEN || '';
+                return [4 /*yield*/, fetchSlide('sli_123546', token)];
+            case 1:
+                slide = _a.sent();
+                t.deepEqual(qcmDragSlide, slide);
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should reject if a bad token is passed', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var badToken, error;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                badToken = 'token is not a jwt';
+                return [4 /*yield*/, t.throwsAsync(function () { return fetchSlide('sli_123546', badToken); })];
+            case 1:
+                error = _a.sent();
+                t.is(error === null || error === void 0 ? void 0 : error.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
+                return [2 /*return*/];
+        }
+    });
+}); });

package/lib/services/test/post-answer.test.d.ts

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

package/lib/services/test/post-answer.test.js

@@ -0,0 +1,111 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import test from 'ava';
+import nock from 'nock';
+import { postAnswer } from '../post-answer';
+var progressionId = '123456789123';
+var skillRef = '_skill-ref';
+var answer = ['Lister vos tâches pour vous libérer l’esprit', 'Vous isoler dans un lieu calme'];
+var result = {
+    content: {
+        type: 'skill',
+        ref: skillRef
+    },
+    engine: {
+        ref: 'review'
+    },
+    _id: '123456123456',
+    state: {
+        allAnswers: [
+            {
+                slideRef: 'sli_NkvrWPFF2',
+                isCorrect: true,
+                answer: answer
+            }
+        ],
+        isCorrect: true,
+        nextContent: {
+            type: 'slide',
+            ref: 'sli_NJ3m5KtWh'
+        },
+        pendingSlides: [],
+        slides: ['sli_NkvrWPFF2'],
+        content: {
+            ref: 'sli_NkvrWPFF2',
+            type: 'slide'
+        },
+        step: {
+            current: 2
+        },
+        stars: 4
+    }
+};
+test.before(function () {
+    var moocApi = nock('http://localhost:3000');
+    moocApi.post("/api/v2/progressions/".concat(progressionId, "/answers")).reply(200, result);
+});
+test.after(function () {
+    nock.cleanAll();
+});
+test('should post the answers successfully', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var token, progression;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                token = process.env.API_TEST_TOKEN || '';
+                return [4 /*yield*/, postAnswer(skillRef, token, progressionId, answer)];
+            case 1:
+                progression = _a.sent();
+                t.deepEqual(result, progression);
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should reject bad token', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var badToken, error;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                badToken = 'token is not a jwt';
+                return [4 /*yield*/, t.throwsAsync(function () { return postAnswer(skillRef, badToken, progressionId, answer); })];
+            case 1:
+                error = _a.sent();
+                t.is(error === null || error === void 0 ? void 0 : error.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
+                return [2 /*return*/];
+        }
+    });
+}); });

package/lib/services/test/post-progression.test.js

@@ -40,6 +40,13 @@ import { postProgression } from '../post-progression';
 var skillRef = '_skill-ref';
 var result = {
     _id: '123456123456',
+    content: {
+        ref: '_skill-ref',
+        type: 'skill'
+    },
+    engine: {
+        ref: 'review'
+    },
     state: {
         allAnswers: [],
         isCorrect: true,
@@ -51,7 +58,8 @@ var result = {
         slides: [],
         step: {
             current: 1
-        }
+        },
+        stars: 0
     }
 };
 test.before(function () {

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

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { qcmSlide } from '../../helpers/test/fixtures/qcm';
+import { freeTextSlide } from '../../views/slides/test/fixtures/free-text';
 export var services = {
     fetchSkills: function () {
         return Promise.resolve([
@@ -18,20 +18,17 @@ export var services = {
                 slidesToReview: 2,
                 name: 'skill-test',
                 custom: false
-                // TODO parentContentTitle
             },
             {
                 skillRef: '_skill-ref-2',
                 slidesToReview: 2,
                 name: 'skill-test-2',
-                custom: true,
-                parentContentTitle: 'parentContentTitle 2'
-                // TODO parentContentTitle
+                custom: true
             }
         ]);
     },
     fetchSlide: function (ref) {
-        return Promise.resolve(__assign(__assign({}, qcmSlide), { universalRef: ref, id: ref }));
+        return Promise.resolve(__assign(__assign({}, freeTextSlide), { universalRef: ref, id: ref }));
     },
     postProgression: function () {
         return Promise.resolve({
@@ -54,7 +51,40 @@ export var services = {
                 slides: [],
                 step: {
                     current: 1
-                }
+                },
+                stars: 0
+            }
+        });
+    },
+    postAnswer: function () {
+        return Promise.resolve({
+            _id: '62b1d1087aa12f00253f40ee',
+            content: {
+                ref: '_skill-ref',
+                type: 'skill'
+            },
+            engine: {
+                ref: 'review'
+            },
+            state: {
+                allAnswers: [
+                    {
+                        slideRef: 'sli_N1XACJobn',
+                        isCorrect: true,
+                        answer: ['Le créateur peut fixer un pourcentage pour chaque transaction future']
+                    }
+                ],
+                isCorrect: true,
+                nextContent: {
+                    ref: 'sli_VkSQroQnx',
+                    type: 'slide'
+                },
+                pendingSlides: [],
+                slides: ['sli_N1XACJobn'],
+                step: {
+                    current: 2
+                },
+                stars: 4
             }
         });
     }

package/lib/types/common.d.ts

@@ -23,21 +23,21 @@ declare type BaseContent = {
     media?: unknown;
     choices: ChoiceFromAPI[];
 };
-declare type Question = {
+declare type BaseQuestion = {
     header?: string;
     content: BaseContent;
     explanation?: string;
 };
-export declare type QcmQuestion = Question & {
+export declare type QcmQuestion = BaseQuestion & {
     type: 'qcm';
 };
-export declare type QcmGraphicQuestion = Question & {
+export declare type QcmGraphicQuestion = BaseQuestion & {
     type: 'qcmGraphic';
 };
-export declare type QcmDragQuestion = Question & {
+export declare type QcmDragQuestion = BaseQuestion & {
     type: 'qcmDrag';
 };
-export declare type BasicQuestion = Omit<Question, 'content'> & {
+export declare type BasicQuestion = Omit<BaseQuestion, 'content'> & {
     type: 'basic';
     content: {
         media?: unknown;
@@ -46,7 +46,7 @@ export declare type BasicQuestion = Omit<Question, 'content'> & {
         id: string;
     };
 };
-export declare type SliderQuestion = Omit<Question, 'content'> & {
+export declare type SliderQuestion = Omit<BaseQuestion, 'content'> & {
     content: {
         media?: unknown;
         unitLabel: string;
@@ -56,20 +56,25 @@ export declare type SliderQuestion = Omit<Question, 'content'> & {
     };
     type: 'slider';
 };
-export declare type TemplateQuestion = Omit<Question, 'content'> & {
+export declare type TemplateQuestion = Omit<BaseQuestion, 'content'> & {
     content: BaseContent & {
         template: string;
     };
     type: 'template';
 };
+export declare type Question = QcmQuestion | QcmGraphicQuestion | QcmDragQuestion | BasicQuestion | SliderQuestion | TemplateQuestion;
 export declare type SlideFromAPI = {
-    question: QcmQuestion | QcmGraphicQuestion | QcmDragQuestion | BasicQuestion | SliderQuestion | TemplateQuestion;
+    question: Question;
     klf: string;
     universalRef: string;
     tips?: string;
     clue?: string;
     hasClue?: boolean;
     id: string;
+    parentContentTitle: {
+        title: string;
+        type: 'chapter' | 'course';
+    };
 };
 declare type ProgressionAnswerItem = {
     isCorrect: boolean;
@@ -92,9 +97,17 @@ export declare type ProgressionState = {
     step: {
         current: number;
     };
+    stars: number;
 };
 export declare type ProgressionFromAPI = {
     _id: string;
+    content: {
+        type: 'skill';
+        ref: string;
+    };
+    engine: {
+        ref: 'review';
+    };
     state: ProgressionState;
 };
 export declare type Skill = {
@@ -107,6 +120,7 @@ export declare type Services = {
     fetchSkills(token: string): Promise<Skill[]>;
     fetchSlide(slideRef: string, token: string): Promise<SlideFromAPI | void>;
     postProgression(skillRef: string, token: string): Promise<ProgressionFromAPI>;
+    postAnswer(skillRef: string, token: string, progressionId: string, answer: string[]): Promise<ProgressionFromAPI>;
 };
 export declare type Options = {
     services: Services;

package/lib/views/slides/index.d.ts

@@ -1,3 +1,79 @@
+import { Dispatch } from 'redux';
+import { UISlide } from '../../types/common';
+import { SlideIndexes } from '../../common';
 import { StoreState } from '../../reducers';
-import { SlidesViewStaticProps } from '../../types/views/slides';
-export declare const mapStateToSlidesProps: (state: StoreState) => SlidesViewStaticProps | null;
+declare const ICON_VALUES: {
+    readonly right: "right";
+    readonly wrong: "wrong";
+    readonly 'no-answer': "no-answer";
+};
+declare type IconValue = keyof typeof ICON_VALUES;
+declare type StepItem = {
+    current: boolean;
+    icon: IconValue;
+    value: string;
+};
+declare type SlidesStack = {
+    [key in SlideIndexes]: UISlide;
+};
+export declare type CorrectionPopinProps = {
+    klf: {
+        label: string;
+        onClick: Function;
+        tooltip: string;
+    };
+    information: {
+        label: string;
+        message: string;
+    };
+    next: {
+        label: string;
+        ariaLabel: string;
+    };
+    successLabel: string;
+    failureLabel: string;
+};
+export declare type SlidesViewProps = {
+    header: {
+        mode: string;
+        skillName: string;
+        onQuitClick: Function;
+        'aria-label'?: string;
+        closeButtonAriaLabel: string;
+        steps: StepItem[];
+    };
+    stack: {
+        slides: SlidesStack;
+        validateButton: {
+            label: string;
+            disabled: boolean;
+            onClick: Function;
+        };
+        correctionPopinProps?: CorrectionPopinProps;
+        endReview: boolean;
+    };
+    reviewBackgroundAriaLabel?: string;
+    congratsProps?: {
+        'aria-label'?: string;
+        'data-name'?: string;
+        animationLottie: unknown;
+        title: string;
+        cardCongratsStar: unknown;
+        cardCongratsRank: unknown;
+        buttonRevising: {
+            'aria-label'?: string;
+            label: string;
+            onClick: Function;
+            type: string;
+        };
+        buttonRevisingSkill: {
+            'aria-label'?: string;
+            label: string;
+            onClick: Function;
+            type: string;
+        };
+    };
+};
+export declare const initialState: SlidesStack;
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch) => SlidesViewProps | null;
+export {};

package/lib/views/slides/index.js

@@ -9,8 +9,74 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+import concat from 'lodash/fp/concat';
+import get from 'lodash/fp/get';
+import getOr from 'lodash/fp/getOr';
 import isEmpty from 'lodash/fp/isEmpty';
-var buildStepItemps = function (state) {
+import pipe from 'lodash/fp/pipe';
+import reduce from 'lodash/fp/reduce';
+import set from 'lodash/fp/set';
+import slice from 'lodash/fp/slice';
+import toInteger from 'lodash/fp/toInteger';
+import { mapApiSlideToUi } from './map-api-slide-to-ui';
+var ICON_VALUES = {
+    right: 'right',
+    wrong: 'wrong',
+    'no-answer': 'no-answer'
+};
+export var initialState = {
+    '0': {
+        hidden: false,
+        position: 0
+    },
+    '1': {
+        hidden: false,
+        position: 1
+    },
+    '2': {
+        hidden: false,
+        position: 2
+    },
+    '3': {
+        hidden: false,
+        position: 3
+    },
+    '4': {
+        hidden: false,
+        position: 4
+    }
+};
+var getProgressionSlidesRef = function (progression) {
+    if (progression.state.step.current < 5) {
+        var slideRef = progression.state.nextContent.ref;
+        return concat([slideRef], progression.state.slides);
+    }
+    return slice(0, 5, progression.state.slides);
+};
+var buildStackSlides = function (state, dispatch) {
+    var currentSlideRef = state.ui.currentSlideRef;
+    var progression = state.data.progression;
+    if (!currentSlideRef || !progression)
+        return initialState;
+    var slideRefs = getProgressionSlidesRef(progression);
+    // @ts-expect-error typescript does not support capped versions of lodash functions
+    var stack = reduce.convert({ cap: false })(function (acc, uiSlide, index) {
+        var slideRef = slideRefs[toInteger(index)];
+        if (!slideRef)
+            return set(index, uiSlide, acc);
+        var slideFromAPI = get(slideRef, state.data.slides);
+        var answers = state.ui.answers;
+        var _a = mapApiSlideToUi(dispatch)(slideFromAPI, answers), questionText = _a.questionText, answerUI = _a.answerUI;
+        var parentContentTitle = getOr('', 'parentContentTitle.title', slideFromAPI);
+        var parentContentType = getOr('', 'parentContentTitle.type', slideFromAPI);
+        var updatedUiSlide = pipe(set(['questionText'], questionText), set(['answerUI'], answerUI), set(['parentContentTitle'], "From \"".concat(parentContentTitle, "\" ").concat(parentContentType)) // TODO translate: -From- .... -Course/chapter-
+        // TODO: Set position according to currentSlideRef et slideRefs (or maybe a value on the state ui.slidePositions !!)
+        )(uiSlide);
+        return set(index, updatedUiSlide, acc);
+    }, initialState, initialState);
+    return stack;
+};
+var buildStepItems = function (state) {
     var progression = state.data.progression;
     var currentSlideRef = state.ui.currentSlideRef;
     if (!progression)
@@ -55,7 +121,7 @@ var buildStepItemps = function (state) {
     });
     return steps;
 };
-export var mapStateToSlidesProps = function (state) {
+export var mapStateToSlidesProps = function (state, dispatch) {
     if (!state.data.slides) {
         return null;
     }
@@ -69,10 +135,10 @@ export var mapStateToSlidesProps = function (state) {
             },
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
-            steps: buildStepItemps(state)
+            steps: buildStepItems(state)
         },
         stack: {
-            slides: state.ui.slides,
+            slides: buildStackSlides(state, dispatch),
             validateButton: {
                 label: '__validate',
                 disabled: true,

package/lib/views/slides/map-api-slide-to-ui.d.ts

@@ -0,0 +1,8 @@
+import { Dispatch } from 'redux';
+import { AnswerUI } from '../../types/slides';
+import { Question, SlideFromAPI } from '../../types/common';
+export declare const getQuestionType: (question: Question) => Question['type'];
+export declare const mapApiSlideToUi: (dispatch: Dispatch) => (slide: SlideFromAPI, answers: string[]) => {
+    questionText: string;
+    answerUI: AnswerUI;
+};