@coorpacademy/app-review 0.1.13 → 0.1.15

package/lib/reducers/data/slides.js

@@ -1,125 +1,16 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-import map from 'lodash/fp/map';
-import { UPDATE_SLIDES_ON_NEXT, UPDATE_SLIDES_ON_VALIDATION } from '../../actions/data/slides';
-import { HIGHEST_INDEX, slideNumbers, TOTAL_SLIDES_STACK } from '../../common';
-import { slide as qcmSlide } from '../../fixtures/qcm-slide';
+import set from 'lodash/fp/set';
 import { SLIDE_FETCH_SUCCESS } from '../../actions/api/fetch-slide';
-var getInitialState = function () {
-    var state = {
-        slideNumbers: slideNumbers
-    };
-    // eslint-disable-next-line fp/no-loops
-    for (var index = 0; index < TOTAL_SLIDES_STACK; index++) {
-        state[index] = { hidden: false, position: index };
-    }
-    return state;
-};
-export var initialState = getInitialState();
-// -----------------------------------------------------------------------------
-var setFirstSlide = function (state, slide) {
-    var _state = {
-        slideNumbers: slideNumbers
-    };
-    // eslint-disable-next-line lodash-fp/no-unused-result
-    map(function (index) {
-        var previousValue = state[index];
-        // Only update the 1st one
-        var content = index === 0 ? __assign(__assign({}, previousValue), slide) : __assign({}, previousValue);
-        _state[index] = __assign({}, content);
-    }, state.slideNumbers);
-    return _state;
-};
-// ||-------> Handles the updates of a given slide on validation,
-// & then updates de remaining slides if this given change should impact their content
-var stateUpdateOnValidation = function (state, payload) {
-    var slideNumber = payload.slideNumber, newSlideContent = payload.newSlideContent, numberOfFinishedSlides = payload.numberOfFinishedSlides, nextContent = payload.nextContent;
-    var _state = {
-        slideNumbers: slideNumbers
-    };
-    // eslint-disable-next-line lodash-fp/no-unused-result
-    map(function (index) {
-        var previousValue = state[index];
-        // the current slide
-        if (index === slideNumber) {
-            // only one slide remaining, presets the next value
-            if (numberOfFinishedSlides === HIGHEST_INDEX) {
-                _state[index] = __assign(__assign({}, previousValue), { nextContent: nextContent, position: newSlideContent.position, isCorrect: newSlideContent.isCorrect });
-            }
-            else
-                _state[slideNumber] = __assign(__assign({}, previousValue), newSlideContent);
-        }
-        else {
-            // updates the rest of the slides here
-            var hidden = previousValue.hidden, position = previousValue.position;
-            _state[index] = __assign(__assign({}, nextContent), { endReview: newSlideContent.endReview, hidden: hidden, position: position });
-        }
-    }, state.slideNumbers);
-    return _state;
-};
-// ||-------> Handles the updates of a given slide on correction popin's next click,
-// & then updates de remaining slides (updates position to trigger animations)
-var stateUpdateOnNext = function (state, payload) {
-    var slideNumber = payload.slideNumber, newSlideContent = payload.newSlideContent, numberOfFinishedSlides = payload.numberOfFinishedSlides;
-    var _state = {
-        slideNumbers: slideNumbers
-    };
-    // eslint-disable-next-line lodash-fp/no-unused-result
-    map(function (index) {
-        var previousValue = state[index];
-        // the current slide
-        if (index === slideNumber) {
-            // when there is only one slide remaining, updates the slide value
-            if (numberOfFinishedSlides === HIGHEST_INDEX && previousValue.nextContent) {
-                _state[index] = __assign(__assign({}, previousValue.nextContent), { position: previousValue.position });
-            }
-            else
-                _state[slideNumber] = newSlideContent;
-        }
-        else {
-            // updates the rest of the slides here
-            var hidden = previousValue.hidden, position = previousValue.position, answerUI = previousValue.answerUI, questionText = previousValue.questionText;
-            _state[index] = {
-                hidden: hidden,
-                position: position - 1,
-                answerUI: answerUI,
-                questionText: questionText,
-                endReview: newSlideContent.endReview
-            };
-        }
-    }, state.slideNumbers);
-    return _state;
-};
-// -----------------------------------------------------------------------------
+export var initialState = {};
 // eslint-disable-next-line default-param-last
 var reducer = function (state, action) {
     if (state === void 0) { state = initialState; }
     switch (action.type) {
         case SLIDE_FETCH_SUCCESS: {
-            // TODO: An intermediate slide transform is needed here (or in fetchSlide)
-            // const apiSlide = action.payload;
-            // apiSlide adapt to uiSlide
-            var uiSlide = qcmSlide;
-            return setFirstSlide(state, uiSlide);
-        }
-        case UPDATE_SLIDES_ON_VALIDATION: {
-            return stateUpdateOnValidation(state, action.payload);
-        }
-        case UPDATE_SLIDES_ON_NEXT: {
-            return stateUpdateOnNext(state, action.payload);
+            var slide = action.payload;
+            return set(slide.id, slide, state);
         }
         default:
             return state;
     }
 };
-// -----------------------------------------------------------------------------
 export default reducer;

package/lib/reducers/index.d.ts

@@ -12,10 +12,9 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         token: import("./data/token").TokenState;
     }>;
     ui: import("redux").CombinedState<{
-        finishedSlides: import("./ui/finished-slides").FinishedSlidesState;
+        currentSlideRef: string;
         navigation: import("./ui/navigation").NavigationState;
-        reviewStatus: import("./ui/review-status").ReviewStatusState;
-        stepItems: import("./ui/step-items").StepItemsState;
+        slides: import("./ui/slides").UISlidesState;
     }>;
-}>, import("../actions/data/slides").ValidateSlide | import("../actions/data/slides").SlidesAction | import("../actions/api/post-progression").ReceiveProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("../actions/data/token").StoreToken | import("../actions/ui/finished-slides").UpdateFinishedSlides | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack | import("../actions/ui/review-status").UpdateReviewStatus | import("../actions/ui/step-items").StepItemsAction>;
+}>, import("../actions/ui/slides").SetCurrentSlide | import("../actions/api/post-progression").ReceiveProgression | import("../actions/api/fetch-skills").ReceivedSkills | import("./data/slides").SlidesAction | import("../actions/data/token").StoreToken | import("../actions/ui/navigation").NavigateTo | import("../actions/ui/navigation").NavigateBack>;
 export default _default;

package/lib/reducers/ui/current-slide-ref.d.ts

@@ -0,0 +1,4 @@
+import { UISlidesAction } from '../../actions/ui/slides';
+export declare type CurrentSlideRefState = string;
+declare const reducer: (state: string | undefined, action: UISlidesAction) => CurrentSlideRefState;
+export default reducer;

package/lib/reducers/ui/{review-status.js → current-slide-ref.js}

@@ -1,11 +1,11 @@
-import { UPDATE_REVIEW_STATUS } from '../../actions/ui/review-status';
+import { SET_CURRENT_SLIDE } from '../../actions/ui/slides';
 var reducer = function (
 // eslint-disable-next-line default-param-last
 state, action) {
-    if (state === void 0) { state = 'ongoing'; }
+    if (state === void 0) { state = ''; }
     switch (action.type) {
-        case UPDATE_REVIEW_STATUS: {
-            return action.payload;
+        case SET_CURRENT_SLIDE: {
+            return action.payload.id;
         }
         default:
             return state;

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

@@ -1,17 +1,14 @@
-import { FinishedSlidesState } from './finished-slides';
+import { CurrentSlideRefState } from './current-slide-ref';
 import { NavigationState } from './navigation';
-import { ReviewStatusState } from './review-status';
-import { StepItemsState } from './step-items';
+import { UISlidesState } from './slides';
 export declare type UIState = {
+    currentSlideRef: CurrentSlideRefState;
     navigation: NavigationState;
-    stepItems: StepItemsState;
-    finishedSlides: FinishedSlidesState;
-    reviewStatus: ReviewStatusState;
+    slides: UISlidesState;
 };
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
-    finishedSlides: FinishedSlidesState;
+    currentSlideRef: string;
     navigation: NavigationState;
-    reviewStatus: ReviewStatusState;
-    stepItems: StepItemsState;
-}>, import("../../actions/ui/finished-slides").UpdateFinishedSlides | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack | import("../../actions/ui/review-status").UpdateReviewStatus | import("../../actions/ui/step-items").StepItemsAction>;
+    slides: UISlidesState;
+}>, import("../../actions/ui/slides").SetCurrentSlide | import("../../actions/ui/navigation").NavigateTo | import("../../actions/ui/navigation").NavigateBack>;
 export default _default;

package/lib/reducers/ui/index.js

@@ -1,11 +1,9 @@
 import { combineReducers } from 'redux';
-import finishedSlides from './finished-slides';
+import currentSlideRef from './current-slide-ref';
 import navigation from './navigation';
-import reviewStatus from './review-status';
-import stepItems from './step-items';
+import slides from './slides';
 export default combineReducers({
-    finishedSlides: finishedSlides,
+    currentSlideRef: currentSlideRef,
     navigation: navigation,
-    reviewStatus: reviewStatus,
-    stepItems: stepItems
+    slides: slides
 });

package/lib/reducers/ui/slides.d.ts

@@ -0,0 +1,9 @@
+import type { UISlide } from '../../types/common';
+import { SlideIndexes } from '../../common';
+import { UISlidesAction } from '../../actions/ui/slides';
+export declare type UISlidesState = {
+    [key in SlideIndexes]: UISlide;
+};
+export declare const initialState: UISlidesState;
+declare const reducer: (state: UISlidesState | undefined, action: UISlidesAction) => UISlidesState;
+export default reducer;

package/lib/reducers/ui/slides.js

@@ -0,0 +1,43 @@
+import pipe from 'lodash/fp/pipe';
+import set from 'lodash/fp/set';
+import { mapApiSlideToUi } from '../../helpers/map-api-slide-to-ui';
+import { SET_CURRENT_SLIDE } from '../../actions/ui/slides';
+export var initialState = {
+    '0': {
+        hidden: false,
+        position: 0
+    },
+    '1': {
+        hidden: false,
+        position: 1
+    },
+    '2': {
+        hidden: false,
+        position: 2
+    },
+    '3': {
+        hidden: false,
+        position: 3
+    },
+    '4': {
+        hidden: false,
+        position: 4
+    }
+};
+var setFirstSlide = function (state, slideFromAPI) {
+    var _a = mapApiSlideToUi({ translate: function (text) { return text; } })(slideFromAPI), questionText = _a.questionText, answerUI = _a.answerUI;
+    return pipe(set(['0', 'questionText'], questionText), set(['0', 'answerUI'], answerUI), set(['0', 'parentContentTitle'], 'Parent Title') // TODO parentContentTitle + translate
+    )(state);
+};
+// eslint-disable-next-line default-param-last
+var reducer = function (state, action) {
+    if (state === void 0) { state = initialState; }
+    switch (action.type) {
+        case SET_CURRENT_SLIDE: {
+            return setFirstSlide(state, action.payload);
+        }
+        default:
+            return state;
+    }
+};
+export default reducer;

package/lib/services/test/post-progression.test.js

@@ -41,15 +41,17 @@ var skillRef = '_skill-ref';
 var result = {
     _id: '123456123456',
     state: {
+        allAnswers: [],
         isCorrect: true,
-        step: {
-            current: 1
-        },
         nextContent: {
             type: 'slide',
             ref: 'sli_NJ3m5KtWh'
         },
-        pendingSlides: []
+        pendingSlides: [],
+        slides: [],
+        step: {
+            current: 1
+        }
     }
 };
 test.before(function () {

package/lib/test/util/services.mock.js

@@ -18,12 +18,15 @@ export var services = {
                 slidesToReview: 2,
                 name: 'skill-test',
                 custom: false
+                // TODO parentContentTitle
             },
             {
                 skillRef: '_skill-ref-2',
                 slidesToReview: 2,
                 name: 'skill-test-2',
-                custom: true
+                custom: true,
+                parentContentTitle: 'parentContentTitle 2'
+                // TODO parentContentTitle
             }
         ]);
     },
@@ -33,15 +36,24 @@ export var services = {
     postProgression: function () {
         return Promise.resolve({
             _id: '62b1d1087aa12f00253f40ee',
+            content: {
+                ref: '_skill-ref',
+                type: 'skill'
+            },
+            engine: {
+                ref: 'review'
+            },
             state: {
-                pendingSlides: [],
-                step: {
-                    current: 1
-                },
+                allAnswers: [],
                 isCorrect: true,
                 nextContent: {
                     ref: 'sli_N1XACJobn',
                     type: 'slide'
+                },
+                pendingSlides: [],
+                slides: [],
+                step: {
+                    current: 1
                 }
             }
         });

package/lib/types/common.d.ts

@@ -1,4 +1,5 @@
-import { UISlide } from './slides';
+import { SlideIndexes } from '../common';
+import { AnswerUI } from './slides';
 declare type TemplateContextValues = {
     brandTheme?: unknown;
     theme?: unknown;
@@ -68,21 +69,33 @@ export declare type SlideFromAPI = {
     tips?: string;
     clue?: string;
     hasClue?: boolean;
-    id?: string;
+    id: string;
+};
+declare type ProgressionAnswerItem = {
+    isCorrect: boolean;
+    slideRef: string;
+    answer: string[];
+};
+export declare type ProgressionState = {
+    allAnswers: ProgressionAnswerItem[];
+    content?: {
+        ref: string;
+        type: string;
+    };
+    isCorrect: boolean;
+    nextContent: {
+        type: 'success' | 'slide';
+        ref: 'successExitNode' | string;
+    };
+    pendingSlides: string[];
+    slides: string[];
+    step: {
+        current: number;
+    };
 };
 export declare type ProgressionFromAPI = {
     _id: string;
-    state: {
-        isCorrect: boolean;
-        step: {
-            current: number;
-        };
-        nextContent: {
-            type: 'success' | 'slide';
-            ref: 'successExitNode' | string;
-        };
-        pendingSlides: [];
-    };
+    state: ProgressionState;
 };
 export declare type Skill = {
     skillRef: string;
@@ -116,23 +129,27 @@ export declare type JWT = {
     host: string;
 };
 declare type SlideUIAnimations = 'unstack' | 'restack';
-export declare type Slide = UISlide & {
+export declare type NextUISlide = {
+    questionText?: string;
+    answerUI?: AnswerUI;
     hidden?: boolean;
-    position: number;
+    position?: number;
     animationType?: SlideUIAnimations;
     isCorrect?: boolean;
     endReview?: boolean;
-    nextContent?: Omit<Slide, 'endReview' | 'hidden' | 'position' | 'nextContent'>;
 };
-declare const ICON_VALUES: {
-    readonly right: "right";
-    readonly wrong: "wrong";
-    readonly 'no-answer': "no-answer";
+export declare type UISlide = {
+    questionText?: string;
+    answerUI?: AnswerUI;
+    hidden?: boolean;
+    position: number;
+    animationType?: SlideUIAnimations;
+    isCorrect?: boolean;
+    endReview?: boolean;
+    nextContent?: NextUISlide;
 };
-export declare type IconValue = keyof typeof ICON_VALUES;
 export declare type FinishedSlides = {
-    slideNumbers: number[];
-    [key: number]: true;
+    [key in SlideIndexes]?: true;
 };
 export declare type WithRequired<T, K extends keyof T> = T & {
     [P in K]-?: T[P];

package/lib/types/common.js

@@ -1,6 +1 @@
-var ICON_VALUES = {
-    right: 'right',
-    wrong: 'wrong',
-    'no-answer': 'no-answer'
-};
 export {};

package/lib/types/slides.d.ts

@@ -74,7 +74,3 @@ export declare type AnswerUI = {
     help: string;
 };
 export declare type SlideUIAnimations = 'unstack' | 'restack';
-export declare type UISlide = {
-    questionText?: string;
-    answerUI?: AnswerUI;
-};

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

@@ -1,20 +1,53 @@
 import type { StoreState } from '../../reducers';
 import { Dispatchers } from '../../actions';
+declare const ICON_VALUES: {
+    readonly right: "right";
+    readonly wrong: "wrong";
+    readonly 'no-answer': "no-answer";
+};
+declare type IconValue = keyof typeof ICON_VALUES;
+declare type StepItem = {
+    current: boolean;
+    icon: IconValue;
+    value: string;
+};
+declare type CorrectionPopinProps = {
+    klf: {
+        label: string;
+        onClick: Function;
+        tooltip: string;
+    };
+    information: {
+        label: string;
+        message: string;
+    };
+    next: {
+        label: string;
+        ariaLabel: string;
+    };
+    successLabel: string;
+    failureLabel: string;
+};
 declare type SlidesViewStaticProps = {
-    slides: StoreState['data']['slides'];
-    headerProps: {
+    header: {
         mode: string;
         skillName: string;
         onQuitClick: Function;
         'aria-label'?: string;
         closeButtonAriaLabel: string;
+        steps: StepItem[];
     };
-    finishedSlides: StoreState['ui']['finishedSlides'];
-    stepItems: StoreState['ui']['stepItems'];
-    reviewStatus: StoreState['ui']['reviewStatus'];
-    validate: {
-        label: string;
+    stack: {
+        slides: StoreState['ui']['slides'];
+        validateButton: {
+            label: string;
+            disabled: boolean;
+            onClick: Function;
+        };
+        correctionPopinProps?: CorrectionPopinProps;
+        endReview: boolean;
     };
+    reviewBackgroundAriaLabel?: string;
     congratsProps?: {
         'aria-label'?: string;
         'data-name'?: string;
@@ -35,26 +68,7 @@ declare type SlidesViewStaticProps = {
             type: string;
         };
     };
-    correctionPopinProps?: {
-        klf: {
-            label: string;
-            onClick: Function;
-            tooltip: string;
-        };
-        information: {
-            label: string;
-            message: string;
-        };
-        next: {
-            label: string;
-            ariaLabel: string;
-        };
-        successLabel: string;
-        failureLabel: string;
-    };
-    reviewBackgroundAriaLabel?: string;
-    progression: StoreState['data']['progression'];
 };
 declare type SlidesViewDispatcherProps = Omit<Dispatchers, 'navigateTo' | 'navigateBack'>;
 declare type SlidesViewProps = SlidesViewStaticProps & SlidesViewDispatcherProps;
-export { SlidesViewStaticProps, SlidesViewDispatcherProps, SlidesViewProps };
+export { CorrectionPopinProps, IconValue, SlidesViewStaticProps, SlidesViewDispatcherProps, SlidesViewProps, StepItem };

package/lib/types/views/slides.js

@@ -1 +1,6 @@
+var ICON_VALUES = {
+    right: 'right',
+    wrong: 'wrong',
+    'no-answer': 'no-answer'
+};
 export {};

package/{es/types/views/skills.d.ts → lib/views/skills/index.d.ts}

@@ -1,3 +1,4 @@
+import { StoreState } from '../../reducers';
 declare type SkillCard = {
     'aria-label': string;
     skillTitle: string;
@@ -22,3 +23,4 @@ declare type SkillsProps = NoSkillsProps & {
     listSkills: SkillCard[];
 };
 export { SkillsProps };
+export declare const mapStateToSkillsProps: (state: StoreState) => SkillsProps | null;

package/lib/views/skills/index.js

@@ -0,0 +1,25 @@
+export var mapStateToSkillsProps = function (state) {
+    if (!state.data.skills) {
+        return null;
+    }
+    return {
+        title: '@todo title',
+        titleNoSkills: '@todo titleNoSkills',
+        textNoSkills: '@todo textNoSkills',
+        iconSkillAriaLabel: '@todo iconSkillAriaLabel',
+        isLoading: false,
+        isLoadingAriaLabel: '@todo loading',
+        listSkills: state.data.skills.map(function (skill) { return ({
+            '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',
+            // eslint-disable-next-line no-console
+            onClick: function () { return console.log('@todo plug dispatcher select skill'); }
+        }); })
+    };
+};

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

@@ -0,0 +1,3 @@
+import { StoreState } from '../../reducers';
+import { SlidesViewStaticProps } from '../../types/views/slides';
+export declare const mapStateToSlidesProps: (state: StoreState) => SlidesViewStaticProps | null;

package/lib/views/slides/index.js

@@ -0,0 +1,89 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import isEmpty from 'lodash/fp/isEmpty';
+var buildStepItemps = function (state) {
+    var progression = state.data.progression;
+    var currentSlideRef = state.ui.currentSlideRef;
+    if (!progression)
+        return [];
+    var defaultProps = [
+        {
+            icon: 'no-answer',
+            current: true,
+            value: '1'
+        },
+        {
+            icon: 'no-answer',
+            current: false,
+            value: '2'
+        },
+        {
+            icon: 'no-answer',
+            current: false,
+            value: '3'
+        },
+        {
+            icon: 'no-answer',
+            current: false,
+            value: '4'
+        },
+        {
+            icon: 'no-answer',
+            current: false,
+            value: '5'
+        }
+    ];
+    var allAnswers = progression.state.allAnswers;
+    var step = progression.state.step;
+    if (isEmpty(allAnswers))
+        return defaultProps;
+    var steps = defaultProps.map(function (stepItem, index) {
+        var givenAnswer = allAnswers[index];
+        if (!givenAnswer) {
+            return __assign(__assign({}, stepItem), { current: step.current === index + 1 });
+        }
+        return __assign(__assign({}, stepItem), { icon: givenAnswer.isCorrect ? 'right' : 'wrong', current: givenAnswer.slideRef === currentSlideRef });
+    });
+    return steps;
+};
+export var mapStateToSlidesProps = function (state) {
+    if (!state.data.slides) {
+        return null;
+    }
+    return {
+        header: {
+            mode: '__revision_mode',
+            skillName: '__agility',
+            onQuitClick: function () {
+                // eslint-disable-next-line no-console
+                console.log('onQuitClick');
+            },
+            'aria-label': 'aria-header-wrapper',
+            closeButtonAriaLabel: 'aria-close-button',
+            steps: buildStepItemps(state)
+        },
+        stack: {
+            slides: state.ui.slides,
+            validateButton: {
+                label: '__validate',
+                disabled: true,
+                onClick: function () {
+                    // eslint-disable-next-line no-console
+                    console.log('TODO: validate question');
+                }
+            },
+            correctionPopinProps: undefined,
+            endReview: false
+        },
+        congratsProps: undefined
+    };
+};