Chore: Updated resolvers from Class to ResolveFn

overlord/src/app/closing-stock/closing-stock-resolver.service.spec.ts

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

overlord/src/app/closing-stock/closing-stock-resolver.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ClosingStock } from './closing-stock';
-import { ClosingStockService } from './closing-stock.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClosingStockResolver {
-  constructor(private ser: ClosingStockService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ClosingStock> {
-    const date = route.paramMap.get('date');
-    const costCentre = route.queryParamMap.get('d') || null;
-    return this.ser.list(date, costCentre);
-  }
-}

overlord/src/app/closing-stock/closing-stock-routing.module.ts

@@ -3,10 +3,10 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
-import { ClosingStockResolver } from './closing-stock-resolver.service';
 import { ClosingStockComponent } from './closing-stock.component';
+import { closingStockResolver } from './closing-stock.resolver';
 
 const closingStockRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const closingStockRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(closingStockRoutes)],
   exports: [RouterModule],
-  providers: [ClosingStockResolver],
 })
 export class ClosingStockRoutingModule {}

overlord/src/app/closing-stock/closing-stock.resolver.spec.ts

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

overlord/src/app/closing-stock/closing-stock.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ClosingStock } from './closing-stock';
+import { ClosingStockService } from './closing-stock.service';
+
+export const closingStockResolver: ResolveFn<ClosingStock> = (route) => {
+  const date = route.paramMap.get('date');
+  const costCentre = route.queryParamMap.get('d') || null;
+  return inject(ClosingStockService).list(date, costCentre);
+};