@coorpacademy/app-review 0.5.5 → 0.5.6-alpha.2

package/es/index.js

@@ -16,7 +16,8 @@ const ConnectedApp = ({ onQuitClick }) => {
     const props = {
         viewName: useSelector((state) => state.ui.navigation[state.ui.navigation.length - 1]),
         slides: useSelector((state) => mapStateToSlidesProps(state, dispatch, onQuitClick)),
-        skills: useSelector((state) => mapStateToSkillsProps(state))
+        skills: useSelector((state) => mapStateToSkillsProps(state)),
+        onboarding: {}
     };
     return React.createElement(AppReviewTemplate, { ...props });
 };

package/es/services/fetch-slides-to-review-by-skill-ref.d.ts

@@ -0,0 +1,2 @@
+import { SlideIdFromAPI } from '../types/common';
+export declare const fetchSlidesToReviewBySkillRef: (url: string, token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;

package/es/services/fetch-slides-to-review-by-skill-ref.js

@@ -0,0 +1,8 @@
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+import { toJSON } from './tools/fetch-responses';
+export const fetchSlidesToReviewBySkillRef = async (url, token, skillRef) => {
+    const { user: userId } = decode(token);
+    const response = await crossFetch(`${url}/api/v1/review/users/${userId}/skills/${skillRef}/slide?limit=5&offset=0`);
+    return toJSON(response);
+};

package/es/services/index.js

@@ -2,6 +2,7 @@ import { fetchCorrection } from './fetch-correction';
 import { fetchRank } from './fetch-rank';
 import { fetchSkills } from './fetch-skills';
 import { fetchSlide } from './fetch-slide';
+import { fetchSlidesToReviewBySkillRef } from './fetch-slides-to-review-by-skill-ref';
 import { postAnswer } from './post-answer';
 import { postProgression } from './post-progression';
 export const getServices = () => ({
@@ -9,6 +10,7 @@ export const getServices = () => ({
     fetchRank,
     fetchSkills,
     fetchSlide,
+    fetchSlidesToReviewBySkillRef,
     postAnswer,
     postProgression
 });

package/es/test/index.test.js

@@ -39,7 +39,8 @@ const appOptions = {
     token: process.env.API_TEST_TOKEN || '',
     skillRef: 'skill_NJC0jFKoH',
     services,
-    onQuitClick: identity
+    onQuitClick: identity,
+    url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 test('should show the loader while the app is fetching the data', async (t) => {
     t.plan(2);

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

@@ -413,6 +413,23 @@ export const getChoicesCorrection = (ref, wrongChoice = false) => {
         }
     }
 };
+const fetchSlidesToReviewBySkillRefResponse = [
+    {
+        slideId: freeTextSlide._id
+    },
+    {
+        slideId: templateSlide._id
+    },
+    {
+        slideId: qcmDragSlide._id
+    },
+    {
+        slideId: qcmGraphicSlide._id
+    },
+    {
+        slideId: qcmSlide._id
+    }
+];
 export const services = {
     fetchSkills: () => Promise.resolve(fetchSkillsResponse),
     fetchSlide: ref => Promise.resolve({ ...getSlideFixture(ref), universalRef: ref, _id: ref }),
@@ -422,5 +439,6 @@ export const services = {
         return Promise.resolve(get(currentSlide, postAnswerResponses));
     },
     fetchCorrection: ref => Promise.resolve(getChoicesCorrection(ref)),
-    fetchRank: () => Promise.resolve(fetchRankResponse)
+    fetchRank: () => Promise.resolve(fetchRankResponse),
+    fetchSlidesToReviewBySkillRef: () => Promise.resolve(fetchSlidesToReviewBySkillRefResponse)
 };

package/es/types/common.d.ts

@@ -69,6 +69,9 @@ export declare type SlideFromAPI = {
         type: 'chapter' | 'course';
     };
 };
+export declare type SlideIdFromAPI = {
+    slideId: string;
+};
 export declare type Rank = {
     rank: number;
 };
@@ -131,6 +134,7 @@ export declare type Services = {
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
     fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
     fetchRank(token: string): Promise<Rank>;
+    fetchSlidesToReviewBySkillRef(url: string, token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
 };
 export declare type Options = {
     services: Services;
@@ -140,6 +144,7 @@ export declare type AppOptions = {
     skillRef?: string;
     services: Services;
     onQuitClick: Function;
+    url: string;
 };
 export declare type JWT = {
     exp: number;

package/lib/index.js

@@ -28,7 +28,8 @@ var ConnectedApp = function (_a) {
     var props = {
         viewName: useSelector(function (state) { return state.ui.navigation[state.ui.navigation.length - 1]; }),
         slides: useSelector(function (state) { return mapStateToSlidesProps(state, dispatch, onQuitClick); }),
-        skills: useSelector(function (state) { return mapStateToSkillsProps(state); })
+        skills: useSelector(function (state) { return mapStateToSkillsProps(state); }),
+        onboarding: {}
     };
     return React.createElement(AppReviewTemplate, __assign({}, props));
 };

package/lib/services/fetch-slides-to-review-by-skill-ref.d.ts

@@ -0,0 +1,2 @@
+import { SlideIdFromAPI } from '../types/common';
+export declare const fetchSlidesToReviewBySkillRef: (url: string, token: string, skillRef: string) => Promise<SlideIdFromAPI[]>;

package/lib/services/fetch-slides-to-review-by-skill-ref.js

@@ -0,0 +1,52 @@
+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 fetchSlidesToReviewBySkillRef = function (url, token, skillRef) { return __awaiter(void 0, void 0, void 0, function () {
+    var userId, response;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                userId = decode(token).user;
+                return [4 /*yield*/, crossFetch("".concat(url, "/api/v1/review/users/").concat(userId, "/skills/").concat(skillRef, "/slide?limit=5&offset=0"))];
+            case 1:
+                response = _a.sent();
+                return [2 /*return*/, toJSON(response)];
+        }
+    });
+}); };

package/lib/services/index.js

@@ -2,6 +2,7 @@ import { fetchCorrection } from './fetch-correction';
 import { fetchRank } from './fetch-rank';
 import { fetchSkills } from './fetch-skills';
 import { fetchSlide } from './fetch-slide';
+import { fetchSlidesToReviewBySkillRef } from './fetch-slides-to-review-by-skill-ref';
 import { postAnswer } from './post-answer';
 import { postProgression } from './post-progression';
 export var getServices = function () { return ({
@@ -9,6 +10,7 @@ export var getServices = function () { return ({
     fetchRank: fetchRank,
     fetchSkills: fetchSkills,
     fetchSlide: fetchSlide,
+    fetchSlidesToReviewBySkillRef: fetchSlidesToReviewBySkillRef,
     postAnswer: postAnswer,
     postProgression: postProgression
 }); };

package/lib/test/index.test.js

@@ -134,7 +134,8 @@ var appOptions = {
     token: process.env.API_TEST_TOKEN || '',
     skillRef: 'skill_NJC0jFKoH',
     services: services,
-    onQuitClick: identity
+    onQuitClick: identity,
+    url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 test('should show the loader while the app is fetching the data', function (t) { return __awaiter(void 0, void 0, void 0, function () {
     var container, loader;

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

@@ -417,6 +417,23 @@ export var getChoicesCorrection = function (ref, wrongChoice) {
         }
     }
 };
+var fetchSlidesToReviewBySkillRefResponse = [
+    {
+        slideId: freeTextSlide._id
+    },
+    {
+        slideId: templateSlide._id
+    },
+    {
+        slideId: qcmDragSlide._id
+    },
+    {
+        slideId: qcmGraphicSlide._id
+    },
+    {
+        slideId: qcmSlide._id
+    }
+];
 export var services = {
     fetchSkills: function () { return Promise.resolve(fetchSkillsResponse); },
     fetchSlide: function (ref) { return Promise.resolve(__assign(__assign({}, getSlideFixture(ref)), { universalRef: ref, _id: ref })); },
@@ -426,5 +443,6 @@ export var services = {
         return Promise.resolve(get(currentSlide, postAnswerResponses));
     },
     fetchCorrection: function (ref) { return Promise.resolve(getChoicesCorrection(ref)); },
-    fetchRank: function () { return Promise.resolve(fetchRankResponse); }
+    fetchRank: function () { return Promise.resolve(fetchRankResponse); },
+    fetchSlidesToReviewBySkillRef: function () { return Promise.resolve(fetchSlidesToReviewBySkillRefResponse); }
 };

package/lib/types/common.d.ts

@@ -69,6 +69,9 @@ export declare type SlideFromAPI = {
         type: 'chapter' | 'course';
     };
 };
+export declare type SlideIdFromAPI = {
+    slideId: string;
+};
 export declare type Rank = {
     rank: number;
 };
@@ -131,6 +134,7 @@ export declare type Services = {
     postAnswer(progression: ProgressionFromAPI, token: string, answer: string[]): Promise<ProgressionFromAPI>;
     fetchCorrection(slideRef: string, token: string, progressionId: string, answer: string[]): Promise<CorrectionFromAPI | void>;
     fetchRank(token: string): Promise<Rank>;
+    fetchSlidesToReviewBySkillRef(url: string, token: string, skillRef: string): Promise<SlideIdFromAPI[]>;
 };
 export declare type Options = {
     services: Services;
@@ -140,6 +144,7 @@ export declare type AppOptions = {
     skillRef?: string;
     services: Services;
     onQuitClick: Function;
+    url: string;
 };
 export declare type JWT = {
     exp: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coorpacademy/app-review",
-  "version": "0.5.5",
+  "version": "0.5.6-alpha.2+eed634ba0",
   "description": "",
   "engines": {
     "node": ">=16.15.0"
@@ -42,7 +42,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@coorpacademy/components": "10.24.4",
+    "@coorpacademy/components": "10.24.5-alpha.2+eed634ba0",
     "@coorpacademy/redux-task": "1.1.6",
     "cross-fetch": "^3.1.5",
     "jwt-decode": "^3.1.2",
@@ -77,5 +77,5 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
   },
-  "gitHead": "687ef3d5b4d1326232d6fa71565c9b50207df1f0"
+  "gitHead": "eed634ba0e2edfffa5b5797dd6251d2e63128bda"
 }

package/src/index.tsx

@@ -27,7 +27,8 @@ const ConnectedApp = ({onQuitClick}: {onQuitClick: Function}): JSX.Element => {
       (state: StoreState) => state.ui.navigation[state.ui.navigation.length - 1]
     ),
     slides: useSelector((state: StoreState) => mapStateToSlidesProps(state, dispatch, onQuitClick)),
-    skills: useSelector((state: StoreState) => mapStateToSkillsProps(state))
+    skills: useSelector((state: StoreState) => mapStateToSkillsProps(state)),
+    onboarding: {}
   };
   return <AppReviewTemplate {...props} />;
 };

package/src/services/fetch-slides-to-review-by-skill-ref.ts

@@ -0,0 +1,18 @@
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+
+import {JWT, SlideIdFromAPI} from '../types/common';
+import {toJSON} from './tools/fetch-responses';
+
+export const fetchSlidesToReviewBySkillRef = async (
+  url: string,
+  token: string,
+  skillRef: string
+): Promise<SlideIdFromAPI[]> => {
+  const {user: userId}: JWT = decode(token);
+  const response = await crossFetch(
+    `${url}/api/v1/review/users/${userId}/skills/${skillRef}/slide?limit=5&offset=0`
+  );
+
+  return toJSON<SlideIdFromAPI[]>(response);
+};

package/src/services/index.ts

@@ -3,6 +3,7 @@ import {fetchCorrection} from './fetch-correction';
 import {fetchRank} from './fetch-rank';
 import {fetchSkills} from './fetch-skills';
 import {fetchSlide} from './fetch-slide';
+import {fetchSlidesToReviewBySkillRef} from './fetch-slides-to-review-by-skill-ref';
 import {postAnswer} from './post-answer';
 import {postProgression} from './post-progression';
 
@@ -11,6 +12,7 @@ export const getServices = (): Services => ({
   fetchRank,
   fetchSkills,
   fetchSlide,
+  fetchSlidesToReviewBySkillRef,
   postAnswer,
   postProgression
 });

package/src/services/test/fetch-slides-to-review-by-skill-ref.test.ts

@@ -0,0 +1,51 @@
+import test from 'ava';
+import nock from 'nock';
+import {fetchSlidesToReviewBySkillRef} from '../fetch-slides-to-review-by-skill-ref';
+import {SlideIdFromAPI} from '../../types/common';
+
+const url = process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006';
+
+const result: SlideIdFromAPI[] = [
+  {
+    slideId: 'sli_6'
+  },
+  {
+    slideId: 'sli_7'
+  },
+  {
+    slideId: 'sli_8'
+  },
+  {
+    slideId: 'sli_9'
+  },
+  {
+    slideId: 'sli_10'
+  }
+];
+
+test.before(() => {
+  nock(url)
+    .get('/api/v1/review/users/592d830b240b923f00bffba6/skills/_skill-ref/slide?limit=5&offset=0')
+    .reply(200, result);
+});
+
+test.after(() => {
+  nock.cleanAll();
+});
+
+test('should fetch slides id with success', async t => {
+  const token = process.env.API_TEST_TOKEN || '';
+  const slidesId = await fetchSlidesToReviewBySkillRef(url, token, '_skill-ref');
+  t.deepEqual(result, slidesId);
+});
+
+test('should reject if a bad token is passed', async t => {
+  const badToken = 'token is not a jwt';
+  const error = await t.throwsAsync(() =>
+    fetchSlidesToReviewBySkillRef(url, badToken, '_skill-ref')
+  );
+  t.is(
+    error?.message,
+    "Invalid token specified: Cannot read properties of undefined (reading 'replace')"
+  );
+});

package/src/test/index.test.tsx

@@ -61,7 +61,8 @@ const appOptions: AppOptions = {
   token: process.env.API_TEST_TOKEN || '',
   skillRef: 'skill_NJC0jFKoH',
   services,
-  onQuitClick: identity
+  onQuitClick: identity,
+  url: process.env.LAMBDA_API_REVIEW_GET_SLIDES_URL || 'http://localhost:7006'
 };
 
 test('should show the loader while the app is fetching the data', async t => {

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

@@ -11,7 +11,8 @@ import {
   ReviewContent,
   ReviewEngine,
   Services,
-  SlideFromAPI
+  SlideFromAPI,
+  SlideIdFromAPI
 } from '../../types/common';
 
 const content: ReviewContent = {
@@ -432,6 +433,24 @@ export const getChoicesCorrection = (ref: string, wrongChoice = false): Correcti
   }
 };
 
+const fetchSlidesToReviewBySkillRefResponse: SlideIdFromAPI[] = [
+  {
+    slideId: freeTextSlide._id
+  },
+  {
+    slideId: templateSlide._id
+  },
+  {
+    slideId: qcmDragSlide._id
+  },
+  {
+    slideId: qcmGraphicSlide._id
+  },
+  {
+    slideId: qcmSlide._id
+  }
+];
+
 export const services: Services = {
   fetchSkills: () => Promise.resolve(fetchSkillsResponse),
   fetchSlide: ref => Promise.resolve({...getSlideFixture(ref), universalRef: ref, _id: ref}),
@@ -441,5 +460,6 @@ export const services: Services = {
     return Promise.resolve(get(currentSlide, postAnswerResponses));
   },
   fetchCorrection: ref => Promise.resolve(getChoicesCorrection(ref)),
-  fetchRank: () => Promise.resolve(fetchRankResponse)
+  fetchRank: () => Promise.resolve(fetchRankResponse),
+  fetchSlidesToReviewBySkillRef: () => Promise.resolve(fetchSlidesToReviewBySkillRefResponse)
 };

package/src/types/common.ts

@@ -82,6 +82,10 @@ export type SlideFromAPI = {
   };
 };
 
+export type SlideIdFromAPI = {
+  slideId: string;
+};
+
 export type Rank = {
   rank: number;
 };
@@ -164,6 +168,11 @@ export type Services = {
     answer: string[]
   ): Promise<CorrectionFromAPI | void>;
   fetchRank(token: string): Promise<Rank>;
+  fetchSlidesToReviewBySkillRef(
+    url: string,
+    token: string,
+    skillRef: string
+  ): Promise<SlideIdFromAPI[]>;
 };
 
 export type Options = {
@@ -175,6 +184,7 @@ export type AppOptions = {
   skillRef?: string;
   services: Services;
   onQuitClick: Function;
+  url: string;
 };
 
 export type JWT = {