Chore: Updated resolvers from Class to ResolveFn

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

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

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

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

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

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

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

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

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

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

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

@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { RoleDetailComponent } from './role-detail/role-detail.component';
 import { RoleListComponent } from './role-list/role-list.component';
-import { RoleListResolver } from './role-list-resolver.service';
-import { RoleResolver } from './role-resolver.service';
+import { roleListResolver } from './role-list.resolver';
+import { roleResolver } from './role.resolver';
 
 const roleRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      list: () => inject(RoleListResolver).resolve(),
+      list: roleListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
+      item: roleResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
+      item: roleResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const roleRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(roleRoutes)],
   exports: [RouterModule],
-  providers: [RoleListResolver, RoleResolver],
 })
 export class RoleRoutingModule {}

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

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

overlord/src/app/role/role.resolver.ts

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