From e6a637b866c99a38442553588d188ce6531d622c Mon Sep 17 00:00:00 2001 From: Wilco Krikke Date: Thu, 5 Oct 2023 11:23:18 +0200 Subject: [PATCH] AW-5467 - Refresh geeft leeg scherm --- package-lock.json | 4 ++-- package.json | 2 +- projects/common/src/fm/components/app/app.component.ts | 7 ------- projects/common/src/fm/shared/app.config.factory.ts | 3 ++- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3dd73d2..92138ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "3.0.1", + "version": "3.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "3.0.1", + "version": "3.4.1", "dependencies": { "@angular-eslint/eslint-plugin": "^15.2.1", "@angular/animations": "^14.1.3", diff --git a/package.json b/package.json index 72698b4..b64c07e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "3.4.0", + "version": "3.4.1", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/projects/common/src/fm/components/app/app.component.ts b/projects/common/src/fm/components/app/app.component.ts index 94b32b2..c754312 100644 --- a/projects/common/src/fm/components/app/app.component.ts +++ b/projects/common/src/fm/components/app/app.component.ts @@ -115,18 +115,11 @@ export class AppComponent implements OnInit, OnDestroy { return action; } - async loadItemTypes() { - await this.itemTypeService$.load(this.appConfig$) - } - ngOnInit() { this.InstallRouteEventHandler(); this.InstallEventServiceEventHandler(); this.InstallAuthenticationEventHandler(); this.InstallHealthCheck(); - - //load item types - this.loadItemTypes(); } @HostListener('document:keyup', ['$event']) diff --git a/projects/common/src/fm/shared/app.config.factory.ts b/projects/common/src/fm/shared/app.config.factory.ts index b286418..7f44e7a 100644 --- a/projects/common/src/fm/shared/app.config.factory.ts +++ b/projects/common/src/fm/shared/app.config.factory.ts @@ -11,7 +11,8 @@ import { IAuthconfigFactory } from './authconfigFactory'; export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService, authconfigFactory:IAuthconfigFactory,authStorage:OAuthStorage,itemtypeService:ItemTypeService): () => Promise { return (): Promise => { return new Promise((resolve,reject) => { - appConfig.load().then(() => { + appConfig.load().then(() => { + itemtypeService.load(appConfig); oauthService.configure(authconfigFactory.getAuthConfig(appConfig)); oauthService.setStorage(authStorage); oauthService.setupAutomaticSilentRefresh();