Merge pull request #9411 from JeraldJF/angular-16-upgrade

Angular 16 upgrade - Rxjs and Ngx chips version upgrade

Author: pallakartheekreddy

src/app/client/angular.json

@@ -95,7 +95,6 @@
               "./node_modules/leaflet/dist/leaflet.css",
               "src/assets/styles/styles.scss",
               "node_modules/video.js/dist/video-js.min.css",
-              "node_modules/katex/dist/katex.min.css",
               "./node_modules/@project-sunbird/sb-themes/themes/themes-material_UI.scss",
               "./node_modules/@project-sunbird/sb-themes/themes/themes-df.scss",
               "./node_modules/@project-sunbird/sb-themes/themes/themes-portal.scss",
@@ -121,7 +120,6 @@
               "node_modules/datatables.net/js/jquery.dataTables.js",
               "src/assets/libs/semantic-ui/sidebar.min.js",
               "node_modules/leaflet/dist/leaflet.js",
-              "./node_modules/katex/dist/katex.min.js",
               "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js",
               "src/assets/scripts/preserve-fancytree.js",
               "src/assets/libs/semantic-ui/modal.min.js",

src/app/client/package.json

@@ -129,12 +129,12 @@
     "ng2-cache-service": "1.1.1",
     "ng2-charts": "5.0.4",
     "ngx-bootstrap": "8.0.0",
-    "ngx-chips": "2.2.2",
+    "ngx-chips": "3.0.0",
     "ngx-daterangepicker-material": "6.0.4",
     "ngx-device-detector": "4.0.1",
     "ngx-filesize": "3.0.1",
     "ngx-infinite-scroll": "8.0.2",
-    "rxjs": "6.5.5",
+    "rxjs": "7.8.1",
     "sass": "1.56.1",
     "sb-svg2pdf-v13": "1.0.0",
     "sb-tag-manager": "3.9.19",

src/app/client/src/app/modules/dashboard/components/report/report.component.ts

@@ -481,7 +481,7 @@ export class ReportComponent implements OnInit {
       switchMap(reports => {
         if (this.reportService.isUserSuperAdmin()) {
           return this.reportService.getMaterializedChildRows(reports).pipe(
-            map(response => {
+            map((response: any[]) => {
               const [reportObj] = response;
               return _.get(reportObj, 'children');
             })

src/app/client/src/app/modules/dashboard/services/report/report.service.spec.ts

@@ -471,7 +471,7 @@ describe('ReportService', () => {
     const input = [{ isParameterized: true, children: [], parameters: ['$board'], reportid: '123' }];
     jest.spyOn(reportService, 'getParameterValues').mockReturnValue({ masterData: () => of(['CBSE']) } as any);
     jest.spyOn(reportService, 'getParameterFromHash').mockReturnValue('NCERT');
-    reportService['getMaterializedChildRows'](input).subscribe(res => {
+    reportService['getMaterializedChildRows'](input).subscribe((res: any[]) => {
       expect(res).toBeDefined();
       expect(res.length).toBe(1);
       expect(reportService.getParameterValues).toHaveBeenCalled();
@@ -486,7 +486,7 @@ describe('ReportService', () => {
   it('should return the same report for unknow parameters', () => {
     const input = [{ isParameterized: true, children: [], parameters: ['$board'], reportid: '123' }];
     jest.spyOn(reportService, 'getParameterValues').mockReturnValue(null);
-    reportService['getMaterializedChildRows'](input).subscribe(res => {
+    reportService['getMaterializedChildRows'](input).subscribe((res: any[]) => {
       expect(res).toBeDefined();
       expect(res.length).toBe(1);
       expect(res).toEqual(input);
@@ -496,7 +496,7 @@ describe('ReportService', () => {
   it('should return the same report if the api to get masterData fails', () => {
     const input = [{ isParameterized: true, children: [], parameters: ['$board'], reportid: '123' }];
     jest.spyOn(reportService, 'getParameterValues').mockReturnValue({ masterData: () => throwError('') } as any);
-    reportService['getMaterializedChildRows'](input).subscribe(res => {
+    reportService['getMaterializedChildRows'](input).subscribe((res: any[]) => {
       expect(res).toBeDefined();
       expect(res.length).toBe(1);
       expect(res).toEqual(input);

src/app/client/src/app/modules/dashboard/services/report/report.service.ts

@@ -79,7 +79,7 @@ export class ReportService  {
       return this.fetchDataSource(_.get(source, 'path'), _.get(source, 'id'));
     });
     return forkJoin(...apiCalls).pipe(
-      mergeMap(response => {
+      mergeMap((response: any[]) => {
 
         response = response.filter(function(item) { if (item ) { return item.loaded = true; } });
         return this.getFileMetaData(dataSources).pipe(

src/app/client/src/app/modules/player-helper/service/quml-player-v2/quml-player-v2.service.ts

@@ -39,7 +39,7 @@ export class QumlPlayerV2Service implements QuestionCursor, EditorCursor {
     const hierarchy = this.playerService.getQuestionSetHierarchy(identifier);
     const questionSetResponse = this.playerService.getQuestionSetRead(identifier);
 
-    return forkJoin([hierarchy, questionSetResponse]).pipe(map(res => {
+    return forkJoin([hierarchy, questionSetResponse]).pipe(map((res: any[]) => {
       const questionSet = _.get(res[0], 'result.questionset');
       const questionsetData = _.get(res[1], 'result.questionset');
       _.merge(questionSet, this.playerService.getProperties(questionsetData, this.configService.editorConfig.QUESTIONSET_EDITOR.additionalProperties))

src/app/client/src/app/modules/public/module/offline/components/content-manager/content-manager.component.ts

@@ -25,7 +25,7 @@ export class ContentManagerComponent implements OnInit, OnDestroy {
   localStatusArr = ['inProgress', 'inQueue', 'resume', 'resuming', 'pausing', 'canceling'];
   cancelId: string;
   apiCallTimer = timer(1000, 3000).pipe(filter(data => !data || (this.callContentList)));
-  apiCallSubject = new Subject();
+  apiCallSubject = new Subject<void>();
   completedCount: number;
   handledFailedList = [];
   unHandledFailedList = [];

src/app/client/src/app/modules/public/module/offline/components/telemetry-import/telemetry-import.component.ts

@@ -17,7 +17,7 @@ export class TelemetryImportComponent implements OnInit, OnDestroy {
   public unsubscribe$ = new Subject<void>();
   importedFilesSize = 0;
   callImportList = false;
-  apiCallSubject = new Subject();
+  apiCallSubject = new Subject<void>();
   contentStatusObject = {};
   localStatusArr = ['inProgress', 'inQueue'];
   apiCallTimer = timer(1000, 3000).pipe(filter(data => !data || (this.callImportList)));

src/app/client/src/app/modules/shared-feature/components/user-location/user-location.component.ts

@@ -345,7 +345,7 @@ export class UserLocationComponent implements OnInit, OnDestroy, AfterViewInit {
     let response1: any;
     response1 = this.updateDeviceProfileData(data, locationDetails);
     const response2 = this.updateUserProfileData(data);
-    forkJoin([response1, response2]).subscribe((res) => {
+    forkJoin([response1, response2]).subscribe((res: any[]) => {
       if (!_.isEmpty(res[0])) {
         this.telemetryLogEvents('Device Profile', true);
       }

src/app/client/src/app/modules/shared/services/util/util.service.ts

@@ -14,7 +14,7 @@ import { TransposeTermsPipe } from '../../pipes/transposeTerms/transposeTerms.pi
 export class UtilService {
   static singletonInstance: UtilService;
   public showAppPopUp = false;
-  private searchQuery = new Subject<any>();
+  private searchQuery = new Subject<void>();
   public searchQuery$ = this.searchQuery.asObservable();
   public languageChange = new EventEmitter<ILanguage>();
   public hideHeaderTabs = new EventEmitter<boolean>();