From 2192797a354873fb137de7cfc084229711c66b22 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Thu, 26 Mar 2026 17:27:22 +0100 Subject: [PATCH] wip --- package-lock.json | 4 ++-- projects/common/src/fm/common-service.module.ts | 5 ----- .../common/src/fm/services/itemtype.service.ts | 3 +-- .../common/src/fm/shared/app.config.factory.ts | 15 --------------- projects/common/src/fm/shared/app.config.ts | 12 +++++------- 5 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 projects/common/src/fm/shared/app.config.factory.ts diff --git a/package-lock.json b/package-lock.json index 4e87b3f..ed9cfd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "2.1.0", + "version": "4.22.0", "dependencies": { "tslib": "^2.3.0" }, @@ -106,7 +106,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "2.0.0", + "version": "4.22.0", "dependencies": { "tslib": "^2.0.0" }, diff --git a/projects/common/src/fm/common-service.module.ts b/projects/common/src/fm/common-service.module.ts index 9b06fe3..a5dc808 100644 --- a/projects/common/src/fm/common-service.module.ts +++ b/projects/common/src/fm/common-service.module.ts @@ -20,7 +20,6 @@ import { DownloadService } from './services/download.service'; import { GeolocatorService } from './services/geolocator.service'; import { WeatherService} from './services/weather.service'; import { AppConfig } from './shared/app.config'; -import { appConfigFactory } from "./shared/app.config.factory"; import { AuthGuard } from './services/auth-guard.service'; import { NavBarGuard } from './services/nav-bar-guard.service'; import { PackageGuard } from './services/package-guard.service'; @@ -85,10 +84,6 @@ export class AppCommonServiceModule { providers: [ AppConfig, ItemTypeService, - provideAppInitializer(() => { - const initializerFn = (appConfigFactory)(inject(Injector), inject(AppConfig), inject(ItemTypeService)); - return initializerFn(); - }), DatePipe ] }; diff --git a/projects/common/src/fm/services/itemtype.service.ts b/projects/common/src/fm/services/itemtype.service.ts index 7433d0b..aff768f 100644 --- a/projects/common/src/fm/services/itemtype.service.ts +++ b/projects/common/src/fm/services/itemtype.service.ts @@ -9,9 +9,8 @@ export class ItemTypeService { public itemTypes: IItemTypes; private httpClient: HttpClient; - constructor(xhrBackend: HttpXhrBackend,appConfig:AppConfig) { + constructor(xhrBackend: HttpXhrBackend) { this.httpClient = new HttpClient(xhrBackend); - this.load(appConfig) } getIcon(itemType: string) { diff --git a/projects/common/src/fm/shared/app.config.factory.ts b/projects/common/src/fm/shared/app.config.factory.ts deleted file mode 100644 index c6b3633..0000000 --- a/projects/common/src/fm/shared/app.config.factory.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Injector } from '@angular/core'; -import { AppConfig } from "./app.config"; -import {ItemTypeService} from '../services/itemtype.service'; - - - -export function appConfigFactory(injector:Injector, appConfig: AppConfig, itemtypeService:ItemTypeService): () => Promise { - return (): Promise => { - return new Promise((resolve,reject) => { - appConfig.load().then(() => { - itemtypeService.load(appConfig); - }).then(() => resolve()).catch(() => reject()); - }); - } -} diff --git a/projects/common/src/fm/shared/app.config.ts b/projects/common/src/fm/shared/app.config.ts index f835118..de7881c 100644 --- a/projects/common/src/fm/shared/app.config.ts +++ b/projects/common/src/fm/shared/app.config.ts @@ -7,11 +7,8 @@ import {Observable} from 'rxjs'; export class AppConfig { private config: Object = null; - private httpClient: HttpClient; - constructor(xhrBackend: HttpXhrBackend,private location:Location) { - this.httpClient = new HttpClient(xhrBackend); - this.config = null; + constructor() { } public getConfig(key: any) { @@ -21,9 +18,10 @@ export class AppConfig { return this.config[key]; } - public load(): Promise { - const url = this.location.prepareExternalUrl('/configuration.json'); - return this.httpClient.get(url) + public load(xhrBackend: HttpXhrBackend,location:Location): Promise { + const httpClient = new HttpClient(xhrBackend); + const url = location.prepareExternalUrl('/configuration.json'); + return httpClient.get(url) .toPromise() .then(data => { this.config = data;