Upgrade to Angular 13

.gitignore

@@ -31,6 +31,7 @@ CATcher.iml
 !.vscode/launch.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

package.json

@@ -29,45 +29,44 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "^12.2.17",
-    "@angular/cdk": "^12.2.13",
-    "@angular/common": "^12.2.17",
-    "@angular/compiler": "^12.2.17",
-    "@angular/core": "^12.2.17",
-    "@angular/forms": "^12.2.17",
-    "@angular/localize": "^12.2.17",
-    "@angular/material": "^12.2.13",
-    "@angular/platform-browser": "^12.2.17",
-    "@angular/platform-browser-dynamic": "^12.2.17",
-    "@angular/router": "^12.2.17",
+    "@angular/animations": "^13.4.0",
+    "@angular/cdk": "^13.3.9",
+    "@angular/common": "^13.4.0",
+    "@angular/compiler": "^13.4.0",
+    "@angular/core": "^13.4.0",
+    "@angular/forms": "^13.4.0",
+    "@angular/localize": "^13.4.0",
+    "@angular/material": "^13.3.9",
+    "@angular/platform-browser": "^13.4.0",
+    "@angular/platform-browser-dynamic": "^13.4.0",
+    "@angular/router": "^13.4.0",
     "@apollo/client": "3.3.0",
     "@github/markdown-toolbar-element": "^2.1.1",
     "@octokit/rest": "^16.37.0",
-    "ajv": "^6.11.0",
-    "apollo-angular": "^2.6.0",
+    "apollo-angular": "^3.0.1",
     "arcsecond": "^4.1.0",
     "core-js": "^3.16.4",
     "diff-match-patch": "^1.0.4",
     "graphql": "^15.0.0",
     "karma-spec-reporter": "0.0.32",
     "moment": "^2.24.0",
-    "ngx-markdown": "^12.0.1",
+    "ngx-markdown": "^13.1.0",
     "ngx-mat-select-search": "^3.3.3",
     "rxjs": "6.6.7",
     "tslib": "^2.0.0",
     "uuid": "7.0.3",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.2.18",
+    "@angular-devkit/build-angular": "~13.3.11",
+    "@angular/cli": "^13.3.11",
+    "@angular/compiler-cli": "^13.4.0",
+    "@angular/language-service": "^13.4.0",
     "@angular-eslint/builder": "12.7.0",
-    "@angular-eslint/eslint-plugin": "12.7.0",
-    "@angular-eslint/eslint-plugin-template": "12.7.0",
-    "@angular-eslint/schematics": "12.7.0",
-    "@angular-eslint/template-parser": "12.7.0",
-    "@angular/cli": "^12.2.18",
-    "@angular/compiler-cli": "^12.2.17",
-    "@angular/language-service": "^12.2.17",
+    "@angular-eslint/eslint-plugin": "13.5.0",
+    "@angular-eslint/eslint-plugin-template": "13.5.0",
+    "@angular-eslint/schematics": "13.5.0",
+    "@angular-eslint/template-parser": "13.5.0",
     "@graphql-codegen/cli": "2.16.4",
     "@graphql-codegen/fragment-matcher": "^1.17.7",
     "@graphql-codegen/typescript": "1.17.7",
@@ -80,10 +79,10 @@
     "@types/jasmine": "^3.8.2",
     "@types/jasminewd2": "2.0.8",
     "@types/node": "^15.6.1",
-    "@typescript-eslint/eslint-plugin": "4.28.2",
-    "@typescript-eslint/parser": "4.28.2",
+    "@typescript-eslint/eslint-plugin": "5.0.0",
+    "@typescript-eslint/parser": "5.0.0",
     "angular-cli-ghpages": "^1.0.0-rc.2",
-    "eslint": "^7.26.0",
+    "eslint": "^8.57.0",
     "husky": "^4.2.5",
     "jasmine": "^3.9.0",
     "jasmine-core": "~3.8.0",
@@ -100,6 +99,6 @@
     "scuri": "^0.9.4",
     "ts-node": "^10.9.2",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "4.3.5"
+    "typescript": "4.6.4"
   }
 }

src/app/app.module.ts

@@ -5,7 +5,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NavigationEnd, Router } from '@angular/router';
 import { ApolloLink, InMemoryCache } from '@apollo/client/core';
 import { setContext } from '@apollo/client/link/context';
-import { Apollo } from 'apollo-angular';
+import { Apollo, ApolloModule } from 'apollo-angular';
 import { HttpLink } from 'apollo-angular/http';
 import { MarkdownModule, MarkedOptions } from 'ngx-markdown';
 import 'reflect-metadata';
@@ -55,6 +55,7 @@ import { SharedModule } from './shared/shared.module';
         useFactory: markedOptionsFactory
       }
     }),
+    ApolloModule,
     AppRoutingModule
   ],
   providers: [

src/app/core/services/loading.service.ts

@@ -1,17 +1,7 @@
 import { DOCUMENT } from '@angular/common';
-import {
-  ComponentFactory,
-  ComponentFactoryResolver,
-  ComponentRef,
-  Inject,
-  Injectable,
-  Injector,
-  OnDestroy,
-  Renderer2,
-  ViewContainerRef
-} from '@angular/core';
+import { ComponentRef, Inject, Injectable, Injector, OnDestroy, Renderer2, ViewContainerRef } from '@angular/core';
 import { ThemePalette } from '@angular/material/core';
-import { MatProgressSpinnerDefaultOptions, MatSpinner, ProgressSpinnerMode } from '@angular/material/progress-spinner';
+import { MatProgressSpinnerDefaultOptions, MatProgressSpinner, ProgressSpinnerMode } from '@angular/material/progress-spinner';
 import { BehaviorSubject } from 'rxjs';
 import { pairwise } from 'rxjs/operators';
 
@@ -24,21 +14,14 @@ import { pairwise } from 'rxjs/operators';
 })
 export class LoadingService implements OnDestroy {
   private isLoading = new BehaviorSubject<boolean>(false);
-  readonly spinnerFactory: ComponentFactory<MatSpinner>;
-  spinnerContainerRef: ViewContainerRef | null = null;
-  spinnerComponentRef: ComponentRef<MatSpinner> | null = null;
+  spinnerComponentRef: ComponentRef<MatProgressSpinner> | null = null;
 
   private animationMode: ProgressSpinnerMode = 'indeterminate';
   private options?: MatProgressSpinnerDefaultOptions;
   private spinnerTheme: ThemePalette = 'primary';
   private classList: string[] = [];
 
-  constructor(
-    readonly componentFactoryResolver: ComponentFactoryResolver,
-    readonly injector: Injector,
-    @Inject(DOCUMENT) private document: Document
-  ) {
-    this.spinnerFactory = this.componentFactoryResolver.resolveComponentFactory(MatSpinner);
+  constructor(public spinnerContainerRef: ViewContainerRef, readonly injector: Injector, @Inject(DOCUMENT) private document: Document) {
     // Subscribe to changes
     this.isLoading
       .pipe(pairwise())
@@ -157,7 +140,7 @@ export class LoadingService implements OnDestroy {
 
   // Creates and formats the spinner to the specification provided
   private createSpinner(injector: Injector) {
-    const spinnerRef = this.spinnerFactory.create(injector);
+    const spinnerRef = this.spinnerContainerRef.createComponent(MatProgressSpinner, { injector });
     if (this.options) {
       spinnerRef.instance.diameter = this.options.diameter;
       spinnerRef.instance.strokeWidth = this.options.strokeWidth;

src/app/shared/issue-tables/issue-paginator.ts

@@ -5,7 +5,7 @@ export function paginateData(paginator: MatPaginator, data: Issue[]): Issue[] {
   paginator.length = data.length;
   let result = getDataForPage(paginator.pageIndex, paginator.pageSize, data);
   if (result.length === 0) {
-    paginator.pageIndex -= 1;
+    paginator.pageIndex = paginator.pageIndex - 1;
     result = getDataForPage(paginator.pageIndex, paginator.pageSize, data);
   }
   return result;

src/polyfills.ts

@@ -22,16 +22,6 @@ import '@angular/localize/init';
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

src/test.ts

@@ -7,7 +7,9 @@ import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@ang
 declare const require: any;
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+  teardown: { destroyAfterEach: false }
+});
 // Then we find all the tests.
 const context = require.context('../tests', true, /\.spec\.ts$/);
 // And load the modules.

tests/helper/mock.view.container.ref.ts

@@ -1,4 +1,14 @@
-import { ComponentRef, ElementRef, EmbeddedViewRef, Injector, TemplateRef, ViewContainerRef, ViewRef } from '@angular/core';
+import {
+  ComponentRef,
+  ElementRef,
+  EmbeddedViewRef,
+  Injector,
+  NgModuleRef,
+  TemplateRef,
+  Type,
+  ViewContainerRef,
+  ViewRef
+} from '@angular/core';
 
 export class MockViewContainerRef implements ViewContainerRef {
   element: ElementRef;
@@ -16,8 +26,7 @@ export class MockViewContainerRef implements ViewContainerRef {
     return null as any;
   }
 
-  createComponent<C>(componentFactory: any, index?: number, injector?: any, projectableNodes?: any[], ngModuleRef?: any): ComponentRef<C> {
-    // Implement the required method with a fake return value or logic.
+  createComponent<C>(componentType: any, options?: any): ComponentRef<C> {
     return null as any;
   }
 

tests/karma.conf.js

@@ -20,7 +20,7 @@ module.exports = function (config) {
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
-    reporters: ['spec'],
+    reporters: ['spec', 'coverage-istanbul'],
     specReporter: {
       maxLogLines: 5, // limit number of lines per test
       suppressErrorSummary: true,

tests/services/loading.service.spec.ts

@@ -1,7 +1,7 @@
 import { DOCUMENT } from '@angular/common';
-import { ComponentFactory, ComponentFactoryResolver, ComponentRef, ElementRef, Injector, Renderer2, ViewContainerRef } from '@angular/core';
+import { ComponentRef, ElementRef, Injector, Renderer2, ViewContainerRef } from '@angular/core';
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { MatSpinner } from '@angular/material/progress-spinner';
+import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { LoadingService } from '../../src/app/core/services/loading.service';
 import { MockMatSpinner } from '../helper/mock.mat.spinner';
 import { MockViewContainerRef } from '../helper/mock.view.container.ref';
@@ -11,11 +11,9 @@ describe('LoadingService', () => {
   let mockRenderer: jasmine.SpyObj<Renderer2>;
   let mockComponentInjector: jasmine.SpyObj<Injector>;
   let elementRef: ElementRef;
-  let mockComponentRef: ComponentRef<MatSpinner>;
+  let mockComponentRef: ComponentRef<MatProgressSpinner>;
   let mockInjector: jasmine.SpyObj<Injector>;
   let loadingService: LoadingService;
-  let mockComponentFactory: jasmine.SpyObj<ComponentFactory<MatSpinner>>;
-  let mockComponentFactoryResolver: jasmine.SpyObj<ComponentFactoryResolver>;
   let mockViewContainerRef: MockViewContainerRef;
   let document: Document;
 
@@ -58,27 +56,21 @@ describe('LoadingService', () => {
       injector: mockComponentInjector,
       onDestroy: null as any,
       destroy: () => {},
-      componentType: MatSpinner
-    } as unknown) as ComponentRef<MatSpinner>;
+      componentType: MatProgressSpinner
+    } as unknown) as ComponentRef<MatProgressSpinner>;
 
-    mockComponentFactory = jasmine.createSpyObj<ComponentFactory<MatSpinner>>({
-      create: mockComponentRef
-    });
-
-    mockComponentFactoryResolver = jasmine.createSpyObj<ComponentFactoryResolver>({
-      resolveComponentFactory: mockComponentFactory
-    });
     mockInjector = jasmine.createSpyObj('Injector', {
       get: mockRenderer
     });
 
     mockViewContainerRef = new MockViewContainerRef(mockInjector);
+    spyOn(mockViewContainerRef, 'createComponent').and.returnValue(mockComponentRef);
 
     await TestBed.configureTestingModule({
       providers: [
-        { provide: ComponentFactoryResolver, useValue: mockComponentFactoryResolver },
+        { provide: ViewContainerRef, useValue: mockViewContainerRef },
         { provide: Injector, useValue: mockInjector },
-        { provide: MatSpinner, useClass: MockMatSpinner },
+        { provide: MatProgressSpinner, useClass: MockMatSpinner },
         LoadingService
       ]
     }).compileComponents();