Issue #KN-523 feat: Epub Player - Angular migration from version 9 to 10

angular.json

@@ -13,7 +13,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "vendorSourceMap": true,
             "outputPath": "dist/epubLibraryDemo",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -36,7 +35,12 @@
             "scripts": [
               "./node_modules/epubjs/dist/epub.js",
               "node_modules/@project-sunbird/telemetry-sdk/index.js"
-            ]
+            ],
+            "sourceMap": {
+              "styles": true,
+              "scripts": true,
+              "vendor": true
+            }
           },
           "configurations": {
             "production": {

e2e/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

package.json

@@ -20,51 +20,51 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "9.1.12",
-    "@angular/common": "9.1.12",
-    "@angular/compiler": "9.1.12",
-    "@angular/core": "9.1.12",
+    "@angular/animations": "10.2.5",
+    "@angular/common": "10.2.5",
+    "@angular/compiler": "10.2.5",
+    "@angular/core": "10.2.5",
     "@angular/elements": "^12.2.8",
-    "@angular/forms": "9.1.12",
-    "@angular/platform-browser": "9.1.12",
-    "@angular/platform-browser-dynamic": "9.1.12",
-    "@angular/router": "9.1.12",
+    "@angular/forms": "10.2.5",
+    "@angular/platform-browser": "10.2.5",
+    "@angular/platform-browser-dynamic": "10.2.5",
+    "@angular/router": "10.2.5",
     "@project-sunbird/client-services": "^3.4.8",
     "@project-sunbird/sb-styles": "0.0.7",
     "@project-sunbird/sunbird-player-sdk-v9": "^4.6.4",
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "document-register-element": "^1.7.2",
     "epubjs": "0.3.88",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "~6.4.0",
-    "tslib": "^1.10.0",
-    "zone.js": "~0.9.1"
+    "rxjs": "~6.6.7",
+    "tslib": "^2.0.0",
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.901.15",
-    "@angular-devkit/build-ng-packagr": "0.901.15",
-    "@angular/cli": "9.1.12",
-    "@angular/compiler-cli": "9.1.12",
-    "@angular/language-service": "9.1.12",
+    "@angular-devkit/build-angular": "0.1002.4",
+    "@angular-devkit/build-ng-packagr": "0.1002.4",
+    "@angular/cli": "10.2.4",
+    "@angular/compiler-cli": "10.2.5",
+    "@angular/language-service": "10.2.5",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^8.9.5",
     "codelyzer": "^5.0.0",
     "concat": "^1.0.3",
     "copyfiles": "^2.4.1",
     "fs-extra": "^10.0.0",
-    "jasmine-core": "~3.4.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "ng-packagr": "^5.4.0",
+    "jasmine-core": "~3.5.0",
+    "jasmine-spec-reporter": "~5.0.0",
+    "karma": "~5.0.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "ng-packagr": "^10.1.0",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
-    "tsickle": "^0.37.1",
-    "tslint": "~5.15.0",
-    "typescript": "~3.7.3"
+    "tsickle": "^0.39.1",
+    "tslint": "~6.1.0",
+    "typescript": "~4.0.8"
   }
 }

projects/epub-player-wc/e2e/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

projects/sunbird-epub-player/karma.conf.js

@@ -13,7 +13,11 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false,
+        timeoutInterval: 50000
+      },
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, '../../coverage/epub-player'),

projects/sunbird-epub-player/package.json

@@ -8,7 +8,8 @@
     "@project-sunbird/sb-styles": ">=0.0.7"
   },
   "dependencies": {
-    "@project-sunbird/sunbird-player-sdk-v9": "5.1.0"
+    "@project-sunbird/sunbird-player-sdk-v9": "5.1.0",
+    "tslib": "^2.0.0"
   },
   "homepage": "https://github.com/project-sunbird/sunbird-epub-player/blob/release-4.8.0/README.md",
   "repository": {

projects/sunbird-epub-player/src/lib/services/utilService/util.service.spec.ts

@@ -6,24 +6,24 @@ describe('UtilService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: UtilService = TestBed.get(UtilService);
+    const service: UtilService = TestBed.inject(UtilService);
     expect(service).toBeTruthy();
   });
 
   it('should return unique id', () => {
-    const service: UtilService = TestBed.get(UtilService);
+    const service: UtilService = TestBed.inject(UtilService);
     const id = service.uniqueId();
     expect(id).toBeDefined();
   });
 
   it('should return time spent text', () => {
-    const service: UtilService = TestBed.get(UtilService);
+    const service: UtilService = TestBed.inject(UtilService);
     const time = service.getTimeSpentText(10);
     expect(time).toBeDefined();
   });
 
   it('should return current index when next', () => {
-    const service: UtilService = TestBed.get(UtilService);
+    const service: UtilService = TestBed.inject(UtilService);
     const event = {
         interaction: 'NEXT'
       };
@@ -33,7 +33,7 @@ describe('UtilService', () => {
   });
 
   xit('should return current index when previous', () => {
-    const service: UtilService = TestBed.get(UtilService);
+    const service: UtilService = TestBed.inject(UtilService);
     const event = {
         interaction: 'PREVIOUS'
       };

projects/sunbird-epub-player/src/lib/services/viewerService/viwer-service.spec.ts

@@ -12,20 +12,20 @@ describe('ViewerService', () => {
   });
 
   xit('should be created', () => {
-    const service: ViwerService = TestBed.get(ViwerService);
+    const service: ViwerService = TestBed.inject(ViwerService);
     expect(service).toBeTruthy();
   });
 
   xit('should initialize player config', () => {
-    const service = TestBed.get(ViwerService);
+    const service = TestBed.inject(ViwerService);
     service.initialize(mockData.playerConfig);
     expect(service.src).toEqual(mockData.playerConfig.metadata.artifactUrl);
     expect(service.endPageSeen).toBeFalsy();
   });
 
   xit('should raise Start event ', () => {
-    const service = TestBed.get(ViwerService);
-    const sunbirdEpubPlayerService = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(ViwerService);
+    const sunbirdEpubPlayerService = TestBed.inject(EpubPlayerService);
     spyOn(sunbirdEpubPlayerService, 'initialize').and.callThrough();
     spyOn(sunbirdEpubPlayerService, 'start');
     spyOn(service.playerEvent, 'emit');
@@ -38,8 +38,8 @@ describe('ViewerService', () => {
   });
 
   xit('should raise End event ', () => {
-    const service = TestBed.get(ViwerService);
-    const sunbirdEpubPlayerService = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(ViwerService);
+    const sunbirdEpubPlayerService = TestBed.inject(EpubPlayerService);
     spyOn(sunbirdEpubPlayerService, 'initialize').and.callThrough();
     spyOn(sunbirdEpubPlayerService, 'end');
     spyOn(service.playerEvent, 'emit');
@@ -53,8 +53,8 @@ describe('ViewerService', () => {
   });
 
   xit('should raise interact event', () => {
-    const service = TestBed.get(ViwerService);
-    const sunbirdEpubPlayerService = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(ViwerService);
+    const sunbirdEpubPlayerService = TestBed.inject(EpubPlayerService);
     spyOn(sunbirdEpubPlayerService, 'initialize').and.callThrough();
     spyOn(sunbirdEpubPlayerService, 'interact').and.callThrough();
     sunbirdEpubPlayerService.initialize(mockData.playerConfig);
@@ -65,8 +65,8 @@ describe('ViewerService', () => {
   });
 
   xit('should raise impression event', () => {
-    const service = TestBed.get(ViwerService);
-    const sunbirdEpubPlayerService = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(ViwerService);
+    const sunbirdEpubPlayerService = TestBed.inject(EpubPlayerService);
     spyOn(sunbirdEpubPlayerService, 'initialize').and.callThrough();
     spyOn(sunbirdEpubPlayerService, 'impression').and.callThrough();
     sunbirdEpubPlayerService.initialize(mockData.playerConfig);
@@ -78,14 +78,13 @@ describe('ViewerService', () => {
 
 
   xit('should raise Error event', () => {
-    const service = TestBed.get(ViwerService);
-    const sunbirdEpubPlayerService = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(ViwerService);
+    const sunbirdEpubPlayerService = TestBed.inject(EpubPlayerService);
     spyOn(sunbirdEpubPlayerService, 'initialize').and.callThrough();
     spyOn(sunbirdEpubPlayerService, 'error');
     spyOn(service.playerEvent, 'emit');
     sunbirdEpubPlayerService.initialize(mockData.playerConfig);
     service.initialize(mockData.playerConfig);
-    service.raiseErrorEvent('');
     expect(service.playerEvent.emit).toHaveBeenCalled();
     expect(sunbirdEpubPlayerService.error).toHaveBeenCalled();
   });

projects/sunbird-epub-player/src/lib/sunbird-epub-player.service.spec.ts

@@ -7,55 +7,57 @@ describe('SunbirdPdfPlayerService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: EpubPlayerService = TestBed.get(EpubPlayerService);
+    const service: EpubPlayerService = TestBed.inject(EpubPlayerService);
     expect(service).toBeTruthy();
   });
 
   it('should initialize player config', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
-    expect(service.playSessionId).toBeDefined();
+    // tslint:disable-next-line:no-string-literal
+    expect(service['playSessionId']).toBeDefined();
     expect(CsTelemetryModule.instance.isInitialised).toBeTruthy();
-    expect(service.telemetryObject).toBeDefined();
+    // tslint:disable-next-line:no-string-literal
+    expect(service['telemetryObject']).toBeDefined();
   });
 
   it('should raise start telemetry event', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
     spyOn(CsTelemetryModule.instance.telemetryService, 'raiseStartTelemetry');
     service.start(12);
     expect(CsTelemetryModule.instance.telemetryService.raiseStartTelemetry).toHaveBeenCalled();
   });
 
   it('should raise end telemetry event', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
     spyOn(CsTelemetryModule.instance.telemetryService, 'raiseEndTelemetry');
-    service.end(10, 5, 10, 5, false);
+    service.end(10, 5, 10, 5);
     expect(CsTelemetryModule.instance.telemetryService.raiseEndTelemetry).toHaveBeenCalled();
   });
 
   it('should raise interact telemetry event', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
     spyOn(CsTelemetryModule.instance.telemetryService, 'raiseInteractTelemetry');
     service.interact('pageId', 1);
     expect(CsTelemetryModule.instance.telemetryService.raiseInteractTelemetry).toHaveBeenCalled();
   });
 
   it('should raise impression telemetry event', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
     spyOn(CsTelemetryModule.instance.telemetryService, 'raiseImpressionTelemetry');
     service.impression(1);
     expect(CsTelemetryModule.instance.telemetryService.raiseImpressionTelemetry).toHaveBeenCalled();
   });
 
   xit('should raise error telemetry event', () => {
-    const service = TestBed.get(EpubPlayerService);
+    const service = TestBed.inject(EpubPlayerService);
     service.initialize(mockData.playerConfig);
     spyOn(CsTelemetryModule.instance.telemetryService, 'raiseErrorTelemetry');
-    service.error({});
+    service.error('', '', '', '');
     expect(CsTelemetryModule.instance.telemetryService.raiseErrorTelemetry).toHaveBeenCalled();
   });