FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details
FarmMaps/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Wilco Krikke 2023-10-05 16:27:20 +02:00
commit 9e3f6010c3
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/common/src/fm/components/app/app.component.ts
View File

@ -115,18 +115,11 @@ export class AppComponent implements OnInit, OnDestroy {
return action; return action;
} }
async loadItemTypes() {
await this.itemTypeService$.load(this.appConfig$)
}
ngOnInit() { ngOnInit() {
this.InstallRouteEventHandler(); this.InstallRouteEventHandler();
this.InstallEventServiceEventHandler(); this.InstallEventServiceEventHandler();
this.InstallAuthenticationEventHandler(); this.InstallAuthenticationEventHandler();
this.InstallHealthCheck(); this.InstallHealthCheck();
//load item types
this.loadItemTypes();
} }
@HostListener('document:keyup', ['$event']) @HostListener('document:keyup', ['$event'])

1
projects/common/src/fm/shared/app.config.factory.ts
View File

@ -12,6 +12,7 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
return (): Promise<any> => { return (): Promise<any> => {
return new Promise<void>((resolve,reject) => { return new Promise<void>((resolve,reject) => {
appConfig.load().then(() => { appConfig.load().then(() => {
itemtypeService.load(appConfig);
oauthService.configure(authconfigFactory.getAuthConfig(appConfig)); oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
oauthService.setStorage(authStorage); oauthService.setStorage(authStorage);
oauthService.setupAutomaticSilentRefresh(); oauthService.setupAutomaticSilentRefresh();