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

package/es/index.js

@@ -1,7 +1,6 @@
 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';
@@ -66,9 +65,7 @@ const AppReview = ({ options }) => {
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
-    const { templateContext: values } = options;
     return (React.createElement(Provider, { store: store },
-        React.createElement(TemplateContext, { values: values },
-            React.createElement(ConnectedApp, null))));
+        React.createElement(ConnectedApp, null)));
 };
 export default AppReview;

package/es/services/fetch-correction.d.ts

@@ -0,0 +1,2 @@
+import { CorrectionFromAPI } from '../types/common';
+export declare const fetchCorrection: (slideRef: string, token: string, progressionId: string, answer: string[]) => Promise<CorrectionFromAPI | void>;

package/es/services/fetch-correction.js

@@ -0,0 +1,14 @@
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+import { toJSON } from './tools/fetch-responses';
+export const fetchCorrection = async (slideRef, token, progressionId, answer) => {
+    const { host } = decode(token);
+    const response = await crossFetch(`${host}/api/v2/progressions/${progressionId}/answers/${slideRef}`, {
+        method: 'post',
+        headers: { authorization: token },
+        body: JSON.stringify({
+            answer
+        })
+    });
+    return toJSON(response);
+};

package/es/services/fetch-slide.js

@@ -6,6 +6,5 @@ export const fetchSlide = async (slideRef, token) => {
     const response = await crossFetch(`${host}/api/v2/slide/${slideRef}/parentContentTitle`, {
         headers: { authorization: token }
     });
-    const slide = (await toJSON(response));
-    return slide;
+    return toJSON(response);
 };

package/es/services/test/fetch-correction.test.d.ts

@@ -0,0 +1 @@
+export {};

package/es/services/test/fetch-correction.test.js

@@ -0,0 +1,39 @@
+import test from 'ava';
+import nock from 'nock';
+import { fetchCorrection } from '../fetch-correction';
+const progressionId = '123456789123';
+const slideRef = 'sli_123546';
+const answer = ['Lister vos tâches pour vous libérer l’esprit', '15 jours à Bora Bora'];
+const correction = {
+    correctAnswer: ['15 jours à Bora Bora'],
+    corrections: [
+        {
+            answer: answer[0],
+            isCorrect: false
+        },
+        {
+            answer: answer[1],
+            isCorrect: true
+        }
+    ]
+};
+test.before(() => {
+    nock('http://localhost:3000')
+        .post(`/api/v2/progressions/${progressionId}/answers/${slideRef}`, JSON.stringify({
+        answer
+    }))
+        .reply(200, correction);
+});
+test.after(() => {
+    nock.cleanAll();
+});
+test('should fetch the correction of the slide for the specified progression successfully', async (t) => {
+    const token = process.env.API_TEST_TOKEN || '';
+    const response = await fetchCorrection(slideRef, token, progressionId, answer);
+    t.deepEqual(correction, response);
+});
+test('should reject if a bad token is passed', async (t) => {
+    const badToken = 'token is not a jwt';
+    const error = await t.throwsAsync(() => fetchCorrection(slideRef, badToken, progressionId, answer));
+    t.is(error?.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
+});

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

@@ -1,4 +1,5 @@
 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';
@@ -21,6 +22,8 @@ const getSlideFixture = (ref) => {
             return freeTextSlide;
         case templateSlide.universalRef:
             return templateSlide;
+        case qcmDragSlide.universalRef:
+            return qcmDragSlide;
         default:
             return sliderSlide;
     }

package/es/types/common.d.ts

@@ -110,6 +110,14 @@ export declare type ProgressionFromAPI = {
     engine: ReviewEngine;
     state: ProgressionState;
 };
+export declare type CorrectedChoice = {
+    answer: string;
+    isCorrect: boolean;
+};
+export declare type CorrectionFromAPI = {
+    correctAnswer: string[];
+    corrections: CorrectedChoice[];
+};
 export declare type Skill = {
     skillRef: string;
     slidesToReview: number;

package/lib/index.js

@@ -12,7 +12,6 @@ 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';
@@ -78,9 +77,7 @@ var AppReview = function (_a) {
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
-    var values = options.templateContext;
     return (React.createElement(Provider, { store: store },
-        React.createElement(TemplateContext, { values: values },
-            React.createElement(ConnectedApp, null))));
+        React.createElement(ConnectedApp, null)));
 };
 export default AppReview;

package/lib/services/fetch-correction.d.ts

@@ -0,0 +1,2 @@
+import { CorrectionFromAPI } from '../types/common';
+export declare const fetchCorrection: (slideRef: string, token: string, progressionId: string, answer: string[]) => Promise<CorrectionFromAPI | void>;

package/lib/services/fetch-correction.js

@@ -0,0 +1,58 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+import { toJSON } from './tools/fetch-responses';
+export var fetchCorrection = function (slideRef, token, progressionId, answer) { return __awaiter(void 0, void 0, void 0, function () {
+    var host, response;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                host = decode(token).host;
+                return [4 /*yield*/, crossFetch("".concat(host, "/api/v2/progressions/").concat(progressionId, "/answers/").concat(slideRef), {
+                        method: 'post',
+                        headers: { authorization: token },
+                        body: JSON.stringify({
+                            answer: answer
+                        })
+                    })];
+            case 1:
+                response = _a.sent();
+                return [2 /*return*/, toJSON(response)];
+        }
+    });
+}); };

package/lib/services/fetch-slide.js

@@ -38,7 +38,7 @@ import crossFetch from 'cross-fetch';
 import decode from 'jwt-decode';
 import { toJSON } from './tools/fetch-responses';
 export var fetchSlide = function (slideRef, token) { return __awaiter(void 0, void 0, void 0, function () {
-    var host, response, slide;
+    var host, response;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -48,10 +48,7 @@ export var fetchSlide = function (slideRef, token) { return __awaiter(void 0, vo
                     })];
             case 1:
                 response = _a.sent();
-                return [4 /*yield*/, toJSON(response)];
-            case 2:
-                slide = (_a.sent());
-                return [2 /*return*/, slide];
+                return [2 /*return*/, toJSON(response)];
         }
     });
 }); };

package/lib/services/test/fetch-correction.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/services/test/fetch-correction.test.js

@@ -0,0 +1,95 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import test from 'ava';
+import nock from 'nock';
+import { fetchCorrection } from '../fetch-correction';
+var progressionId = '123456789123';
+var slideRef = 'sli_123546';
+var answer = ['Lister vos tâches pour vous libérer l’esprit', '15 jours à Bora Bora'];
+var correction = {
+    correctAnswer: ['15 jours à Bora Bora'],
+    corrections: [
+        {
+            answer: answer[0],
+            isCorrect: false
+        },
+        {
+            answer: answer[1],
+            isCorrect: true
+        }
+    ]
+};
+test.before(function () {
+    nock('http://localhost:3000')
+        .post("/api/v2/progressions/".concat(progressionId, "/answers/").concat(slideRef), JSON.stringify({
+        answer: answer
+    }))
+        .reply(200, correction);
+});
+test.after(function () {
+    nock.cleanAll();
+});
+test('should fetch the correction of the slide for the specified progression successfully', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var token, response;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                token = process.env.API_TEST_TOKEN || '';
+                return [4 /*yield*/, fetchCorrection(slideRef, token, progressionId, answer)];
+            case 1:
+                response = _a.sent();
+                t.deepEqual(correction, response);
+                return [2 /*return*/];
+        }
+    });
+}); });
+test('should reject if a bad token is passed', function (t) { return __awaiter(void 0, void 0, void 0, function () {
+    var badToken, error;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                badToken = 'token is not a jwt';
+                return [4 /*yield*/, t.throwsAsync(function () {
+                        return fetchCorrection(slideRef, badToken, progressionId, answer);
+                    })];
+            case 1:
+                error = _a.sent();
+                t.is(error === null || error === void 0 ? void 0 : error.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
+                return [2 /*return*/];
+        }
+    });
+}); });

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

@@ -11,6 +11,7 @@ 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';
@@ -33,6 +34,8 @@ var getSlideFixture = function (ref) {
             return freeTextSlide;
         case templateSlide.universalRef:
             return templateSlide;
+        case qcmDragSlide.universalRef:
+            return qcmDragSlide;
         default:
             return sliderSlide;
     }

package/lib/types/common.d.ts

@@ -110,6 +110,14 @@ export declare type ProgressionFromAPI = {
     engine: ReviewEngine;
     state: ProgressionState;
 };
+export declare type CorrectedChoice = {
+    answer: string;
+    isCorrect: boolean;
+};
+export declare type CorrectionFromAPI = {
+    correctAnswer: string[];
+    corrections: CorrectedChoice[];
+};
 export declare type Skill = {
     skillRef: string;
     slidesToReview: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.1.20",
+  "version": "0.1.21-alpha.8+d10426e39",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -41,8 +41,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.22.14",
-    "@coorpacademy/redux-task": "^1.1.5",
+    "@coorpacademy/components": "10.22.15-alpha.8+d10426e39",
+    "@coorpacademy/redux-task": "1.1.5",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
     "react-redux": "^8.0.1",
@@ -77,5 +77,6 @@
     "react-dom": "^17.0.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
-  }
+  },
+  "gitHead": "d10426e390835b81b9b692661522c08ead9db231"
 }

package/src/index.tsx

@@ -3,7 +3,6 @@ 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';
@@ -87,13 +86,9 @@ const AppReview = ({options}: {options: AppOptions}): JSX.Element | null => {
 
   if (!store) return null;
 
-  const {templateContext: values} = options;
-
   return (
     <Provider store={store}>
-      <TemplateContext values={values}>
-        <ConnectedApp />
-      </TemplateContext>
+      <ConnectedApp />
     </Provider>
   );
 };

package/src/services/fetch-correction.ts

@@ -0,0 +1,26 @@
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+
+import {CorrectionFromAPI, JWT} from '../types/common';
+import {toJSON} from './tools/fetch-responses';
+
+export const fetchCorrection = async (
+  slideRef: string,
+  token: string,
+  progressionId: string,
+  answer: string[]
+): Promise<CorrectionFromAPI | void> => {
+  const {host}: JWT = decode(token);
+  const response = await crossFetch(
+    `${host}/api/v2/progressions/${progressionId}/answers/${slideRef}`,
+    {
+      method: 'post',
+      headers: {authorization: token},
+      body: JSON.stringify({
+        answer
+      })
+    }
+  );
+
+  return toJSON<CorrectionFromAPI>(response);
+};

package/src/services/fetch-slide.ts

@@ -10,6 +10,5 @@ export const fetchSlide = async (slideRef: string, token: string): Promise<Slide
     headers: {authorization: token}
   });
 
-  const slide = (await toJSON(response)) as SlideFromAPI;
-  return slide;
+  return toJSON<SlideFromAPI>(response);
 };

package/src/services/test/fetch-correction.test.ts

@@ -0,0 +1,55 @@
+import test from 'ava';
+import nock from 'nock';
+import {CorrectionFromAPI} from '../../types/common';
+import {fetchCorrection} from '../fetch-correction';
+
+const progressionId = '123456789123';
+const slideRef = 'sli_123546';
+const answer = ['Lister vos tâches pour vous libérer l’esprit', '15 jours à Bora Bora'];
+
+const correction: CorrectionFromAPI = {
+  correctAnswer: ['15 jours à Bora Bora'],
+  corrections: [
+    {
+      answer: answer[0],
+      isCorrect: false
+    },
+    {
+      answer: answer[1],
+      isCorrect: true
+    }
+  ]
+};
+
+test.before(() => {
+  nock('http://localhost:3000')
+    .post(
+      `/api/v2/progressions/${progressionId}/answers/${slideRef}`,
+      JSON.stringify({
+        answer
+      })
+    )
+    .reply(200, correction);
+});
+
+test.after(() => {
+  nock.cleanAll();
+});
+
+test('should fetch the correction of the slide for the specified progression successfully', async t => {
+  const token = process.env.API_TEST_TOKEN || '';
+  const response = await fetchCorrection(slideRef, token, progressionId, answer);
+  t.deepEqual(correction, response);
+});
+
+test('should reject if a bad token is passed', async t => {
+  const badToken = 'token is not a jwt';
+  const error = await t.throwsAsync(() =>
+    fetchCorrection(slideRef, badToken, progressionId, answer)
+  );
+
+  t.is(
+    error?.message,
+    "Invalid token specified: Cannot read properties of undefined (reading 'replace')"
+  );
+});

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

@@ -1,4 +1,5 @@
 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';
@@ -31,6 +32,8 @@ const getSlideFixture = (ref: string): SlideFromAPI => {
       return freeTextSlide;
     case templateSlide.universalRef:
       return templateSlide;
+    case qcmDragSlide.universalRef:
+      return qcmDragSlide;
     default:
       return sliderSlide;
   }

package/src/types/common.ts

@@ -131,6 +131,16 @@ export type ProgressionFromAPI = {
   state: ProgressionState;
 };
 
+export type CorrectedChoice = {
+  answer: string;
+  isCorrect: boolean;
+};
+
+export type CorrectionFromAPI = {
+  correctAnswer: string[];
+  corrections: CorrectedChoice[];
+};
+
 export type Skill = {
   skillRef: string;
   slidesToReview: number;