@coorpacademy/app-review 0.2.7 → 0.2.9-alpha.5

package/lib/views/slides/test/slide.free-text.on-change.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: freeTextSlide._id,
@@ -59,6 +60,8 @@ test('should dispatch EDIT_BASIC action via the property onChange of a Free Text
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/lib/views/slides/test/slide.qcm-drag.on-click.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmDragSlide._id,
@@ -59,6 +60,8 @@ test('should dispatch EDIT_QCM_DRAG action via the property onClick of a QCM Dra
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/lib/views/slides/test/slide.qcm-graphic.on-click.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmGraphicSlide._id,
@@ -53,17 +54,19 @@ test('should dispatch EDIT_QCM_GRAPHIC action via the property onClick of a QCM
     var expectedActions = [
         {
             type: EDIT_QCM_GRAPHIC,
-            payload: ['Faux']
+            payload: ['Le retour d’information']
         }
     ];
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
         parentContentTitle: 'From "Developing the review app" course',
-        questionText: 'Pour mener une bonne négociation, il ne faut ressentir aucune émotion. Vrai ou faux ?'
+        questionText: 'Quels sont les 4 piliers de l’apprentissage ?'
     });
     var SlideProps = (_a = props.stack.slides['0'].answerUI) === null || _a === void 0 ? void 0 : _a.model;
     var onClick = get(['1', 'onClick'], SlideProps.answers);

package/lib/views/slides/test/slide.qcm.on-click.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: qcmSlide._id,
@@ -61,6 +62,8 @@ test('should dispatch EDIT_QCM action via the property onClick of a QCM slide',
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/lib/views/slides/test/slide.slider.on-change.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: sliderSlide._id,
@@ -59,6 +60,8 @@ test('should dispatch EDIT_SLIDER action via the property onChange of a Slider s
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/lib/views/slides/test/slide.template.on-change.test.js

@@ -36,7 +36,8 @@ var initialState = {
             _a),
         skills: [],
         token: '1234',
-        corrections: {}
+        corrections: {},
+        rank: {}
     },
     ui: {
         currentSlideRef: templateSlide._id,
@@ -54,6 +55,8 @@ test('should dispatch EDIT_TEMPLATE action via the property onChange of a Templa
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,
@@ -71,6 +74,8 @@ test('should dispatch EDIT_TEMPLATE action via the property onChange of a Templa
     var _b = createTestStore(t, initialState, services, expectedActions), dispatch = _b.dispatch, getState = _b.getState;
     var props = mapStateToSlidesProps(getState(), dispatch);
     t.deepEqual(omit('answerUI', props.stack.slides['0']), {
+        animateCorrectionPopin: false,
+        showCorrectionPopin: false,
         hidden: false,
         position: 0,
         loading: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.2.7",
+  "version": "0.2.9-alpha.5+31142bfd9",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -41,8 +41,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.22.22",
-    "@coorpacademy/redux-task": "^1.1.5",
+    "@coorpacademy/components": "10.22.24-alpha.5+31142bfd9",
+    "@coorpacademy/redux-task": "1.1.5",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
     "react-redux": "^8.0.1",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
-  "gitHead": "6eca157ba8c342a0d345a7d303166b43e4a9792a"
+  "gitHead": "31142bfd914b3f169048c3e0bc261835ab74c030"
 }

package/src/actions/api/fetch-rank.ts

@@ -0,0 +1,84 @@
+import buildTask from '@coorpacademy/redux-task';
+import get from 'lodash/fp/get';
+import type {Dispatch} from 'redux';
+import type {StoreState} from '../../reducers';
+import type {Rank, Services, Options} from '../../types/common';
+
+export const RANK_FETCH_START_REQUEST = '@@rank/FETCH_START_REQUEST' as const;
+export const RANK_FETCH_START_SUCCESS = '@@rank/FETCH_START_SUCCESS' as const;
+export const RANK_FETCH_START_FAILURE = '@@rank/FETCH_START_FAILURE' as const;
+
+export const RANK_FETCH_END_REQUEST = '@@rank/FETCH_END_REQUEST' as const;
+export const RANK_FETCH_END_SUCCESS = '@@rank/FETCH_END_SUCCESS' as const;
+export const RANK_FETCH_END_FAILURE = '@@rank/FETCH_END_FAILURE' as const;
+
+type RankFetchStartRequestType = typeof RANK_FETCH_START_REQUEST;
+type RankFetchStartSuccessType = typeof RANK_FETCH_START_SUCCESS;
+type RankFetchStartFailureType = typeof RANK_FETCH_START_FAILURE;
+type RankFetchEndRequestType = typeof RANK_FETCH_END_REQUEST;
+type RankFetchEndSuccessType = typeof RANK_FETCH_END_SUCCESS;
+type RankFetchEndFailureType = typeof RANK_FETCH_END_FAILURE;
+
+export type RankRequestAction = {
+  type: RankFetchStartRequestType | RankFetchEndRequestType;
+};
+
+export type RankSuccessAction = {
+  type: RankFetchStartSuccessType | RankFetchEndSuccessType;
+  payload: Rank;
+};
+
+export type RankFailureAction = {
+  type: RankFetchStartFailureType | RankFetchEndFailureType;
+};
+
+export type RankAction = RankRequestAction | RankSuccessAction | RankFailureAction;
+
+type RankStart = [RankFetchStartRequestType, RankFetchStartSuccessType, RankFetchStartFailureType];
+type RankEnd = [RankFetchEndRequestType, RankFetchEndSuccessType, RankFetchEndFailureType];
+
+export const fetchRank = (
+  dispatch: Dispatch,
+  getState: () => StoreState,
+  services: Services,
+  types: RankStart | RankEnd,
+  path?: string
+): RankAction => {
+  const action = buildTask({
+    types,
+    task: () => {
+      const state = getState();
+      const token = get(['data', 'token'], state);
+      return services.fetchRank(token);
+    },
+    bailout: path ? (state: StoreState): boolean => !!get(path, state) : undefined
+  });
+
+  return dispatch(action);
+};
+
+export const fetchStartRank = (
+  dispatch: Dispatch,
+  getState: () => StoreState,
+  {services}: Options
+): RankAction => {
+  return fetchRank(
+    dispatch,
+    getState,
+    services,
+    [RANK_FETCH_START_REQUEST, RANK_FETCH_START_SUCCESS, RANK_FETCH_START_FAILURE],
+    'data.rank.start'
+  );
+};
+
+export const fetchEndRank = (
+  dispatch: Dispatch,
+  getState: () => StoreState,
+  {services}: Options
+): RankAction => {
+  return fetchRank(dispatch, getState, services, [
+    RANK_FETCH_END_REQUEST,
+    RANK_FETCH_END_SUCCESS,
+    RANK_FETCH_END_FAILURE
+  ]);
+};

package/src/actions/api/test/fetch-correction.test.ts

@@ -29,7 +29,8 @@ const initialState: StoreState = {
     },
     skills: [{skillRef, custom: false, name: skillRef, slidesToReview: 5}],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: freeTextSlide._id,

package/src/actions/api/test/fetch-rank.test.ts

@@ -0,0 +1,130 @@
+import test from 'ava';
+import type {Services} from '../../../types/common';
+import type {StoreState} from '../../../reducers';
+import {
+  fetchStartRank,
+  fetchEndRank,
+  RANK_FETCH_START_REQUEST,
+  RANK_FETCH_START_SUCCESS,
+  RANK_FETCH_START_FAILURE,
+  RANK_FETCH_END_REQUEST,
+  RANK_FETCH_END_SUCCESS,
+  RANK_FETCH_END_FAILURE
+} from '../fetch-rank';
+import {services as mockedServices} from '../../../test/util/services.mock';
+import {createTestStore} from '../../test/create-test-store';
+
+const initialState: StoreState = {
+  data: {
+    progression: null,
+    slides: {},
+    skills: [],
+    token: '1234',
+    corrections: {},
+    rank: {}
+  },
+  ui: {
+    currentSlideRef: '',
+    navigation: [],
+    answers: [],
+    slide: {
+      validateButton: false
+    }
+  }
+};
+
+test('should dispatch FETCH_START_SUCCESS action when fetchStartRank returns the start rank', async t => {
+  t.plan(3);
+
+  const services: Services = {
+    ...mockedServices,
+    fetchRank: token => {
+      t.is(token, '1234');
+      return Promise.resolve({rank: 93});
+    }
+  };
+  const expectedActions = [
+    {type: RANK_FETCH_START_REQUEST},
+    {
+      type: RANK_FETCH_START_SUCCESS,
+      payload: {rank: 93}
+    }
+  ];
+
+  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+  await dispatch(fetchStartRank);
+});
+
+test('should dispatch FETCH_START_FAILURE action when fetchStartRank fails', async t => {
+  t.plan(3);
+
+  const services: Services = {
+    ...mockedServices,
+    fetchRank: token => {
+      t.is(token, '1234');
+      return Promise.reject(new Error('unexpected'));
+    }
+  };
+
+  const expectedActions = [
+    {type: RANK_FETCH_START_REQUEST},
+    {
+      type: RANK_FETCH_START_FAILURE,
+      payload: new Error('unexpected'),
+      error: true
+    }
+  ];
+
+  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+
+  await dispatch(fetchStartRank);
+});
+
+test('should dispatch FETCH_END_SUCCESS action when fetchEndRank returns the end rank', async t => {
+  t.plan(3);
+
+  const services: Services = {
+    ...mockedServices,
+    fetchRank: token => {
+      t.is(token, '1234');
+      return Promise.resolve({rank: 93});
+    }
+  };
+
+  const expectedActions = [
+    {type: RANK_FETCH_END_REQUEST},
+    {
+      type: RANK_FETCH_END_SUCCESS,
+      payload: {rank: 93}
+    }
+  ];
+
+  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+
+  await dispatch(fetchEndRank);
+});
+
+test('should dispatch FETCH_END_FAILURE action when fetchEndRank fails', async t => {
+  t.plan(3);
+
+  const services: Services = {
+    ...mockedServices,
+    fetchRank: token => {
+      t.is(token, '1234');
+      return Promise.reject(new Error('unexpected'));
+    }
+  };
+
+  const expectedActions = [
+    {type: RANK_FETCH_END_REQUEST},
+    {
+      type: RANK_FETCH_END_FAILURE,
+      payload: new Error('unexpected'),
+      error: true
+    }
+  ];
+
+  const {dispatch} = createTestStore(t, initialState, services, expectedActions);
+
+  await dispatch(fetchEndRank);
+});

package/src/actions/api/test/fetch-skills.test.ts

@@ -16,7 +16,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/actions/api/test/fetch-slide.test.ts

@@ -18,7 +18,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/actions/api/test/post-answer.test.ts

@@ -50,7 +50,8 @@ const initialState: StoreState = {
     },
     skills: [{skillRef, custom: false, name: skillRef, slidesToReview: 5}],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: freeTextSlide._id,

package/src/actions/api/test/post-progression.test.ts

@@ -19,7 +19,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/actions/data/test/token.test.ts

@@ -10,7 +10,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/actions/ui/test/answers.test.ts

@@ -44,7 +44,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/actions/ui/test/slides.test.ts

@@ -11,7 +11,8 @@ const initialState: StoreState = {
     slides: {},
     skills: [],
     token: '1234',
-    corrections: {}
+    corrections: {},
+    rank: {}
   },
   ui: {
     currentSlideRef: '',

package/src/reducers/data/corrections.ts

@@ -1,5 +1,5 @@
 import set from 'lodash/fp/set';
-import {CorrectionFromAPI} from '../../types/common';
+import type {CorrectionFromAPI} from '../../types/common';
 import {
   ReceivedCorrection,
   CORRECTION_FETCH_SUCCESS,

package/src/reducers/data/index.ts

@@ -5,6 +5,7 @@ import progression, {ProgressionState} from './progression';
 import skills, {SkillsState} from './skills';
 import slides, {SlidesState} from './slides';
 import token, {TokenState} from './token';
+import rank, {RankState} from './rank';
 
 export type DataState = {
   corrections: CorrectionsState;
@@ -12,6 +13,7 @@ export type DataState = {
   skills: SkillsState;
   slides: SlidesState;
   token: TokenState;
+  rank: RankState;
 };
 
-export default combineReducers({corrections, progression, skills, slides, token});
+export default combineReducers({corrections, progression, skills, slides, token, rank});

package/src/reducers/data/rank.ts

@@ -0,0 +1,60 @@
+import {get, isNull, isUndefined, pipe, set, unset, update} from 'lodash/fp';
+import {
+  RankAction,
+  RANK_FETCH_START_REQUEST,
+  RANK_FETCH_START_SUCCESS,
+  RANK_FETCH_START_FAILURE,
+  RANK_FETCH_END_REQUEST,
+  RANK_FETCH_END_SUCCESS,
+  RANK_FETCH_END_FAILURE
+} from '../../actions/api/fetch-rank';
+
+export type RankState = {
+  start?: number | null;
+  end?: number | null;
+};
+
+const initialState: RankState = {};
+
+const reducer = (
+  // eslint-disable-next-line default-param-last
+  state: RankState = initialState,
+  action: RankAction
+): RankState => {
+  switch (action.type) {
+    case RANK_FETCH_START_REQUEST: {
+      return update(
+        'start',
+        (startRank: RankState['start']) => (isUndefined(startRank) ? null : startRank),
+        state
+      );
+    }
+    case RANK_FETCH_START_SUCCESS: {
+      const {payload} = action;
+      return set('start', payload.rank, state);
+    }
+    case RANK_FETCH_START_FAILURE: {
+      if (pipe(get('start'), isNull)(state)) return unset('start', state);
+      return state;
+    }
+    case RANK_FETCH_END_REQUEST: {
+      return update(
+        'end',
+        (endRank: RankState['end']) => (isUndefined(endRank) ? null : endRank),
+        state
+      );
+    }
+    case RANK_FETCH_END_SUCCESS: {
+      const {payload} = action;
+      return set('end', payload.rank, state);
+    }
+    case RANK_FETCH_END_FAILURE: {
+      if (pipe(get('end'), isNull)(state)) return unset('end', state);
+      return state;
+    }
+    default:
+      return state;
+  }
+};
+
+export default reducer;

package/src/reducers/data/test/rank.test.ts

@@ -0,0 +1,78 @@
+import test from 'ava';
+import reducer from '../rank';
+import {
+  RankAction,
+  RANK_FETCH_START_REQUEST,
+  RANK_FETCH_START_SUCCESS,
+  RANK_FETCH_START_FAILURE,
+  RANK_FETCH_END_REQUEST,
+  RANK_FETCH_END_SUCCESS,
+  RANK_FETCH_END_FAILURE
+} from '../../../actions/api/fetch-rank';
+
+test('should have initial value', t => {
+  const state = reducer(undefined, {} as RankAction);
+  t.deepEqual(state, {});
+});
+
+test("should set the start value to null if the value doesn't exist of FETCH_START_REQUEST action", t => {
+  const state = reducer({}, {type: RANK_FETCH_START_REQUEST});
+  t.deepEqual(state, {
+    start: null
+  });
+});
+
+test('should do nothing if a start value already exists of FETCH_START_REQUEST action', t => {
+  const state = reducer({start: 93}, {type: RANK_FETCH_START_REQUEST});
+  t.deepEqual(state, {
+    start: 93
+  });
+});
+
+test('should set the start value of FETCH_START_SUCCESS action', t => {
+  const state = reducer({}, {type: RANK_FETCH_START_SUCCESS, payload: {rank: 93}});
+  t.deepEqual(state, {
+    start: 93
+  });
+});
+
+test('should unset the start value if the value is null of FETCH_START_FAILURE action', t => {
+  const state = reducer({start: null}, {type: RANK_FETCH_START_FAILURE});
+  t.deepEqual(state, {});
+});
+
+test('should do nothing if the start value already exists of FETCH_START_FAILURE action', t => {
+  const state = reducer({start: 93}, {type: RANK_FETCH_START_FAILURE});
+  t.deepEqual(state, {start: 93});
+});
+
+test("should set the end value to null if the value doesn't exist of FETCH_END_REQUEST action", t => {
+  const state = reducer({}, {type: RANK_FETCH_END_REQUEST});
+  t.deepEqual(state, {
+    end: null
+  });
+});
+
+test('should do nothing if an end value already exists of FETCH_END_REQUEST action', t => {
+  const state = reducer({end: 94}, {type: RANK_FETCH_END_REQUEST});
+  t.deepEqual(state, {
+    end: 94
+  });
+});
+
+test('should set the end value of FETCH_END_SUCCESS action', t => {
+  const state = reducer({}, {type: RANK_FETCH_END_SUCCESS, payload: {rank: 94}});
+  t.deepEqual(state, {
+    end: 94
+  });
+});
+
+test('should unset the end value if the value is null of FETCH_END_FAILURE action', t => {
+  const state = reducer({end: null}, {type: RANK_FETCH_END_FAILURE});
+  t.deepEqual(state, {});
+});
+
+test('should do nothing if the end value already exists of FETCH_END_FAILURE action', t => {
+  const state = reducer({end: 94}, {type: RANK_FETCH_END_FAILURE});
+  t.deepEqual(state, {end: 94});
+});

package/src/reducers/index.ts

@@ -1,7 +1,7 @@
 import {combineReducers} from 'redux';
 
-import data, {DataState} from './data';
-import ui, {UIState} from './ui';
+import data, {type DataState} from './data';
+import ui, {type UIState} from './ui';
 
 export type StoreState = {
   ui: UIState;

package/src/reducers/ui/slide.ts

@@ -17,6 +17,7 @@ import {CORRECTION_FETCH_SUCCESS, ReceivedCorrection} from '../../actions/api/fe
 export type UISlideState = {
   validateButton: boolean;
   animateCorrectionPopin?: boolean;
+  showCorrectionPopin?: boolean;
 };
 
 export const initialState: UISlideState = {validateButton: false};
@@ -39,7 +40,7 @@ const reducer = (
       return initialState;
     }
     case CORRECTION_FETCH_SUCCESS: {
-      return set(['animateCorrectionPopin'], true, state);
+      return pipe(set(['animateCorrectionPopin'], true), set(['showCorrectionPopin'], true))(state);
     }
     default:
       return state;

package/src/services/index.ts

@@ -1,5 +1,6 @@
 import {Services} from '../types/common';
 import {fetchCorrection} from './fetch-correction';
+import {fetchRank} from './fetch-rank';
 import {fetchSkills} from './fetch-skills';
 import {fetchSlide} from './fetch-slide';
 import {postAnswer} from './post-answer';
@@ -7,6 +8,7 @@ import {postProgression} from './post-progression';
 
 export const getServices = (): Services => ({
   fetchCorrection,
+  fetchRank,
   fetchSkills,
   fetchSlide,
   postAnswer,