@coorpacademy/app-review 0.1.21-alpha.8 → 0.1.21

package/es/index.js

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch, Provider } from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
+import { TemplateContext } from '@coorpacademy/components/es/template/app-review/template-context';
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
@@ -65,7 +66,9 @@ const AppReview = ({ options }) => {
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
+    const { templateContext: values } = options;
     return (React.createElement(Provider, { store: store },
-        React.createElement(ConnectedApp, null)));
+        React.createElement(TemplateContext, { values: values },
+            React.createElement(ConnectedApp, null))));
 };
 export default AppReview;

package/es/services/index.js

@@ -1,10 +1,12 @@
+import { fetchCorrection } from './fetch-correction';
 import { fetchSkills } from './fetch-skills';
-import { postProgression } from './post-progression';
 import { fetchSlide } from './fetch-slide';
 import { postAnswer } from './post-answer';
+import { postProgression } from './post-progression';
 export const getServices = () => ({
+    fetchCorrection,
     fetchSkills,
     fetchSlide,
-    postProgression,
-    postAnswer
+    postAnswer,
+    postProgression
 });

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

@@ -1,5 +1,4 @@
 import get from 'lodash/fp/get';
-import { qcmDragSlide } from '../../views/slides/test/fixtures/qcm-drag';
 import { qcmSlide } from '../../views/slides/test/fixtures/qcm';
 import { qcmGraphicSlide } from '../../views/slides/test/fixtures/qcm-graphic';
 import { freeTextSlide } from '../../views/slides/test/fixtures/free-text';
@@ -22,8 +21,6 @@ const getSlideFixture = (ref) => {
             return freeTextSlide;
         case templateSlide.universalRef:
             return templateSlide;
-        case qcmDragSlide.universalRef:
-            return qcmDragSlide;
         default:
             return sliderSlide;
     }
@@ -330,6 +327,70 @@ export const progressionSlideWithPendingSlide = {
         stars: 32
     }
 };
+const getChoicesCorrection = (ref, wrongChoice = false) => {
+    switch (ref) {
+        case qcmSlide.universalRef: {
+            const correctAnswer = [get('question.content.choices.0.label', qcmSlide)];
+            return {
+                correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: get('question.content.choices.2.label', qcmSlide),
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case qcmGraphicSlide.universalRef: {
+            const correctAnswer = [get('question.content.choices.1.label', qcmGraphicSlide)];
+            return {
+                correctAnswer,
+                corrections: wrongChoice
+                    ? [{ answer: get('question.content.choices.0.label', qcmGraphicSlide), isCorrect: false }]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case freeTextSlide.universalRef: {
+            const correctAnswer = ['Benchmark'];
+            return {
+                correctAnswer,
+                corrections: wrongChoice
+                    ? [{ answer: 'Nope', isCorrect: false }]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case templateSlide.universalRef: {
+            const correctAnswer = [get('question.content.choices.1.items.1.text', templateSlide)];
+            return {
+                correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: get('question.content.choices.1.items.0.text', templateSlide),
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        default: {
+            const correctAnswer = ['7', '7 ans'];
+            return {
+                correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: '8',
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: '7', isCorrect: true }]
+            };
+        }
+    }
+};
 export const services = {
     fetchSkills: () => Promise.resolve(fetchSkillsResponse),
     fetchSlide: ref => Promise.resolve({ ...getSlideFixture(ref), universalRef: ref, id: ref }),
@@ -337,5 +398,6 @@ export const services = {
     postAnswer: progression => {
         const currentSlide = progression.state.nextContent.ref;
         return Promise.resolve(get(currentSlide, postAnswerResponses));
-    }
+    },
+    fetchCorrection: ref => Promise.resolve(getChoicesCorrection(ref))
 };

package/es/types/common.d.ts

@@ -129,6 +129,7 @@ export declare type Services = {
     fetchSlide(slideRef: string, token: string): Promise<SlideFromAPI | void>;
     postProgression(skillRef: string, token: string): Promise<ProgressionFromAPI>;
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
+    fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
 };
 export declare type Options = {
     services: Services;

package/lib/index.js

@@ -12,6 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch, Provider } from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
+import { TemplateContext } from '@coorpacademy/components/es/template/app-review/template-context';
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
@@ -77,7 +78,9 @@ var AppReview = function (_a) {
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
+    var values = options.templateContext;
     return (React.createElement(Provider, { store: store },
-        React.createElement(ConnectedApp, null)));
+        React.createElement(TemplateContext, { values: values },
+            React.createElement(ConnectedApp, null))));
 };
 export default AppReview;

package/lib/services/index.js

@@ -1,10 +1,12 @@
+import { fetchCorrection } from './fetch-correction';
 import { fetchSkills } from './fetch-skills';
-import { postProgression } from './post-progression';
 import { fetchSlide } from './fetch-slide';
 import { postAnswer } from './post-answer';
+import { postProgression } from './post-progression';
 export var getServices = function () { return ({
+    fetchCorrection: fetchCorrection,
     fetchSkills: fetchSkills,
     fetchSlide: fetchSlide,
-    postProgression: postProgression,
-    postAnswer: postAnswer
+    postAnswer: postAnswer,
+    postProgression: postProgression
 }); };

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

@@ -11,7 +11,6 @@ var __assign = (this && this.__assign) || function () {
 };
 var _a;
 import get from 'lodash/fp/get';
-import { qcmDragSlide } from '../../views/slides/test/fixtures/qcm-drag';
 import { qcmSlide } from '../../views/slides/test/fixtures/qcm';
 import { qcmGraphicSlide } from '../../views/slides/test/fixtures/qcm-graphic';
 import { freeTextSlide } from '../../views/slides/test/fixtures/free-text';
@@ -34,8 +33,6 @@ var getSlideFixture = function (ref) {
             return freeTextSlide;
         case templateSlide.universalRef:
             return templateSlide;
-        case qcmDragSlide.universalRef:
-            return qcmDragSlide;
         default:
             return sliderSlide;
     }
@@ -342,6 +339,71 @@ export var progressionSlideWithPendingSlide = {
         stars: 32
     }
 };
+var getChoicesCorrection = function (ref, wrongChoice) {
+    if (wrongChoice === void 0) { wrongChoice = false; }
+    switch (ref) {
+        case qcmSlide.universalRef: {
+            var correctAnswer = [get('question.content.choices.0.label', qcmSlide)];
+            return {
+                correctAnswer: correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: get('question.content.choices.2.label', qcmSlide),
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case qcmGraphicSlide.universalRef: {
+            var correctAnswer = [get('question.content.choices.1.label', qcmGraphicSlide)];
+            return {
+                correctAnswer: correctAnswer,
+                corrections: wrongChoice
+                    ? [{ answer: get('question.content.choices.0.label', qcmGraphicSlide), isCorrect: false }]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case freeTextSlide.universalRef: {
+            var correctAnswer = ['Benchmark'];
+            return {
+                correctAnswer: correctAnswer,
+                corrections: wrongChoice
+                    ? [{ answer: 'Nope', isCorrect: false }]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        case templateSlide.universalRef: {
+            var correctAnswer = [get('question.content.choices.1.items.1.text', templateSlide)];
+            return {
+                correctAnswer: correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: get('question.content.choices.1.items.0.text', templateSlide),
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: correctAnswer[0], isCorrect: true }]
+            };
+        }
+        default: {
+            var correctAnswer = ['7', '7 ans'];
+            return {
+                correctAnswer: correctAnswer,
+                corrections: wrongChoice
+                    ? [
+                        {
+                            answer: '8',
+                            isCorrect: false
+                        }
+                    ]
+                    : [{ answer: '7', isCorrect: true }]
+            };
+        }
+    }
+};
 export var services = {
     fetchSkills: function () { return Promise.resolve(fetchSkillsResponse); },
     fetchSlide: function (ref) { return Promise.resolve(__assign(__assign({}, getSlideFixture(ref)), { universalRef: ref, id: ref })); },
@@ -349,5 +411,6 @@ export var services = {
     postAnswer: function (progression) {
         var currentSlide = progression.state.nextContent.ref;
         return Promise.resolve(get(currentSlide, postAnswerResponses));
-    }
+    },
+    fetchCorrection: function (ref) { return Promise.resolve(getChoicesCorrection(ref)); }
 };

package/lib/types/common.d.ts

@@ -129,6 +129,7 @@ export declare type Services = {
     fetchSlide(slideRef: string, token: string): Promise<SlideFromAPI | void>;
     postProgression(skillRef: string, token: string): Promise<ProgressionFromAPI>;
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
+    fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
 };
 export declare type Options = {
     services: Services;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.1.21-alpha.8+d10426e39",
+  "version": "0.1.21",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -41,8 +41,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.22.15-alpha.8+d10426e39",
-    "@coorpacademy/redux-task": "1.1.5",
+    "@coorpacademy/components": "10.22.15",
+    "@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": "d10426e390835b81b9b692661522c08ead9db231"
+  "gitHead": "c1783083ab70ca3ccbeebb029a521470457212c8"
 }

package/src/index.tsx

@@ -3,6 +3,7 @@ import type {} from 'redux-thunk/extend-redux'; // https://github.com/reduxjs/re
 import {AnyAction, Store} from 'redux';
 import {useSelector, useDispatch, Provider} from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
+import {TemplateContext} from '@coorpacademy/components/es/template/app-review/template-context';
 
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
@@ -86,9 +87,13 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
 
   if (!store) return null;
 
+  const {templateContext: values} = options;
+
   return (
     <Provider store={store}>
-      <ConnectedApp />
+      <TemplateContext values={values}>
+        <ConnectedApp />
+      </TemplateContext>
     </Provider>
   );
 };

package/src/services/index.ts

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

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

@@ -1,11 +1,11 @@
 import get from 'lodash/fp/get';
-import {qcmDragSlide} from '../../views/slides/test/fixtures/qcm-drag';
 import {qcmSlide} from '../../views/slides/test/fixtures/qcm';
 import {qcmGraphicSlide} from '../../views/slides/test/fixtures/qcm-graphic';
 import {freeTextSlide} from '../../views/slides/test/fixtures/free-text';
 import {sliderSlide} from '../../views/slides/test/fixtures/slider';
 import {templateSlide} from '../../views/slides/test/fixtures/template';
 import {
+  CorrectionFromAPI,
   ProgressionFromAPI,
   ReviewContent,
   ReviewEngine,
@@ -32,8 +32,6 @@ const getSlideFixture = (ref: string): SlideFromAPI => {
       return freeTextSlide;
     case templateSlide.universalRef:
       return templateSlide;
-    case qcmDragSlide.universalRef:
-      return qcmDragSlide;
     default:
       return sliderSlide;
   }
@@ -345,6 +343,71 @@ export const progressionSlideWithPendingSlide: ProgressionFromAPI = {
   }
 };
 
+const getChoicesCorrection = (ref: string, wrongChoice = false): CorrectionFromAPI => {
+  switch (ref) {
+    case qcmSlide.universalRef: {
+      const correctAnswer = [get('question.content.choices.0.label', qcmSlide)];
+      return {
+        correctAnswer,
+        corrections: wrongChoice
+          ? [
+              {
+                answer: get('question.content.choices.2.label', qcmSlide),
+                isCorrect: false
+              }
+            ]
+          : [{answer: correctAnswer[0], isCorrect: true}]
+      };
+    }
+    case qcmGraphicSlide.universalRef: {
+      const correctAnswer = [get('question.content.choices.1.label', qcmGraphicSlide)];
+      return {
+        correctAnswer,
+        corrections: wrongChoice
+          ? [{answer: get('question.content.choices.0.label', qcmGraphicSlide), isCorrect: false}]
+          : [{answer: correctAnswer[0], isCorrect: true}]
+      };
+    }
+    case freeTextSlide.universalRef: {
+      const correctAnswer = ['Benchmark'];
+      return {
+        correctAnswer,
+        corrections: wrongChoice
+          ? [{answer: 'Nope', isCorrect: false}]
+          : [{answer: correctAnswer[0], isCorrect: true}]
+      };
+    }
+    case templateSlide.universalRef: {
+      const correctAnswer = [get('question.content.choices.1.items.1.text', templateSlide)];
+      return {
+        correctAnswer,
+        corrections: wrongChoice
+          ? [
+              {
+                answer: get('question.content.choices.1.items.0.text', templateSlide),
+                isCorrect: false
+              }
+            ]
+          : [{answer: correctAnswer[0], isCorrect: true}]
+      };
+    }
+    default: {
+      const correctAnswer = ['7', '7 ans'];
+      return {
+        correctAnswer,
+        corrections: wrongChoice
+          ? [
+              {
+                answer: '8',
+                isCorrect: false
+              }
+            ]
+          : [{answer: '7', isCorrect: true}]
+      };
+    }
+  }
+};
+
 export const services: Services = {
   fetchSkills: () => Promise.resolve(fetchSkillsResponse),
   fetchSlide: ref => Promise.resolve({...getSlideFixture(ref), universalRef: ref, id: ref}),
@@ -352,5 +415,6 @@ export const services: Services = {
   postAnswer: progression => {
     const currentSlide = progression.state.nextContent.ref;
     return Promise.resolve(get(currentSlide, postAnswerResponses));
-  }
+  },
+  fetchCorrection: ref => Promise.resolve(getChoicesCorrection(ref))
 };

package/src/types/common.ts

@@ -157,6 +157,12 @@ export type Services = {
     token: string,
     answer: string[]
   ): Promise<ProgressionFromAPI>;
+  fetchCorrection(
+    slideRef: string,
+    token: string,
+    progressionId: string,
+    answer: string[]
+  ): Promise<CorrectionFromAPI | void>;
 };
 
 export type Options = {