@sumaris-net/ngx-components 0.26.7 → 0.27.0

package/fesm2015/sumaris-net.ngx-components.js

@@ -37,7 +37,7 @@ import { __awaiter, __decorate } from 'tslib';
 import * as i1$6 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, FormGroupDirective, AbstractControl, FormGroup, FormArray, FormControl, ReactiveFormsModule, Validators, FormBuilder } from '@angular/forms';
 import { timer, merge, fromEvent, Subscription, BehaviorSubject, Subject, isObservable, of, noop as noop$8, Observable, defer, from, combineLatest, EMPTY } from 'rxjs';
-import { filter, first, map, takeUntil, startWith, debounceTime, takeWhile, switchMap, tap, distinctUntilChanged, mergeMap, catchError, throttleTime } from 'rxjs/operators';
+import { filter, first, map, takeUntil, startWith, debounceTime, takeWhile, switchMap, tap, distinctUntilChanged, mergeMap, catchError, throttleTime, skip } from 'rxjs/operators';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import * as i1$4 from '@ionic/angular';
@@ -7619,13 +7619,14 @@ AppFormField.propDecorators = {
 };
 
 class StartableService {
-    constructor(platform) {
+    constructor(prerequisiteService) {
         this.onStart = new Subject();
         this._debug = false;
+        this._startByReadyFunction = true; // should start when calling ready() ?
         this._data = null;
         this._started = false;
-        this._startPrerequisite = platform
-            ? () => platform.ready()
+        this._startPrerequisite = prerequisiteService
+            ? () => prerequisiteService.ready()
             : () => Promise.resolve();
     }
     start() {
@@ -7680,7 +7681,12 @@ class StartableService {
     ready() {
         if (this._started)
             return Promise.resolve(this._data);
-        return this.start();
+        if (this._startPromise)
+            return this._startPromise;
+        if (this._startByReadyFunction)
+            return this.start();
+        return waitFor(() => this._started)
+            .then(() => this._data);
     }
     ngOnStop() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -12260,7 +12266,6 @@ class GraphqlService extends StartableService {
                         .append('Authorization', authorization);
                     //.append('X-App-Name', environment.name)
                     //.append('X-App-Version', environment.version)
-                    ;
                     // Use the setContext method to set the HTTP headers.
                     operation.setContext(Object.assign(Object.assign({}, operation.getContext()), { headers }));
                     // Call the next link in the middleware chain.
@@ -14371,8 +14376,9 @@ ConfigService.ctorParameters = () => [
 ];
 
 const moment$2 = momentImported;
-class PlatformService {
+class PlatformService extends StartableService {
     constructor(platform, cdkPlatform, toastController, translate, dateAdapter, entitiesStorage, settings, networkService, accountService, configService, cache, storage, audioProvider, environment, statusBar, keyboard, splashScreen, browser, downloader) {
+        super(platform);
         this.platform = platform;
         this.cdkPlatform = cdkPlatform;
         this.toastController = toastController;
@@ -14392,15 +14398,13 @@ class PlatformService {
         this.splashScreen = splashScreen;
         this.browser = browser;
         this.downloader = downloader;
-        this._started = false;
         this._downloadingJobs = new Map();
         this._debug = !environment.production;
         if (this._debug)
             console.debug('[platform] Creating service');
-        this.start();
-    }
-    get started() {
-        return this._started;
+        this.start()
+            // Manage error
+            .catch(err => this.onStartupError(err));
     }
     get mobile() {
         return isNotNil(this._mobile) ? this._mobile : this.platform.is('mobile');
@@ -14427,78 +14431,62 @@ class PlatformService {
     height() {
         return this.platform.height();
     }
-    start() {
-        if (this._startPromise)
-            return this._startPromise;
-        if (this._started)
-            return Promise.resolve();
-        this._started = false;
-        const now = Date.now();
-        this.accountService.tokenType = undefined;
-        console.info('[platform] Starting platform...');
-        this._startPromise = this.platform.ready()
-            .then(() => {
-            this._mobile = this.platform.is('mobile');
-            this._cordova = this.platform.is('cordova');
-            this._android = this.platform.is('android');
-            this.configureCordovaPlugins(this._mobile);
-            this.touchUi = this._mobile || this.platform.is('tablet') || this.platform.is('phablet');
-            // Force mobile in settings
-            if (this._mobile) {
-                this.settings.mobile = this._mobile;
-                this.settings.touchUi = this.touchUi;
-            }
-            this.configureTranslate();
-        })
-            .then(() => this.storageReady())
-            .then((forage) => this.migrateStorage(forage))
-            .then(() => Promise.all([
-            this.entitiesStorage.ready(),
-            this.cache.ready().then(() => this.configureCache()),
-            this.settings.ready(),
-            this.networkService.ready(),
-            this.audioProvider.ready()
-        ]))
-            .then(() => {
-            this._started = true;
-            this._startPromise = undefined;
-            console.info(`[platform] Starting platform [OK] {mobile: ${this._mobile}, touchUi: ${this.touchUi}, canDownload: ${this.canDownload}} in ${Date.now() - now}ms`);
-            // Update cache configuration when network changed
-            this.networkService.onNetworkStatusChanges.subscribe((type) => this.configureCache(type !== 'none'));
-            // Update authentication type
-            this.configService.config
-                .pipe(map(config => config === null || config === void 0 ? void 0 : config.getProperty(CORE_CONFIG_OPTIONS.AUTH_TOKEN_TYPE)), filter(isNotNilOrBlank), distinctUntilChanged())
-                .subscribe(tokenType => {
-                console.info(`[platform] Using auth token type {${tokenType}}`);
-                this.accountService.tokenType = tokenType;
-            });
-            // Wait 1 more seconds, before hiding the splash screen
-            setTimeout(() => {
-                if (this.splashScreen)
-                    this.splashScreen.hide();
-                // Play startup sound
-                this.audioProvider.playStartupSound();
-            }, 1000);
-        })
-            // Manage error
-            .catch(err => this.onStartupError(err));
-        return this._startPromise;
-    }
-    /**
-     * Wait platform is ready.<br/>
-     * Important: this will NOT start the platform, has it should be started by the AppComponent
-     *
-     * @param opts
-     */
-    ready(opts) {
-        const period = opts && opts.checkPeriod || 300;
-        if (this._started)
-            return Promise.resolve();
-        return timer(period, period)
-            .pipe(
-        // For DEBUG :
-        //tap(() => this._debug && console.debug("Waiting platform ready...")),
-        filter(() => this._started), first()).toPromise();
+    ngOnStart() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now();
+            this.accountService.tokenType = undefined;
+            console.info('[platform] Starting platform...');
+            try {
+                this._mobile = this.platform.is('mobile');
+                this._cordova = this.platform.is('cordova');
+                this._android = this.platform.is('android');
+                this.configureCordovaPlugins(this._mobile);
+                this.touchUi = this._mobile || this.platform.is('tablet') || this.platform.is('phablet');
+                // Force mobile in settings
+                if (this._mobile) {
+                    this.settings.mobile = this._mobile;
+                    this.settings.touchUi = this.touchUi;
+                }
+                // Configure translation
+                yield this.configureTranslate();
+                // Configure storage
+                const forage = yield this.storageReady();
+                yield this.migrateStorage(forage);
+                // Start root services
+                yield Promise.all([
+                    this.entitiesStorage.ready(),
+                    this.cache.ready().then(() => this.configureCache()),
+                    this.settings.ready(),
+                    this.networkService.ready(),
+                    this.audioProvider.ready()
+                ]);
+                console.info(`[platform] Starting platform [OK] {mobile: ${this._mobile}, touchUi: ${this.touchUi}, downloader: ${this.canDownload}} in ${Date.now() - now}ms`);
+                // Update cache configuration when network changed
+                this.networkService.onNetworkStatusChanges
+                    .pipe(skip(1)) // Skip the first event (behavior subject send event immediately)
+                    .subscribe(type => this.configureCache(type !== 'none'));
+                // Update authentication type
+                this.configService.config
+                    .pipe(map(config => config === null || config === void 0 ? void 0 : config.getProperty(CORE_CONFIG_OPTIONS.AUTH_TOKEN_TYPE)), filter(isNotNilOrBlank), distinctUntilChanged())
+                    .subscribe(tokenType => {
+                    console.info(`[platform] Using auth token type {${tokenType}}`);
+                    this.accountService.tokenType = tokenType;
+                });
+                // Hide the splashscreen (if mobile) - after 1s
+                if (this.mobile) {
+                    setTimeout(() => {
+                        var _a;
+                        (_a = this.splashScreen) === null || _a === void 0 ? void 0 : _a.hide();
+                        // Play startup sound
+                        this.audioProvider.playStartupSound();
+                    }, 1000);
+                }
+            }
+            catch (err) {
+                // Manage startup error
+                return this.onStartupError(err);
+            }
+        });
     }
     open(url, target, features, replace) {
         console.info(`[platform] Opening link: ${url}`);
@@ -14609,9 +14597,9 @@ class PlatformService {
         });
     }
     configureCache(online) {
-        online = isNotNil(online) ? online : this.cache.isOnline();
+        online = toBoolean(online, this.cache.isOnline());
         const cacheTTL = online ? 3600 /* 1h */ : 3600 * 24 * 30; /* 1 month */
-        console.info(`[platform] Configuring cache [OK] {online: ${online}}, {timeToLive: ${cacheTTL / 3600}h}, {offlineInvalidate: false}`);
+        console.info(`[platform] Configuring cache [OK] {online: ${online}, timeToLive: ${cacheTTL / 3600}h, offlineInvalidate: false}`);
         this.cache.setDefaultTTL(cacheTTL);
         this.cache.setOfflineInvalidate(false); // Do not invalidate cache when offline
     }