tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Chore: Updated resolvers from Class to ResolveFn

Browse Source
This commit is contained in:
tanshu
2024-05-31 09:58:48 +05:30
parent 6f433ef203
commit 6e3c429db3
255 changed files with 1737 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlord/src/app/account/account-list-resolver.service.spec.ts
-17
View File
@@ -1,17 +0,0 @@
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AccountListResolver } from './account-list-resolver.service';
describe('AccountListResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientModule],
providers: [AccountListResolver],
});
});
it('should be created', inject([AccountListResolver], (service: AccountListResolver) => {
expect(service).toBeTruthy();
}));
});
overlord/src/app/account/account-list-resolver.service.ts
-16
View File
@@ -1,16 +0,0 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { Account } from '../core/account';
import { AccountService } from '../core/account.service';
@Injectable({
providedIn: 'root',
})
export class AccountListResolver {
constructor(private ser: AccountService) {}
resolve(): Observable<Account[]> {
return this.ser.list();
}
}
overlord/src/app/account/account-list.resolver.spec.ts
+19
View File
@@ -0,0 +1,19 @@
import { TestBed } from '@angular/core/testing';
import { ResolveFn } from '@angular/router';
import { Account } from '../core/account';
import { accountListResolver } from './account-list.resolver';
describe('accountListResolver', () => {
const executeResolver: ResolveFn<Account[]> = (...resolverParameters) =>
TestBed.runInInjectionContext(() => accountListResolver(...resolverParameters));
beforeEach(() => {
TestBed.configureTestingModule({});
});
it('should be created', () => {
expect(executeResolver).toBeTruthy();
});
});
overlord/src/app/account/account-list.resolver.ts
+9
View File
@@ -0,0 +1,9 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { Account } from '../core/account';
import { AccountService } from '../core/account.service';
export const accountListResolver: ResolveFn<Account[]> = () => {
return inject(AccountService).list();
};
overlord/src/app/account/account-resolver.service.spec.ts
-18
View File
@@ -1,18 +0,0 @@
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AccountResolver } from './account-resolver.service';
describe('AccountResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientModule, RouterTestingModule],
providers: [AccountResolver],
});
});
it('should be created', inject([AccountResolver], (service: AccountResolver) => {
expect(service).toBeTruthy();
}));
});
overlord/src/app/account/account-resolver.service.ts
-18
View File
@@ -1,18 +0,0 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { Account } from '../core/account';
import { AccountService } from '../core/account.service';
@Injectable({
providedIn: 'root',
})
export class AccountResolver {
constructor(private ser: AccountService) {}
resolve(route: ActivatedRouteSnapshot): Observable<Account> {
const id = route.paramMap.get('id');
return this.ser.get(id);
}
}
overlord/src/app/account/account-routing.module.ts
+12 -13
View File
@@ -3,13 +3,13 @@ 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 { AccountDetailComponent } from './account-detail/account-detail.component';
import { AccountListComponent } from './account-list/account-list.component';
import { AccountListResolver } from './account-list-resolver.service';
import { AccountResolver } from './account-resolver.service';
import { AccountTypeResolver } from './account-type-resolver.service';
import { accountListResolver } from './account-list.resolver';
import { accountTypeResolver } from './account-type.resolver';
import { accountResolver } from './account.resolver';
const accountRoutes: Routes = [
{
@@ -22,8 +22,8 @@ const accountRoutes: Routes = [
permission: 'Accounts',
},
resolve: {
list: () => inject(AccountListResolver).resolve(),
accountTypes: () => inject(AccountTypeResolver).resolve(),
list: accountListResolver,
accountTypes: accountTypeResolver,
},
},
{
@@ -36,9 +36,9 @@ const accountRoutes: Routes = [
permission: 'Accounts',
},
resolve: {
item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
accountTypes: () => inject(AccountTypeResolver).resolve(),
costCentres: () => inject(CostCentreListResolver).resolve(),
item: accountResolver,
accountTypes: accountTypeResolver,
costCentres: costCentreListResolver,
},
},
{
@@ -51,9 +51,9 @@ const accountRoutes: Routes = [
permission: 'Accounts',
},
resolve: {
item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
accountTypes: () => inject(AccountTypeResolver).resolve(),
costCentres: () => inject(CostCentreListResolver).resolve(),
item: accountResolver,
accountTypes: accountTypeResolver,
costCentres: costCentreListResolver,
},
},
];
@@ -61,6 +61,5 @@ const accountRoutes: Routes = [
@NgModule({
imports: [CommonModule, RouterModule.forChild(accountRoutes)],
exports: [RouterModule],
providers: [AccountListResolver, AccountResolver],
})
export class AccountRoutingModule {}
overlord/src/app/account/account-type-resolver.service.spec.ts
-17
View File
@@ -1,17 +0,0 @@
import { HttpClientModule } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AccountTypeResolver } from './account-type-resolver.service';
describe('AccountTypeResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientModule],
providers: [AccountTypeResolver],
});
});
it('should be created', inject([AccountTypeResolver], (service: AccountTypeResolver) => {
expect(service).toBeTruthy();
}));
});
overlord/src/app/account/account-type-resolver.service.ts
-17
View File
@@ -1,17 +0,0 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { AccountType } from '../core/account-type';
import { AccountTypeService } from './account-type.service';
@Injectable({
providedIn: 'root',
})
export class AccountTypeResolver {
constructor(private ser: AccountTypeService) {}
resolve(): Observable<AccountType[]> {
return this.ser.list();
}
}
overlord/src/app/account/account-type.resolver.spec.ts
+19
View File
@@ -0,0 +1,19 @@
import { TestBed } from '@angular/core/testing';
import { ResolveFn } from '@angular/router';
import { AccountType } from '../core/account-type';
import { accountTypeResolver } from './account-type.resolver';
describe('accountTypeResolver', () => {
const executeResolver: ResolveFn<AccountType[]> = (...resolverParameters) =>
TestBed.runInInjectionContext(() => accountTypeResolver(...resolverParameters));
beforeEach(() => {
TestBed.configureTestingModule({});
});
it('should be created', () => {
expect(executeResolver).toBeTruthy();
});
});
overlord/src/app/account/account-type.resolver.ts
+10
View File
@@ -0,0 +1,10 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { AccountType } from '../core/account-type';
import { AccountTypeService } from './account-type.service';
export const accountTypeResolver: ResolveFn<AccountType[]> = () => {
return inject(AccountTypeService).list();
};
overlord/src/app/account/account.resolver.spec.ts
+19
View File
@@ -0,0 +1,19 @@
import { TestBed } from '@angular/core/testing';
import { ResolveFn } from '@angular/router';
import { Account } from '../core/account';
import { accountResolver } from './account.resolver';
describe('accountResolver', () => {
const executeResolver: ResolveFn<Account> = (...resolverParameters) =>
TestBed.runInInjectionContext(() => accountResolver(...resolverParameters));
beforeEach(() => {
TestBed.configureTestingModule({});
});
it('should be created', () => {
expect(executeResolver).toBeTruthy();
});
});
overlord/src/app/account/account.resolver.ts
+10
View File
@@ -0,0 +1,10 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { Account } from '../core/account';
import { AccountService } from '../core/account.service';
export const accountResolver: ResolveFn<Account> = (route) => {
const id = route.paramMap.get('id');
return inject(AccountService).get(id);
};