@coorpacademy/app-review 0.7.1-alpha.10 → 0.7.2-alpha.0

package/es/index.js

@@ -8,15 +8,15 @@ 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 { mapStateToSkillsProps } from './views/skills';
 import { mapStateToSlidesProps } from './views/slides';
-const ConnectedApp = (options) => {
+import { mapStateToSkillsProps } from './views/skills';
+const ConnectedApp = ({ onQuitClick }) => {
     const dispatch = useDispatch();
     const props = {
+        navigateBack: () => dispatch(navigateBack),
         viewName: useSelector((state) => state.ui.navigation[state.ui.navigation.length - 1]),
-        slides: useSelector((state) => mapStateToSlidesProps(state, dispatch, options)),
+        slides: useSelector((state) => mapStateToSlidesProps(state, dispatch, onQuitClick)),
         skills: useSelector((state) => mapStateToSkillsProps(state)),
-        navigateBack: () => dispatch(navigateBack),
         onboarding: {}
     };
     return React.createElement(AppReviewTemplate, { ...props });
@@ -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 onQuitClick = options.onQuitClick;
     useEffect(() => {
         if (store)
             return;
@@ -68,6 +68,6 @@ const AppReview = ({ options }) => {
     if (!store)
         return null;
     return (React.createElement(Provider, { store: store },
-        React.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate })));
+        React.createElement(ConnectedApp, { onQuitClick: onQuitClick })));
 };
 export default AppReview;

package/es/types/common.d.ts

@@ -137,17 +137,12 @@ 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 ConnectedOptions = {
-    translate: (key: string, data?: unknown) => string;
-    onQuitClick: () => void;
-};
-export declare type AppOptions = ConnectedOptions & {
+export declare type AppOptions = {
     token: string;
     skillRef?: string;
     services: Services;
+    onQuitClick: () => void;
+    translate: Function;
     url: string;
     callbackOnViewChanged?: (viewName: ViewName) => void;
 };

package/es/views/slides/index.d.ts

@@ -1,7 +1,6 @@
 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 { ConnectedOptions } from '../../types/common';
 import type { StoreState } from '../../reducers';
 import type { AnswerUI } from '../../types/slides';
 declare const ICON_VALUES: {
@@ -31,5 +30,5 @@ declare type SlidesStack = {
 };
 export declare const initialState: SlidesStack;
 export declare const buildStepItems: (state: StoreState) => StepItem[];
-export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, options: ConnectedOptions) => ReviewPlayerProps;
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, onQuitClick: () => void) => ReviewPlayerProps;
 export {};

package/es/views/slides/index.js

@@ -166,22 +166,22 @@ export const buildStepItems = (state) => {
     });
     return steps;
 };
-const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, translate) => {
+const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf) => {
     return {
         klf: isCorrect
             ? undefined
             : {
-                label: translate('KLF'),
+                label: '_klf',
                 tooltip: klf
             },
-        resultLabel: isCorrect ? translate('Correct Answer') : translate('Wrong Answer'),
+        resultLabel: isCorrect ? '_right' : '_wrong',
         information: {
-            label: isCorrect ? translate('KLF') : translate('Correct Answer'),
+            label: isCorrect ? '_klf' : '_correctAnswer',
             message: isCorrect ? klf : join(',', correctAnswer)
         },
         next: {
-            'aria-label': translate('Next Question'),
-            label: translate('Next Question'),
+            'aria-label': '_correctionNextAriaLabel',
+            label: '_correctionNextLabel',
             onClick: () => {
                 dispatch(nextSlide);
             }
@@ -214,7 +214,7 @@ const buildQuitPopinProps = (dispatch) => (onQuitClick) => {
         }
     };
 };
-const buildRankCard = (rank, translate) => {
+const buildRankCard = (rank) => {
     return {
         'aria-label': 'Review Card Congrats Container',
         'data-name': 'card-rank',
@@ -229,13 +229,13 @@ const buildRankCard = (rank, translate) => {
         cardType: 'card-rank',
         iconAriaLabel: 'Image without information',
         className: undefined,
-        reviewCardTitle: translate('You are now'),
+        reviewCardTitle: 'You are now',
         reviewCardValue: `${rank}`,
         rankSuffix: 'th',
         timerAnimation: 200
     };
 };
-const buildCongratsProps = (state, translate) => {
+const buildCongratsProps = (state) => {
     if (!state.ui.showCongrats)
         return;
     const progression = state.data.progression;
@@ -258,18 +258,18 @@ const buildCongratsProps = (state, translate) => {
         iconAriaLabel: 'Image without information',
         className: undefined,
         cardType: 'card-star',
-        reviewCardTitle: translate('You have won'),
+        reviewCardTitle: 'You have won',
         reviewCardValue: `${stars}`,
         timerAnimation: 200
     };
     const { start, end } = state.data.rank;
     const newRank = start - end;
-    const cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end, translate) : undefined;
+    const cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end) : undefined;
     return {
         'aria-label': 'Review Congratulations',
         'data-name': 'review-congrats',
         animationLottie: confettiAnimation,
-        title: translate('Congratulations!'),
+        title: 'Congratulations!',
         cardCongratsStar,
         cardCongratsRank,
         buttonRevising: undefined,
@@ -281,8 +281,7 @@ const isEndOfProgression = (progression) => {
         return false;
     return progression.state.nextContent.ref === 'successExitNode';
 };
-export const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick } = options;
+export const mapStateToSlidesProps = (state, dispatch, onQuitClick) => {
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = get(['data', 'corrections', currentSlideRef], state);
@@ -292,8 +291,8 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
     const showCongrats = get(['ui', 'showCongrats'], state);
     return {
         header: {
-            mode: translate('Review Title'),
-            skillName: translate('Content Parent Title'),
+            mode: '__revision_mode',
+            skillName: '__agility',
             onQuitClick: () => dispatch(openQuitPopin),
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
@@ -303,17 +302,16 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
         stack: {
             slides: buildStackSlides(state, dispatch),
             validateButton: {
-                label: translate('Validate'),
+                label: '__validate',
                 disabled: !get(['ui', 'slide', currentSlideRef, 'validateButton'], state),
                 onClick: () => {
                     dispatch(postAnswer);
                 }
             },
-            correctionPopinProps: correction &&
-                getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf, translate),
+            correctionPopinProps: correction && getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf),
             endReview: endReview && state.ui.showCongrats
         },
-        congrats: buildCongratsProps(state, translate),
+        congrats: buildCongratsProps(state),
         quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
     };
 };

package/lib/index.js

@@ -36,15 +36,15 @@ const navigation_1 = require("./actions/ui/navigation");
 const token_1 = require("./actions/data/token");
 const fetch_skills_1 = require("./actions/api/fetch-skills");
 const post_progression_1 = require("./actions/api/post-progression");
-const skills_1 = require("./views/skills");
 const slides_1 = require("./views/slides");
-const ConnectedApp = (options) => {
+const skills_1 = require("./views/skills");
+const ConnectedApp = ({ onQuitClick }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const props = {
+        navigateBack: () => dispatch(navigation_1.navigateBack),
         viewName: (0, react_redux_1.useSelector)((state) => state.ui.navigation[state.ui.navigation.length - 1]),
-        slides: (0, react_redux_1.useSelector)((state) => (0, slides_1.mapStateToSlidesProps)(state, dispatch, options)),
+        slides: (0, react_redux_1.useSelector)((state) => (0, slides_1.mapStateToSlidesProps)(state, dispatch, onQuitClick)),
         skills: (0, react_redux_1.useSelector)((state) => (0, skills_1.mapStateToSkillsProps)(state)),
-        navigateBack: () => dispatch(navigation_1.navigateBack),
         onboarding: {}
     };
     return react_1.default.createElement(app_review_1.default, { ...props });
@@ -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 onQuitClick = options.onQuitClick;
     (0, react_1.useEffect)(() => {
         if (store)
             return;
@@ -96,6 +96,6 @@ const AppReview = ({ options }) => {
     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 })));
 };
 exports.default = AppReview;

package/lib/types/common.d.ts

@@ -137,17 +137,12 @@ 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 ConnectedOptions = {
-    translate: (key: string, data?: unknown) => string;
-    onQuitClick: () => void;
-};
-export declare type AppOptions = ConnectedOptions & {
+export declare type AppOptions = {
     token: string;
     skillRef?: string;
     services: Services;
+    onQuitClick: () => void;
+    translate: Function;
     url: string;
     callbackOnViewChanged?: (viewName: ViewName) => void;
 };

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

@@ -1,7 +1,6 @@
 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 { ConnectedOptions } from '../../types/common';
 import type { StoreState } from '../../reducers';
 import type { AnswerUI } from '../../types/slides';
 declare const ICON_VALUES: {
@@ -31,5 +30,5 @@ declare type SlidesStack = {
 };
 export declare const initialState: SlidesStack;
 export declare const buildStepItems: (state: StoreState) => StepItem[];
-export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, options: ConnectedOptions) => ReviewPlayerProps;
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, onQuitClick: () => void) => ReviewPlayerProps;
 export {};

package/lib/views/slides/index.js

@@ -173,22 +173,22 @@ const buildStepItems = (state) => {
     return steps;
 };
 exports.buildStepItems = buildStepItems;
-const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, translate) => {
+const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf) => {
     return {
         klf: isCorrect
             ? undefined
             : {
-                label: translate('KLF'),
+                label: '_klf',
                 tooltip: klf
             },
-        resultLabel: isCorrect ? translate('Correct Answer') : translate('Wrong Answer'),
+        resultLabel: isCorrect ? '_right' : '_wrong',
         information: {
-            label: isCorrect ? translate('KLF') : translate('Correct Answer'),
+            label: isCorrect ? '_klf' : '_correctAnswer',
             message: isCorrect ? klf : (0, join_1.default)(',', correctAnswer)
         },
         next: {
-            'aria-label': translate('Next Question'),
-            label: translate('Next Question'),
+            'aria-label': '_correctionNextAriaLabel',
+            label: '_correctionNextLabel',
             onClick: () => {
                 dispatch(next_slide_1.nextSlide);
             }
@@ -221,7 +221,7 @@ const buildQuitPopinProps = (dispatch) => (onQuitClick) => {
         }
     };
 };
-const buildRankCard = (rank, translate) => {
+const buildRankCard = (rank) => {
     return {
         'aria-label': 'Review Card Congrats Container',
         'data-name': 'card-rank',
@@ -236,13 +236,13 @@ const buildRankCard = (rank, translate) => {
         cardType: 'card-rank',
         iconAriaLabel: 'Image without information',
         className: undefined,
-        reviewCardTitle: translate('You are now'),
+        reviewCardTitle: 'You are now',
         reviewCardValue: `${rank}`,
         rankSuffix: 'th',
         timerAnimation: 200
     };
 };
-const buildCongratsProps = (state, translate) => {
+const buildCongratsProps = (state) => {
     if (!state.ui.showCongrats)
         return;
     const progression = state.data.progression;
@@ -265,18 +265,18 @@ const buildCongratsProps = (state, translate) => {
         iconAriaLabel: 'Image without information',
         className: undefined,
         cardType: 'card-star',
-        reviewCardTitle: translate('You have won'),
+        reviewCardTitle: 'You have won',
         reviewCardValue: `${stars}`,
         timerAnimation: 200
     };
     const { start, end } = state.data.rank;
     const newRank = start - end;
-    const cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end, translate) : undefined;
+    const cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end) : undefined;
     return {
         'aria-label': 'Review Congratulations',
         'data-name': 'review-congrats',
         animationLottie: confettiAnimation,
-        title: translate('Congratulations!'),
+        title: 'Congratulations!',
         cardCongratsStar,
         cardCongratsRank,
         buttonRevising: undefined,
@@ -288,8 +288,7 @@ const isEndOfProgression = (progression) => {
         return false;
     return progression.state.nextContent.ref === 'successExitNode';
 };
-const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick } = options;
+const mapStateToSlidesProps = (state, dispatch, onQuitClick) => {
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = (0, get_1.default)(['data', 'corrections', currentSlideRef], state);
@@ -299,8 +298,8 @@ const mapStateToSlidesProps = (state, dispatch, options) => {
     const showCongrats = (0, get_1.default)(['ui', 'showCongrats'], state);
     return {
         header: {
-            mode: translate('Review Title'),
-            skillName: translate('Content Parent Title'),
+            mode: '__revision_mode',
+            skillName: '__agility',
             onQuitClick: () => dispatch(quit_popin_1.openQuitPopin),
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
@@ -310,17 +309,16 @@ const mapStateToSlidesProps = (state, dispatch, options) => {
         stack: {
             slides: buildStackSlides(state, dispatch),
             validateButton: {
-                label: translate('Validate'),
+                label: '__validate',
                 disabled: !(0, get_1.default)(['ui', 'slide', currentSlideRef, 'validateButton'], state),
                 onClick: () => {
                     dispatch(post_answer_1.postAnswer);
                 }
             },
-            correctionPopinProps: correction &&
-                getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf, translate),
+            correctionPopinProps: correction && getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf),
             endReview: endReview && state.ui.showCongrats
         },
-        congrats: buildCongratsProps(state, translate),
+        congrats: buildCongratsProps(state),
         quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.7.1-alpha.10+c25fc5a79",
+  "version": "0.7.2-alpha.0+c67805b5f",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -29,13 +29,12 @@
   "files": [
     "lib",
     "es",
-    "locales",
     "readme.md"
   ],
   "main": "lib/index.js",
   "module": "es/index.js",
   "dependencies": {
-    "@coorpacademy/components": "10.26.0",
+    "@coorpacademy/components": "10.27.1-alpha.0+c67805b5f",
     "@coorpacademy/redux-task": "1.1.6",
     "@coorpacademy/translate": "6.1.5",
     "cross-fetch": "^3.1.5",
@@ -71,5 +70,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "c25fc5a790ad6f08d1930a44eb65decd19f9f143"
+  "gitHead": "c67805b5f6cd6c8d74a4d9c3ead99fa8a0d5465d"
 }

package/locales/en/review.json

@@ -1,14 +0,0 @@
-{
-    "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!"
-}