@mediusinc/mng-commons 0.4.3 → 0.4.6

package/fesm2020/mediusinc-mng-commons.mjs

@@ -72,7 +72,7 @@ import * as i4$3 from 'primeng/toolbar';
 import { ToolbarModule } from 'primeng/toolbar';
 import * as i9 from 'primeng/tooltip';
 import { TooltipModule } from 'primeng/tooltip';
-import { throwError, of, Subject, Observable, from, BehaviorSubject, ReplaySubject, switchMap, distinctUntilChanged, combineLatest } from 'rxjs';
+import { throwError, of, Subject, Observable, from, combineLatest, tap, BehaviorSubject, ReplaySubject, switchMap, distinctUntilChanged, mergeMap as mergeMap$1 } from 'rxjs';
 import 'reflect-metadata';
 import { map, mergeMap, first, catchError, filter, finalize, startWith } from 'rxjs/operators';
 import * as i4$1 from '@angular/platform-browser';
@@ -3203,12 +3203,11 @@ var I18nUtils;
             return I18nUtils.Action.getAsync(translate, action, ['editor.title', 'title'], action.editorTitle ?? undefined, item);
         }
         static getParams(translate, action, item, params = {}) {
-            const modelI18nParams = I18nUtils.Model.getParams(translate, action.model ?? undefined, item, params);
-            return I18nUtils.Action.populateParams(modelI18nParams);
+            const i18nParams = I18nUtils.Model.getParams(translate, action.model ?? undefined, item, params);
+            return I18nUtils.Action.populateParams(i18nParams);
         }
         static getParamsAsync(translate, action, item, params = {}) {
-            let modelI18nParams;
-            return I18nUtils.Model.getParamsAsync(translate, action.model ?? undefined, item, params).pipe(map(i18nParams => I18nUtils.Action.populateParams(modelI18nParams)));
+            return I18nUtils.Model.getParamsAsync(translate, action.model ?? undefined, item, params).pipe(map(i18nParams => I18nUtils.Action.populateParams(i18nParams)));
         }
         static populateParams(params = {}) {
             params = { ...params };
@@ -3800,6 +3799,8 @@ const MNG_BROWSER_STORAGE_IT = new InjectionToken('Browser storage', {
     factory: () => localStorage
 });
 
+const MNG_COMMONS_INITIALIZER_IT = new InjectionToken('MNG Commons Initializer');
+
 const ACTION_EDITOR_DIALOG_COMPONENT_SETTING = new InjectionToken('ACTION_EDITOR_DIALOG_COMPONENT_SETTING');
 
 const MNG_MODULE_CONFIG_IT = new InjectionToken('MngModuleConfig');
@@ -4363,7 +4364,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
 class MngConfigurationService {
     constructor(http) {
         this.http = http;
-        this.jsonEnvironments = [];
+        this.jsonSources = [];
         this.configuration = { ...this.projectEnvironment };
     }
     static init(httpClient) {
@@ -4390,23 +4391,55 @@ class MngConfigurationService {
      * Adds new config source from JSON file.
      * @param url Url to JSON file.
      */
-    addJsonSource(url = this.projectEnvironment.configurationJsonSource) {
+    addJsonSource(url = this.projectEnvironment.configurationJsonSource, load = false) {
         if (!url) {
-            console.warn('No path to configuration file specified. Setting default.');
+            console.debug('No path to configuration file specified. Setting default.');
             url = 'assets/config/env{{environment}}.json';
         }
-        const envName = this.projectEnvironment.name || (this.projectEnvironment.production ? 'prod' : 'dev');
-        url = url.replace('{{environment}}', '.' + envName);
-        return this.http.get(url).pipe(catchError(err => {
-            console.warn('Error loading configuration file:' + err.message + '. Falling back to env.json');
-            const pathSegments = url.split('/');
-            pathSegments[pathSegments.length - 1] = 'env.json';
-            return this.http.get(pathSegments.join('/'));
-        }), map(res => {
-            this.jsonEnvironments.push(res);
-            this.mergeConfigs();
-            return true;
-        }));
+        const sourceInfo = {
+            url: url,
+            isEnvironment: false,
+            isLoaded: false
+        };
+        this.jsonSources.push(sourceInfo);
+        console.debug(`Added JSON source: ${url}`);
+        if (load) {
+            return this.loadJsonSources();
+        }
+        else {
+            return of(true);
+        }
+    }
+    loadJsonSources() {
+        return combineLatest(this.jsonSources
+            .filter(source => !source.isLoaded)
+            .map(sourceInfo => {
+            let url = sourceInfo.url;
+            if (url.indexOf('{{environment}}') >= 0) {
+                sourceInfo.isEnvironment = true;
+                sourceInfo.environment = this.projectEnvironment.name || (this.projectEnvironment.production ? 'prod' : 'dev');
+                url = url.replace('{{environment}}', '.' + sourceInfo.environment);
+            }
+            console.debug(`Loading JSON source: ${sourceInfo.url} with env ${sourceInfo.environment ?? '/'}`);
+            return this.http.get(url).pipe(catchError((err) => {
+                if (sourceInfo.isEnvironment) {
+                    const noEnvUrl = sourceInfo.url.replace('{{environment}}', '');
+                    sourceInfo.environment = null;
+                    console.debug(`Reloading JSON source: ${sourceInfo.url} with env ${sourceInfo.environment ?? '/'}`);
+                    return this.http.get(noEnvUrl);
+                }
+                else {
+                    const message = `Configuration file ${url} not loaded (${err.status}): ${err.message}.`;
+                    console.error(message);
+                    return throwError(() => new Error(message));
+                }
+            }), map(configuration => {
+                sourceInfo.configuration = configuration;
+                sourceInfo.isLoaded = true;
+                console.debug(`JSON source loaded: ${sourceInfo.url}`);
+                return true;
+            }));
+        })).pipe(map(sourceResults => sourceResults.every(sr => sr)), tap(sourceResults => this.mergeConfigs()));
     }
     /**
      * Get configuration.
@@ -4426,9 +4459,10 @@ class MngConfigurationService {
      */
     mergeConfigs() {
         let config = { ...this.projectEnvironment };
-        if (this.jsonEnvironments.length) {
-            for (const je of this.jsonEnvironments) {
-                config = { ...config, ...je };
+        const jsonConfigs = this.jsonSources.filter(source => source.isLoaded && typeof source.configuration === 'object').map(source => source.configuration);
+        if (jsonConfigs.length) {
+            for (const jsonConfig of jsonConfigs) {
+                config = { ...config, ...jsonConfig };
             }
         }
         this.configuration = config;
@@ -4437,12 +4471,11 @@ class MngConfigurationService {
 MngConfigurationService._instance = null;
 
 class MngCommonsService {
-    constructor(router, primengConfig, translate, titleService, configurationService, moduleConfig, localStorage) {
+    constructor(router, primengConfig, translate, titleService, moduleConfig, localStorage) {
         this.router = router;
         this.primengConfig = primengConfig;
         this.translate = translate;
         this.titleService = titleService;
-        this.configurationService = configurationService;
         this.moduleConfig = moduleConfig;
         this.localStorage = localStorage;
         // menu
@@ -4571,8 +4604,7 @@ class MngCommonsService {
     get user$() {
         return this.userSubject.asObservable();
     }
-    initialize() {
-        // menu
+    reset() {
         this._menuMode = this.moduleConfig?.menu?.mode ?? 'sidebar';
         this._menuModeSubject.next(this._menuMode);
         this._menuItems = this.moduleConfig?.menu?.menuItems ?? [];
@@ -4606,7 +4638,8 @@ class MngCommonsService {
         this.translate.langs = this.appLanguages;
         this.translate.use(this.appLanguage);
         this.translate.get('mngPrime').subscribe(value => this.primengConfig.setTranslation(value));
-        this.router.events
+        this.routerEventsSubscription?.unsubscribe();
+        this.routerEventsSubscription = this.router.events
             .pipe(
         // Filter the NavigationEnd events as the breadcrumb is updated only when the route reaches its end
         filter(event => event instanceof NavigationEnd))
@@ -4614,7 +4647,8 @@ class MngCommonsService {
             this.updateBreadcrumbs();
             this.setPageTitle();
         });
-        this.translate.onLangChange.subscribe(() => {
+        this.translateLangChangeSubscription?.unsubscribe();
+        this.translateLangChangeSubscription = this.translate.onLangChange.subscribe(() => {
             this.updateBreadcrumbs();
             this.setPageTitle();
         });
@@ -4757,11 +4791,11 @@ class MngCommonsService {
         return titlePieces.join(' - ');
     }
 }
-MngCommonsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsService, deps: [{ token: i1.Router }, { token: i2.PrimeNGConfig }, { token: i1$1.TranslateService }, { token: i4$1.Title }, { token: MngConfigurationService }, { token: MNG_MODULE_CONFIG_IT }, { token: MNG_BROWSER_STORAGE_IT }], target: i0.ɵɵFactoryTarget.Injectable });
+MngCommonsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsService, deps: [{ token: i1.Router }, { token: i2.PrimeNGConfig }, { token: i1$1.TranslateService }, { token: i4$1.Title }, { token: MNG_MODULE_CONFIG_IT }, { token: MNG_BROWSER_STORAGE_IT }], target: i0.ɵɵFactoryTarget.Injectable });
 MngCommonsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.PrimeNGConfig }, { type: i1$1.TranslateService }, { type: i4$1.Title }, { type: MngConfigurationService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.PrimeNGConfig }, { type: i1$1.TranslateService }, { type: i4$1.Title }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [MNG_MODULE_CONFIG_IT]
                 }] }, { type: Storage, decorators: [{
@@ -7505,9 +7539,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
                 args: ['window:resize', ['$event']]
             }] } });
 
-function mngCommonsInitializerProvider(mngCommons) {
-    return () => mngCommons.initialize();
+function mngCommonsInitializerProvider(mngCommonsInit) {
+    return () => mngCommonsInit.initialize();
+}
+
+class MngCommonsInitService {
+    constructor(translate, configurationService, mngCommons, commonsInitializers) {
+        this.translate = translate;
+        this.configurationService = configurationService;
+        this.mngCommons = mngCommons;
+        this.commonsInitializers = commonsInitializers;
+        this.isInitialized = false;
+    }
+    initialize() {
+        if (this.isInitialized) {
+            return of(void 0);
+        }
+        console.debug(`Initializing @mediusinc/mng-commons.`);
+        return this.configurationService.loadJsonSources().pipe(mergeMap$1(() => {
+            if (this.commonsInitializers) {
+                console.debug(`Module initializers for @mediusinc/mng-commons.`);
+                return combineLatest(this.commonsInitializers.map(ci => ci())).pipe(map(res => res));
+            }
+            else {
+                return of(true);
+            }
+        }), map(() => this.mngCommons.reset()));
+        this.isInitialized = true;
+    }
 }
+MngCommonsInitService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsInitService, deps: [{ token: i1$1.TranslateService }, { token: MngConfigurationService }, { token: MngCommonsService }, { token: MNG_COMMONS_INITIALIZER_IT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+MngCommonsInitService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsInitService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: MngCommonsInitService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: i1$1.TranslateService }, { type: MngConfigurationService }, { type: MngCommonsService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [MNG_COMMONS_INITIALIZER_IT]
+                }, {
+                    type: Optional
+                }] }]; } });
 
 const mngConfigurationServiceProvider = (httpClient, moduleConfig) => {
     const service = MngConfigurationService.init(httpClient);
@@ -7522,7 +7592,16 @@ function mngConfigJsonAppInitializerProvider(configService, moduleConfig) {
             return of(false);
         }
         else {
-            return configService.addJsonSource(moduleConfig?.configuration?.jsonSource ?? undefined);
+            const jsonSource = moduleConfig?.configuration?.jsonSource;
+            if (!jsonSource) {
+                return configService.addJsonSource();
+            }
+            else if (Array.isArray(jsonSource)) {
+                return combineLatest(jsonSource.map(source => configService.addJsonSource(source))).pipe(map(sourcesRes => sourcesRes.every(s => s)));
+            }
+            else {
+                return configService.addJsonSource(jsonSource);
+            }
         }
     };
 }
@@ -7803,6 +7882,7 @@ class MngCommonsModule {
                 DialogService,
                 MessageService,
                 ConfirmationService,
+                MngCommonsInitService,
                 MngActionExecutorService,
                 MngNavigationService,
                 MngCommonsService,
@@ -7832,7 +7912,7 @@ class MngCommonsModule {
                 {
                     provide: APP_INITIALIZER,
                     useFactory: mngCommonsInitializerProvider,
-                    deps: [MngCommonsService],
+                    deps: [MngCommonsInitService],
                     multi: true
                 },
                 {
@@ -8667,5 +8747,5 @@ class RouteDataBuilder {
  * Generated bundle index. Do not edit.
  */
 
-export { AFieldDescriptor, AFieldGroupDescriptor, AGenericFieldDescriptor, AMngApiService, AMngBaseApiService, AMngCrudApiService, AMngGetAllApiService, AMngTableviewRouteComponent, ActionActivationResult, ActionActivationTriggerEnum, ActionDeleteDescriptor, ActionDescriptor, ActionEditorAddDescriptor, ActionEditorDescriptor, ActionEditorDetailsDescriptor, ActionEditorEditDescriptor, ActionEditorSubmitDescriptor, ActionError, ActionExecContext, ActionLevelEnum, ActionLinkDescriptor, ActionPositionEnum, ActionRunResult, ActionSimpleDescriptor, ActionTriggerResult, ActionTypeEnum, ColumnDescriptor, DataProvider, DefaultMngErrorMapperService, EditorDataProvider, EditorDescriptor, EditorFormlyUtil, EnumName, EnumUtil, FieldDescriptor, FieldGroupDescriptor, FieldInputDescriptor, FieldLookupDescriptor, FieldLookupEnumDescriptor, FieldManyEditorDescriptor, FieldManyToManyEditorDescriptor, FieldTabGroupDescriptor, FieldValidator, FilterDescriptor, FilterLookupDescriptor, FilterLookupEnumDescriptor, I18nUtils, JsonPathPipe, LookupDataProvider, MNG_AUTOCOMPLETE_VALUE_ACCESSOR, MNG_DROPDOWN_VALUE_ACCESSOR, MediusFilterMatchType, MediusFilterParam, MediusQueryMode, MediusQueryParam, MediusQueryParamBuilder, MediusQueryResult, MediusRestUtil, MngActionComponent, MngActionEditorComponent, MngActionExecutorService, MngActionRouteComponent, MngAutocompleteComponent, MngBooleanPipe, MngBreadcrumbComponent, MngCommonsModule, MngCommonsService, MngComponentDirective, MngConfigurationService, MngDropdownComponent, MngEnumPipe, MngErrorMapperService, MngFooterComponent, MngFormEditorComponent, MngFormEditorSubmitEvent, MngFormFieldEvent, MngFormFieldEventComponentSubtype, MngFormFieldEventDialogSubtype, MngFormFieldEventTypeEnum, MngFormlyFieldAutocompleteComponent, MngFormlyFieldDropdownComponent, MngFormlyFieldFieldsetComponent, MngFormlyFieldInputComponent, MngFormlyFieldLookupDialogComponent, MngFormlyFieldTableDialogFormComponent, MngFormlyFieldTableDialogMultiselectComponent, MngFormlyFieldTabsComponent, MngFormlyFieldWrapperComponent, MngFormlyTableWrapperComponent, MngI18nPropertyPipe, MngLinkFormatterPipe, MngMainLayoutComponent, MngMainLayoutComponentService, MngMenuComponent, MngMenuItemComponent, MngNavigationService, MngTableCellClickEvent, MngTableColumnFilterComponent, MngTableColumnValueComponent, MngTableComponent, MngTableLoadEvent, MngTableReloadEvent, MngTableviewComponent, MngTableviewRouteComponent, MngTemplateDirective, MngTopbarComponent, MngViewContainerComponentService, ModelDescriptor, ModelUtil, NotificationUtil, ObjectSerializer, RouteBuilder, RouteDataBuilder, RoutesBuilder, TableDataProvider, TableDescriptor, TableviewDataProvider, TableviewDescriptor, TypeName, TypeUtil, enumNameDecoratorPropertyName, enumsMapBase, formlyTypesConfig, formlyWrappersConfig, getEmailValidationMessage, getFormlyValidationMessages, getMaxLengthValidationMessage, getMinLengthValidationMessage, getRequiredValidationMessage, getTextPatternValidationMessage, mngCommonsInitializerProvider, mngConfigJsonAppInitializerProvider, mngConfigurationServiceProvider, mngFormlyConfigProvider, primeNgModules, typeMapBase, typeNameDecoratorPropertyName };
+export { ACTION_EDITOR_DIALOG_COMPONENT_SETTING, AFieldDescriptor, AFieldGroupDescriptor, AGenericFieldDescriptor, AMngApiService, AMngBaseApiService, AMngCrudApiService, AMngGetAllApiService, AMngTableviewRouteComponent, ActionActivationResult, ActionActivationTriggerEnum, ActionDeleteDescriptor, ActionDescriptor, ActionEditorAddDescriptor, ActionEditorDescriptor, ActionEditorDetailsDescriptor, ActionEditorEditDescriptor, ActionEditorSubmitDescriptor, ActionError, ActionExecContext, ActionLevelEnum, ActionLinkDescriptor, ActionPositionEnum, ActionRunResult, ActionSimpleDescriptor, ActionTriggerResult, ActionTypeEnum, ColumnDescriptor, DataProvider, DefaultMngErrorMapperService, EditorDataProvider, EditorDescriptor, EditorFormlyUtil, EnumName, EnumUtil, FieldDescriptor, FieldGroupDescriptor, FieldInputDescriptor, FieldLookupDescriptor, FieldLookupEnumDescriptor, FieldManyEditorDescriptor, FieldManyToManyEditorDescriptor, FieldTabGroupDescriptor, FieldValidator, FilterDescriptor, FilterLookupDescriptor, FilterLookupEnumDescriptor, I18nUtils, JsonPathPipe, LookupDataProvider, MNG_AUTOCOMPLETE_VALUE_ACCESSOR, MNG_BROWSER_STORAGE_IT, MNG_COMMONS_INITIALIZER_IT, MNG_DROPDOWN_VALUE_ACCESSOR, MNG_MODULE_CONFIG_IT, MediusFilterMatchType, MediusFilterParam, MediusQueryMode, MediusQueryParam, MediusQueryParamBuilder, MediusQueryResult, MediusRestUtil, MngActionComponent, MngActionEditorComponent, MngActionExecutorService, MngActionRouteComponent, MngAutocompleteComponent, MngBooleanPipe, MngBreadcrumbComponent, MngCommonsModule, MngCommonsService, MngComponentDirective, MngConfigurationService, MngDropdownComponent, MngEnumPipe, MngErrorMapperService, MngFooterComponent, MngFormEditorComponent, MngFormEditorSubmitEvent, MngFormFieldEvent, MngFormFieldEventComponentSubtype, MngFormFieldEventDialogSubtype, MngFormFieldEventTypeEnum, MngFormlyFieldAutocompleteComponent, MngFormlyFieldDropdownComponent, MngFormlyFieldFieldsetComponent, MngFormlyFieldInputComponent, MngFormlyFieldLookupDialogComponent, MngFormlyFieldTableDialogFormComponent, MngFormlyFieldTableDialogMultiselectComponent, MngFormlyFieldTabsComponent, MngFormlyFieldWrapperComponent, MngFormlyTableWrapperComponent, MngI18nPropertyPipe, MngLinkFormatterPipe, MngMainLayoutComponent, MngMainLayoutComponentService, MngMenuComponent, MngMenuItemComponent, MngNavigationService, MngTableCellClickEvent, MngTableColumnFilterComponent, MngTableColumnValueComponent, MngTableComponent, MngTableLoadEvent, MngTableReloadEvent, MngTableviewComponent, MngTableviewRouteComponent, MngTemplateDirective, MngTopbarComponent, MngViewContainerComponentService, ModelDescriptor, ModelUtil, NotificationUtil, ObjectSerializer, RouteBuilder, RouteDataBuilder, RoutesBuilder, TableDataProvider, TableDescriptor, TableviewDataProvider, TableviewDescriptor, TypeName, TypeUtil, enumNameDecoratorPropertyName, enumsMapBase, formlyTypesConfig, formlyWrappersConfig, getEmailValidationMessage, getFormlyValidationMessages, getMaxLengthValidationMessage, getMinLengthValidationMessage, getRequiredValidationMessage, getTextPatternValidationMessage, mngConfigJsonAppInitializerProvider, mngConfigurationServiceProvider, mngFormlyConfigProvider, primeNgModules, typeMapBase, typeNameDecoratorPropertyName };
 //# sourceMappingURL=mediusinc-mng-commons.mjs.map