Chore: Updated resolvers from Class to ResolveFn

overlord/src/app/client/client-list-resolver.service.spec.ts

@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ClientListResolver } from './client-list-resolver.service';
-
-describe('ClientListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ClientListResolver],
-    });
-  });
-
-  it('should be created', inject([ClientListResolver], (service: ClientListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});

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

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientListResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(): Observable<Client[]> {
-    return this.ser.list();
-  }
-}

overlord/src/app/client/client-list.resolver.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { clientListResolver } from './client-list.resolver';
+
+describe('clientListResolver', () => {
+  const executeResolver: ResolveFn<Client[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => clientListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/client/client-list.resolver.ts

@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientListResolver: ResolveFn<Client[]> = () => {
+  return inject(ClientService).list();
+};

overlord/src/app/client/client-resolver.service.spec.ts

@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ClientResolver } from './client-resolver.service';
-
-describe('ClientResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ClientResolver],
-    });
-  });
-
-  it('should be created', inject([ClientResolver], (service: ClientResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});

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

@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Client> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

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

@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { ClientDetailComponent } from './client-detail/client-detail.component';
 import { ClientListComponent } from './client-list/client-list.component';
-import { ClientListResolver } from './client-list-resolver.service';
-import { ClientResolver } from './client-resolver.service';
+import { clientListResolver } from './client-list.resolver';
+import { clientResolver } from './client.resolver';
 
 const clientRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(ClientListResolver).resolve(),
+      list: clientListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ClientResolver).resolve(route),
+      item: clientResolver,
     },
   },
 ];
@@ -41,6 +41,5 @@ const clientRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(clientRoutes)],
   exports: [RouterModule],
-  providers: [ClientListResolver, ClientResolver],
 })
 export class ClientRoutingModule {}

overlord/src/app/client/client.resolver.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { clientResolver } from './client.resolver';
+
+describe('clientResolver', () => {
+  const executeResolver: ResolveFn<Client> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => clientResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});

overlord/src/app/client/client.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientResolver: ResolveFn<Client> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ClientService).get(id);
+};