From 1fdbbe9f8f6c9d127d5b1f3c3adc476b9eb7b0da Mon Sep 17 00:00:00 2001 From: Guillaume ROCHELLE Date: Wed, 21 Aug 2024 11:21:57 +0200 Subject: [PATCH] fix: added generic to getConfig --- .../services/configuration/configuration.base.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@o3r/configuration/src/services/configuration/configuration.base.service.ts b/packages/@o3r/configuration/src/services/configuration/configuration.base.service.ts index c3f986790e..f560d3b07a 100644 --- a/packages/@o3r/configuration/src/services/configuration/configuration.base.service.ts +++ b/packages/@o3r/configuration/src/services/configuration/configuration.base.service.ts @@ -94,8 +94,8 @@ export class ConfigurationBaseService { * @param defaultValue Default value of the configuration */ public getComponentConfig(id: string, defaultValue: T) { - return (source: Observable | undefined>): Observable => { - const componentConfigurationFromStore$ = this.getConfig(id) as Observable; + return (source: Observable | undefined>): Observable => { + const componentConfigurationFromStore$ = this.getConfig(id); return source.pipe( switchMap((overrideConfig) => componentConfigurationFromStore$.pipe( @@ -112,7 +112,7 @@ export class ConfigurationBaseService { * Get an observable of the configuration from store for a given component and merge it with the global config + the config overrides from the rules engine * @param id Id of the component */ - public getConfig(id: string): Observable { + public getConfig(id: string): Observable { const globalConfig$ = this.store.pipe(select(selectGlobalConfiguration)); const componentConfig$ = id !== globalConfigurationId ? this.store.pipe(select(selectConfigurationForComponent({ id }))) : of({}); const overrideConfig$ = this.store.pipe(select(selectComponentOverrideConfig(id)));