@igo2/core 16.0.0-rc.1 → 16.0.0-rc.2

package/fesm2022/igo2-core.mjs

@@ -1,20 +1,20 @@
-import * as i0 from '@angular/core';
-import { Injectable, NgModule, InjectionToken, APP_INITIALIZER, Injector, Inject, Optional, SkipSelf, EventEmitter } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HTTP_INTERCEPTORS, HttpClient, HttpBackend, HttpErrorResponse, HttpClientModule, HttpResponse } from '@angular/common/http';
+import * as i0 from '@angular/core';
+import { Injectable, NgModule, InjectionToken, APP_INITIALIZER, Injector, Inject, Optional, SkipSelf, EventEmitter } from '@angular/core';
+import * as i1$3 from '@angular/material/icon';
 import * as i2 from '@angular/platform-browser';
 import { HammerGestureConfig, HAMMER_GESTURE_CONFIG, HammerModule } from '@angular/platform-browser';
-import * as i1$3 from '@angular/material/icon';
+import * as i8 from 'ngx-indexed-db';
+import { NgxIndexedDBModule } from 'ngx-indexed-db';
 import { finalize, catchError, debounceTime, first, tap, startWith } from 'rxjs/operators';
-import { BehaviorSubject, throwError, forkJoin, map, combineLatest, Observable, fromEvent } from 'rxjs';
 import { uuid, ObjectUtils } from '@igo2/utils';
+import { BehaviorSubject, throwError, forkJoin, map, combineLatest, Observable, fromEvent } from 'rxjs';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateLoader, TranslateModule, MissingTranslationHandler } from '@ngx-translate/core';
 import * as i1$2 from 'ngx-toastr';
 import { ToastrModule, ToastrService } from 'ngx-toastr';
-import * as i8 from 'ngx-indexed-db';
-import { NgxIndexedDBModule } from 'ngx-indexed-db';
 import * as i1$4 from '@angular/router';
 import * as i1$5 from '@angular/cdk/layout';
 import { Breakpoints } from '@angular/cdk/layout';
@@ -100,11 +100,6 @@ class IgoActivityModule {
             }]
     }], null, null); })();
 
-const version = {
-    lib: '16.0.0-rc.1',
-    releaseDate: 1695395320530
-};
-
 const CONFIG_DEPRECATED = {
     showMenuButton: {
         alternativeKey: 'menu.button.visible',
@@ -113,6 +108,14 @@ const CONFIG_DEPRECATED = {
     menuButtonReverseColor: {
         alternativeKey: 'menu.button.useThemeColor',
         mayBeRemoveIn: new Date('2024-06-06')
+    },
+    importWithStyle: {
+        alternativeKey: 'importExport.importWithStyle',
+        mayBeRemoveIn: new Date('2024-06-06')
+    },
+    hasGeolocateButton: {
+        alternativeKey: 'geolocate.button.visible',
+        mayBeRemoveIn: new Date('2024-06-06')
     }
 };
 const ALTERNATE_CONFIG_FROM_DEPRECATION = new Map(Object.entries(CONFIG_DEPRECATED)
@@ -124,26 +127,43 @@ const ALTERNATE_CONFIG_FROM_DEPRECATION = new Map(Object.entries(CONFIG_DEPRECAT
     }
 ]));
 
+const version = {
+    lib: '16.0.0-rc.2',
+    releaseDate: 1697030263684
+};
+
 class ConfigService {
-    config = {};
+    config;
     httpClient;
     configDeprecated = new Map(Object.entries(CONFIG_DEPRECATED));
     constructor(handler) {
         this.httpClient = new HttpClient(handler);
     }
+    /**
+     * Use to get the all config file (merge from environnement.ts and config.json)
+     */
+    getConfigs() {
+        Array.from(this.configDeprecated.keys()).map((deprecatedKey) => {
+            const deprecatedValue = ObjectUtils.resolve(this.config, deprecatedKey);
+            if (deprecatedValue !== undefined) {
+                this.handleDeprecatedConfig(deprecatedKey);
+            }
+        });
+        return this.config;
+    }
     /**
      * Use to get the data found in config file
      */
-    getConfig(key) {
-        const value = ObjectUtils.resolve(this.config, key);
+    getConfig(key, defaultValue) {
+        let value = ObjectUtils.resolve(this.config, key);
         const isDeprecated = this.configDeprecated.get(key);
-        if (isDeprecated) {
+        if (isDeprecated && value !== undefined) {
             this.handleDeprecatedConfig(key);
         }
         else if (value === undefined) {
-            return this.handleDeprecationPossibility(key);
+            value = this.handleDeprecationPossibility(key);
         }
-        return value;
+        return value ?? defaultValue;
     }
     handleDeprecatedConfig(key) {
         const options = this.configDeprecated.get(key);
@@ -167,7 +187,7 @@ class ConfigService {
      * This method loads "[path]" to get all config's variables
      */
     load(options) {
-        const baseConfig = options.default || {};
+        const baseConfig = options.default;
         if (!options.path) {
             this.config = baseConfig;
             return true;
@@ -385,16 +405,6 @@ class IgoMessageModule {
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoMessageModule, { imports: [CommonModule, i1$2.ToastrModule] }); })();
 
-var MessageType;
-(function (MessageType) {
-    MessageType["ERROR"] = "error";
-    MessageType["ALERT"] = "warning";
-    MessageType["WARNING"] = "warning";
-    MessageType["INFO"] = "info";
-    MessageType["SUCCESS"] = "success";
-    MessageType["SHOW"] = "show";
-})(MessageType || (MessageType = {}));
-
 class LanguageService {
     translate;
     language;
@@ -428,6 +438,16 @@ class LanguageService {
             }]
     }], function () { return [{ type: i1$1.TranslateService }]; }, null); })();
 
+var MessageType;
+(function (MessageType) {
+    MessageType["ERROR"] = "error";
+    MessageType["ALERT"] = "warning";
+    MessageType["WARNING"] = "warning";
+    MessageType["INFO"] = "info";
+    MessageType["SUCCESS"] = "success";
+    MessageType["SHOW"] = "show";
+})(MessageType || (MessageType = {}));
+
 class MessageService {
     injector;
     configService;
@@ -560,17 +580,23 @@ class MessageService {
         const translatedTitlenterpolateParams = { ...titleInterpolateParams };
         if (textInterpolateParams) {
             Object.keys(textInterpolateParams).map((k) => {
-                if (textInterpolateParams[k]) {
+                const value = textInterpolateParams[k];
+                if (value) {
                     translatedTextInterpolateParams[k] =
-                        this.languageService.translate.instant(textInterpolateParams[k]);
+                        typeof value === 'string'
+                            ? this.languageService.translate.instant(value)
+                            : value;
                 }
             });
         }
         if (titleInterpolateParams) {
             Object.keys(titleInterpolateParams).map((k) => {
                 if (k) {
+                    const value = titleInterpolateParams[k];
                     translatedTitlenterpolateParams[k] =
-                        this.languageService.translate.instant(titleInterpolateParams[k]);
+                        typeof value === "string"
+                            ? this.languageService.translate.instant(value)
+                            : value;
                 }
             });
         }
@@ -637,9 +663,9 @@ class MessageService {
             }] }, { type: ConfigService }, { type: LanguageService }]; }, null); })();
 
 class ErrorInterceptor {
-    injector;
-    constructor(injector) {
-        this.injector = injector;
+    messageService;
+    constructor(messageService) {
+        this.messageService = messageService;
     }
     intercept(originalReq, next) {
         const interceptError = originalReq.headers.get('interceptError');
@@ -651,8 +677,16 @@ class ErrorInterceptor {
         }
         const errorContainer = { httpError: undefined };
         return next.handle(req).pipe(catchError((error) => this.handleError(error, errorContainer)), finalize(() => {
-            this.handleCaughtError(errorContainer);
-            this.handleUncaughtError(errorContainer);
+            const httpError = errorContainer.httpError;
+            if (!httpError) {
+                return;
+            }
+            if (httpError.error.toDisplay) {
+                this.handleCaughtError(httpError);
+            }
+            else if (!httpError.error.caught) {
+                this.handleUncaughtError(httpError);
+            }
         }));
     }
     handleError(httpError, errorContainer) {
@@ -671,23 +705,19 @@ class ErrorInterceptor {
         errorContainer.httpError = httpError;
         return throwError(httpError);
     }
-    handleCaughtError(errorContainer) {
-        const httpError = errorContainer.httpError;
-        if (httpError && httpError.error.toDisplay) {
-            httpError.error.caught = true;
-            const messageService = this.injector.get(MessageService);
-            messageService.error(httpError.error.message, httpError.error.title);
-        }
+    handleCaughtError(httpError) {
+        httpError.error.caught = true;
+        this.messageService.error(httpError.error.message, httpError.error.title, {
+            progressBar: false
+        });
     }
-    handleUncaughtError(errorContainer) {
-        const httpError = errorContainer.httpError;
-        if (httpError && !httpError.error.caught) {
-            const messageService = this.injector.get(MessageService);
-            httpError.error.caught = true;
-            messageService.error('igo.core.errors.uncaught.message', 'igo.core.errors.uncaught.title');
-        }
+    handleUncaughtError(httpError) {
+        httpError.error.caught = true;
+        this.messageService.error('igo.core.errors.uncaught.message', 'igo.core.errors.uncaught.title', {
+            progressBar: false
+        });
     }
-    static ɵfac = function ErrorInterceptor_Factory(t) { return new (t || ErrorInterceptor)(i0.ɵɵinject(i0.Injector)); };
+    static ɵfac = function ErrorInterceptor_Factory(t) { return new (t || ErrorInterceptor)(i0.ɵɵinject(MessageService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: ErrorInterceptor, factory: ErrorInterceptor.ɵfac, providedIn: 'root' });
 }
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ErrorInterceptor, [{
@@ -695,7 +725,7 @@ class ErrorInterceptor {
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i0.Injector }]; }, null); })();
+    }], function () { return [{ type: MessageService }]; }, null); })();
 
 class IgoErrorModule {
     static forRoot() {
@@ -868,7 +898,7 @@ class LoggingInterceptor {
         // Log when response observable either completes or errors
         finalize(() => {
             const elapsed = Date.now() - started;
-            const msg = `${req.method} "${req.urlWithParams}"
+            const msg = `${req.method} "${req.urlWithParams}"
              ${ok} in ${elapsed} ms.`;
             console.log(msg);
         }));