Chore: Updated resolvers from Class to ResolveFn

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

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

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

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Product } from '../core/product';
-
-import { ProductService } from './product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductListResolver {
-  constructor(private ser: ProductService) {}
-
-  resolve(): Observable<Product[]> {
-    return this.ser.list();
-  }
-}

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

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

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

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productListResolver: ResolveFn<Product[]> = () => {
+  return inject(ProductService).list();
+};

overlord/src/app/product/product-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 { ProductResolver } from './product-resolver.service';
-
-describe('ProductResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductResolver],
-    });
-  });
-
-  it('should be created', inject([ProductResolver], (service: ProductResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});

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

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

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

@@ -3,12 +3,12 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { ProductGroupListResolver } from '../product-group/product-group-list-resolver.service';
+import { productGroupListResolver } from '../product-group/product-group-list.resolver';
 
 import { ProductDetailComponent } from './product-detail/product-detail.component';
 import { ProductListComponent } from './product-list/product-list.component';
-import { ProductListResolver } from './product-list-resolver.service';
-import { ProductResolver } from './product-resolver.service';
+import { productListResolver } from './product-list.resolver';
+import { productResolver } from './product.resolver';
 
 const productRoutes: Routes = [
   {
@@ -21,7 +21,7 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      list: () => inject(ProductListResolver).resolve(),
+      list: productListResolver,
     },
   },
   {
@@ -34,8 +34,8 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
-      productGroups: () => inject(ProductGroupListResolver).resolve(),
+      item: productResolver,
+      productGroups: productGroupListResolver,
     },
   },
   {
@@ -48,8 +48,8 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
-      productGroups: () => inject(ProductGroupListResolver).resolve(),
+      item: productResolver,
+      productGroups: productGroupListResolver,
     },
   },
 ];
@@ -57,6 +57,5 @@ const productRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(productRoutes)],
   exports: [RouterModule],
-  providers: [ProductListResolver, ProductResolver],
 })
 export class ProductRoutingModule {}

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

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

overlord/src/app/product/product.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productResolver: ResolveFn<Product> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ProductService).get(id);
+};