@coorpacademy/app-review 0.1.21 → 0.2.0

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

@@ -0,0 +1,11 @@
+import type { Dispatch } from 'redux';
+import type { StoreState } from '../../reducers';
+import type { CorrectionFromAPI, Options } from '../../types/common';
+export declare const CORRECTION_FETCH_REQUEST: "@@correction/FETCH_REQUEST";
+export declare const CORRECTION_FETCH_SUCCESS: "@@correction/FETCH_SUCCESS";
+export declare const CORRECTION_FETCH_FAILURE: "@@correction/FETCH_FAILURE";
+export declare type FetchCorrection = {
+    type: typeof CORRECTION_FETCH_SUCCESS;
+    payload: CorrectionFromAPI | void;
+};
+export declare const fetchCorrection: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => FetchCorrection;

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

@@ -0,0 +1,20 @@
+import buildTask from '@coorpacademy/redux-task';
+import get from 'lodash/fp/get';
+export var CORRECTION_FETCH_REQUEST = '@@correction/FETCH_REQUEST';
+export var CORRECTION_FETCH_SUCCESS = '@@correction/FETCH_SUCCESS';
+export var CORRECTION_FETCH_FAILURE = '@@correction/FETCH_FAILURE';
+export var fetchCorrection = function (dispatch, getState, _a) {
+    var services = _a.services;
+    var action = buildTask({
+        types: [CORRECTION_FETCH_REQUEST, CORRECTION_FETCH_SUCCESS, CORRECTION_FETCH_FAILURE],
+        task: function () {
+            var state = getState();
+            var token = get(['data', 'token'], state);
+            var progressionId = get(['data', 'progression', '_id'], state);
+            var answer = get(['ui', 'answers'], state);
+            var slideRef = get(['ui', 'currentSlideRef'], state);
+            return services.fetchCorrection(slideRef, token, progressionId, answer);
+        }
+    });
+    return dispatch(action);
+};

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

@@ -5,7 +5,7 @@ export declare const SKILLS_FETCH_REQUEST: "@@skills/FETCH_REQUEST";
 export declare const SKILLS_FETCH_SUCCESS: "@@skills/FETCH_SUCCESS";
 export declare const SKILLS_FETCH_FAILURE: "@@skills/FETCH_FAILURE";
 export declare type ReceivedSkills = {
-    type: '@@skills/FETCH_SUCCESS';
+    type: typeof SKILLS_FETCH_SUCCESS;
     payload: Skill[];
 };
-export declare const fetchSkills: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => Promise<void>;
+export declare const fetchSkills: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => ReceivedSkills;

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

@@ -1,39 +1,3 @@
-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 buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
 export var SKILLS_FETCH_REQUEST = '@@skills/FETCH_REQUEST';
@@ -41,24 +5,13 @@ export var SKILLS_FETCH_SUCCESS = '@@skills/FETCH_SUCCESS';
 export var SKILLS_FETCH_FAILURE = '@@skills/FETCH_FAILURE';
 export var fetchSkills = function (dispatch, getState, _a) {
     var services = _a.services;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var action;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    action = buildTask({
-                        types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
-                        task: function () {
-                            var state = getState();
-                            var token = get('data.token', state);
-                            return services.fetchSkills(token);
-                        }
-                    });
-                    return [4 /*yield*/, dispatch(action)];
-                case 1:
-                    _b.sent();
-                    return [2 /*return*/];
-            }
-        });
+    var action = buildTask({
+        types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
+        task: function () {
+            var state = getState();
+            var token = get(['data', 'token'], state);
+            return services.fetchSkills(token);
+        }
     });
+    return dispatch(action);
 };

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

@@ -57,7 +57,7 @@ export var fetchSlide = function (slideRef) {
                             },
                             task: function () {
                                 var state = getState();
-                                var token = get('data.token', state);
+                                var token = get(['data', 'token'], state);
                                 return services.fetchSlide(slideRef, token);
                             },
                             meta: { slideRef: slideRef }

package/lib/actions/api/post-answer.js

@@ -48,16 +48,14 @@ export var postAnswer = function (dispatch, getState, _a) {
             switch (_b.label) {
                 case 0:
                     state = getState();
-                    token = get('data.token', state);
-                    answer = get('ui.answers', state);
+                    token = get(['data', 'token'], state);
+                    answer = get(['ui', 'answers'], state);
                     progression = state.data.progression;
                     if (!progression)
                         throw new Error('cannot answer question of inexisting progression');
                     action = buildTask({
                         types: [POST_ANSWER_REQUEST, POST_ANSWER_SUCCESS, POST_ANSWER_FAILURE],
-                        task: function () {
-                            return services.postAnswer(progression, token, answer);
-                        }
+                        task: function () { return services.postAnswer(progression, token, answer); }
                     });
                     return [4 /*yield*/, dispatch(action)];
                 case 1:

package/lib/actions/api/post-progression.js

@@ -49,12 +49,10 @@ export var postProgression = function (skillRef) {
                 switch (_b.label) {
                     case 0:
                         state = getState();
-                        token = get('data.token', state);
+                        token = get(['data', 'token'], state);
                         action = buildTask({
                             types: [POST_PROGRESSION_REQUEST, POST_PROGRESSION_SUCCESS, POST_PROGRESSION_FAILURE],
-                            task: function () {
-                                return services.postProgression(skillRef, token);
-                            }
+                            task: function () { return services.postProgression(skillRef, token); }
                         });
                         return [4 /*yield*/, dispatch(action)];
                     case 1:

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

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

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

@@ -0,0 +1,133 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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 };
+    }
+};
+var _a;
+import test from 'ava';
+import { getChoicesCorrection, postAnswerResponses, services as mockedServices } from '../../../test/util/services.mock';
+import { createTestStore } from '../../test/create-test-store';
+import { CORRECTION_FETCH_FAILURE, CORRECTION_FETCH_REQUEST, CORRECTION_FETCH_SUCCESS, fetchCorrection } from '../fetch-correction';
+import { freeTextSlide } from '../../../views/slides/test/fixtures/free-text';
+import { qcmSlide } from '../../../views/slides/test/fixtures/qcm';
+var progression = postAnswerResponses[freeTextSlide.universalRef];
+var skillRef = '_skill-ref';
+var answer = ['Lister vos tâches pour vous libérer l’esprit', 'Vous isoler dans un lieu calme'];
+var initialState = {
+    data: {
+        progression: progression,
+        slides: (_a = {},
+            _a[freeTextSlide.universalRef] = freeTextSlide,
+            _a[qcmSlide.universalRef] = qcmSlide,
+            _a),
+        skills: [{ skillRef: skillRef, custom: false, name: skillRef, slidesToReview: 5 }],
+        token: '1234'
+    },
+    ui: {
+        currentSlideRef: freeTextSlide._id,
+        navigation: ['skills', 'slides'],
+        answers: answer,
+        slide: {
+            validateButton: false
+        }
+    }
+};
+test('should dispatch CORRECTION_FETCH_SUCCESS actions when fetchCorrection returns a correction object', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var services, expectedActions, dispatch;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                t.plan(6);
+                services = __assign(__assign({}, mockedServices), { fetchCorrection: function (slideRef, token, progressionId, _answer) {
+                        t.is(slideRef, freeTextSlide.universalRef);
+                        t.is(token, '1234');
+                        t.is(progression._id, progressionId);
+                        t.is(_answer, answer);
+                        return Promise.resolve(getChoicesCorrection(slideRef));
+                    } });
+                expectedActions = [
+                    { type: CORRECTION_FETCH_REQUEST },
+                    {
+                        type: CORRECTION_FETCH_SUCCESS,
+                        payload: getChoicesCorrection(freeTextSlide.universalRef)
+                    }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(fetchCorrection)];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should dispatch CORRECTION_FETCH_FAILURE action when fetchCorrection fails', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var services, expectedActions, dispatch;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                t.plan(6);
+                services = __assign(__assign({}, mockedServices), { fetchCorrection: function (slideRef, token, progressionId, _answer) {
+                        t.is(slideRef, freeTextSlide.universalRef);
+                        t.is(token, '1234');
+                        t.is(progression._id, progressionId);
+                        t.is(_answer, answer);
+                        return Promise.reject(new Error('unexpected'));
+                    } });
+                expectedActions = [
+                    { type: CORRECTION_FETCH_REQUEST },
+                    {
+                        type: CORRECTION_FETCH_FAILURE,
+                        payload: new Error('unexpected'),
+                        error: true
+                    }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(fetchCorrection)];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });

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

@@ -65,11 +65,12 @@ var initialState = {
         }
     }
 };
-test('should dispatch SKILLS_FETCH_SUCCESS actions when fetchSkills return a list of skills', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+test('should dispatch SKILLS_FETCH_SUCCESS actions when fetchSkills returns a list of skills', function (t) { return __awaiter(void 0, void 0, void 0, function () {
     var services, expectedActions, dispatch;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(3);
                 services = __assign(__assign({}, mockedServices), { fetchSkills: function (token) {
                         t.is(token, '1234');
                         return Promise.resolve([]);
@@ -94,6 +95,7 @@ test('should dispatch SKILLS_FETCH_FAILURE action when fetchSkills fails', funct
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(3);
                 services = __assign(__assign({}, mockedServices), { fetchSkills: function (token) {
                         t.is(token, '1234');
                         return Promise.reject(new Error('unexpected'));

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

@@ -72,6 +72,7 @@ test('should dispatch FETCH_SUCCESS and SET_CURRENT_SLIDE actions when fetchSlid
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(5);
                 services = __assign(__assign({}, mockedServices), { fetchSlide: function (slideRef, token) {
                         t.is(token, '1234');
                         t.is(slideRef, 'sli_VJYjJnJhg');
@@ -99,6 +100,7 @@ test('should dispatch SLIDE_FETCH_FAILURE action when fetchSlide fails', functio
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(4);
                 services = __assign(__assign({}, mockedServices), { fetchSlide: function (slideRef, token) {
                         t.is(token, '1234');
                         t.is(slideRef, 'slide_ref');

package/lib/actions/api/test/post-answer.test.js

@@ -69,7 +69,7 @@ var initialState = {
                 allAnswers: [],
                 isCorrect: true,
                 nextContent: {
-                    ref: freeTextSlide.id,
+                    ref: freeTextSlide._id,
                     type: 'slide'
                 },
                 pendingSlides: [],
@@ -81,13 +81,13 @@ var initialState = {
             }
         },
         slides: (_a = {},
-            _a[freeTextSlide.id] = freeTextSlide,
+            _a[freeTextSlide._id] = freeTextSlide,
             _a),
         skills: [{ skillRef: skillRef, custom: false, name: skillRef, slidesToReview: 5 }],
         token: '1234'
     },
     ui: {
-        currentSlideRef: freeTextSlide.id,
+        currentSlideRef: freeTextSlide._id,
         navigation: ['skills', 'slides'],
         answers: answer,
         slide: {
@@ -100,16 +100,17 @@ test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_SUCCESS when the upd
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(4);
                 expectedActions = [
                     { type: POST_ANSWER_REQUEST },
                     {
                         type: POST_ANSWER_SUCCESS,
-                        payload: postAnswerResponses[freeTextSlide.id]
+                        payload: postAnswerResponses[freeTextSlide._id]
                     },
-                    { type: SLIDE_FETCH_REQUEST, meta: { slideRef: qcmGraphicSlide.id } },
+                    { type: SLIDE_FETCH_REQUEST, meta: { slideRef: qcmGraphicSlide._id } },
                     {
                         type: SLIDE_FETCH_SUCCESS,
-                        meta: { slideRef: qcmGraphicSlide.id },
+                        meta: { slideRef: qcmGraphicSlide._id },
                         payload: qcmGraphicSlide
                     },
                     { type: SET_CURRENT_SLIDE, payload: qcmGraphicSlide }
@@ -127,6 +128,7 @@ test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_FAILURE on error', f
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(3);
                 expectedActions = [
                     { type: POST_ANSWER_REQUEST },
                     {
@@ -135,7 +137,10 @@ test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_FAILURE on error', f
                         error: true
                     }
                 ];
-                dispatch = createTestStore(t, initialState, __assign(__assign({}, services), { postAnswer: function () { return Promise.reject(new Error('unexpected')); } }), expectedActions).dispatch;
+                dispatch = createTestStore(t, initialState, __assign(__assign({}, services), { postAnswer: function () {
+                        t.pass();
+                        return Promise.reject(new Error('unexpected'));
+                    } }), expectedActions).dispatch;
                 return [4 /*yield*/, dispatch(postAnswer)];
             case 1:
                 _a.sent();

package/lib/actions/api/test/post-progression.test.js

@@ -68,11 +68,12 @@ var initialState = {
         }
     }
 };
-test('should dispatch POST_PROGRESSION_SUCCESS and SLIDE_FETCH_REQUEST actions when postProgression return a progression', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+test('should dispatch POST_PROGRESSION_SUCCESS and SLIDE_FETCH_REQUEST actions when postProgression returns a progression', function (t) { return __awaiter(void 0, void 0, void 0, function () {
     var progression, services, expectedActions, dispatch;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(9);
                 progression = {
                     _id: '62b1d1087aa12f00253f40ee',
                     content: {
@@ -140,6 +141,7 @@ test('should dispatch POST_PROGRESSION_FAILURE action when postProgression fails
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                t.plan(4);
                 services = __assign(__assign({}, mockedServices), { postProgression: function (skillRef, token) {
                         t.is(token, '1234');
                         t.is(skillRef, 'skill_12345');

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

@@ -86,7 +86,7 @@ var initialState = {
     }
 };
 var buildInitialState = function (state, question) {
-    return pipe(set(['data', 'progression', 'state', 'nextContent', 'ref'], question.id), set(['data', 'slides', question.id], question), set(['ui', 'currentSlideRef'], question.id))(state);
+    return pipe(set(['data', 'progression', 'state', 'nextContent', 'ref'], question._id), set(['data', 'slides', question._id], question), set(['ui', 'currentSlideRef'], question._id))(state);
 };
 test('should dispatch EDIT_BASIC action when editAnswer is called', function (t) { return __awaiter(void 0, void 0, void 0, function () {
     var state, expectedActions, dispatch;

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

@@ -7,12 +7,12 @@ export declare type DataState = {
     progression: ProgressionState;
     skills: SkillsState;
     slides: SlidesState;
-    token?: TokenState;
+    token: TokenState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     progression: ProgressionState;
     skills: SkillsState;
     slides: SlidesState;
-    token: TokenState;
+    token: string;
 }>, 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/lib/reducers/data/slides.js

@@ -7,11 +7,11 @@ var reducer = function (state, action) {
     switch (action.type) {
         case SLIDE_FETCH_REQUEST: {
             var meta = action.meta;
-            return set(meta.slideRef, null, state);
+            return set([meta.slideRef], null, state);
         }
         case SLIDE_FETCH_SUCCESS: {
             var slide = action.payload;
-            return set(slide.id, slide, state);
+            return set([slide._id], slide, state);
         }
         default:
             return state;

package/lib/reducers/data/test/token.test.js

@@ -1,11 +1,11 @@
 import test from 'ava';
 import reducer from '../token';
 import { STORE_TOKEN } from '../../../actions/data/token';
-test('should have inital value', function (t) {
+test('should have initial value', function (t) {
     var state = reducer(undefined, {});
-    t.is(state, null);
+    t.is(state, '');
 });
 test('should set the value of STORE_TOKEN action', function (t) {
-    var state = reducer(null, { type: STORE_TOKEN, payload: 'token' });
+    var state = reducer('', { type: STORE_TOKEN, payload: 'token' });
     t.is(state, 'token');
 });

package/lib/reducers/data/token.d.ts

@@ -1,4 +1,4 @@
 import { StoreToken } from '../../actions/data/token';
-export declare type TokenState = string | null;
-declare const reducer: (state: TokenState | undefined, action: StoreToken) => TokenState;
+export declare type TokenState = string;
+declare const reducer: (state: string | undefined, action: StoreToken) => TokenState;
 export default reducer;

package/lib/reducers/data/token.js

@@ -1,7 +1,7 @@
 import { STORE_TOKEN } from '../../actions/data/token';
 // eslint-disable-next-line default-param-last
 var reducer = function (state, action) {
-    if (state === void 0) { state = null; }
+    if (state === void 0) { state = ''; }
     switch (action.type) {
         case STORE_TOKEN:
             return action.payload;

package/lib/reducers/index.d.ts

@@ -9,7 +9,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         progression: import("./data/progression").ProgressionState;
         skills: import("./data/skills").SkillsState;
         slides: import("./data/slides").SlidesState;
-        token: import("./data/token").TokenState;
+        token: string;
     }>;
     ui: import("redux").CombinedState<{
         currentSlideRef: string;

package/lib/reducers/ui/current-slide-ref.js

@@ -5,7 +5,7 @@ state, action) {
     if (state === void 0) { state = ''; }
     switch (action.type) {
         case SET_CURRENT_SLIDE: {
-            return action.payload.id;
+            return action.payload._id;
         }
         default:
             return state;

package/lib/services/fetch-slide.js

@@ -43,7 +43,7 @@ export var fetchSlide = function (slideRef, token) { return __awaiter(void 0, vo
         switch (_a.label) {
             case 0:
                 host = decode(token).host;
-                return [4 /*yield*/, crossFetch("".concat(host, "/api/v2/slide/").concat(slideRef, "/parentContentTitle"), {
+                return [4 /*yield*/, crossFetch("".concat(host, "/api/v1/slides/").concat(slideRef, "/parentContentTitle"), {
                         headers: { authorization: token }
                     })];
             case 1:

package/lib/services/post-answer.js

@@ -38,19 +38,19 @@ import crossFetch from 'cross-fetch';
 import decode from 'jwt-decode';
 import { toJSON } from './tools/fetch-responses';
 export var postAnswer = function (progression, token, answer) { return __awaiter(void 0, void 0, void 0, function () {
-    var progressionId, skillRef, host, response;
+    var progressionId, slideRef, host, response;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 progressionId = progression._id;
-                skillRef = progression.content.ref;
+                slideRef = progression.state.nextContent.ref;
                 host = decode(token).host;
                 return [4 /*yield*/, crossFetch("".concat(host, "/api/v2/progressions/").concat(progressionId, "/answers"), {
                         method: 'post',
-                        headers: { authorization: token },
+                        headers: { authorization: token, 'content-type': 'application/json' },
                         body: JSON.stringify({
                             content: {
-                                ref: skillRef,
+                                ref: slideRef,
                                 type: 'slide'
                             },
                             answer: answer

package/lib/services/post-progression.js

@@ -45,11 +45,11 @@ export var postProgression = function (skillRef, token) { return __awaiter(void
                 host = decode(token).host;
                 return [4 /*yield*/, crossFetch("".concat(host, "/api/v2/progressions"), {
                         method: 'post',
-                        headers: { authorization: token },
+                        headers: { authorization: token, 'content-type': 'application/json' },
                         body: JSON.stringify({
                             content: {
                                 ref: skillRef,
-                                type: 'slide'
+                                type: 'skill'
                             },
                             engine: {
                                 ref: 'review',

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

@@ -40,7 +40,7 @@ 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')
+        .get('/api/v1/slides/sli_123546/parentContentTitle')
         .reply(200, qcmDragSlide);
 });
 test.after(function () {

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

@@ -99,7 +99,15 @@ var result = {
 };
 test.before(function () {
     var moocApi = nock('http://localhost:3000');
-    moocApi.post('/api/v2/progressions/123456123456/answers').reply(200, result);
+    moocApi
+        .post('/api/v2/progressions/123456123456/answers', {
+        content: {
+            ref: 'sli_NkvrWPFF2',
+            type: 'slide'
+        },
+        answer: answer
+    })
+        .reply(200, result);
 });
 test.after(function () {
     nock.cleanAll();

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

@@ -64,7 +64,18 @@ var result = {
 };
 test.before(function () {
     var moocApi = nock('http://localhost:3000');
-    moocApi.post('/api/v2/progressions').reply(200, result);
+    moocApi
+        .post('/api/v2/progressions', {
+        content: {
+            ref: '_skill-ref',
+            type: 'skill'
+        },
+        engine: {
+            ref: 'review',
+            version: '1'
+        }
+    })
+        .reply(200, result);
 });
 test.after(function () {
     nock.cleanAll();

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

@@ -1,5 +1,6 @@
-import { ProgressionFromAPI, Services } from '../../types/common';
+import { CorrectionFromAPI, ProgressionFromAPI, Services } from '../../types/common';
 export declare const postProgressionResponse: ProgressionFromAPI;
 export declare const postAnswerResponses: Record<string, ProgressionFromAPI>;
 export declare const progressionSlideWithPendingSlide: ProgressionFromAPI;
+export declare const getChoicesCorrection: (ref: string, wrongChoice?: boolean) => CorrectionFromAPI;
 export declare const services: Services;