@coorpacademy/app-review 0.8.1 → 0.8.3-alpha.3

package/es/reducers/data/current-skill.d.ts

@@ -0,0 +1,5 @@
+import { ReceivedSkill } from '../../actions/api/fetch-skill';
+import { Skill } from '../../types/common';
+export declare type CurrentSkillState = Skill | null;
+declare const reducer: (state: CurrentSkillState | undefined, action: ReceivedSkill) => CurrentSkillState;
+export default reducer;

package/es/reducers/data/current-skill.js

@@ -0,0 +1,13 @@
+import { SKILL_FETCH_SUCCESS } from '../../actions/api/fetch-skill';
+const initialState = null;
+const reducer = (
+// eslint-disable-next-line default-param-last
+state = initialState, action) => {
+    switch (action.type) {
+        case SKILL_FETCH_SUCCESS:
+            return action.payload;
+        default:
+            return state;
+    }
+};
+export default reducer;

package/es/reducers/data/index.d.ts

@@ -4,6 +4,7 @@ import { SkillsState } from './skills';
 import { SlidesState } from './slides';
 import { TokenState } from './token';
 import { RankState } from './rank';
+import { CurrentSkillState } from './current-skill';
 export declare type DataState = {
     corrections: CorrectionsState;
     progression: ProgressionState;
@@ -11,6 +12,7 @@ export declare type DataState = {
     slides: SlidesState;
     token: TokenState;
     rank: RankState;
+    currentSkill: CurrentSkillState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     corrections: CorrectionsState;
@@ -19,5 +21,6 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     slides: SlidesState;
     token: string;
     rank: RankState;
-}>, import("../../actions/api/post-progression").FetchProgression | import("../../actions/api/post-progression").ReceivedProgression | import("./corrections").CorrectionsAction | import("../../actions/api/fetch-rank").RankAction | import("../../actions/api/post-answer").PostAnswerSuccessAction | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
+    currentSkill: CurrentSkillState;
+}>, import("../../actions/api/fetch-skill").ReceivedSkill | import("../../actions/api/post-progression").FetchProgression | import("../../actions/api/post-progression").ReceivedProgression | import("./corrections").CorrectionsAction | import("../../actions/api/fetch-rank").RankAction | import("../../actions/api/post-answer").PostAnswerSuccessAction | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
 export default _default;

package/es/reducers/data/index.js

@@ -5,4 +5,13 @@ import skills from './skills';
 import slides from './slides';
 import token from './token';
 import rank from './rank';
-export default combineReducers({ corrections, progression, skills, slides, token, rank });
+import currentSkill from './current-skill';
+export default combineReducers({
+    corrections,
+    progression,
+    skills,
+    slides,
+    token,
+    rank,
+    currentSkill
+});

package/es/reducers/index.d.ts

@@ -12,6 +12,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         slides: import("./data/slides").SlidesState;
         token: string;
         rank: import("./data/rank").RankState;
+        currentSkill: import("./data/current-skill").CurrentSkillState;
     }>;
     ui: import("redux").CombinedState<{
         currentSlideRef: string;
@@ -23,7 +24,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         showButtonRevising: boolean;
         showCongrats: boolean;
     }>;
-}>, import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/post-progression").FetchProgression | import("../actions/api/post-progression").ReceivedProgression | import("./data/corrections").CorrectionsAction | 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/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("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-skill").ReceivedSkill | import("../actions/api/post-progression").FetchProgression | import("../actions/api/post-progression").ReceivedProgression | import("./data/corrections").CorrectionsAction | 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/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/views/skills/index.d.ts

@@ -1,24 +1,3 @@
+import { ReviewSkillsProps } from '@coorpacademy/components/es/template/app-review/skills/prop-types';
 import { StoreState } from '../../reducers';
-declare type SkillCard = {
-    'aria-label': string;
-    skillTitle: string;
-    skillAriaLabel: string;
-    buttonLabel: string;
-    buttonAriaLabel: string;
-    reviseLabel: string;
-    reviseAriaLabel: string;
-    isCustom: boolean;
-    onClick: () => void;
-};
-declare type NoSkillsProps = {
-    iconSkillAriaLabel: string;
-};
-declare type SkillsProps = NoSkillsProps & {
-    'aria-label'?: string;
-    title: string;
-    isLoading?: boolean;
-    isLoadingAriaLabel: string;
-    listSkills: SkillCard[];
-};
-export { SkillsProps };
-export declare const mapStateToSkillsProps: (state: StoreState) => SkillsProps;
+export declare const mapStateToSkillsProps: (state: StoreState) => ReviewSkillsProps;

package/es/views/skills/index.js

@@ -1,11 +1,11 @@
 export const mapStateToSkillsProps = (state) => {
     return {
+        'aria-label': '@todo aria-label',
         title: '@todo title',
-        iconSkillAriaLabel: '@todo iconSkillAriaLabel',
         isLoading: false,
         isLoadingAriaLabel: '@todo loading',
         listSkills: state.data.skills.map(skill => ({
-            'aria-label': '',
+            'aria-label': '@todo aria-label skill',
             isCustom: skill.custom,
             skillTitle: skill.name,
             skillAriaLabel: '@todo skill aria label',
@@ -15,6 +15,9 @@ export const mapStateToSkillsProps = (state) => {
             reviseAriaLabel: '@todo revise aria label',
             // 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'
     };
 };

package/es/views/slides/index.js

@@ -60,6 +60,9 @@ const getCurrentSlideRef = (state) => {
     const content = progression.state.content;
     return content.ref;
 };
+const isLastSlideAnswered = (slidesRef, slideRef) => {
+    return last(slidesRef) === slideRef;
+};
 const buildStackSlides = (state, dispatch, options) => {
     const { translate } = options;
     const currentSlideRef = getCurrentSlideRef(state);
@@ -70,9 +73,12 @@ const buildStackSlides = (state, dispatch, options) => {
     // @ts-expect-error typescript does not support capped versions of lodash functions
     const stack = reduce.convert({ cap: false })((acc, uiSlide, _index) => {
         const index = toInteger(_index);
-        const positions = state.ui.positions;
-        const position = positions[index];
         const slideRef = slideRefs[index];
+        const lastAnsweredSlideRef = isLastSlideAnswered(progression.state.slides, slideRef);
+        const positions = state.ui.positions;
+        // when unstack the last answered slide (position -1), we set the position to 0 only during the animation
+        // to avoid to hide the slide (caused by the position -1).
+        const position = lastAnsweredSlideRef && positions[index] === -1 ? 0 : positions[index];
         if (!slideRef)
             return set(index, { ...uiSlide, position }, acc);
         const slideFromAPI = get(slideRef, state.data.slides);
@@ -85,7 +91,7 @@ const buildStackSlides = (state, dispatch, options) => {
         const slideUI = get(['ui', 'slide', slideRef], state);
         const animateCorrectionPopin = isCurrentSlideRef && slideUI.animateCorrectionPopin;
         const showCorrectionPopin = isCurrentSlideRef && slideUI.showCorrectionPopin;
-        const animationType = slideUI.animationType;
+        const animationType = lastAnsweredSlideRef ? slideUI.animationType : undefined;
         const updatedUiSlide = {
             ...uiSlide,
             position,
@@ -182,7 +188,7 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         resultLabel: isCorrect ? translate('Correct Answer') : translate('Wrong Answer'),
         information: {
             label: isCorrect ? translate('KLF') : translate('Correct Answer'),
-            message: isCorrect ? klf : join(',', correctAnswer)
+            message: isCorrect ? klf : join(', ', correctAnswer)
         },
         next: {
             'aria-label': translate('Next Question'),

package/lib/reducers/data/current-skill.d.ts

@@ -0,0 +1,5 @@
+import { ReceivedSkill } from '../../actions/api/fetch-skill';
+import { Skill } from '../../types/common';
+export declare type CurrentSkillState = Skill | null;
+declare const reducer: (state: CurrentSkillState | undefined, action: ReceivedSkill) => CurrentSkillState;
+export default reducer;

package/lib/reducers/data/current-skill.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fetch_skill_1 = require("../../actions/api/fetch-skill");
+const initialState = null;
+const reducer = (
+// eslint-disable-next-line default-param-last
+state = initialState, action) => {
+    switch (action.type) {
+        case fetch_skill_1.SKILL_FETCH_SUCCESS:
+            return action.payload;
+        default:
+            return state;
+    }
+};
+exports.default = reducer;

package/lib/reducers/data/index.d.ts

@@ -4,6 +4,7 @@ import { SkillsState } from './skills';
 import { SlidesState } from './slides';
 import { TokenState } from './token';
 import { RankState } from './rank';
+import { CurrentSkillState } from './current-skill';
 export declare type DataState = {
     corrections: CorrectionsState;
     progression: ProgressionState;
@@ -11,6 +12,7 @@ export declare type DataState = {
     slides: SlidesState;
     token: TokenState;
     rank: RankState;
+    currentSkill: CurrentSkillState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     corrections: CorrectionsState;
@@ -19,5 +21,6 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     slides: SlidesState;
     token: string;
     rank: RankState;
-}>, import("../../actions/api/post-progression").FetchProgression | import("../../actions/api/post-progression").ReceivedProgression | import("./corrections").CorrectionsAction | import("../../actions/api/fetch-rank").RankAction | import("../../actions/api/post-answer").PostAnswerSuccessAction | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
+    currentSkill: CurrentSkillState;
+}>, import("../../actions/api/fetch-skill").ReceivedSkill | import("../../actions/api/post-progression").FetchProgression | import("../../actions/api/post-progression").ReceivedProgression | import("./corrections").CorrectionsAction | import("../../actions/api/fetch-rank").RankAction | import("../../actions/api/post-answer").PostAnswerSuccessAction | import("../../actions/api/fetch-skills").ReceivedSkills | import("./slides").SlidesAction | import("../../actions/data/token").StoreToken>;
 export default _default;

package/lib/reducers/data/index.js

@@ -10,4 +10,13 @@ const skills_1 = __importDefault(require("./skills"));
 const slides_1 = __importDefault(require("./slides"));
 const token_1 = __importDefault(require("./token"));
 const rank_1 = __importDefault(require("./rank"));
-exports.default = (0, redux_1.combineReducers)({ corrections: corrections_1.default, progression: progression_1.default, skills: skills_1.default, slides: slides_1.default, token: token_1.default, rank: rank_1.default });
+const current_skill_1 = __importDefault(require("./current-skill"));
+exports.default = (0, redux_1.combineReducers)({
+    corrections: corrections_1.default,
+    progression: progression_1.default,
+    skills: skills_1.default,
+    slides: slides_1.default,
+    token: token_1.default,
+    rank: rank_1.default,
+    currentSkill: current_skill_1.default
+});

package/lib/reducers/index.d.ts

@@ -12,6 +12,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         slides: import("./data/slides").SlidesState;
         token: string;
         rank: import("./data/rank").RankState;
+        currentSkill: import("./data/current-skill").CurrentSkillState;
     }>;
     ui: import("redux").CombinedState<{
         currentSlideRef: string;
@@ -23,7 +24,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         showButtonRevising: boolean;
         showCongrats: boolean;
     }>;
-}>, import("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/post-progression").FetchProgression | import("../actions/api/post-progression").ReceivedProgression | import("./data/corrections").CorrectionsAction | 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/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("../actions/ui/slides").SetCurrentSlideAction | import("../actions/api/fetch-skill").ReceivedSkill | import("../actions/api/post-progression").FetchProgression | import("../actions/api/post-progression").ReceivedProgression | import("./data/corrections").CorrectionsAction | 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/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/views/skills/index.d.ts

@@ -1,24 +1,3 @@
+import { ReviewSkillsProps } from '@coorpacademy/components/es/template/app-review/skills/prop-types';
 import { StoreState } from '../../reducers';
-declare type SkillCard = {
-    'aria-label': string;
-    skillTitle: string;
-    skillAriaLabel: string;
-    buttonLabel: string;
-    buttonAriaLabel: string;
-    reviseLabel: string;
-    reviseAriaLabel: string;
-    isCustom: boolean;
-    onClick: () => void;
-};
-declare type NoSkillsProps = {
-    iconSkillAriaLabel: string;
-};
-declare type SkillsProps = NoSkillsProps & {
-    'aria-label'?: string;
-    title: string;
-    isLoading?: boolean;
-    isLoadingAriaLabel: string;
-    listSkills: SkillCard[];
-};
-export { SkillsProps };
-export declare const mapStateToSkillsProps: (state: StoreState) => SkillsProps;
+export declare const mapStateToSkillsProps: (state: StoreState) => ReviewSkillsProps;

package/lib/views/skills/index.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapStateToSkillsProps = void 0;
 const mapStateToSkillsProps = (state) => {
     return {
+        'aria-label': '@todo aria-label',
         title: '@todo title',
-        iconSkillAriaLabel: '@todo iconSkillAriaLabel',
         isLoading: false,
         isLoadingAriaLabel: '@todo loading',
         listSkills: state.data.skills.map(skill => ({
-            'aria-label': '',
+            'aria-label': '@todo aria-label skill',
             isCustom: skill.custom,
             skillTitle: skill.name,
             skillAriaLabel: '@todo skill aria label',
@@ -18,7 +18,10 @@ const mapStateToSkillsProps = (state) => {
             reviseAriaLabel: '@todo revise aria label',
             // 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'
     };
 };
 exports.mapStateToSkillsProps = mapStateToSkillsProps;

package/lib/views/slides/index.js

@@ -66,6 +66,9 @@ const getCurrentSlideRef = (state) => {
     const content = progression.state.content;
     return content.ref;
 };
+const isLastSlideAnswered = (slidesRef, slideRef) => {
+    return (0, last_1.default)(slidesRef) === slideRef;
+};
 const buildStackSlides = (state, dispatch, options) => {
     const { translate } = options;
     const currentSlideRef = getCurrentSlideRef(state);
@@ -76,9 +79,12 @@ const buildStackSlides = (state, dispatch, options) => {
     // @ts-expect-error typescript does not support capped versions of lodash functions
     const stack = reduce_1.default.convert({ cap: false })((acc, uiSlide, _index) => {
         const index = (0, toInteger_1.default)(_index);
-        const positions = state.ui.positions;
-        const position = positions[index];
         const slideRef = slideRefs[index];
+        const lastAnsweredSlideRef = isLastSlideAnswered(progression.state.slides, slideRef);
+        const positions = state.ui.positions;
+        // when unstack the last answered slide (position -1), we set the position to 0 only during the animation
+        // to avoid to hide the slide (caused by the position -1).
+        const position = lastAnsweredSlideRef && positions[index] === -1 ? 0 : positions[index];
         if (!slideRef)
             return (0, set_1.default)(index, { ...uiSlide, position }, acc);
         const slideFromAPI = (0, get_1.default)(slideRef, state.data.slides);
@@ -91,7 +97,7 @@ const buildStackSlides = (state, dispatch, options) => {
         const slideUI = (0, get_1.default)(['ui', 'slide', slideRef], state);
         const animateCorrectionPopin = isCurrentSlideRef && slideUI.animateCorrectionPopin;
         const showCorrectionPopin = isCurrentSlideRef && slideUI.showCorrectionPopin;
-        const animationType = slideUI.animationType;
+        const animationType = lastAnsweredSlideRef ? slideUI.animationType : undefined;
         const updatedUiSlide = {
             ...uiSlide,
             position,
@@ -189,7 +195,7 @@ const getCorrectionPopinProps = (dispatch) => (isCorrect, correctAnswer, klf, tr
         resultLabel: isCorrect ? translate('Correct Answer') : translate('Wrong Answer'),
         information: {
             label: isCorrect ? translate('KLF') : translate('Correct Answer'),
-            message: isCorrect ? klf : (0, join_1.default)(',', correctAnswer)
+            message: isCorrect ? klf : (0, join_1.default)(', ', correctAnswer)
         },
         next: {
             'aria-label': translate('Next Question'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.8.1",
+  "version": "0.8.3-alpha.3+f2bb79b3c",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -35,9 +35,9 @@
   "main": "lib/index.js",
   "module": "es/index.js",
   "dependencies": {
-    "@coorpacademy/components": "10.28.1",
+    "@coorpacademy/components": "10.28.3-alpha.3+f2bb79b3c",
     "@coorpacademy/redux-task": "1.1.6",
-    "@coorpacademy/translate": "^6.1.5",
+    "@coorpacademy/translate": "6.1.5",
     "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": "f16cc5fd899c3a83f60b9909d29ea52a3a9c8c60"
+  "gitHead": "f2bb79b3cbf9c8299df8a8dde9d05b0ca98cc199"
 }