@coorpacademy/app-review 0.8.10-alpha.2 → 0.9.0

package/es/index.js

@@ -15,7 +15,7 @@ const ConnectedApp = (options) => {
     const props = {
         viewName: useSelector((state) => state.ui.navigation[state.ui.navigation.length - 1]),
         slides: useSelector((state) => mapStateToSlidesProps(state, dispatch, options)),
-        skills: useSelector((state) => mapStateToSkillsProps(state)),
+        skills: useSelector((state) => mapStateToSkillsProps(state, options)),
         navigateBack: () => dispatch(navigateBack),
         onboarding: {}
     };
@@ -24,7 +24,7 @@ const ConnectedApp = (options) => {
 const AppReview = ({ options }) => {
     const [store, setStore] = useState(null);
     const [isProgressionCreated, setIsProgressionCreated] = useState(false);
-    const { translate, onQuitClick, skin } = options;
+    const { translate, onQuitClick } = options;
     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, skin: skin })));
+        React.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate })));
 };
 export default AppReview;

package/es/types/common.d.ts

@@ -151,7 +151,6 @@ export declare type Options = {
 export declare type ConnectedOptions = {
     translate: Translate;
     onQuitClick: () => void;
-    skin: PrimarySkin;
 };
 export declare type AppOptions = ConnectedOptions & {
     token: string;
@@ -175,9 +174,4 @@ export declare type JWT = {
 export declare type WithRequired<T, K extends keyof T> = T & {
     [P in K]-?: T[P];
 };
-export declare type PrimarySkin = {
-    common: {
-        primary: string;
-    };
-};
 export {};

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

@@ -1,3 +1,4 @@
 import { ReviewSkillsProps } from '@coorpacademy/components/es/template/app-review/skills/prop-types';
 import { StoreState } from '../../reducers';
-export declare const mapStateToSkillsProps: (state: StoreState) => ReviewSkillsProps;
+import type { ConnectedOptions } from '../../types/common';
+export declare const mapStateToSkillsProps: (state: StoreState, options: ConnectedOptions) => ReviewSkillsProps;

package/es/views/skills/index.js

@@ -1,23 +1,26 @@
-export const mapStateToSkillsProps = (state) => {
+export const mapStateToSkillsProps = (state, options) => {
+    const { translate } = options;
     return {
-        'aria-label': '@todo aria-label',
-        title: '@todo title',
+        'aria-label': translate('list_aria_label'),
+        title: translate('list_title'),
         isLoading: false,
-        isLoadingAriaLabel: '@todo loading',
+        isLoadingAriaLabel: 'Review skills container is loading',
         listSkills: state.data.skills.map(skill => ({
-            'aria-label': '@todo aria-label skill',
+            'aria-label': translate('card.aria_label'),
             isCustom: skill.custom,
             skillTitle: skill.name,
-            skillAriaLabel: '@todo skill aria label',
-            buttonLabel: '@todo button',
-            buttonAriaLabel: '@todo button aria label',
-            reviseLabel: '@todo revise',
-            reviseAriaLabel: '@todo revise aria label',
+            skillAriaLabel: skill.name,
+            buttonLabel: translate('card.button_text'),
+            buttonAriaLabel: translate('card.button_text'),
+            reviseLabel: translate('card.text', { total: `${skill.slidesToReview}` }),
+            reviseAriaLabel: translate('card.text', {
+                total: `${skill.slidesToReview}`
+            }),
             // eslint-disable-next-line no-console
             onClick: () => console.log('@todo plug dispatcher select skill')
         })),
-        titleNoSkills: '@todo title no skills',
-        textNoSkills: '@todo text no skills',
-        iconSkillAriaLabel: '@todo iconSkillAriaLabel'
+        titleNoSkills: translate('no_skills.title'),
+        textNoSkills: translate('no_skills.text'),
+        iconSkillAriaLabel: 'Image without information'
     };
 };

package/es/views/slides/index.js

@@ -201,7 +201,7 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         type: isCorrect ? 'right' : 'wrong'
     };
 };
-const buildQuitPopinProps = (dispatch) => (onQuitClick, translate, skin) => {
+const buildQuitPopinProps = (dispatch) => (onQuitClick, translate) => {
     return {
         content: translate('Quit Title'),
         icon: `MoonRocket`,
@@ -222,10 +222,7 @@ const buildQuitPopinProps = (dispatch) => (onQuitClick, translate, skin) => {
             handleOnclick: () => {
                 dispatch(closeQuitPopin);
             },
-            'aria-label': translate('Continue learning'),
-            customStyle: {
-                color: skin.common.primary
-            }
+            'aria-label': translate('Continue learning')
         }
     };
 };
@@ -315,7 +312,7 @@ const isEndOfProgression = (progression) => {
     return progression.state.nextContent.ref === 'successExitNode';
 };
 export const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick, skin } = options;
+    const { translate, onQuitClick } = options;
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = get(['data', 'corrections', currentSlideRef], state);
@@ -348,8 +345,6 @@ export const mapStateToSlidesProps = (state, dispatch, options) => {
             endReview: endReview && state.ui.showCongrats
         },
         congrats: buildCongratsProps(state, dispatch, options),
-        quitPopin: showQuitPopin
-            ? buildQuitPopinProps(dispatch)(onQuitClick, translate, skin)
-            : undefined
+        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick, translate) : undefined
     };
 };

package/lib/index.js

@@ -43,7 +43,7 @@ const ConnectedApp = (options) => {
     const props = {
         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)),
-        skills: (0, react_redux_1.useSelector)((state) => (0, skills_1.mapStateToSkillsProps)(state)),
+        skills: (0, react_redux_1.useSelector)((state) => (0, skills_1.mapStateToSkillsProps)(state, options)),
         navigateBack: () => dispatch(navigation_1.navigateBack),
         onboarding: {}
     };
@@ -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, skin } = options;
+    const { translate, onQuitClick } = options;
     (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, skin: skin })));
+        react_1.default.createElement(ConnectedApp, { onQuitClick: onQuitClick, translate: translate })));
 };
 exports.default = AppReview;

package/lib/types/common.d.ts

@@ -151,7 +151,6 @@ export declare type Options = {
 export declare type ConnectedOptions = {
     translate: Translate;
     onQuitClick: () => void;
-    skin: PrimarySkin;
 };
 export declare type AppOptions = ConnectedOptions & {
     token: string;
@@ -175,9 +174,4 @@ export declare type JWT = {
 export declare type WithRequired<T, K extends keyof T> = T & {
     [P in K]-?: T[P];
 };
-export declare type PrimarySkin = {
-    common: {
-        primary: string;
-    };
-};
 export {};

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

@@ -1,3 +1,4 @@
 import { ReviewSkillsProps } from '@coorpacademy/components/es/template/app-review/skills/prop-types';
 import { StoreState } from '../../reducers';
-export declare const mapStateToSkillsProps: (state: StoreState) => ReviewSkillsProps;
+import type { ConnectedOptions } from '../../types/common';
+export declare const mapStateToSkillsProps: (state: StoreState, options: ConnectedOptions) => ReviewSkillsProps;

package/lib/views/skills/index.js

@@ -1,27 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapStateToSkillsProps = void 0;
-const mapStateToSkillsProps = (state) => {
+const mapStateToSkillsProps = (state, options) => {
+    const { translate } = options;
     return {
-        'aria-label': '@todo aria-label',
-        title: '@todo title',
+        'aria-label': translate('list_aria_label'),
+        title: translate('list_title'),
         isLoading: false,
-        isLoadingAriaLabel: '@todo loading',
+        isLoadingAriaLabel: 'Review skills container is loading',
         listSkills: state.data.skills.map(skill => ({
-            'aria-label': '@todo aria-label skill',
+            'aria-label': translate('card.aria_label'),
             isCustom: skill.custom,
             skillTitle: skill.name,
-            skillAriaLabel: '@todo skill aria label',
-            buttonLabel: '@todo button',
-            buttonAriaLabel: '@todo button aria label',
-            reviseLabel: '@todo revise',
-            reviseAriaLabel: '@todo revise aria label',
+            skillAriaLabel: skill.name,
+            buttonLabel: translate('card.button_text'),
+            buttonAriaLabel: translate('card.button_text'),
+            reviseLabel: translate('card.text', { total: `${skill.slidesToReview}` }),
+            reviseAriaLabel: translate('card.text', {
+                total: `${skill.slidesToReview}`
+            }),
             // eslint-disable-next-line no-console
             onClick: () => console.log('@todo plug dispatcher select skill')
         })),
-        titleNoSkills: '@todo title no skills',
-        textNoSkills: '@todo text no skills',
-        iconSkillAriaLabel: '@todo iconSkillAriaLabel'
+        titleNoSkills: translate('no_skills.title'),
+        textNoSkills: translate('no_skills.text'),
+        iconSkillAriaLabel: 'Image without information'
     };
 };
 exports.mapStateToSkillsProps = mapStateToSkillsProps;

package/lib/views/slides/index.js

@@ -208,7 +208,7 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         type: isCorrect ? 'right' : 'wrong'
     };
 };
-const buildQuitPopinProps = (dispatch) => (onQuitClick, translate, skin) => {
+const buildQuitPopinProps = (dispatch) => (onQuitClick, translate) => {
     return {
         content: translate('Quit Title'),
         icon: `MoonRocket`,
@@ -229,10 +229,7 @@ const buildQuitPopinProps = (dispatch) => (onQuitClick, translate, skin) => {
             handleOnclick: () => {
                 dispatch(quit_popin_1.closeQuitPopin);
             },
-            'aria-label': translate('Continue learning'),
-            customStyle: {
-                color: skin.common.primary
-            }
+            'aria-label': translate('Continue learning')
         }
     };
 };
@@ -322,7 +319,7 @@ const isEndOfProgression = (progression) => {
     return progression.state.nextContent.ref === 'successExitNode';
 };
 const mapStateToSlidesProps = (state, dispatch, options) => {
-    const { translate, onQuitClick, skin } = options;
+    const { translate, onQuitClick } = options;
     const currentSlideRef = getCurrentSlideRef(state);
     const endReview = isEndOfProgression(state.data.progression);
     const correction = (0, get_1.default)(['data', 'corrections', currentSlideRef], state);
@@ -355,9 +352,7 @@ const mapStateToSlidesProps = (state, dispatch, options) => {
             endReview: endReview && state.ui.showCongrats
         },
         congrats: buildCongratsProps(state, dispatch, options),
-        quitPopin: showQuitPopin
-            ? buildQuitPopinProps(dispatch)(onQuitClick, translate, skin)
-            : undefined
+        quitPopin: showQuitPopin ? buildQuitPopinProps(dispatch)(onQuitClick, translate) : undefined
     };
 };
 exports.mapStateToSlidesProps = mapStateToSlidesProps;

package/locales/.mtslconfig.json

@@ -0,0 +1 @@
+{"ignore_dirs":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.8.10-alpha.2+3ba0e3af2",
+  "version": "0.9.0",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -35,9 +35,9 @@
   "main": "lib/index.js",
   "module": "es/index.js",
   "dependencies": {
-    "@coorpacademy/components": "10.28.7",
+    "@coorpacademy/components": "10.29.0",
     "@coorpacademy/redux-task": "1.1.6",
-    "@coorpacademy/translate": "6.1.5",
+    "@coorpacademy/translate": "6.2.0",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
     "react-redux": "^7.2.9",
@@ -71,5 +71,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "3ba0e3af21047cf11dde0e5a3afd7ca892d5abb7"
+  "gitHead": "d86b61ca4d94a5e0c8691bc10bc5c8e67e45153d"
 }