@coorpacademy/app-review 0.5.6-alpha.9 → 0.5.6

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

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

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

@@ -11,11 +11,11 @@ import { postProgression } from './actions/api/post-progression';
 import { VIEWS } from './common';
 import { mapStateToSlidesProps } from './views/slides';
 import { mapStateToSkillsProps } from './views/skills';
-const ConnectedApp = (options) => {
+const ConnectedApp = ({ onQuitClick }) => {
     const dispatch = useDispatch();
     const props = {
         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)),
         onboarding: {}
     };
@@ -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/{src/test → test}/index.test.js

@@ -40,7 +40,6 @@ const appOptions = {
     skillRef: 'skill_NJC0jFKoH',
     services,
     onQuitClick: identity,
-    translate: key => key,
     url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 test('should show the loader while the app is fetching the data', async (t) => {

package/{lib/src → es}/test/util/services.mock.d.ts

@@ -5,4 +5,3 @@ export declare const incorrectFreeTextPostAnswerResponse: ProgressionFromAPI;
 export declare const progressionSlideWithPendingSlide: ProgressionFromAPI;
 export declare const getChoicesCorrection: (ref: string, wrongChoice?: boolean) => CorrectionFromAPI;
 export declare const services: Services;
-export declare const translate: (key: string) => string;

package/es/{src/test → test}/util/services.mock.js

@@ -442,4 +442,3 @@ export const services = {
     fetchRank: () => Promise.resolve(fetchRankResponse),
     fetchSlidesToReviewBySkillRef: () => Promise.resolve(fetchSlidesToReviewBySkillRefResponse)
 };
-export const translate = (key) => `___${key}`;

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

@@ -139,14 +139,11 @@ export declare type Services = {
 export declare type Options = {
     services: Services;
 };
-export declare type ConnectedOptions = {
-    translate: (key: string, data?: unknown) => string;
-    onQuitClick: Function;
-};
-export declare type AppOptions = ConnectedOptions & {
+export declare type AppOptions = {
     token: string;
     skillRef?: string;
     services: Services;
+    onQuitClick: Function;
     url: string;
 };
 export declare type JWT = {

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

@@ -1,5 +1,4 @@
 import type { Dispatch } from 'redux';
-import type { ConnectedOptions } from '../../types/common';
 import { type SlideIndexes } from '../../common';
 import type { StoreState } from '../../reducers';
 import type { AnswerUI } from '../../types/slides';
@@ -139,5 +138,5 @@ export declare type CongratsProps = {
 };
 export declare const initialState: SlidesStack;
 export declare const buildStepItems: (state: StoreState) => StepItem[];
-export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, options: ConnectedOptions) => SlidesViewProps;
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, onQuitClick: Function) => SlidesViewProps;
 export {};

package/es/{src/views → 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: {
-            ariaLabel: translate('Next Question'),
-            label: translate('Next Question'),
+            ariaLabel: '_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);
@@ -291,8 +290,8 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
     const showQuitPopin = get(['ui', 'showQuitPopin'], 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',
@@ -301,17 +300,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, options.translate),
+            correctionPopinProps: correction && getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf),
             endReview: endReview && state.ui.showCongrats
         },
-        congrats: buildCongratsProps(state, options.translate),
+        congrats: buildCongratsProps(state),
         quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
     };
 };

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

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

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

@@ -22,11 +22,12 @@ import { postProgression } from './actions/api/post-progression';
 import { VIEWS } from './common';
 import { mapStateToSlidesProps } from './views/slides';
 import { mapStateToSkillsProps } from './views/skills';
-var ConnectedApp = function (options) {
+var ConnectedApp = function (_a) {
+    var onQuitClick = _a.onQuitClick;
     var dispatch = useDispatch();
     var props = {
         viewName: useSelector(function (state) { return state.ui.navigation[state.ui.navigation.length - 1]; }),
-        slides: useSelector(function (state) { return mapStateToSlidesProps(state, dispatch, options); }),
+        slides: useSelector(function (state) { return mapStateToSlidesProps(state, dispatch, onQuitClick); }),
         skills: useSelector(function (state) { return mapStateToSkillsProps(state); }),
         onboarding: {}
     };
@@ -36,7 +37,7 @@ var AppReview = function (_a) {
     var options = _a.options;
     var _b = useState(null), store = _b[0], setStore = _b[1];
     var _c = useState(false), isProgressionCreated = _c[0], setIsProgressionCreated = _c[1];
-    var translate = options.translate, onQuitClick = options.onQuitClick;
+    var onQuitClick = options.onQuitClick;
     useEffect(function () {
         if (store)
             return;
@@ -80,6 +81,6 @@ var AppReview = function (_a) {
     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/lib/{src/test → test}/index.test.js

@@ -135,7 +135,6 @@ var appOptions = {
     skillRef: 'skill_NJC0jFKoH',
     services: services,
     onQuitClick: identity,
-    translate: function (key) { return key; },
     url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 test('should show the loader while the app is fetching the data', function (t) { return __awaiter(void 0, void 0, void 0, function () {

package/{es/src → lib}/test/util/services.mock.d.ts

@@ -5,4 +5,3 @@ export declare const incorrectFreeTextPostAnswerResponse: ProgressionFromAPI;
 export declare const progressionSlideWithPendingSlide: ProgressionFromAPI;
 export declare const getChoicesCorrection: (ref: string, wrongChoice?: boolean) => CorrectionFromAPI;
 export declare const services: Services;
-export declare const translate: (key: string) => string;

package/lib/{src/test → test}/util/services.mock.js

@@ -446,4 +446,3 @@ export var services = {
     fetchRank: function () { return Promise.resolve(fetchRankResponse); },
     fetchSlidesToReviewBySkillRef: function () { return Promise.resolve(fetchSlidesToReviewBySkillRefResponse); }
 };
-export var translate = function (key) { return "___".concat(key); };

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

@@ -139,14 +139,11 @@ export declare type Services = {
 export declare type Options = {
     services: Services;
 };
-export declare type ConnectedOptions = {
-    translate: (key: string, data?: unknown) => string;
-    onQuitClick: Function;
-};
-export declare type AppOptions = ConnectedOptions & {
+export declare type AppOptions = {
     token: string;
     skillRef?: string;
     services: Services;
+    onQuitClick: Function;
     url: string;
 };
 export declare type JWT = {

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

@@ -1,5 +1,4 @@
 import type { Dispatch } from 'redux';
-import type { ConnectedOptions } from '../../types/common';
 import { type SlideIndexes } from '../../common';
 import type { StoreState } from '../../reducers';
 import type { AnswerUI } from '../../types/slides';
@@ -139,5 +138,5 @@ export declare type CongratsProps = {
 };
 export declare const initialState: SlidesStack;
 export declare const buildStepItems: (state: StoreState) => StepItem[];
-export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, options: ConnectedOptions) => SlidesViewProps;
+export declare const mapStateToSlidesProps: (state: StoreState, dispatch: Dispatch, onQuitClick: Function) => SlidesViewProps;
 export {};

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

@@ -161,22 +161,22 @@ export var buildStepItems = function (state) {
     return steps;
 };
 var getCorrectionPopinProps = function (dispatch) {
-    return function (isCorrect, correctAnswer, klf, translate) {
+    return function (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: {
-                ariaLabel: translate('Next Question'),
-                label: translate('Next Question'),
+                ariaLabel: '_correctionNextAriaLabel',
+                label: '_correctionNextLabel',
                 onClick: function () {
                     dispatch(nextSlide);
                 }
@@ -212,7 +212,7 @@ var buildQuitPopinProps = function (dispatch) {
         };
     };
 };
-var buildRankCard = function (rank, translate) {
+var buildRankCard = function (rank) {
     return {
         'aria-label': 'Review Card Congrats Container',
         'data-name': 'card-rank',
@@ -227,13 +227,13 @@ var buildRankCard = function (rank, translate) {
         cardType: 'card-rank',
         iconAriaLabel: 'Image without information',
         className: undefined,
-        reviewCardTitle: translate('You are now'),
+        reviewCardTitle: 'You are now',
         reviewCardValue: "".concat(rank),
         rankSuffix: 'th',
         timerAnimation: 200
     };
 };
-var buildCongratsProps = function (state, translate) {
+var buildCongratsProps = function (state) {
     if (!state.ui.showCongrats)
         return;
     var progression = state.data.progression;
@@ -256,18 +256,18 @@ var buildCongratsProps = function (state, translate) {
         iconAriaLabel: 'Image without information',
         className: undefined,
         cardType: 'card-star',
-        reviewCardTitle: translate('You have won'),
+        reviewCardTitle: 'You have won',
         reviewCardValue: "".concat(stars),
         timerAnimation: 200
     };
     var _a = state.data.rank, start = _a.start, end = _a.end;
     var newRank = start - end;
-    var cardCongratsRank = !Number.isNaN(newRank) && newRank > 0 ? buildRankCard(end, translate) : undefined;
+    var 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: cardCongratsStar,
         cardCongratsRank: cardCongratsRank,
         buttonRevising: undefined,
@@ -279,8 +279,7 @@ var isEndOfProgression = function (progression) {
         return false;
     return progression.state.nextContent.ref === 'successExitNode';
 };
-export var mapStateToSlidesProps = function (state, dispatch, options) {
-    var translate = options.translate, onQuitClick = options.onQuitClick;
+export var mapStateToSlidesProps = function (state, dispatch, onQuitClick) {
     var currentSlideRef = getCurrentSlideRef(state);
     var endReview = isEndOfProgression(state.data.progression);
     var correction = get(['data', 'corrections', currentSlideRef], state);
@@ -289,8 +288,8 @@ export var mapStateToSlidesProps = function (state, dispatch, options) {
     var showQuitPopin = get(['ui', 'showQuitPopin'], state);
     return {
         header: {
-            mode: translate('Review Title'),
-            skillName: translate('Content Parent Title'),
+            mode: '__revision_mode',
+            skillName: '__agility',
             onQuitClick: function () { return dispatch(openQuitPopin); },
             'aria-label': 'aria-header-wrapper',
             closeButtonAriaLabel: 'aria-close-button',
@@ -299,17 +298,16 @@ export var mapStateToSlidesProps = function (state, dispatch, options) {
         stack: {
             slides: buildStackSlides(state, dispatch),
             validateButton: {
-                label: translate('Validate'),
+                label: '__validate',
                 disabled: !get(['ui', 'slide', currentSlideRef, 'validateButton'], state),
                 onClick: function () {
                     dispatch(postAnswer);
                 }
             },
-            correctionPopinProps: correction &&
-                getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf, options.translate),
+            correctionPopinProps: correction && getCorrectionPopinProps(dispatch)(isCorrect, correction.correctAnswer, klf),
             endReview: endReview && state.ui.showCongrats
         },
-        congrats: buildCongratsProps(state, options.translate),
+        congrats: buildCongratsProps(state),
         quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick) : undefined
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.5.6-alpha.9+0b1916fe7",
+  "version": "0.5.6",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -30,7 +30,6 @@
     "lib",
     "es",
     "src",
-    "locales",
     "readme.md"
   ],
   "main": "./es/index.js",
@@ -40,13 +39,11 @@
       "commonjs": "./lib/index.js",
       "types": "./es/index.d.ts"
     },
-    "./package.json": "./package.json",
-    "./locales/en/review.json": "./locales/en/review.json"
+    "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.24.4",
+    "@coorpacademy/components": "10.24.5",
     "@coorpacademy/redux-task": "1.1.6",
-    "@coorpacademy/translate": "6.1.5",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
     "react-redux": "^7.2.9",
@@ -80,5 +77,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "0b1916fe74bf3a250dc021360c84ce87db32b6d6"
+  "gitHead": "56b61ee3e78d9670cb28ab04d0a912779a265a78"
 }

package/src/index.tsx

@@ -8,7 +8,7 @@ import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
 
-import type {AppOptions, ConnectedOptions} from './types/common';
+import type {AppOptions} from './types/common';
 import type {StoreState} from './reducers';
 
 import {navigateTo, ViewPath} from './actions/ui/navigation';
@@ -19,13 +19,14 @@ import {VIEWS} from './common';
 import {mapStateToSlidesProps} from './views/slides';
 import {mapStateToSkillsProps} from './views/skills';
 
-const ConnectedApp = (options: ConnectedOptions): JSX.Element => {
+const ConnectedApp = ({onQuitClick}: {onQuitClick: Function}): JSX.Element => {
   const dispatch = useDispatch();
+
   const props = {
     viewName: useSelector(
       (state: StoreState) => state.ui.navigation[state.ui.navigation.length - 1]
     ),
-    slides: useSelector((state: StoreState) => mapStateToSlidesProps(state, dispatch, options)),
+    slides: useSelector((state: StoreState) => mapStateToSlidesProps(state, dispatch, onQuitClick)),
     skills: useSelector((state: StoreState) => mapStateToSkillsProps(state)),
     onboarding: {}
   };
@@ -36,7 +37,7 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
   const [store, setStore] = useState<Store<StoreState, AnyAction> | null>(null);
   const [isProgressionCreated, setIsProgressionCreated] = useState(false);
 
-  const {translate, onQuitClick} = options;
+  const onQuitClick = options.onQuitClick;
 
   useEffect(() => {
     if (store) return;
@@ -89,7 +90,7 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
 
   return (
     <Provider store={store}>
-      <ConnectedApp onQuitClick={onQuitClick} translate={translate} />
+      <ConnectedApp onQuitClick={onQuitClick} />
     </Provider>
   );
 };

package/src/test/index.test.tsx

@@ -62,7 +62,6 @@ const appOptions: AppOptions = {
   skillRef: 'skill_NJC0jFKoH',
   services,
   onQuitClick: identity,
-  translate: key => key,
   url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 

package/src/test/util/services.mock.ts

@@ -463,5 +463,3 @@ export const services: Services = {
   fetchRank: () => Promise.resolve(fetchRankResponse),
   fetchSlidesToReviewBySkillRef: () => Promise.resolve(fetchSlidesToReviewBySkillRefResponse)
 };
-
-export const translate = (key: string): string => `___${key}`;

package/src/types/common.ts

@@ -179,15 +179,11 @@ export type Options = {
   services: Services;
 };
 
-export type ConnectedOptions = {
-  translate: (key: string, data?: unknown) => string;
-  onQuitClick: Function;
-};
-
-export type AppOptions = ConnectedOptions & {
+export type AppOptions = {
   token: string;
   skillRef?: string;
   services: Services;
+  onQuitClick: Function;
   url: string;
 };
 

package/src/types/globals.d.ts

@@ -2,4 +2,3 @@ declare module '*.css';
 declare module 'browser-env';
 declare module '@coorpacademy/components/es/*';
 declare module '@coorpacademy/redux-task';
-declare module '@coorpacademy/translate';