Chore: Updated resolvers from Class to ResolveFn

2024-05-31 09:58:48 +05:30
parent 6f433ef203
commit 6e3c429db3
255 changed files with 1737 additions and 2155 deletions
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ProductGroupListResolver } from './product-group-list-resolver.service';
-
-describe('ProductGroupListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductGroupListResolver],
-    });
-  });
-
-  it('should be created', inject([ProductGroupListResolver], (service: ProductGroupListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProductGroup } from '../core/product-group';
-
-import { ProductGroupService } from './product-group.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductGroupListResolver {
-  constructor(private ser: ProductGroupService) {}
-
-  resolve(): Observable<ProductGroup[]> {
-    return this.ser.list();
-  }
-}
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { productGroupListResolver } from './product-group-list.resolver';
+
+describe('productGroupListResolver', () => {
+  const executeResolver: ResolveFn<ProductGroup[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productGroupListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { ProductGroupService } from './product-group.service';
+
+export const productGroupListResolver: ResolveFn<ProductGroup[]> = () => {
+  return inject(ProductGroupService).list();
+};
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ProductGroupResolver } from './product-group-resolver.service';
-
-describe('ProductGroupResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductGroupResolver],
-    });
-  });
-
-  it('should be created', inject([ProductGroupResolver], (service: ProductGroupResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProductGroup } from '../core/product-group';
-
-import { ProductGroupService } from './product-group.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductGroupResolver {
-  constructor(private ser: ProductGroupService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ProductGroup> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';

 import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
 import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
-import { ProductGroupListResolver } from './product-group-list-resolver.service';
-import { ProductGroupResolver } from './product-group-resolver.service';
+import { productGroupListResolver } from './product-group-list.resolver';
+import { productGroupResolver } from './product-group.resolver';

 const productGroupRoutes: Routes = [
  {
@@ -20,7 +20,7 @@ const productGroupRoutes: Routes = [
      permission: 'Cost Centres',
    },
    resolve: {
-      list: () => inject(ProductGroupListResolver).resolve(),
+      list: productGroupListResolver,
    },
  },
  {
@@ -33,7 +33,7 @@ const productGroupRoutes: Routes = [
      permission: 'Cost Centres',
    },
    resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductGroupResolver).resolve(route),
+      item: productGroupResolver,
    },
  },
  {
@@ -46,7 +46,7 @@ const productGroupRoutes: Routes = [
      permission: 'Cost Centres',
    },
    resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductGroupResolver).resolve(route),
+      item: productGroupResolver,
    },
  },
 ];
@@ -54,6 +54,5 @@ const productGroupRoutes: Routes = [
@NgModule({
  imports: [CommonModule, RouterModule.forChild(productGroupRoutes)],
  exports: [RouterModule],
-  providers: [ProductGroupListResolver, ProductGroupResolver],
 })
 export class ProductGroupRoutingModule {}
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { productGroupResolver } from './product-group.resolver';
+
+describe('productGroupResolver', () => {
+  const executeResolver: ResolveFn<ProductGroup> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productGroupResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { ProductGroupService } from './product-group.service';
+
+export const productGroupResolver: ResolveFn<ProductGroup> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ProductGroupService).get(id);
+};