Issue #ED-4098 merge: Merge pull request #3594 from Ajoymaity/release…

…-8.0.0_v16 Issue #ED-4098 feat: Angular migration 15 to 16
Sunbird-Ed · Apr 17, 2024 · 4934a60 · 4934a60
2 parents 4d4a440 + 9d23188
commit 4934a60
Show file tree

Hide file tree

Showing 10 changed files with 28,814 additions and 16,456 deletions.
diff --git a/angular.json b/angular.json
@@ -124,7 +124,7 @@
                   "with": "src/configuration/configuration.prod.ts"
                 }
               ],
-              "optimization": true,
+              "optimization": false,
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -135,8 +135,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "8mb",
-                  "maximumError": "16mb"
+                  "maximumWarning": "16mb",
+                  "maximumError": "40mb"
                 }
               ]
             },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,7 +11,6 @@
     "e2e": "ng e2e",
     "test": "jest",
     "test:coverage": "jest --coverage",
-    "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
     "debug-sdk": "node sdk-local.js",
     "test:ci": "jest --ci --collectCoverage=true --coverageReporters=lcov --forceExit --detectOpenHandles --maxWorkers=2",
     "ionic-build": "ng build --source-map && node attach-source-maps.js && cordova build android",
@@ -24,16 +23,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "15.2.10",
-    "@angular/cdk": "^15.2.9",
-    "@angular/common": "15.2.10",
-    "@angular/core": "15.2.10",
-    "@angular/forms": "15.2.10",
-    "@angular/localize": "15.2.10",
-    "@angular/material": "^15.2.9",
-    "@angular/platform-browser": "15.2.10",
-    "@angular/platform-browser-dynamic": "15.2.10",
-    "@angular/router": "15.2.10",
+    "@angular/animations": "16.2.12",
+    "@angular/cdk": "^16.2.14",
+    "@angular/common": "16.2.12",
+    "@angular/core": "16.2.12",
+    "@angular/forms": "16.2.12",
+    "@angular/localize": "16.2.12",
+    "@angular/material": "16.2.14",
+    "@angular/platform-browser": "16.2.12",
+    "@angular/platform-browser-dynamic": "16.2.12",
+    "@angular/router": "16.2.12",
     "@awesome-cordova-plugins/android-permissions": "6.3.0",
     "@awesome-cordova-plugins/app-version": "6.3.0",
     "@awesome-cordova-plugins/camera": "6.3.0",
@@ -65,28 +64,29 @@
     "@awesome-cordova-plugins/streaming-media": "6.3.0",
     "@ionic/angular": "6.7.4",
     "@ionic/cordova-builders": "9.0.0",
-    "@ionic/storage": "2.2.0",
-    "@ngx-translate/core": "^11.0.1",
-    "@ngx-translate/http-loader": "^4.0.0",
-    "@project-sunbird/client-services": "7.0.4",
+    "@ionic/storage": "4.0.0",
+    "@ionic/storage-angular": "^4.0.0",
+    "@ngx-translate/core": "14.0.0",
+    "@ngx-translate/http-loader": "6.0.0",
+    "@project-sunbird/client-services": "7.0.6",
     "@project-sunbird/common-consumption": "^8.0.1",
-    "@project-sunbird/common-form-elements": "^8.0.0",
+    "@project-sunbird/common-form-elements": "8.0.4",
     "@project-sunbird/content-player": "5.1.0",
-    "@project-sunbird/discussions-ui": "8.0.0",
-    "@project-sunbird/sb-dashlet": "^8.0.0",
+    "@project-sunbird/discussions-ui": "8.0.3",
+    "@project-sunbird/sb-dashlet": "^8.0.1",
     "@project-sunbird/sb-notification": "^8.0.0",
     "@project-sunbird/sb-styles": "0.0.16",
-    "@project-sunbird/sb-svg2pdf": "^8.0.1",
+    "@project-sunbird/sb-svg2pdf": "^8.0.3",
     "@project-sunbird/sunbird-epub-player-v9": "^5.6.0",
     "@project-sunbird/sunbird-epub-player-web-component": "^1.2.0",
     "@project-sunbird/sunbird-pdf-player-v9": "^5.6.0",
     "@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0",
     "@project-sunbird/sunbird-quml-player-web-component": "3.0.3",
-    "@project-sunbird/sunbird-sdk": "7.0.19",
+    "@project-sunbird/sunbird-sdk": "7.0.23",
     "@project-sunbird/sunbird-video-player-web-component": "^1.0.1",
-    "chart.js": "^2.9.4",
-    "chartjs-plugin-datalabels": "^0.7.0",
-    "chartjs-plugin-stacked100": "^0.7.1",
+    "chart.js": "4.1.1",
+    "chartjs-plugin-datalabels": "2.2.0",
+    "chartjs-plugin-stacked100": "1.5.0",
     "colors": "1.4.0",
     "com.jjdltc.cordova.plugin.zip": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git",
     "cordova-plugin-badge": "^0.8.8",
@@ -99,18 +99,18 @@
     "grapheme-splitter": "^1.0.4",
     "hammerjs": "^2.0.8",
     "ionic4-rating": "^1.0.9",
-    "jest-preset-angular": "^12.2.6",
-    "jspdf": "^2.0.0",
+    "jest-preset-angular": "13.1.4",
+    "jspdf": "^2.5.1",
     "jwt-decode": "^2.2.0",
     "katex": "^0.11.1",
     "lodash": "^4.17.21",
-    "lodash-es": "^4.17.20",
+    "lodash-es": "^4.17.21",
     "material-design-icons": "^3.0.1",
     "moment": "^2.29.4",
-    "ng-recaptcha": "^9.0.0",
-    "ng2-charts": "^2.4.2",
+    "ng-recaptcha": "12.0.2",
+    "ng2-charts": "5.0.4",
     "ng2-material-dropdown": "1.0.0",
-    "ngx-bootstrap": "^8.0.0",
+    "ngx-bootstrap": "11.0.2",
     "ngx-chips": "2.2.2",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-moment": "^5.0.0",
@@ -119,14 +119,14 @@
     "pouchdb-find": "^7.2.2",
     "rxjs": "^6.6.3",
     "sb-tag-manager": "^3.9.19",
-    "ts-jest": "^28.0.8",
+    "ts-jest": "29.1.2",
     "tslib": "^2.0.0",
     "uuid": "^3.4.0",
     "video.js": "7.18.1",
     "videojs-contrib-quality-levels": "2.1.0",
     "videojs-http-source-selector": "1.1.6",
     "x2js": "^3.3.0",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.3"
   },
   "resolutions": {
     "ng2-material-dropdown": "1.0.0"
@@ -141,11 +141,11 @@
     "assert": false
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "15.2.10",
-    "@angular/cli": "15.2.10",
-    "@angular/compiler": "15.2.10",
-    "@angular/compiler-cli": "15.2.10",
-    "@angular/language-service": "15.2.10",
+    "@angular-devkit/build-angular": "16.2.14",
+    "@angular/cli": "16.2.14",
+    "@angular/compiler": "16.2.12",
+    "@angular/compiler-cli": "16.2.12",
+    "@angular/language-service": "16.2.12",
     "@angularclass/hmr": "3.0.0",
     "@babel/core": "^7.5.5",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
@@ -166,61 +166,61 @@
     "com.telerik.plugins.nativepagetransitions": "^0.7.0",
     "cordova-android": "^12.0.0",
     "cordova-plugin-advanced-http": "^2.5.1",
-    "cordova-plugin-android-downloadmanager": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git",
+    "cordova-plugin-android-downloadmanager": "github:Sunbird-Ed/sb-cordova-plugin-downloadmanager",
     "cordova-plugin-android-permissions": "^1.1.5",
     "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-app-version": "^0.1.14",
     "cordova-plugin-appavailability": "^0.4.2",
-    "cordova-plugin-awesome-shared-preferences": "git+https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git",
+    "cordova-plugin-awesome-shared-preferences": "github:adriano-di-giovanni/cordova-plugin-shared-preferences",
     "cordova-plugin-badge-fix": "^0.8.10",
-    "cordova-plugin-camera": "git+https://github.com/shikshalokam/cordova-plugin-camera.git",
-    "cordova-plugin-chooser": "git+https://github.com/shikshalokam/cordova-plugin-chooser.git",
-    "cordova-plugin-code-push": "git+https://github.com/swayangjit/cordova-plugin-code-push.git",
+    "cordova-plugin-camera": "github:shikshalokam/cordova-plugin-camera",
+    "cordova-plugin-chooser": "github:shikshalokam/cordova-plugin-chooser",
+    "cordova-plugin-code-push": "github:swayangjit/cordova-plugin-code-push",
     "cordova-plugin-console": "^1.1.0",
     "cordova-plugin-device": "^2.1.0",
     "cordova-plugin-dialogs": "^2.0.2",
     "cordova-plugin-document-viewer": "^0.9.13",
-    "cordova-plugin-fcm-with-dependecy-updated": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.1.2",
+    "cordova-plugin-fcm-with-dependecy-updated": "github:Sunbird-Ed/sb-cordova-plugin-fcm#release-5.1.2",
     "cordova-plugin-file": "^8.0.1",
     "cordova-plugin-file-opener2": "^2.2.1",
-    "cordova-plugin-file-transfer": "git+https://github.com/shikshalokam/cordova-plugin-file-transfer.git",
+    "cordova-plugin-file-transfer": "github:shikshalokam/cordova-plugin-file-transfer",
     "cordova-plugin-filechooser": "^1.2.0",
-    "cordova-plugin-filepath": "git+https://github.com/shikshalokam/cordova-plugin-filepath.git",
+    "cordova-plugin-filepath": "github:shikshalokam/cordova-plugin-filepath",
     "cordova-plugin-filepicker": "^1.1.6",
     "cordova-plugin-googleplus": "^8.5.2",
     "cordova-plugin-inappbrowser": "^5.0.0",
-    "cordova-plugin-inappupdatemanager": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0",
+    "cordova-plugin-inappupdatemanager": "github:subranil/cordova-plugin-inappupdatemanager#release-3.7.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
     "cordova-plugin-ionic-webview": "^4.2.1",
-    "cordova-plugin-local-notification": "git+https://github.com/fquirin/cordova-plugin-local-notifications.git",
+    "cordova-plugin-local-notification": "github:fquirin/cordova-plugin-local-notifications",
     "cordova-plugin-media": "^7.0.0",
     "cordova-plugin-network-information": "^2.0.2",
-    "cordova-plugin-openrap": "git+https://github.com/project-sunbird/cordova-plugin-openrap.git",
+    "cordova-plugin-openrap": "github:project-sunbird/cordova-plugin-openrap",
     "cordova-plugin-printer": "^0.8.0",
-    "cordova-plugin-proguard": "git+https://github.com/greybax/cordova-plugin-proguard.git",
-    "cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-5.0.2",
-    "cordova-plugin-screen-orientation": "git+https://github.com/521dimensions/cordova-plugin-screen-orientation.git",
+    "cordova-plugin-proguard": "github:greybax/cordova-plugin-proguard",
+    "cordova-plugin-qr-scanner": "github:project-sunbird/cordova-plugin-qr-scanner#release-5.0.2",
+    "cordova-plugin-screen-orientation": "github:521dimensions/cordova-plugin-screen-orientation",
     "cordova-plugin-secure-storage-echo": "^5.1.1",
     "cordova-plugin-statusbar": "^2.4.3",
     "cordova-plugin-streaming-media": "^2.3.0",
-    "cordova-plugin-sunbirdsplash": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-6.0.0",
+    "cordova-plugin-sunbirdsplash": "github:project-sunbird/cordova-plugin-sunbirdsplash#release-6.0.0",
     "cordova-plugin-telerik-imagepicker": "^2.3.3",
     "cordova-plugin-webview-checker": "^1.0.1",
     "cordova-plugin-x-socialsharing": "^6.0.4",
     "cordova-plugin-zip": "^3.1.0",
     "cordova-sqlite-storage": "^6.0.0",
-    "cordova-zip-plugin": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git",
+    "cordova-zip-plugin": "github:Sunbird-Ed/jjdltc-cordova-plugin-zip",
     "cordova.plugins.diagnostic": "^5.0.2",
     "es6-promise-plugin": "^4.2.2",
     "fs-extra": "^8.1.0",
     "ionic-plugin-keyboard": "^2.2.1",
-    "jest": "^28.0.3",
+    "jest": "^29.5.0",
     "plist": "^3.0.2",
     "properties-reader": "^2.2.0",
-    "sb-cordova-plugin-customtabs": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git#release-5.0.2",
-    "sb-cordova-plugin-db": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-4.6.0",
-    "sb-cordova-plugin-sync": "git+https://github.com/project-sunbird/sb-cordova-plugin-sync.git",
-    "sb-cordova-plugin-utility": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-6.0.0",
+    "sb-cordova-plugin-customtabs": "github:Sunbird-Ed/sb-cordova-plugin-customtabs#release-5.0.2",
+    "sb-cordova-plugin-db": "github:Sunbird-Ed/sb-cordova-plugin-db#release-4.6.0",
+    "sb-cordova-plugin-sync": "github:project-sunbird/sb-cordova-plugin-sync",
+    "sb-cordova-plugin-utility": "github:Sunbird-Ed/sb-cordova-plugin-utility#release-6.0.0",
     "sonarqube-scanner": "^3.3.0",
     "tiny-glob": "^0.2.9",
     "ts-node": "^10.9.1",
@@ -233,18 +233,24 @@
     "plugins": {
       "com.jjdltc.cordova.plugin.zip": {},
       "ionic-plugin-keyboard": {},
-      "cordova-plugin-ionic-webview": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-app-version": {},
       "cordova-plugin-x-socialsharing": {},
       "cordova-plugin-device": {},
-      "cordova-plugin-file": {},
+      "cordova-plugin-file": {
+        "ANDROIDX_WEBKIT_VERSION": "1.4.0"
+      },
       "cordova-plugin-file-transfer": {},
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-network-information": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-streaming-media": {},
       "cordova-plugin-awesome-shared-preferences": {},
-      "cordova-plugin-advanced-http": {},
+      "cordova-plugin-advanced-http": {
+        "OKHTTP_VERSION": "3.10.0"
+      },
       "cordova-plugin-android-permissions": {},
       "cordova-plugin-media": {},
       "cordova-plugin-android-downloadmanager": {},
@@ -261,7 +267,9 @@
       "cordova-plugin-screen-orientation": {},
       "cordova-plugin-zip": {},
       "cordova-plugin-local-notification": {
-        "ANDROID_SUPPORT_V4_VERSION": "26.+"
+        "ANDROID_SUPPORT_V4_VERSION": "26.+",
+        "ANDROIDX_VERSION": "1.2.0",
+        "ANDROIDX_APPCOMPAT_VERSION": "1.3.1"
       },
       "cordova-plugin-code-push": {},
       "cordova.plugins.diagnostic": {
@@ -270,20 +278,26 @@
       "cordova-plugin-openrap": {},
       "cordova-plugin-webview-checker": {},
       "sb-cordova-plugin-utility": {},
-      "cordova-plugin-printer": {},
+      "cordova-plugin-printer": {
+        "ANDROID_SUPPORT_V4_VERSION": "28.+"
+      },
       "cordova-plugin-fcm-with-dependecy-updated": {
         "ANDROID_FIREBASE_BOM_VERSION": "26.5.0",
         "GRADLE_TOOLS_VERSION": "3.5.0",
         "GOOGLE_SERVICES_VERSION": "4.3.8",
-        "ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher"
+        "ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher",
+        "FCM_CORE_VERSION": "16.0.9",
+        "FCM_VERSION": "18.0.0"
       },
       "com.telerik.plugins.nativepagetransitions": {},
       "sb-cordova-plugin-sync": {},
       "cordova-plugin-proguard": {},
       "cordova-plugin-androidx-adapter": {},
       "cordova-plugin-secure-storage-echo": {},
       "cordova-plugin-appavailability": {},
-      "cordova-plugin-camera": {},
+      "cordova-plugin-camera": {
+        "ANDROIDX_CORE_VERSION": "1.6.+"
+      },
       "cordova-plugin-filepath": {},
       "cordova-plugin-chooser": {},
       "cordova-plugin-filepicker": {},

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -69,7 +69,7 @@ import {AliasBoardName} from '../pipes/alias-board-name/alias-board-name';
 import { DownloadPdfService } from '../services/download-pdf/download-pdf.service';
 import {ConsentService} from '../services/consent-service';
 import { ProfileHandler } from '../services/profile-handler';
-import { IonicStorageModule } from '@ionic/storage';
+import { IonicStorageModule } from '@ionic/storage-angular';
 import { Camera } from '@awesome-cordova-plugins/camera/ngx';
 import { FilePath } from '@awesome-cordova-plugins/file-path/ngx';
 import { Chooser } from '@awesome-cordova-plugins/chooser/ngx';

diff --git a/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.ts b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { ChartOptions, ChartType, ChartDataSets } from 'chart.js';
-import { Label } from 'ng2-charts';
+//import { ChartOptions, ChartType, ChartDataSets } from 'chart.js';
+//import { Label } from 'ng2-charts';
 
 @Component({
   selector: 'bar-chart',
@@ -12,7 +12,7 @@ export class BarChartComponent implements OnInit {
   @Input() questionNumber;
 
 
-  public barChartOptions: ChartOptions = {
+  public barChartOptions: any = {
     responsive: true,
     maintainAspectRatio: true,
     scales: {
@@ -61,9 +61,9 @@ export class BarChartComponent implements OnInit {
       ],
     },
   };
-  public barChartLabels: Label[];
+  public barChartLabels: any[];
   // = ['Option A', 'Option B'];
-  public barChartType: ChartType = 'horizontalBar';
+  public barChartType: any  = 'horizontalBar';
   public barChartLegend = false;
   public barChartPlugins;
   public chartColors: Array<any>;
@@ -75,7 +75,7 @@ export class BarChartComponent implements OnInit {
   //   },
   // ];
 
-  public barChartData: ChartDataSets[];
+  public barChartData: any[];
   // =[{ data: [65, 59], label: 'Series A' }];
 
   constructor() {}

diff --git a/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.ts b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, SimpleChanges } from '@angular/core';
 import { ChartType } from 'chart.js';
-import { MultiDataSet, Label } from 'ng2-charts';
+//import { MultiDataSet, Label } from 'ng2-charts';
 import * as pluginDataLabels from 'chartjs-plugin-datalabels';
 
 @Component({
@@ -16,9 +16,9 @@ export class GraphCircleComponent {
 
   chartOption;
 
-  public doughnutChartLabels: Label[];
+  public doughnutChartLabels: any[];
   // = ['Download Sales', 'In-Store Sales', 'Mail-Order Sales'];
-  public doughnutChartData: MultiDataSet;
+  public doughnutChartData: any;
   // = [[350, 450, 100]];
   public doughnutChartType: ChartType = 'doughnut';