@coorpacademy/app-review 0.1.14 → 0.1.16

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

@@ -1,13 +1,11 @@
-import type { ThunkAction } from 'redux-thunk';
-import { AnyAction } from 'redux';
+import { Dispatch } from 'redux';
 import type { StoreState } from '../../reducers';
 import { Options, Skill } from '../../types/common';
 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 interface ReceivedSkills extends AnyAction {
+export declare type ReceivedSkills = {
     type: '@@skills/FETCH_SUCCESS';
     payload: Skill[];
-}
-export declare type FetchSkillsAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
-export declare const fetchSkills: (token: string) => FetchSkillsAction;
+};
+export declare const fetchSkills: (token: string) => (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => Promise<void>;

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

@@ -2,7 +2,10 @@ import buildTask from '@coorpacademy/redux-task';
 export const SKILLS_FETCH_REQUEST = '@@skills/FETCH_REQUEST';
 export const SKILLS_FETCH_SUCCESS = '@@skills/FETCH_SUCCESS';
 export const SKILLS_FETCH_FAILURE = '@@skills/FETCH_FAILURE';
-export const fetchSkills = (token) => buildTask({
-    types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
-    task: (dispatch, getState, { services }) => services.fetchSkills(token)
-});
+export const fetchSkills = (token) => async (dispatch, getState, { services }) => {
+    const action = buildTask({
+        types: [SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS, SKILLS_FETCH_FAILURE],
+        task: () => services.fetchSkills(token)
+    });
+    await dispatch(action);
+};

package/es/actions/api/fetch-slide.d.ts

@@ -1,13 +1,20 @@
-import type { AnyAction } from 'redux';
-import type { ThunkAction } from 'redux-thunk';
+import type { Dispatch } from 'redux';
 import type { StoreState } from '../../reducers';
-import { Options, SlideFromAPI } from '../../types/common';
+import type { Options, SlideFromAPI } from '../../types/common';
 export declare const SLIDE_FETCH_REQUEST: "@@slides/FETCH_REQUEST";
 export declare const SLIDE_FETCH_SUCCESS: "@@slides/FETCH_SUCCESS";
 export declare const SLIDE_FETCH_FAILURE: "@@slides/FETCH_FAILURE";
-export interface ReceivedSlide extends AnyAction {
+export declare type FetchSlide = {
+    type: typeof SLIDE_FETCH_REQUEST;
+    meta: {
+        slideRef: string;
+    };
+};
+export declare type ReceivedSlide = {
     type: typeof SLIDE_FETCH_SUCCESS;
     payload: SlideFromAPI;
-}
-export declare type FetchSlideAction = ThunkAction<Promise<void>, StoreState, Options, AnyAction>;
-export declare const fetchSlide: (slideRef: string, token: string) => FetchSlideAction;
+    meta: {
+        slideRef: string;
+    };
+};
+export declare const fetchSlide: (slideRef: string, token: string) => (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => Promise<void>;

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

@@ -1,8 +1,31 @@
 import buildTask from '@coorpacademy/redux-task';
+import get from 'lodash/fp/get';
+import has from 'lodash/fp/has';
+import isEmpty from 'lodash/fp/isEmpty';
+import { setCurrentSlide } from '../ui/slides';
 export const SLIDE_FETCH_REQUEST = '@@slides/FETCH_REQUEST';
 export const SLIDE_FETCH_SUCCESS = '@@slides/FETCH_SUCCESS';
 export const SLIDE_FETCH_FAILURE = '@@slides/FETCH_FAILURE';
-export const fetchSlide = (slideRef, token) => buildTask({
-    types: [SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS, SLIDE_FETCH_FAILURE],
-    task: (dispatch, getState, { services }) => services.fetchSlide(slideRef, token)
-});
+export const fetchSlide = (slideRef, token) => async (dispatch, getState, { services }) => {
+    const action = buildTask({
+        types: [SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS, SLIDE_FETCH_FAILURE],
+        bailout: (state) => {
+            return has(`data.slide.${slideRef}`, state);
+        },
+        task: () => {
+            return services.fetchSlide(slideRef, token);
+        },
+        meta: { slideRef }
+    });
+    const response = await dispatch(action);
+    if (response.type === SLIDE_FETCH_SUCCESS) {
+        const slideFromAPI = response.payload;
+        if (!slideFromAPI)
+            throw new Error('Slide not found');
+        const state = getState();
+        const slides = get('data.progression.state.slides', state);
+        if (isEmpty(slides)) {
+            dispatch(setCurrentSlide(slideFromAPI));
+        }
+    }
+};

package/es/actions/api/post-progression.d.ts

@@ -1,13 +1,11 @@
-import type { AnyAction } from 'redux';
-import type { ThunkAction } from 'redux-thunk';
+import type { Dispatch } from 'redux';
 import { Options, ProgressionFromAPI } from '../../types/common';
 import type { StoreState } from '../../reducers';
 export declare const POST_PROGRESSION_REQUEST: "@@progression/POST_REQUEST";
 export declare const POST_PROGRESSION_SUCCESS: "@@progression/POST_SUCCESS";
 export declare const POST_PROGRESSION_FAILURE: "@@progression/POST_FAILURE";
-export interface ReceiveProgression extends AnyAction {
+export declare type ReceiveProgression = {
     type: typeof POST_PROGRESSION_SUCCESS;
     payload: ProgressionFromAPI;
-}
-export declare type PostProgressionAction = ThunkAction<Promise<ProgressionFromAPI>, StoreState, Options, AnyAction>;
-export declare const postProgression: (skillRef: string, token: string) => PostProgressionAction;
+};
+export declare const postProgression: (skillRef: string, token: string) => (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => Promise<void>;

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

@@ -3,13 +3,17 @@ import { fetchSlide } from './fetch-slide';
 export const POST_PROGRESSION_REQUEST = '@@progression/POST_REQUEST';
 export const POST_PROGRESSION_SUCCESS = '@@progression/POST_SUCCESS';
 export const POST_PROGRESSION_FAILURE = '@@progression/POST_FAILURE';
-export const postProgression = (skillRef, token) => buildTask({
-    types: [POST_PROGRESSION_REQUEST, POST_PROGRESSION_SUCCESS, POST_PROGRESSION_FAILURE],
-    task: (dispatch, getState, { services }) => {
-        return services.postProgression(skillRef, token).then((progression) => {
-            const { ref } = progression.state.nextContent;
-            dispatch(fetchSlide(ref, token));
-            return progression;
-        });
+export const postProgression = (skillRef, token) => async (dispatch, getState, { services }) => {
+    const action = buildTask({
+        types: [POST_PROGRESSION_REQUEST, POST_PROGRESSION_SUCCESS, POST_PROGRESSION_FAILURE],
+        task: () => {
+            return services.postProgression(skillRef, token);
+        }
+    });
+    const response = await dispatch(action);
+    if (response.type === POST_PROGRESSION_SUCCESS) {
+        const progression = response.payload;
+        const slideRef = progression.state.nextContent.ref;
+        await dispatch(fetchSlide(slideRef, token));
     }
-});
+};

package/es/actions/api/test/create-test-store.d.ts

@@ -0,0 +1,5 @@
+import type { ExecutionContext } from 'ava';
+import { AnyAction, Store } from 'redux';
+import { StoreState } from '../../../reducers';
+import { Services } from '../../../types/common';
+export declare const createTestStore: (t: ExecutionContext, initialState: StoreState, services: Services, actions: AnyAction[]) => Store;

package/es/actions/api/test/create-test-store.js

@@ -0,0 +1,16 @@
+import constant from 'lodash/fp/constant';
+import { applyMiddleware, compose, createStore } from 'redux';
+import thunk from 'redux-thunk';
+import rootReducer from '../../../reducers';
+const assertActionsMiddleware = (t, ACTIONS) => constant((next) => (action) => {
+    const expectedAction = ACTIONS.shift();
+    if (!expectedAction)
+        throw new Error(`Missing {type: "${action.type}"} action`);
+    t.deepEqual(action, expectedAction);
+    return next(action);
+});
+export const createTestStore = (t, initialState, services, actions) => {
+    const thunkMiddleware = thunk.withExtraArgument({ services });
+    const enhancer = compose(applyMiddleware(thunkMiddleware, assertActionsMiddleware(t, actions)));
+    return createStore(rootReducer, initialState, enhancer);
+};

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

@@ -0,0 +1,54 @@
+import test from 'ava';
+import { fetchSkills, SKILLS_FETCH_FAILURE, SKILLS_FETCH_REQUEST, SKILLS_FETCH_SUCCESS } from '../fetch-skills';
+import { services as mockedServices } from '../../../test/util/services.mock';
+import { createTestStore } from './create-test-store';
+const initialState = {
+    data: {
+        progression: null,
+        slides: {},
+        skills: [],
+        token: '1234'
+    },
+    ui: {
+        currentSlideRef: '',
+        navigation: [],
+        answers: []
+    }
+};
+test('should dispatch SKILLS_FETCH_SUCCESS actions when fetchSkills return a list of skills', async (t) => {
+    const services = {
+        ...mockedServices,
+        fetchSkills: token => {
+            t.is(token, '1234');
+            return Promise.resolve([]);
+        }
+    };
+    const expectedActions = [
+        { type: SKILLS_FETCH_REQUEST },
+        {
+            type: SKILLS_FETCH_SUCCESS,
+            payload: []
+        }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(fetchSkills('1234'));
+});
+test('should dispatch SKILLS_FETCH_FAILURE action when fetchSkills fails', async (t) => {
+    const services = {
+        ...mockedServices,
+        fetchSkills: token => {
+            t.is(token, '1234');
+            return Promise.reject(new Error('unexpected'));
+        }
+    };
+    const expectedActions = [
+        { type: SKILLS_FETCH_REQUEST },
+        {
+            type: SKILLS_FETCH_FAILURE,
+            payload: new Error('unexpected'),
+            error: true
+        }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(fetchSkills('1234'));
+});

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

@@ -0,0 +1,61 @@
+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';
+const 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', async (t) => {
+    const services = {
+        ...mockedServices,
+        fetchSlide: (slideRef, token) => {
+            t.is(token, '1234');
+            t.is(slideRef, 'sli_VJYjJnJhg');
+            return Promise.resolve(freeTextSlide);
+        }
+    };
+    const 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 }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(fetchSlide('sli_VJYjJnJhg', '1234'));
+});
+test('should dispatch SLIDE_FETCH_FAILURE action when fetchSlide fails', async (t) => {
+    const services = {
+        ...mockedServices,
+        fetchSlide: (slideRef, token) => {
+            t.is(token, '1234');
+            t.is(slideRef, 'slide_ref');
+            return Promise.reject(new Error('error'));
+        }
+    };
+    const expectedActions = [
+        { type: SLIDE_FETCH_REQUEST, meta: { slideRef: 'slide_ref' } },
+        {
+            type: SLIDE_FETCH_FAILURE,
+            meta: { slideRef: 'slide_ref' },
+            payload: new Error('error'),
+            error: true
+        }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(fetchSlide('slide_ref', '1234'));
+});

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

@@ -0,0 +1,102 @@
+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';
+const 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', async (t) => {
+    const 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
+        }
+    };
+    const services = {
+        ...mockedServices,
+        postProgression: (skillRef, token) => {
+            t.is(token, '1234');
+            t.is(skillRef, 'skill_12345');
+            return Promise.resolve(progression);
+        },
+        fetchSlide: (slideRef, token) => {
+            t.is(token, '1234');
+            t.is(slideRef, 'sli_VJYjJnJhg');
+            return Promise.resolve(freeTextSlide);
+        }
+    };
+    const 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 }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(postProgression('skill_12345', '1234'));
+});
+test('should dispatch POST_PROGRESSION_FAILURE action when postProgression fails', async (t) => {
+    const services = {
+        ...mockedServices,
+        postProgression: (skillRef, token) => {
+            t.is(token, '1234');
+            t.is(skillRef, 'skill_12345');
+            return Promise.reject(new Error('error'));
+        }
+    };
+    const expectedActions = [
+        { type: POST_PROGRESSION_REQUEST },
+        {
+            type: POST_PROGRESSION_FAILURE,
+            payload: new Error('error'),
+            error: true
+        }
+    ];
+    const { dispatch } = createTestStore(t, initialState, services, expectedActions);
+    await dispatch(postProgression('skill_12345', '1234'));
+});

package/es/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/es/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/es/actions/ui/answers.js

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

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

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

package/es/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/es/actions/ui/slides.js

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

package/es/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/es/common/index.js

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

package/es/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/es/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'];