@coorpacademy/app-review 0.5.6 → 0.6.0

package/lib/src/actions/ui/navigation.d.ts

@@ -0,0 +1,19 @@
+import { Dispatch } from 'redux';
+import type { StoreState } from '../../reducers';
+import { ThunkOptions, AppOptions, ViewName } from '../../types/common';
+export declare type NavigateToAction = {
+    type: '@@navigation/NAVIGATE_TO';
+    payload: ViewName;
+};
+export declare type NavigateBackAction = {
+    type: '@@navigation/NAVIGATE_BACK';
+};
+export declare type StartApp = {
+    type: '@@navigation/START_APP';
+    payload: AppOptions;
+};
+export declare const NAVIGATE_TO = "@@navigation/NAVIGATE_TO";
+export declare const NAVIGATE_BACK = "@@navigation/NAVIGATE_BACK";
+export declare const START_APP = "@@navigation/START_APP";
+export declare const navigateTo: (newViewName: ViewName) => (dispatch: Dispatch, getState: () => StoreState, { callbackOnViewChanged }: ThunkOptions) => Promise<NavigateToAction>;
+export declare const navigateBack: (dispatch: Dispatch, getState: () => StoreState, { callbackOnViewChanged }: ThunkOptions) => Promise<NavigateBackAction>;

package/lib/src/actions/ui/navigation.js

@@ -0,0 +1,86 @@
+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 };
+    }
+};
+export var NAVIGATE_TO = '@@navigation/NAVIGATE_TO';
+export var NAVIGATE_BACK = '@@navigation/NAVIGATE_BACK';
+export var START_APP = '@@navigation/START_APP';
+export var navigateTo = function (newViewName) {
+    return function (dispatch, getState, _a) {
+        var callbackOnViewChanged = _a.callbackOnViewChanged;
+        return __awaiter(void 0, void 0, void 0, function () {
+            var action, res;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        action = {
+                            type: NAVIGATE_TO,
+                            payload: newViewName
+                        };
+                        return [4 /*yield*/, dispatch(action)];
+                    case 1:
+                        res = _b.sent();
+                        if (callbackOnViewChanged) {
+                            callbackOnViewChanged(newViewName);
+                        }
+                        return [2 /*return*/, res];
+                }
+            });
+        });
+    };
+};
+export var navigateBack = function (dispatch, getState, _a) {
+    var callbackOnViewChanged = _a.callbackOnViewChanged;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var action, res, storeState, viewName;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    action = {
+                        type: NAVIGATE_BACK
+                    };
+                    return [4 /*yield*/, dispatch(action)];
+                case 1:
+                    res = _b.sent();
+                    if (callbackOnViewChanged) {
+                        storeState = getState();
+                        viewName = storeState.ui.navigation[storeState.ui.navigation.length - 1];
+                        callbackOnViewChanged(viewName);
+                    }
+                    return [2 /*return*/, res];
+            }
+        });
+    });
+};

package/{es → lib/src}/common/index.d.ts

@@ -1,9 +1,4 @@
 import type { ProgressionFromAPI } from '../types/common';
-export declare const VIEWS: {
-    readonly skills: 'skills';
-    readonly onboarding: 'onboarding';
-    readonly slides: 'slides';
-};
 export declare const slideIndexes: readonly ["0", "1", "2", "3", "4"];
 export declare type SlideIndexes = typeof slideIndexes[number];
 export declare const getProgressionSlidesRefs: (progression: ProgressionFromAPI) => string[];

package/lib/{common → src/common}/index.js

@@ -1,10 +1,5 @@
 import concat from 'lodash/fp/concat';
 import slice from 'lodash/fp/slice';
-export var VIEWS = {
-    skills: 'skills',
-    onboarding: 'onboarding',
-    slides: 'slides'
-};
 export var slideIndexes = ['0', '1', '2', '3', '4'];
 export var getProgressionSlidesRefs = function (progression) {
     if (progression.state.step.current <= 5) {

package/lib/{configure-store.js → src/configure-store.js}

@@ -10,7 +10,11 @@ export default function configureStore(options) {
             traceLimit: 25
         })
         : compose;
-    var thunkMiddleware = thunk.withExtraArgument({ services: options.services || getServices() });
+    var thunkOptions = {
+        services: options.services || getServices(),
+        callbackOnViewChanged: options.callbackOnViewChanged
+    };
+    var thunkMiddleware = thunk.withExtraArgument(thunkOptions);
     var enhancer = _compose(applyMiddleware(thunkMiddleware));
     var store = createStore(rootReducer, undefined, enhancer);
     return store;

package/{es → lib/src}/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { AppOptions } from './types/common';
 declare const AppReview: ({ options }: {
     options: AppOptions;

package/lib/{index.js → src/index.js}

@@ -15,17 +15,17 @@ import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
-import { navigateTo } from './actions/ui/navigation';
+import { navigateBack, navigateTo } from './actions/ui/navigation';
 import { storeToken } from './actions/data/token';
 import { fetchSkills } from './actions/api/fetch-skills';
 import { postProgression } from './actions/api/post-progression';
-import { VIEWS } from './common';
 import { mapStateToSlidesProps } from './views/slides';
 import { mapStateToSkillsProps } from './views/skills';
 var ConnectedApp = function (_a) {
     var onQuitClick = _a.onQuitClick;
     var dispatch = useDispatch();
     var props = {
+        navigateBack: function () { return dispatch(navigateBack); },
         viewName: useSelector(function (state) { return state.ui.navigation[state.ui.navigation.length - 1]; }),
         slides: useSelector(function (state) { return mapStateToSlidesProps(state, dispatch, onQuitClick); }),
         skills: useSelector(function (state) { return mapStateToSkillsProps(state); }),
@@ -75,7 +75,7 @@ var AppReview = function (_a) {
             store.dispatch(navigateTo('loader')); // use loader while posting progression
             return;
         }
-        var initialView = skillRef ? VIEWS.slides : VIEWS.skills;
+        var initialView = skillRef ? 'slides' : 'skills';
         store.dispatch(navigateTo(initialView));
     }, [isProgressionCreated, options, store]);
     if (!store)

package/{es → lib/src}/reducers/index.d.ts

@@ -22,7 +22,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         showQuitPopin: boolean;
         showCongrats: boolean;
     }>;
-}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/post-answer").PostAnswerRequestAction | import("../actions/api/post-answer").PostAnswerSuccessAction | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/next-slide").NextSlideAction | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/answers").EditAnswerAction | {
+}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/post-answer").PostAnswerRequestAction | import("../actions/api/post-answer").PostAnswerSuccessAction | import("../actions/api/post-progression").ReceivedProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/next-slide").NextSlideAction | import("../actions/ui/navigation").NavigateToAction | import("../actions/ui/navigation").NavigateBackAction | import("../actions/ui/answers").EditAnswerAction | {
     type: "@@ui/OPEN_POPIN";
 } | {
     type: "@@ui/CLOSE_POPIN";

package/lib/{reducers → src/reducers}/ui/index.d.ts

@@ -22,7 +22,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     positions: UIPositionState;
     showQuitPopin: boolean;
     showCongrats: boolean;
-}>, import("../../actions/api/fetch-correction").ReceivedCorrection | import("../../actions/ui/slides").SetCurrentSlideAction | import("../../actions/api/fetch-slide").FetchSlide | import("../../actions/api/post-answer").PostAnswerRequestAction | import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/ui/next-slide").NextSlideAction | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/answers").EditAnswerAction | {
+}>, import("../../actions/api/fetch-correction").ReceivedCorrection | import("../../actions/ui/slides").SetCurrentSlideAction | import("../../actions/api/fetch-slide").FetchSlide | import("../../actions/api/post-answer").PostAnswerRequestAction | import("../../actions/api/post-progression").ReceivedProgression | import("../../actions/ui/next-slide").NextSlideAction | import("../../actions/ui/navigation").NavigateToAction | import("../../actions/ui/navigation").NavigateBackAction | import("../../actions/ui/answers").EditAnswerAction | {
     type: "@@ui/OPEN_POPIN";
 } | {
     type: "@@ui/CLOSE_POPIN";

package/{es → lib/src}/reducers/ui/navigation.d.ts

@@ -1,4 +1,4 @@
-import { type NavigateTo, type NavigateBack } from '../../actions/ui/navigation';
+import { NavigateToAction, NavigateBackAction } from '../../actions/ui/navigation';
 export declare type NavigationState = Array<'skills' | 'onboarding' | 'slides' | 'loader'>;
-declare const reducer: (state: NavigationState | undefined, action: NavigateTo | NavigateBack) => NavigationState;
+declare const reducer: (state: NavigationState | undefined, action: NavigateToAction | NavigateBackAction) => NavigationState;
 export default reducer;

package/lib/{reducers → src/reducers}/ui/navigation.js

@@ -7,7 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { NAVIGATE_BACK, NAVIGATE_TO } from '../../actions/ui/navigation';
+import { NAVIGATE_TO, NAVIGATE_BACK } from '../../actions/ui/navigation';
 var reducer = function (
 // eslint-disable-next-line default-param-last
 state, action) {

package/{es → lib/src}/types/common.d.ts

@@ -1,3 +1,4 @@
+export declare type ViewName = 'skills' | 'onboarding' | 'slides' | 'loader';
 export declare type ChoiceFromAPI = {
     _id: string;
     id?: string;
@@ -136,15 +137,17 @@ export declare type Services = {
     fetchRank(token: string): Promise<Rank>;
     fetchSlidesToReviewBySkillRef(url: string, token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
 };
-export declare type Options = {
-    services: Services;
-};
 export declare type AppOptions = {
     token: string;
     skillRef?: string;
     services: Services;
-    onQuitClick: Function;
+    onQuitClick: () => void;
     url: string;
+    callbackOnViewChanged?: (viewName: ViewName) => void;
+};
+export declare type ThunkOptions = {
+    callbackOnViewChanged?: AppOptions['callbackOnViewChanged'];
+    services: Services;
 };
 export declare type JWT = {
     exp: number;

package/{es → lib/src}/views/skills/index.d.ts

@@ -8,11 +8,9 @@ declare type SkillCard = {
     reviseLabel: string;
     reviseAriaLabel: string;
     isCustom: boolean;
-    onClick: Function;
+    onClick: () => void;
 };
 declare type NoSkillsProps = {
-    titleNoSkills: string;
-    textNoSkills: string;
     iconSkillAriaLabel: string;
 };
 declare type SkillsProps = NoSkillsProps & {

package/lib/{views → src/views}/skills/index.js

@@ -1,8 +1,6 @@
 export var mapStateToSkillsProps = function (state) {
     return {
         title: '@todo title',
-        titleNoSkills: '@todo titleNoSkills',
-        textNoSkills: '@todo textNoSkills',
         iconSkillAriaLabel: '@todo iconSkillAriaLabel',
         isLoading: false,
         isLoadingAriaLabel: '@todo loading',

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

@@ -0,0 +1,34 @@
+import type { Dispatch } from 'redux';
+import { ReviewPlayerProps } from '@coorpacademy/components/es/template/app-review/player/prop-types';
+import { SlideProps } from '@coorpacademy/components/es/organism/review-slide/prop-types';
+import type { StoreState } from '../../reducers';
+import type { AnswerUI } from '../../types/slides';
+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 SlideUIAnimations = 'unstack' | 'restack';
+export declare type ReviewSlide = {
+    position: number;
+    loading: boolean;
+    showCorrectionPopin?: boolean;
+    animateCorrectionPopin?: boolean;
+    parentContentTitle?: string;
+    questionText?: string;
+    answerUI?: AnswerUI;
+    animationType?: SlideUIAnimations;
+};
+declare type SlidesStack = {
+    [key: string]: SlideProps;
+};
+export declare const initialState: SlidesStack;
+export declare const buildStepItems: (state: StoreState) => StepItem[];
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, onQuitClick: () => void) => ReviewPlayerProps;
+export {};

package/lib/{views → src/views}/slides/index.js

@@ -175,7 +175,7 @@ var getCorrectionPopinProps = function (dispatch) {
                 message: isCorrect ? klf : join(',', correctAnswer)
             },
             next: {
-                ariaLabel: '_correctionNextAriaLabel',
+                'aria-label': '_correctionNextAriaLabel',
                 label: '_correctionNextLabel',
                 onClick: function () {
                     dispatch(nextSlide);
@@ -199,7 +199,7 @@ var buildQuitPopinProps = function (dispatch) {
                     color: '#ED3436'
                 },
                 handleOnclick: onQuitClick,
-                ariaLabel: 'Stop session'
+                'aria-label': 'Stop session'
             },
             secondButton: {
                 label: "Continuer d'apprendre",
@@ -207,7 +207,7 @@ var buildQuitPopinProps = function (dispatch) {
                 handleOnclick: function () {
                     dispatch(closeQuitPopin);
                 },
-                ariaLabel: 'Continue review'
+                'aria-label': 'Continue review'
             }
         };
     };
@@ -286,6 +286,7 @@ export var mapStateToSlidesProps = function (state, dispatch, onQuitClick) {
     var isCorrect = get(['data', 'progression', 'state', 'isCorrect'], state);
     var klf = getOr('', ['data', 'slides', currentSlideRef, 'klf'], state);
     var showQuitPopin = get(['ui', 'showQuitPopin'], state);
+    var showCongrats = get(['ui', 'showCongrats'], state);
     return {
         header: {
             mode: '__revision_mode',
@@ -293,7 +294,8 @@ export var mapStateToSlidesProps = function (state, dispatch, onQuitClick) {
             onQuitClick: function () { return dispatch(openQuitPopin); },
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
-            steps: buildStepItems(state)
+            steps: buildStepItems(state),
+            hiddenSteps: showCongrats
         },
         stack: {
             slides: buildStackSlides(state, dispatch),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -42,7 +42,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.24.5",
+    "@coorpacademy/components": "10.25.0",
     "@coorpacademy/redux-task": "1.1.6",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
@@ -77,5 +77,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "56b61ee3e78d9670cb28ab04d0a912779a265a78"
+  "gitHead": "c588893546b513a06e95efcc4dd7c5ce31b27a3f"
 }

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

@@ -2,7 +2,7 @@ import type {Dispatch} from 'redux';
 import buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
 import type {StoreState} from '../../reducers';
-import type {CorrectionFromAPI, Options} from '../../types/common';
+import type {CorrectionFromAPI, ThunkOptions} from '../../types/common';
 
 export const CORRECTION_FETCH_REQUEST = '@@correction/FETCH_REQUEST' as const;
 export const CORRECTION_FETCH_SUCCESS = '@@correction/FETCH_SUCCESS' as const;
@@ -22,7 +22,7 @@ export type ReceivedCorrection = {
 export const fetchCorrection = (
   dispatch: Dispatch,
   getState: () => StoreState,
-  {services}: Options
+  {services}: ThunkOptions
 ): ReceivedCorrection => {
   const state = getState();
   const slideRef = get(['ui', 'currentSlideRef'], state);

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

@@ -2,7 +2,7 @@ import buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
 import type {Dispatch} from 'redux';
 import type {StoreState} from '../../reducers';
-import type {Rank, Services, Options} from '../../types/common';
+import type {Rank, Services, ThunkOptions} from '../../types/common';
 
 export const RANK_FETCH_START_REQUEST = '@@rank/FETCH_START_REQUEST' as const;
 export const RANK_FETCH_START_SUCCESS = '@@rank/FETCH_START_SUCCESS' as const;
@@ -67,7 +67,7 @@ export const fetchRank = (
 export const fetchStartRank = (
   dispatch: Dispatch,
   getState: () => StoreState,
-  {services}: Options
+  {services}: ThunkOptions
 ): RankAction => {
   return fetchRank(
     dispatch,
@@ -81,7 +81,7 @@ export const fetchStartRank = (
 export const fetchEndRank = (
   dispatch: Dispatch,
   getState: () => StoreState,
-  {services}: Options
+  {services}: ThunkOptions
 ): RankAction => {
   return fetchRank(dispatch, getState, services, [
     RANK_FETCH_END_REQUEST,

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

@@ -2,7 +2,7 @@ import buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
 import type {Dispatch} from 'redux';
 import type {StoreState} from '../../reducers';
-import type {Options, Skill} from '../../types/common';
+import type {ThunkOptions, Skill} from '../../types/common';
 
 export const SKILLS_FETCH_REQUEST = '@@skills/FETCH_REQUEST' as const;
 export const SKILLS_FETCH_SUCCESS = '@@skills/FETCH_SUCCESS' as const;
@@ -16,7 +16,7 @@ export type ReceivedSkills = {
 export const fetchSkills = (
   dispatch: Dispatch,
   getState: () => StoreState,
-  {services}: Options
+  {services}: ThunkOptions
 ): ReceivedSkills => {
   const action = buildTask({
     types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],

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

@@ -4,7 +4,7 @@ import get from 'lodash/fp/get';
 import has from 'lodash/fp/has';
 import isEmpty from 'lodash/fp/isEmpty';
 import type {StoreState} from '../../reducers';
-import type {Options, SlideFromAPI} from '../../types/common';
+import type {ThunkOptions, SlideFromAPI} from '../../types/common';
 import {setCurrentSlide} from '../ui/slides';
 
 export const SLIDE_FETCH_REQUEST = '@@slides/FETCH_REQUEST' as const;
@@ -24,7 +24,11 @@ export type ReceivedSlide = {
 
 export const fetchSlide =
   (slideRef: string) =>
-  async (dispatch: Dispatch, getState: () => StoreState, {services}: Options): Promise<void> => {
+  async (
+    dispatch: Dispatch,
+    getState: () => StoreState,
+    {services}: ThunkOptions
+  ): Promise<void> => {
     const action = buildTask({
       types: [SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS, SLIDE_FETCH_FAILURE],
       bailout: (state: StoreState): boolean => {

package/src/actions/api/post-answer.ts

@@ -1,7 +1,7 @@
 import type {Dispatch} from 'redux';
 import buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
-import type {Options, ProgressionFromAPI} from '../../types/common';
+import type {ThunkOptions, ProgressionFromAPI} from '../../types/common';
 import type {StoreState} from '../../reducers';
 import {fetchCorrection} from './fetch-correction';
 import {fetchSlide} from './fetch-slide';
@@ -25,7 +25,7 @@ export type PostAnswerSuccessAction = {
 export const postAnswer = async (
   dispatch: Dispatch,
   getState: () => StoreState,
-  {services}: Options
+  {services}: ThunkOptions
 ): Promise<void> => {
   const state = getState();
   const currentSlideRef = get(['ui', 'currentSlideRef'], state);

package/src/actions/api/post-progression.ts

@@ -1,7 +1,7 @@
 import type {Dispatch} from 'redux';
 import buildTask from '@coorpacademy/redux-task';
 import get from 'lodash/fp/get';
-import type {Options, ProgressionFromAPI} from '../../types/common';
+import type {ThunkOptions, ProgressionFromAPI} from '../../types/common';
 import type {StoreState} from '../../reducers';
 import {fetchSlide} from './fetch-slide';
 
@@ -16,7 +16,11 @@ export type ReceivedProgression = {
 
 export const postProgression =
   (skillRef: string) =>
-  async (dispatch: Dispatch, getState: () => StoreState, {services}: Options): Promise<void> => {
+  async (
+    dispatch: Dispatch,
+    getState: () => StoreState,
+    {services}: ThunkOptions
+  ): Promise<void> => {
     const state = getState();
     const token = get(['data', 'token'], state);
     const action = buildTask({

package/src/actions/api/test/fetch-correction.test.ts

@@ -78,7 +78,7 @@ test('should dispatch CORRECTION_FETCH_SUCCESS actions when fetchCorrection retu
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchCorrection);
 });
@@ -113,7 +113,7 @@ test('should dispatch CORRECTION_FETCH_FAILURE action when fetchCorrection fails
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchCorrection);
 });

package/src/actions/api/test/fetch-rank.test.ts

@@ -53,7 +53,7 @@ test('should dispatch FETCH_START_SUCCESS action when fetchStartRank returns the
     }
   ];
 
-  const {dispatch, getState} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch, getState} = createTestStore(t, initialState, {services}, expectedActions);
   await dispatch(fetchStartRank);
 
   const newState = getState();
@@ -80,7 +80,7 @@ test('should dispatch FETCH_START_FAILURE action when fetchStartRank fails', asy
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchStartRank);
 });
@@ -105,7 +105,7 @@ test('should dispatch FETCH_END_SUCCESS action when fetchEndRank returns the end
   ];
 
   const _initialState = set('data.rank.start', 93, initialState);
-  const {dispatch, getState} = createTestStore(t, _initialState, services, expectedActions);
+  const {dispatch, getState} = createTestStore(t, _initialState, {services}, expectedActions);
 
   await dispatch(fetchEndRank);
   const newState = getState();
@@ -132,7 +132,7 @@ test('should dispatch FETCH_END_FAILURE action when fetchEndRank fails', async t
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchEndRank);
 });

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

@@ -48,7 +48,7 @@ test('should dispatch SKILLS_FETCH_SUCCESS actions when fetchSkills returns a li
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchSkills);
 });
@@ -72,7 +72,7 @@ test('should dispatch SKILLS_FETCH_FAILURE action when fetchSkills fails', async
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchSkills);
 });

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

@@ -53,7 +53,7 @@ test('should dispatch FETCH_SUCCESS and SET_CURRENT_SLIDE actions when fetchSlid
     {type: SET_CURRENT_SLIDE, payload: freeTextSlide}
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchSlide('sli_VJYjJnJhg'));
 });
@@ -79,7 +79,7 @@ test('should dispatch SLIDE_FETCH_FAILURE action when fetchSlide fails', async t
     }
   ];
 
-  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(fetchSlide('slide_ref'));
 });

package/src/actions/api/test/post-answer.test.ts

@@ -113,7 +113,7 @@ test('should dispatch post-answer, fetch-slide and fetch-correction and fetch-st
     }
   ];
 
-  const {dispatch, getState} = createTestStore(t, initialState, services, expectedActions);
+  const {dispatch, getState} = createTestStore(t, initialState, {services}, expectedActions);
 
   await dispatch(postAnswer);
 
@@ -202,7 +202,7 @@ test('should dispatch post-answer, fetch-correction and fetch-end-rank actions w
     }
   ];
 
-  const {dispatch, getState} = createTestStore(t, stateBeforeExitNode, services, expectedActions);
+  const {dispatch, getState} = createTestStore(t, stateBeforeExitNode, {services}, expectedActions);
 
   await dispatch(postAnswer);
 
@@ -231,10 +231,12 @@ test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_FAILURE on error', a
     t,
     initialState,
     {
-      ...services,
-      postAnswer: () => {
-        t.pass();
-        return Promise.reject(new Error('unexpected'));
+      services: {
+        ...services,
+        postAnswer: () => {
+          t.pass();
+          return Promise.reject(new Error('unexpected'));
+        }
       }
     },
     expectedActions
@@ -250,7 +252,9 @@ test('should not dispatch any action && throw an error if progression does not e
   const {dispatch} = createTestStore(
     t,
     {...initialState, data: {...initialState.data, progression: null}},
-    services,
+    {
+      services
+    },
     expectedActions
   );