@coorpacademy/app-review 0.1.14 → 0.1.16

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

@@ -0,0 +1,120 @@
+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 };
+    }
+};
+import test from 'ava';
+import { fetchSlide, SLIDE_FETCH_FAILURE, SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS } from '../fetch-slide';
+import { freeTextSlide } from '../../../views/slides/test/fixtures/free-text';
+import { services as mockedServices } from '../../../test/util/services.mock';
+import { SET_CURRENT_SLIDE } from '../../ui/slides';
+import { createTestStore } from './create-test-store';
+var initialState = {
+    data: {
+        progression: null,
+        slides: {},
+        skills: [],
+        token: '1234'
+    },
+    ui: {
+        currentSlideRef: '',
+        navigation: [],
+        answers: []
+    }
+};
+test('should dispatch FETCH_SUCCESS and SET_CURRENT_SLIDE actions when fetchSlide return a slide', 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:
+                services = __assign(__assign({}, mockedServices), { fetchSlide: function (slideRef, token) {
+                        t.is(token, '1234');
+                        t.is(slideRef, 'sli_VJYjJnJhg');
+                        return Promise.resolve(freeTextSlide);
+                    } });
+                expectedActions = [
+                    { type: SLIDE_FETCH_REQUEST, meta: { slideRef: 'sli_VJYjJnJhg' } },
+                    {
+                        type: SLIDE_FETCH_SUCCESS,
+                        meta: { slideRef: 'sli_VJYjJnJhg' },
+                        payload: freeTextSlide
+                    },
+                    { type: SET_CURRENT_SLIDE, payload: freeTextSlide }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(fetchSlide('sli_VJYjJnJhg', '1234'))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should dispatch SLIDE_FETCH_FAILURE action when fetchSlide 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:
+                services = __assign(__assign({}, mockedServices), { fetchSlide: function (slideRef, token) {
+                        t.is(token, '1234');
+                        t.is(slideRef, 'slide_ref');
+                        return Promise.reject(new Error('error'));
+                    } });
+                expectedActions = [
+                    { type: SLIDE_FETCH_REQUEST, meta: { slideRef: 'slide_ref' } },
+                    {
+                        type: SLIDE_FETCH_FAILURE,
+                        meta: { slideRef: 'slide_ref' },
+                        payload: new Error('error'),
+                        error: true
+                    }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(fetchSlide('slide_ref', '1234'))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });

package/lib/actions/api/test/post-progression.test.d.ts

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

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

@@ -0,0 +1,160 @@
+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 };
+    }
+};
+import test from 'ava';
+import { postProgression, POST_PROGRESSION_REQUEST, POST_PROGRESSION_SUCCESS, POST_PROGRESSION_FAILURE } from '../post-progression';
+import { freeTextSlide } from '../../../views/slides/test/fixtures/free-text';
+import { services as mockedServices } from '../../../test/util/services.mock';
+import { SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS } from '../fetch-slide';
+import { SET_CURRENT_SLIDE } from '../../ui/slides';
+import { createTestStore } from './create-test-store';
+var initialState = {
+    data: {
+        progression: null,
+        slides: {},
+        skills: [],
+        token: '1234'
+    },
+    ui: {
+        currentSlideRef: '',
+        navigation: [],
+        answers: []
+    }
+};
+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 () {
+    var progression, services, expectedActions, dispatch;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                progression = {
+                    _id: '62b1d1087aa12f00253f40ee',
+                    content: {
+                        ref: '_skill-ref',
+                        type: 'skill'
+                    },
+                    engine: {
+                        ref: 'review'
+                    },
+                    state: {
+                        allAnswers: [],
+                        isCorrect: true,
+                        nextContent: {
+                            ref: 'sli_VJYjJnJhg',
+                            type: 'slide'
+                        },
+                        pendingSlides: [],
+                        slides: [],
+                        step: {
+                            current: 1
+                        },
+                        stars: 0
+                    }
+                };
+                services = __assign(__assign({}, mockedServices), { postProgression: function (skillRef, token) {
+                        t.is(token, '1234');
+                        t.is(skillRef, 'skill_12345');
+                        return Promise.resolve(progression);
+                    }, fetchSlide: function (slideRef, token) {
+                        t.is(token, '1234');
+                        t.is(slideRef, 'sli_VJYjJnJhg');
+                        return Promise.resolve(freeTextSlide);
+                    } });
+                expectedActions = [
+                    { type: POST_PROGRESSION_REQUEST },
+                    {
+                        type: POST_PROGRESSION_SUCCESS,
+                        payload: progression
+                    },
+                    {
+                        type: SLIDE_FETCH_REQUEST,
+                        meta: {
+                            slideRef: 'sli_VJYjJnJhg'
+                        }
+                    },
+                    {
+                        type: SLIDE_FETCH_SUCCESS,
+                        meta: {
+                            slideRef: 'sli_VJYjJnJhg'
+                        },
+                        payload: freeTextSlide
+                    },
+                    { type: SET_CURRENT_SLIDE, payload: freeTextSlide }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(postProgression('skill_12345', '1234'))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should dispatch POST_PROGRESSION_FAILURE action when postProgression 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:
+                services = __assign(__assign({}, mockedServices), { postProgression: function (skillRef, token) {
+                        t.is(token, '1234');
+                        t.is(skillRef, 'skill_12345');
+                        return Promise.reject(new Error('error'));
+                    } });
+                expectedActions = [
+                    { type: POST_PROGRESSION_REQUEST },
+                    {
+                        type: POST_PROGRESSION_FAILURE,
+                        payload: new Error('error'),
+                        error: true
+                    }
+                ];
+                dispatch = createTestStore(t, initialState, services, expectedActions).dispatch;
+                return [4 /*yield*/, dispatch(postProgression('skill_12345', '1234'))];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); });

package/lib/actions/index.d.ts

@@ -1,21 +1,12 @@
-import { updateSlidesOnValidation, updateSlidesOnNext, validateSlide } from './data/slides';
 import { StoreToken } from './data/token';
-import { updateFinishedSlides } from './ui/finished-slides';
 import { navigateBack, navigateTo, NavigateBack, NavigateTo, StartApp } from './ui/navigation';
-import { updateReviewStatus } from './ui/review-status';
-import { updateStepItemsOnValidation, updateStepItemsOnNext } from './ui/step-items';
 import { ReceivedSlide } from './api/fetch-slide';
 import { ReceiveProgression } from './api/post-progression';
 import { ReceivedSkills } from './api/fetch-skills';
+import { validateSlide } from './ui/slides';
 export declare type Action = NavigateBack | NavigateTo | ReceivedSkills | StartApp | ReceivedSlide | StoreToken | ReceiveProgression;
 export declare type Dispatchers = {
     navigateTo: typeof navigateTo;
     navigateBack: typeof navigateBack;
     validateSlide: typeof validateSlide;
-    updateSlidesOnValidation: typeof updateSlidesOnValidation;
-    updateSlidesOnNext: typeof updateSlidesOnNext;
-    updateReviewStatus: typeof updateReviewStatus;
-    updateStepItemsOnValidation: typeof updateStepItemsOnValidation;
-    updateStepItemsOnNext: typeof updateStepItemsOnNext;
-    updateFinishedSlides: typeof updateFinishedSlides;
 };

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

@@ -0,0 +1,7 @@
+import { Dispatch } from 'redux';
+export declare const EDIT_BASIC: "@@answer/EDIT_BASIC";
+export declare type EditBasicAction = {
+    type: typeof EDIT_BASIC;
+    payload: string[];
+};
+export declare const editAnswer: (answer: string) => (dispatch: Dispatch) => EditBasicAction;

package/lib/actions/ui/answers.js

@@ -0,0 +1,9 @@
+export var EDIT_BASIC = '@@answer/EDIT_BASIC';
+export var editAnswer = function (answer) {
+    return function (dispatch) {
+        return dispatch({
+            type: EDIT_BASIC,
+            payload: [answer]
+        });
+    };
+};

package/lib/actions/ui/is-fetching.js

@@ -1,6 +1,4 @@
-// -----------------------------------------------------------------------------
 export var START_FETCHING = '@@ui/START_FETCHING';
 export var STOP_FETCHING = '@@ui/STOP_FETCHING';
-// -----------------------------------------------------------------------------
 export var startFetching = function () { return ({ type: START_FETCHING }); };
 export var stopFetching = function () { return ({ type: STOP_FETCHING }); };

package/lib/actions/ui/slides.d.ts

@@ -0,0 +1,26 @@
+import { SlideFromAPI } from '../../types/common';
+import { AnswerUI } from '../../types/slides';
+declare type SlideUIAnimations = 'unstack' | 'restack';
+export declare type Slide = {
+    questionText?: string;
+    answerUI?: AnswerUI;
+    hidden?: boolean;
+    position: number;
+    animationType?: SlideUIAnimations;
+    isCorrect?: boolean;
+    endReview?: boolean;
+    nextContent?: Omit<Slide, 'endReview' | 'hidden' | 'position' | 'nextContent'>;
+};
+export declare const SET_CURRENT_SLIDE: "@@slide/SET_CURRENT_SLIDE";
+export declare type SetCurrentSlide = {
+    type: typeof SET_CURRENT_SLIDE;
+    payload: SlideFromAPI;
+};
+export declare const setCurrentSlide: (payload: SlideFromAPI) => SetCurrentSlide;
+export declare const VALIDATE_SLIDE = "@@slide/VALIDATE";
+export declare type ValidateSlide = {
+    type: typeof VALIDATE_SLIDE;
+};
+export declare const validateSlide: () => ValidateSlide;
+export declare type UISlidesAction = SetCurrentSlide;
+export {};

package/lib/actions/ui/slides.js

@@ -0,0 +1,9 @@
+export var SET_CURRENT_SLIDE = '@@slide/SET_CURRENT_SLIDE';
+export var setCurrentSlide = function (payload) { return ({
+    type: SET_CURRENT_SLIDE,
+    payload: payload
+}); };
+export var VALIDATE_SLIDE = '@@slide/VALIDATE';
+export var validateSlide = function () { return ({
+    type: VALIDATE_SLIDE
+}); };

package/lib/common/index.d.ts

@@ -5,4 +5,6 @@ export declare const VIEWS: {
     readonly onboarding: 'onboarding';
     readonly slides: 'slides';
 };
-export declare const slideNumbers: number[];
+export declare const slideIndexes: readonly ["0", "1", "2", "3", "4"];
+export declare type SlideIndexes = typeof slideIndexes[number];
+export declare const indexToString: (index: number) => SlideIndexes;

package/lib/common/index.js

@@ -1,3 +1,4 @@
+import _toString from 'lodash/fp/toString';
 export var TOTAL_SLIDES_STACK = 5;
 export var HIGHEST_INDEX = TOTAL_SLIDES_STACK - 1;
 export var VIEWS = {
@@ -5,4 +6,5 @@ export var VIEWS = {
     onboarding: 'onboarding',
     slides: 'slides'
 };
-export var slideNumbers = [0, 1, 2, 3, 4];
+export var slideIndexes = ['0', '1', '2', '3', '4'];
+export var indexToString = function (index) { return _toString(index); };

package/lib/fixtures/qcm-slide.d.ts

@@ -1,2 +1,2 @@
-import { UISlide } from '../types/slides';
-export declare const slide: UISlide;
+import { UISlide } from '../types/common';
+export declare const slide: Pick<UISlide, 'questionText' | 'answerUI'>;

package/lib/fixtures/temp-fixture.d.ts

@@ -1,3 +1,3 @@
-import { SlidesViewProps } from '../types/views/slides';
-export declare const correctionPopinProps: SlidesViewProps['correctionPopinProps'];
+import { SlidesViewProps, CorrectionPopinProps } from '../views/slides';
+export declare const correctionPopinProps: CorrectionPopinProps;
 export declare const congratsProps: SlidesViewProps['congratsProps'];

package/lib/index.js

@@ -1,98 +1,41 @@
+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);
+};
 import React, { useEffect, useState } from 'react';
-import { connect, Provider } from 'react-redux';
+import { useSelector, useDispatch, Provider } from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
 import { TemplateContext } from '@coorpacademy/components/es/template/app-review/template-context';
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
-import { congratsProps, correctionPopinProps } from './fixtures/temp-fixture';
-import { updateSlidesOnNext, updateSlidesOnValidation, validateSlide } from './actions/data/slides';
-import { navigateTo, navigateBack } from './actions/ui/navigation';
+import { navigateTo } from './actions/ui/navigation';
 import { storeToken } from './actions/data/token';
-import { updateFinishedSlides } from './actions/ui/finished-slides';
-import { updateReviewStatus } from './actions/ui/review-status';
-import { updateStepItemsOnValidation, updateStepItemsOnNext } from './actions/ui/step-items';
 import { fetchSkills } from './actions/api/fetch-skills';
 import { postProgression } from './actions/api/post-progression';
 import { VIEWS } from './common';
-var mapDispatchToProps = {
-    navigateTo: navigateTo,
-    navigateBack: navigateBack,
-    validateSlide: validateSlide,
-    updateSlidesOnValidation: updateSlidesOnValidation,
-    updateSlidesOnNext: updateSlidesOnNext,
-    updateReviewStatus: updateReviewStatus,
-    updateStepItemsOnValidation: updateStepItemsOnValidation,
-    updateStepItemsOnNext: updateStepItemsOnNext,
-    updateFinishedSlides: updateFinishedSlides
-};
-var getCurrentViewName = function (storeState) {
-    return storeState.ui.navigation[storeState.ui.navigation.length - 1];
-};
-var mapStateToSkillsProps = function (state) {
-    if (!state.data.skills) {
-        return null;
-    }
-    return {
-        title: '@todo title',
-        titleNoSkills: '@todo titleNoSkills',
-        textNoSkills: '@todo textNoSkills',
-        iconSkillAriaLabel: '@todo iconSkillAriaLabel',
-        isLoading: false,
-        isLoadingAriaLabel: '@todo loading',
-        listSkills: state.data.skills.map(function (skill) { return ({
-            'aria-label': '',
-            isCustom: skill.custom,
-            skillTitle: skill.name,
-            skillAriaLabel: '@todo skill aria label',
-            buttonLabel: '@todo button',
-            buttonAriaLabel: '@todo button aria label',
-            reviseLabel: '@todo revise',
-            reviseAriaLabel: '@todo revise aria label',
-            // eslint-disable-next-line no-console
-            onClick: function () { return console.log('@todo plug dispatcher select skill'); }
-        }); })
-    };
-};
-var mapStateToSlidesProps = function (state) {
-    if (!state.data.slides) {
-        return null;
-    }
-    return {
-        headerProps: {
-            mode: '__revision_mode',
-            skillName: '__agility',
-            onQuitClick: function () {
-                // eslint-disable-next-line no-console
-                console.log('onQuitClick');
-            },
-            'aria-label': 'aria-header-wrapper',
-            closeButtonAriaLabel: 'aria-close-button'
-        },
-        slides: state.data.slides,
-        validate: {
-            label: '__validate'
-        },
-        finishedSlides: state.ui.finishedSlides,
-        stepItems: state.ui.stepItems,
-        reviewStatus: state.ui.reviewStatus,
-        correctionPopinProps: correctionPopinProps,
-        congratsProps: congratsProps,
-        progression: state.data.progression
-    };
-};
-var mapStateToProps = function (state) {
-    return {
-        viewName: getCurrentViewName(state),
-        slides: mapStateToSlidesProps(state),
-        skills: mapStateToSkillsProps(state)
+import { mapStateToSlidesProps } from './views/slides';
+import { mapStateToSkillsProps } from './views/skills';
+var ConnectedApp = function () {
+    var dispatch = useDispatch();
+    var props = {
+        viewName: useSelector(function (state) { return state.ui.navigation[state.ui.navigation.length - 1]; }),
+        slides: useSelector(function (state) { return mapStateToSlidesProps(state, dispatch); }),
+        skills: useSelector(function (state) { return mapStateToSkillsProps(state); })
     };
+    return React.createElement(AppReviewTemplate, __assign({}, props));
 };
-var App = connect(mapStateToProps, mapDispatchToProps)(AppReviewTemplate);
 var AppReview = function (_a) {
     var options = _a.options;
     var _b = useState(null), store = _b[0], setStore = _b[1];
-    var _c = useState(false), isSlideFetched = _c[0], setIsSlideFetched = _c[1];
+    var _c = useState(false), isProgressionCreated = _c[0], setIsProgressionCreated = _c[1];
     useEffect(function () {
         if (store)
             return;
@@ -100,14 +43,13 @@ var AppReview = function (_a) {
         setStore(newStore);
     }, [options, store]);
     useEffect(function () {
-        if (!store || isSlideFetched)
+        if (!store || isProgressionCreated)
             return;
         return store.subscribe(function () {
-            var isSlidePresent = !isEmpty(store.getState().data.slides[0].questionText);
-            return isSlidePresent && setIsSlideFetched(isSlidePresent);
-        }); // using the first slide questionText for now, should only check for a slide's presence
-        // when the refactor is done (slides will be feed one by one on api's side)
-    }, [isSlideFetched, options, store]);
+            var isProgressionPresent = !isEmpty(store.getState().data.progression);
+            return isProgressionPresent && setIsProgressionCreated(isProgressionPresent);
+        });
+    }, [isProgressionCreated, options, store]);
     useEffect(function () {
         var token = get('token', options);
         if (store === null || isEmpty(token))
@@ -119,8 +61,8 @@ var AppReview = function (_a) {
         if (store === null || isEmpty(token))
             return;
         var skillRef = get('skillRef', options);
-        // ThunkAction is not assignable to parameter of type 'AnyAction'
-        // ts problem describre here = https://github.com/reduxjs/redux-thunk/issues/333
+        /* ThunkAction is not assignable to parameter of type 'AnyAction'
+          ts problem is described here = https://github.com/reduxjs/redux-thunk/issues/333 */
         skillRef
             ? store.dispatch(postProgression(skillRef, token))
             : store.dispatch(fetchSkills(token));
@@ -129,21 +71,18 @@ var AppReview = function (_a) {
         if (store === null)
             return;
         var skillRef = options.skillRef;
-        if (skillRef && !isSlideFetched) {
+        if (skillRef && !isProgressionCreated) {
             store.dispatch(navigateTo('loader')); // use loader while posting progression
             return;
         }
-        // TODO: when slides state is refactored (data + mapping),
-        // use loader in case a skillRef is found && no slides from the API
-        // are found
         var initialView = skillRef ? VIEWS.slides : VIEWS.skills;
         store.dispatch(navigateTo(initialView));
-    }, [isSlideFetched, options, store]);
+    }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
     var values = options.templateContext;
     return (React.createElement(Provider, { store: store },
         React.createElement(TemplateContext, { values: values },
-            React.createElement(App, null))));
+            React.createElement(ConnectedApp, null))));
 };
 export default AppReview;

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

@@ -4,7 +4,7 @@ import { SlidesState } from './slides';
 import { TokenState } from './token';
 export declare type DataState = {
     isFetching?: boolean;
-    progression?: ProgressionState;
+    progression: ProgressionState;
     skills: SkillsState;
     slides: SlidesState;
     token?: TokenState;
@@ -14,5 +14,5 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     skills: SkillsState;
     slides: SlidesState;
     token: TokenState;
-}>, import("../../actions/data/slides").ValidateSlide | import("../../actions/data/slides").SlidesAction | import("../../actions/api/post-progression").ReceiveProgression | import("../../actions/api/fetch-skills").ReceivedSkills | import("../../actions/data/token").StoreToken>;
+}>, import("../../actions/api/post-progression").ReceiveProgression | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
 export default _default;

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

@@ -1,19 +1,6 @@
-import { ValidateSlide } from '../../actions/data/slides';
+import { ValidateSlide } from '../../actions/ui/slides';
 import { ReceiveProgression } from '../../actions/api/post-progression';
-export declare type ProgressionState = {
-    _id?: string;
-    state: {
-        isCorrect: boolean;
-        nextContent: {
-            ref: 'successExitNode' | string;
-            type: 'success' | 'slide';
-        };
-        pendingSlides: string[];
-        step: {
-            current: number;
-        };
-    };
-    slideNumber?: number;
-} | null;
+import { ProgressionFromAPI } from '../../types/common';
+export declare type ProgressionState = ProgressionFromAPI | null;
 declare const reducer: (state: ProgressionState | undefined, action: ValidateSlide | ReceiveProgression) => ProgressionState;
 export default reducer;