Prettied, Linted and updated angular.json according to the latest schematic of Angular CLI.

Now all that is needed is to make it ready for strict compiling.
Removed eslint-plugin-prettier as it is not recommended and causes errors for both eslint and prettier

Bumped to v8.0.0

overlord/src/app/employee/employee-detail/employee-detail.component.ts

@@ -2,14 +2,13 @@ import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angula
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
-
 import * as moment from 'moment';
 
-import { ToasterService } from '../../core/toaster.service';
-import { EmployeeService } from '../employee.service';
-import { Employee } from '../employee';
 import { CostCentre } from '../../core/cost-centre';
+import { ToasterService } from '../../core/toaster.service';
 import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
+import { Employee } from '../employee';
+import { EmployeeService } from '../employee.service';
 
 @Component({
   selector: 'app-employee-detail',
@@ -81,12 +80,14 @@ export class EmployeeDetailComponent implements OnInit, AfterViewInit {
   }
 
   listenToIsActiveChanges(): void {
-    this.form.get('isActive').valueChanges.subscribe((x) => (this.item.isActive = x));
+    this.form.get('isActive').valueChanges.subscribe((x) => {
+      this.item.isActive = x;
+    });
   }
 
   save() {
     this.ser.saveOrUpdate(this.getItem()).subscribe(
-      (result) => {
+      () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/employees');
       },
@@ -98,7 +99,7 @@ export class EmployeeDetailComponent implements OnInit, AfterViewInit {
 
   delete() {
     this.ser.delete(this.item.id).subscribe(
-      (result) => {
+      () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/employees');
       },

overlord/src/app/employee/employee-list-resolver.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Employee } from './employee';
+import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
+
+import { Employee } from './employee';
 import { EmployeeService } from './employee.service';
 
 @Injectable({
@@ -10,7 +11,7 @@ import { EmployeeService } from './employee.service';
 export class EmployeeListResolver implements Resolve<Employee[]> {
   constructor(private ser: EmployeeService) {}
 
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Employee[]> {
+  resolve(): Observable<Employee[]> {
     return this.ser.list();
   }
 }

overlord/src/app/employee/employee-list/employee-list-datasource.ts

@@ -1,10 +1,16 @@
 import { DataSource } from '@angular/cdk/collections';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import { map, tap } from 'rxjs/operators';
 import { merge, Observable, of as observableOf } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+
 import { Employee } from '../employee';
 
+/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
+function compare(a, b, isAsc) {
+  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+}
+
 export class EmployeeListDataSource extends DataSource<Employee> {
   private filterValue: string;
 
@@ -15,7 +21,11 @@ export class EmployeeListDataSource extends DataSource<Employee> {
     public data: Employee[],
   ) {
     super();
-    this.filter = filter.pipe(tap((x) => (this.filterValue = x)));
+    this.filter = filter.pipe(
+      tap((x) => {
+        this.filterValue = x;
+      }),
+    );
   }
 
   connect(): Observable<Employee[]> {
@@ -28,37 +38,28 @@ export class EmployeeListDataSource extends DataSource<Employee> {
 
     return merge(...dataMutations)
       .pipe(
-        map((x: any) => {
-          return this.getFilteredData([...this.data]);
+        map(() => this.getFilteredData([...this.data])),
+        tap((x: Employee[]) => {
+          this.paginator.length = x.length;
         }),
-        tap((x: Employee[]) => (this.paginator.length = x.length)),
       )
-      .pipe(
-        map((x: any) => {
-          return this.getPagedData(this.getSortedData(x));
-        }),
-      );
+      .pipe(map((x: any) => this.getPagedData(this.getSortedData(x))));
   }
 
   disconnect() {}
 
   private getFilteredData(data: Employee[]): Employee[] {
     const filter = this.filterValue === undefined ? '' : this.filterValue;
-    return filter.split(' ').reduce((p: Employee[], c: string) => {
-      return p.filter((x) => {
-        const employeeString = (
-          x.code +
-          ' ' +
-          x.name +
-          ' ' +
-          x.designation +
-          ' ' +
-          x.costCentre +
-          (x.isActive ? ' active' : ' inactive')
-        ).toLowerCase();
-        return employeeString.indexOf(c) !== -1;
-      });
-    }, Object.assign([], data));
+    return filter.split(' ').reduce(
+      (p: Employee[], c: string) =>
+        p.filter((x) => {
+          const employeeString = `${x.code} ${x.name} ${x.designation} ${x.costCentre}${
+            x.isActive ? ' active' : ' inactive'
+          }`.toLowerCase();
+          return employeeString.indexOf(c) !== -1;
+        }),
+      Object.assign([], data),
+    );
   }
 
   private getPagedData(data: Employee[]) {
@@ -96,8 +97,3 @@ export class EmployeeListDataSource extends DataSource<Employee> {
     });
   }
 }
-
-/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
-function compare(a, b, isAsc) {
-  return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
-}

overlord/src/app/employee/employee-list/employee-list.component.ts

@@ -1,13 +1,15 @@
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import { EmployeeListDataSource } from './employee-list-datasource';
-import { Employee } from '../employee';
 import { ActivatedRoute } from '@angular/router';
-import { FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, startWith } from 'rxjs/operators';
+
 import { ToCsvService } from '../../shared/to-csv.service';
+import { Employee } from '../employee';
+
+import { EmployeeListDataSource } from './employee-list-datasource';
 
 @Component({
   selector: 'app-employee-list',

overlord/src/app/employee/employee-resolver.service.ts

@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { EmployeeService } from './employee.service';
-import { Employee } from './employee';
+import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
+import { Employee } from './employee';
+import { EmployeeService } from './employee.service';
+
 @Injectable({
   providedIn: 'root',
 })
 export class EmployeeResolver implements Resolve<Employee> {
   constructor(private ser: EmployeeService, private router: Router) {}
 
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Employee> {
+  resolve(route: ActivatedRouteSnapshot): Observable<Employee> {
     const id = route.paramMap.get('id');
     return this.ser.get(id);
   }

overlord/src/app/employee/employee-routing.module.ts

@@ -1,15 +1,15 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { EmployeeListResolver } from './employee-list-resolver.service';
-import { EmployeeResolver } from './employee-resolver.service';
-import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
-import { EmployeeListComponent } from './employee-list/employee-list.component';
-
 import { AuthGuard } from '../auth/auth-guard.service';
 import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
 
+import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
+import { EmployeeListResolver } from './employee-list-resolver.service';
+import { EmployeeListComponent } from './employee-list/employee-list.component';
+import { EmployeeResolver } from './employee-resolver.service';
+
 const employeeRoutes: Routes = [
   {
     path: '',

overlord/src/app/employee/employee.module.ts

@@ -1,9 +1,9 @@
-import { NgModule } from '@angular/core';
+import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
-
-import { EmployeeListComponent } from './employee-list/employee-list.component';
-import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
-import { EmployeeRoutingModule } from './employee-routing.module';
+import { NgModule } from '@angular/core';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -22,10 +22,10 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
-import { CdkTableModule } from '@angular/cdk/table';
-import { ReactiveFormsModule } from '@angular/forms';
-import { FlexLayoutModule } from '@angular/flex-layout';
-import { MomentDateAdapter } from '@angular/material-moment-adapter';
+
+import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
+import { EmployeeListComponent } from './employee-list/employee-list.component';
+import { EmployeeRoutingModule } from './employee-routing.module';
 
 export const MY_FORMATS = {
   parse: {

overlord/src/app/employee/employee.service.ts

@@ -1,10 +1,12 @@
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { catchError } from 'rxjs/operators';
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Employee } from './employee';
+
 import { ErrorLoggerService } from '../core/error-logger.service';
 
+import { Employee } from './employee';
+
 const httpOptions = {
   headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
 };
@@ -52,9 +54,8 @@ export class EmployeeService {
   saveOrUpdate(employee: Employee): Observable<Employee> {
     if (!employee.id) {
       return this.save(employee);
-    } else {
-      return this.update(employee);
     }
+    return this.update(employee);
   }
 
   delete(id: string): Observable<Employee> {