@coorpacademy/app-review 0.7.4 → 0.7.5-alpha.32

package/es/actions/api/fetch-slides-to-review-by-skill-ref.d.ts

@@ -0,0 +1,11 @@
+import type { Dispatch } from 'redux';
+import type { StoreState } from '../../reducers';
+import type { Options, SlideIdFromAPI } from '../../types/common';
+export declare const SLIDES_TO_REVIEW_FETCH_REQUEST: "@@slidesToReview/FETCH_REQUEST";
+export declare const SLIDES_TO_REVIEW_FETCH_SUCCESS: "@@slidesToReview/FETCH_SUCCESS";
+export declare const SLIDES_TO_REVIEW_FETCH_FAILURE: "@@slidesToReview/FETCH_FAILURE";
+export declare type ReceivedSlidesToReviewBySkillRef = {
+    type: typeof SLIDES_TO_REVIEW_FETCH_SUCCESS;
+    payload: SlideIdFromAPI[];
+};
+export declare const fetchSlidesToReviewBySkillRef: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => ReceivedSlidesToReviewBySkillRef;

package/es/actions/api/fetch-slides-to-review-by-skill-ref.js

@@ -0,0 +1,21 @@
+import buildTask from '@coorpacademy/redux-task';
+export const SLIDES_TO_REVIEW_FETCH_REQUEST = '@@slidesToReview/FETCH_REQUEST';
+export const SLIDES_TO_REVIEW_FETCH_SUCCESS = '@@slidesToReview/FETCH_SUCCESS';
+export const SLIDES_TO_REVIEW_FETCH_FAILURE = '@@slidesToReview/FETCH_FAILURE';
+export const fetchSlidesToReviewBySkillRef = (dispatch, getState, { services }) => {
+    const action = buildTask({
+        types: [
+            SLIDES_TO_REVIEW_FETCH_REQUEST,
+            SLIDES_TO_REVIEW_FETCH_SUCCESS,
+            SLIDES_TO_REVIEW_FETCH_FAILURE
+        ],
+        task: () => {
+            const state = getState();
+            const token = state.data.token;
+            const progression = state.data.progression;
+            const skillRef = progression.content.ref;
+            return services.fetchSlidesToReviewBySkillRef(token, skillRef);
+        }
+    });
+    return dispatch(action);
+};

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

@@ -3,6 +3,7 @@ import get from 'lodash/fp/get';
 import { fetchCorrection } from './fetch-correction';
 import { fetchSlide } from './fetch-slide';
 import { fetchEndRank, fetchStartRank } from './fetch-rank';
+import { fetchSlidesToReviewBySkillRef } from './fetch-slides-to-review-by-skill-ref';
 export const POST_ANSWER_REQUEST = '@@answer/POST_REQUEST';
 export const POST_ANSWER_SUCCESS = '@@answer/POST_SUCCESS';
 export const POST_ANSWER_FAILURE = '@@answer/POST_FAILURE';
@@ -31,6 +32,7 @@ export const postAnswer = async (dispatch, getState, { services }) => {
         else {
             await dispatch(fetchCorrection);
             await dispatch(fetchEndRank);
+            await dispatch(fetchSlidesToReviewBySkillRef);
         }
     }
 };

package/es/index.js

@@ -24,7 +24,7 @@ const ConnectedApp = (options) => {
 const AppReview = ({ options }) => {
     const [store, setStore] = useState(null);
     const [isProgressionCreated, setIsProgressionCreated] = useState(false);
-    const { translate, onQuitClick } = options;
+    const { translate, onQuitClick, skill } = options;
     useEffect(() => {
         if (store)
             return;
@@ -49,25 +49,23 @@ const AppReview = ({ options }) => {
         const token = get('token', options);
         if (store === null || isEmpty(token))
             return;
-        const skillRef = get('skillRef', options);
         /* 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)) : store.dispatch(fetchSkills);
+        skill.ref ? store.dispatch(postProgression(skill.ref)) : store.dispatch(fetchSkills);
     }, [options, store]);
     useEffect(() => {
         if (store === null)
             return;
-        const { skillRef } = options;
-        if (skillRef && !isProgressionCreated) {
+        if (skill.ref && !isProgressionCreated) {
             store.dispatch(navigateTo('loader')); // use loader while posting progression
             return;
         }
-        const initialView = skillRef ? 'slides' : 'skills';
+        const initialView = skill.ref ? 'slides' : 'skills';
         store.dispatch(navigateTo(initialView));
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
     return (React.createElement(Provider, { store: store },
-        React.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate })));
+        React.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate, skill: skill })));
 };
 export default AppReview;

package/es/reducers/index.d.ts

@@ -20,9 +20,10 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         slide: import("./ui/slide").UISlideState;
         positions: import("./ui/positions").UIPositionState;
         showQuitPopin: boolean;
+        showButtonRevising: 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").NavigateToAction | import("../actions/ui/navigation").NavigateBackAction | import("../actions/ui/answers").EditAnswerAction | {
+}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/fetch-slides-to-review-by-skill-ref").ReceivedSlidesToReviewBySkillRef | 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/es/reducers/ui/index.d.ts

@@ -4,6 +4,7 @@ import { UIAnswerState } from './answers';
 import { UIPositionState } from './positions';
 import { UISlideState } from './slide';
 import { type ShowQuitPopinState } from './quit-popin';
+import { UIShowButtonRevisingState } from './show-button-revising';
 import { UIShowCongratsState } from './show-congrats';
 export declare type UIState = {
     currentSlideRef: CurrentSlideRefState;
@@ -12,6 +13,7 @@ export declare type UIState = {
     slide: UISlideState;
     positions: UIPositionState;
     showQuitPopin: ShowQuitPopinState;
+    showButtonRevising: UIShowButtonRevisingState;
     showCongrats: UIShowCongratsState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
@@ -21,8 +23,9 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     slide: UISlideState;
     positions: UIPositionState;
     showQuitPopin: boolean;
+    showButtonRevising: 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").NavigateToAction | import("../../actions/ui/navigation").NavigateBackAction | 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/fetch-slides-to-review-by-skill-ref").ReceivedSlidesToReviewBySkillRef | 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/reducers/ui/index.js

@@ -5,6 +5,7 @@ import answers from './answers';
 import positions from './positions';
 import slide from './slide';
 import showQuitPopin from './quit-popin';
+import showButtonRevising from './show-button-revising';
 import showCongrats from './show-congrats';
 export default combineReducers({
     currentSlideRef,
@@ -13,5 +14,6 @@ export default combineReducers({
     slide,
     positions,
     showQuitPopin,
+    showButtonRevising,
     showCongrats
 });

package/es/reducers/ui/show-button-revising.d.ts

@@ -0,0 +1,4 @@
+import { ReceivedSlidesToReviewBySkillRef } from '../../actions/api/fetch-slides-to-review-by-skill-ref';
+export declare type UIShowButtonRevisingState = boolean;
+declare const reducer: (state: boolean | undefined, action: ReceivedSlidesToReviewBySkillRef) => UIShowButtonRevisingState;
+export default reducer;

package/es/reducers/ui/show-button-revising.js

@@ -0,0 +1,13 @@
+import { SLIDES_TO_REVIEW_FETCH_SUCCESS } from '../../actions/api/fetch-slides-to-review-by-skill-ref';
+const reducer = (
+// eslint-disable-next-line default-param-last
+state = false, action) => {
+    switch (action.type) {
+        case SLIDES_TO_REVIEW_FETCH_SUCCESS: {
+            return action.payload.length === 5;
+        }
+        default:
+            return state;
+    }
+};
+export default reducer;

package/es/services/fetch-slides-to-review-by-skill-ref.d.ts

@@ -1,2 +1,2 @@
 import { SlideIdFromAPI } from '../types/common';
-export declare const fetchSlidesToReviewBySkillRef: (url: string, token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;
+export declare const fetchSlidesToReviewBySkillRef: (token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;

package/es/services/fetch-slides-to-review-by-skill-ref.js

@@ -1,8 +1,10 @@
 import crossFetch from 'cross-fetch';
 import decode from 'jwt-decode';
 import { toJSON } from './tools/fetch-responses';
-export const fetchSlidesToReviewBySkillRef = async (url, token, skillRef) => {
-    const { user: userId } = decode(token);
-    const response = await crossFetch(`${url}/api/v1/review/users/${userId}/skills/${skillRef}/slide?limit=5&offset=0`);
+export const fetchSlidesToReviewBySkillRef = async (token, skillRef) => {
+    const { user: userId, host } = decode(token);
+    const response = await crossFetch(`${host}/api/v2/skills/${skillRef}/review/user/${userId}/slide`, {
+        headers: { authorization: token }
+    });
     return toJSON(response);
 };

package/es/types/common.d.ts

@@ -128,6 +128,10 @@ export declare type Skill = {
     custom: boolean;
     name: string;
 };
+export declare type SkillOptions = {
+    name: string;
+    ref: string;
+};
 export declare type Services = {
     fetchSkills(token: string): Promise<Skill[]>;
     fetchSlide(slideRef: string, token: string): Promise<SlideFromAPI | void>;
@@ -135,7 +139,7 @@ export declare type Services = {
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
     fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
     fetchRank(token: string): Promise<Rank>;
-    fetchSlidesToReviewBySkillRef(url: string, token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
+    fetchSlidesToReviewBySkillRef(token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
 };
 export declare type Options = {
     services: Services;
@@ -143,12 +147,11 @@ export declare type Options = {
 export declare type ConnectedOptions = {
     translate: (key: string, data?: unknown) => string;
     onQuitClick: () => void;
+    skill: SkillOptions;
 };
 export declare type AppOptions = ConnectedOptions & {
     token: string;
-    skillRef?: string;
     services: Services;
-    url: string;
     callbackOnViewChanged?: (viewName: ViewName) => void;
 };
 export declare type ThunkOptions = {

package/es/views/slides/index.js

@@ -189,28 +189,28 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         type: isCorrect ? 'right' : 'wrong'
     };
 };
-const buildQuitPopinProps = (dispatch) => (onQuitClick) => {
+const buildQuitPopinProps = (dispatch) => (onQuitClick, translate) => {
     return {
-        content: `Tu t'en vas déjà ?`,
+        content: translate('Quit Title'),
         icon: `MoonRocket`,
         mode: 'alert',
-        descriptionText: `Tu vas t'en sortir ! Si tu arrêtes maintenant, tu vas perdre ta progression.`,
+        descriptionText: translate('Quit Description Text'),
         firstButton: {
-            label: 'Arrêter ma session',
+            label: translate('Stop learning'),
             type: 'tertiary',
             customStyle: {
                 color: '#ED3436'
             },
             handleOnclick: onQuitClick,
-            'aria-label': 'Stop session'
+            'aria-label': translate('Stop learning')
         },
         secondButton: {
-            label: `Continuer d'apprendre`,
+            label: translate('Continue learning'),
             type: 'primary',
             handleOnclick: () => {
                 dispatch(closeQuitPopin);
             },
-            'aria-label': 'Continue review'
+            'aria-label': translate('Continue learning')
         }
     };
 };
@@ -282,7 +282,7 @@ const isEndOfProgression = (progression) => {
     return progression.state.nextContent.ref === 'successExitNode';
 };
 export const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick } = options;
+    const { translate, onQuitClick, skill } = options;
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = get(['data', 'corrections', currentSlideRef], state);
@@ -290,10 +290,12 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
     const klf = getOr('', ['data', 'slides', currentSlideRef, 'klf'], state);
     const showQuitPopin = get(['ui', 'showQuitPopin'], state);
     const showCongrats = get(['ui', 'showCongrats'], state);
+    // eslint-disable-next-line no-console
+    console.log(skill.name);
     return {
         header: {
             mode: translate('Review Title'),
-            skillName: '__agility',
+            skillName: skill.name,
             onQuitClick: () => dispatch(openQuitPopin),
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
@@ -314,6 +316,6 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
             endReview: endReview && state.ui.showCongrats
         },
         congrats: buildCongratsProps(state, translate),
-        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
+        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick, translate) : undefined
     };
 };

package/lib/actions/api/fetch-slides-to-review-by-skill-ref.d.ts

@@ -0,0 +1,11 @@
+import type { Dispatch } from 'redux';
+import type { StoreState } from '../../reducers';
+import type { Options, SlideIdFromAPI } from '../../types/common';
+export declare const SLIDES_TO_REVIEW_FETCH_REQUEST: "@@slidesToReview/FETCH_REQUEST";
+export declare const SLIDES_TO_REVIEW_FETCH_SUCCESS: "@@slidesToReview/FETCH_SUCCESS";
+export declare const SLIDES_TO_REVIEW_FETCH_FAILURE: "@@slidesToReview/FETCH_FAILURE";
+export declare type ReceivedSlidesToReviewBySkillRef = {
+    type: typeof SLIDES_TO_REVIEW_FETCH_SUCCESS;
+    payload: SlideIdFromAPI[];
+};
+export declare const fetchSlidesToReviewBySkillRef: (dispatch: Dispatch, getState: () => StoreState, { services }: Options) => ReceivedSlidesToReviewBySkillRef;

package/lib/actions/api/fetch-slides-to-review-by-skill-ref.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSlidesToReviewBySkillRef = exports.SLIDES_TO_REVIEW_FETCH_FAILURE = exports.SLIDES_TO_REVIEW_FETCH_SUCCESS = exports.SLIDES_TO_REVIEW_FETCH_REQUEST = void 0;
+const redux_task_1 = __importDefault(require("@coorpacademy/redux-task"));
+exports.SLIDES_TO_REVIEW_FETCH_REQUEST = '@@slidesToReview/FETCH_REQUEST';
+exports.SLIDES_TO_REVIEW_FETCH_SUCCESS = '@@slidesToReview/FETCH_SUCCESS';
+exports.SLIDES_TO_REVIEW_FETCH_FAILURE = '@@slidesToReview/FETCH_FAILURE';
+const fetchSlidesToReviewBySkillRef = (dispatch, getState, { services }) => {
+    const action = (0, redux_task_1.default)({
+        types: [
+            exports.SLIDES_TO_REVIEW_FETCH_REQUEST,
+            exports.SLIDES_TO_REVIEW_FETCH_SUCCESS,
+            exports.SLIDES_TO_REVIEW_FETCH_FAILURE
+        ],
+        task: () => {
+            const state = getState();
+            const token = state.data.token;
+            const progression = state.data.progression;
+            const skillRef = progression.content.ref;
+            return services.fetchSlidesToReviewBySkillRef(token, skillRef);
+        }
+    });
+    return dispatch(action);
+};
+exports.fetchSlidesToReviewBySkillRef = fetchSlidesToReviewBySkillRef;

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

@@ -9,6 +9,7 @@ const get_1 = __importDefault(require("lodash/fp/get"));
 const fetch_correction_1 = require("./fetch-correction");
 const fetch_slide_1 = require("./fetch-slide");
 const fetch_rank_1 = require("./fetch-rank");
+const fetch_slides_to_review_by_skill_ref_1 = require("./fetch-slides-to-review-by-skill-ref");
 exports.POST_ANSWER_REQUEST = '@@answer/POST_REQUEST';
 exports.POST_ANSWER_SUCCESS = '@@answer/POST_SUCCESS';
 exports.POST_ANSWER_FAILURE = '@@answer/POST_FAILURE';
@@ -37,6 +38,7 @@ const postAnswer = async (dispatch, getState, { services }) => {
         else {
             await dispatch(fetch_correction_1.fetchCorrection);
             await dispatch(fetch_rank_1.fetchEndRank);
+            await dispatch(fetch_slides_to_review_by_skill_ref_1.fetchSlidesToReviewBySkillRef);
         }
     }
 };

package/lib/index.js

@@ -52,7 +52,7 @@ const ConnectedApp = (options) => {
 const AppReview = ({ options }) => {
     const [store, setStore] = (0, react_1.useState)(null);
     const [isProgressionCreated, setIsProgressionCreated] = (0, react_1.useState)(false);
-    const { translate, onQuitClick } = options;
+    const { translate, onQuitClick, skill } = options;
     (0, react_1.useEffect)(() => {
         if (store)
             return;
@@ -77,25 +77,23 @@ const AppReview = ({ options }) => {
         const token = (0, get_1.default)('token', options);
         if (store === null || (0, isEmpty_1.default)(token))
             return;
-        const skillRef = (0, get_1.default)('skillRef', options);
         /* 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((0, post_progression_1.postProgression)(skillRef)) : store.dispatch(fetch_skills_1.fetchSkills);
+        skill.ref ? store.dispatch((0, post_progression_1.postProgression)(skill.ref)) : store.dispatch(fetch_skills_1.fetchSkills);
     }, [options, store]);
     (0, react_1.useEffect)(() => {
         if (store === null)
             return;
-        const { skillRef } = options;
-        if (skillRef && !isProgressionCreated) {
+        if (skill.ref && !isProgressionCreated) {
             store.dispatch((0, navigation_1.navigateTo)('loader')); // use loader while posting progression
             return;
         }
-        const initialView = skillRef ? 'slides' : 'skills';
+        const initialView = skill.ref ? 'slides' : 'skills';
         store.dispatch((0, navigation_1.navigateTo)(initialView));
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
     return (react_1.default.createElement(react_redux_1.Provider, { store: store },
-        react_1.default.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate })));
+        react_1.default.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate, skill: skill })));
 };
 exports.default = AppReview;

package/lib/reducers/index.d.ts

@@ -20,9 +20,10 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         slide: import("./ui/slide").UISlideState;
         positions: import("./ui/positions").UIPositionState;
         showQuitPopin: boolean;
+        showButtonRevising: 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").NavigateToAction | import("../actions/ui/navigation").NavigateBackAction | import("../actions/ui/answers").EditAnswerAction | {
+}>, import("./data/corrections").CorrectionsAction | import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-rank").RankAction | import("../actions/api/fetch-slides-to-review-by-skill-ref").ReceivedSlidesToReviewBySkillRef | 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/ui/index.d.ts

@@ -4,6 +4,7 @@ import { UIAnswerState } from './answers';
 import { UIPositionState } from './positions';
 import { UISlideState } from './slide';
 import { type ShowQuitPopinState } from './quit-popin';
+import { UIShowButtonRevisingState } from './show-button-revising';
 import { UIShowCongratsState } from './show-congrats';
 export declare type UIState = {
     currentSlideRef: CurrentSlideRefState;
@@ -12,6 +13,7 @@ export declare type UIState = {
     slide: UISlideState;
     positions: UIPositionState;
     showQuitPopin: ShowQuitPopinState;
+    showButtonRevising: UIShowButtonRevisingState;
     showCongrats: UIShowCongratsState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
@@ -21,8 +23,9 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     slide: UISlideState;
     positions: UIPositionState;
     showQuitPopin: boolean;
+    showButtonRevising: 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").NavigateToAction | import("../../actions/ui/navigation").NavigateBackAction | 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/fetch-slides-to-review-by-skill-ref").ReceivedSlidesToReviewBySkillRef | 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/lib/reducers/ui/index.js

@@ -10,6 +10,7 @@ const answers_1 = __importDefault(require("./answers"));
 const positions_1 = __importDefault(require("./positions"));
 const slide_1 = __importDefault(require("./slide"));
 const quit_popin_1 = __importDefault(require("./quit-popin"));
+const show_button_revising_1 = __importDefault(require("./show-button-revising"));
 const show_congrats_1 = __importDefault(require("./show-congrats"));
 exports.default = (0, redux_1.combineReducers)({
     currentSlideRef: current_slide_ref_1.default,
@@ -18,5 +19,6 @@ exports.default = (0, redux_1.combineReducers)({
     slide: slide_1.default,
     positions: positions_1.default,
     showQuitPopin: quit_popin_1.default,
+    showButtonRevising: show_button_revising_1.default,
     showCongrats: show_congrats_1.default
 });

package/lib/reducers/ui/show-button-revising.d.ts

@@ -0,0 +1,4 @@
+import { ReceivedSlidesToReviewBySkillRef } from '../../actions/api/fetch-slides-to-review-by-skill-ref';
+export declare type UIShowButtonRevisingState = boolean;
+declare const reducer: (state: boolean | undefined, action: ReceivedSlidesToReviewBySkillRef) => UIShowButtonRevisingState;
+export default reducer;

package/lib/reducers/ui/show-button-revising.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fetch_slides_to_review_by_skill_ref_1 = require("../../actions/api/fetch-slides-to-review-by-skill-ref");
+const reducer = (
+// eslint-disable-next-line default-param-last
+state = false, action) => {
+    switch (action.type) {
+        case fetch_slides_to_review_by_skill_ref_1.SLIDES_TO_REVIEW_FETCH_SUCCESS: {
+            return action.payload.length === 5;
+        }
+        default:
+            return state;
+    }
+};
+exports.default = reducer;

package/lib/services/fetch-slides-to-review-by-skill-ref.d.ts

@@ -1,2 +1,2 @@
 import { SlideIdFromAPI } from '../types/common';
-export declare const fetchSlidesToReviewBySkillRef: (url: string, token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;
+export declare const fetchSlidesToReviewBySkillRef: (token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;

package/lib/services/fetch-slides-to-review-by-skill-ref.js

@@ -7,9 +7,11 @@ exports.fetchSlidesToReviewBySkillRef = void 0;
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const jwt_decode_1 = __importDefault(require("jwt-decode"));
 const fetch_responses_1 = require("./tools/fetch-responses");
-const fetchSlidesToReviewBySkillRef = async (url, token, skillRef) => {
-    const { user: userId } = (0, jwt_decode_1.default)(token);
-    const response = await (0, cross_fetch_1.default)(`${url}/api/v1/review/users/${userId}/skills/${skillRef}/slide?limit=5&offset=0`);
+const fetchSlidesToReviewBySkillRef = async (token, skillRef) => {
+    const { user: userId, host } = (0, jwt_decode_1.default)(token);
+    const response = await (0, cross_fetch_1.default)(`${host}/api/v2/skills/${skillRef}/review/user/${userId}/slide`, {
+        headers: { authorization: token }
+    });
     return (0, fetch_responses_1.toJSON)(response);
 };
 exports.fetchSlidesToReviewBySkillRef = fetchSlidesToReviewBySkillRef;

package/lib/types/common.d.ts

@@ -128,6 +128,10 @@ export declare type Skill = {
     custom: boolean;
     name: string;
 };
+export declare type SkillOptions = {
+    name: string;
+    ref: string;
+};
 export declare type Services = {
     fetchSkills(token: string): Promise<Skill[]>;
     fetchSlide(slideRef: string, token: string): Promise<SlideFromAPI | void>;
@@ -135,7 +139,7 @@ export declare type Services = {
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
     fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
     fetchRank(token: string): Promise<Rank>;
-    fetchSlidesToReviewBySkillRef(url: string, token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
+    fetchSlidesToReviewBySkillRef(token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
 };
 export declare type Options = {
     services: Services;
@@ -143,12 +147,11 @@ export declare type Options = {
 export declare type ConnectedOptions = {
     translate: (key: string, data?: unknown) => string;
     onQuitClick: () => void;
+    skill: SkillOptions;
 };
 export declare type AppOptions = ConnectedOptions & {
     token: string;
-    skillRef?: string;
     services: Services;
-    url: string;
     callbackOnViewChanged?: (viewName: ViewName) => void;
 };
 export declare type ThunkOptions = {

package/lib/views/slides/index.js

@@ -196,28 +196,28 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         type: isCorrect ? 'right' : 'wrong'
     };
 };
-const buildQuitPopinProps = (dispatch) => (onQuitClick) => {
+const buildQuitPopinProps = (dispatch) => (onQuitClick, translate) => {
     return {
-        content: `Tu t'en vas déjà ?`,
+        content: translate('Quit Title'),
         icon: `MoonRocket`,
         mode: 'alert',
-        descriptionText: `Tu vas t'en sortir ! Si tu arrêtes maintenant, tu vas perdre ta progression.`,
+        descriptionText: translate('Quit Description Text'),
         firstButton: {
-            label: 'Arrêter ma session',
+            label: translate('Stop learning'),
             type: 'tertiary',
             customStyle: {
                 color: '#ED3436'
             },
             handleOnclick: onQuitClick,
-            'aria-label': 'Stop session'
+            'aria-label': translate('Stop learning')
         },
         secondButton: {
-            label: `Continuer d'apprendre`,
+            label: translate('Continue learning'),
             type: 'primary',
             handleOnclick: () => {
                 dispatch(quit_popin_1.closeQuitPopin);
             },
-            'aria-label': 'Continue review'
+            'aria-label': translate('Continue learning')
         }
     };
 };
@@ -289,7 +289,7 @@ const isEndOfProgression = (progression) => {
     return progression.state.nextContent.ref === 'successExitNode';
 };
 const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick } = options;
+    const { translate, onQuitClick, skill } = options;
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = (0, get_1.default)(['data', 'corrections', currentSlideRef], state);
@@ -297,10 +297,12 @@ const mapStateToSlidesProps = (state, dispatch, options) => {
     const klf = (0, getOr_1.default)('', ['data', 'slides', currentSlideRef, 'klf'], state);
     const showQuitPopin = (0, get_1.default)(['ui', 'showQuitPopin'], state);
     const showCongrats = (0, get_1.default)(['ui', 'showCongrats'], state);
+    // eslint-disable-next-line no-console
+    console.log(skill.name);
     return {
         header: {
             mode: translate('Review Title'),
-            skillName: '__agility',
+            skillName: skill.name,
             onQuitClick: () => dispatch(quit_popin_1.openQuitPopin),
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
@@ -321,7 +323,7 @@ const mapStateToSlidesProps = (state, dispatch, options) => {
             endReview: endReview && state.ui.showCongrats
         },
         congrats: buildCongratsProps(state, translate),
-        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
+        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick, translate) : undefined
     };
 };
 exports.mapStateToSlidesProps = mapStateToSlidesProps;

package/locales/bs/review.json

@@ -1,14 +1,18 @@
 {
-    "Review Title": "Review Mode",
-    "Content Parent Title": "From `{{contentTitle}}` `{{contentType}}`",
-    "Validate": "Validate",
-    "Next Question": "Next Question",
-    "KLF": "Key point",
-    "Correct Answer": "Good Answer",
-    "Wrong Answer": "Wrong Answer",
-    "You have won": "You have won",
-    "You are now": "You are now",
-    "Revise another skill": "Review another skill",
-    "Continue reviewing": "Keep reviewing",
-    "Congratulations!": "Congratulations!"
+    "Review Title": "Recenzija Mode",
+    "Content Parent Title": "Od `{{contentTitle}}` `{{contentType}}`",
+    "Validate": "Potvrdi",
+    "Next question": "Sljedeće pitanje",
+    "KLF": "Ključni faktor učenja",
+    "Correct Answer": "Tačan odgovor",
+    "Wrong Answer": "Pogrešan odgovor",
+    "You have won": "Pobijedio si",
+    "You are now": "Sada jesi",
+    "Revise another skill": "Revidirajte drugu vještinu",
+    "Continue reviewing": "Nastavite sa pregledom",
+    "Congratulations!": "Čestitamo!",
+    "Quit Title": "Are you sure you want to quit ?",
+    "Quit Description Text": "You’re right on track! If you quit now, you’ll lose your progress.",
+    "Stop learning": "End session",
+    "Continue learning": "Continue learning"
 }