@sumaris-net/ngx-components 1.0.6 → 1.0.10

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

@@ -2509,35 +2509,15 @@ TranslateContextService.ctorParameters = () => [
 ];
 
 class TranslateContextPipe {
-    constructor(translate, _ref) {
+    constructor(translate) {
         this.translate = translate;
-        this._ref = _ref;
-        this.value = '';
-        this.lastKey = null;
-        this.lastSuffix = null;
-        this.lastParams = [];
     }
     transform(query, ...params) {
-        if (!query || !query.length) {
+        if (!query || !query.length)
             return query;
-        }
         const suffix = params && params.length ? params[0] : '';
         params = suffix && params.slice(1);
-        // if we ask another time for the same key, return the last value
-        if (equalsOrNil(query, this.lastKey)
-            && equals(suffix, this.lastSuffix)
-            && equals(params, this.lastParams)) {
-            return this.value;
-        }
-        // store the query, in case it changes
-        this.lastKey = query;
-        // store the params, in case they change
-        this.lastParams = params;
-        // store the params, in case they change
-        this.lastSuffix = suffix;
-        // set the value
-        this.value = this.translate.instant(query, suffix, params);
-        return this.value;
+        return this.translate.instant(query, suffix, params);
     }
 }
 TranslateContextPipe.decorators = [
@@ -2547,8 +2527,7 @@ TranslateContextPipe.decorators = [
             },] }
 ];
 TranslateContextPipe.ctorParameters = () => [
-    { type: TranslateContextService },
-    { type: ChangeDetectorRef }
+    { type: TranslateContextService }
 ];
 class TranslatablePipe {
     transform(value) {
@@ -3675,20 +3654,70 @@ FormErrorTranslator.ctorParameters = () => [
 ];
 
 class FormErrorTranslatePipe {
-    constructor(adapter) {
+    constructor(adapter, _ref) {
         this.adapter = adapter;
+        this._ref = _ref;
+        this.value = '';
+        this._lastForm = null;
+        this._lastOptions = null;
     }
     transform(form, opts) {
-        return this.adapter.translateErrors(form, opts);
+        if (!form) {
+            this._dispose();
+            return '';
+        }
+        // if we ask another time for the same form and opts, return the last value
+        if (form === this._lastForm && equals(opts, this._lastOptions)) {
+            return this.value;
+        }
+        // store the query, in case it changes
+        this._lastForm = form;
+        // store the params, in case they change
+        this._lastOptions = opts;
+        // set the value
+        this._updateValue(form, opts);
+        // if there is a subscription to onLangChange, clean it
+        this._dispose();
+        // subscribe to onTranslationChange event, in case the translations change
+        if (!this._onFormStatusChange) {
+            this._onFormStatusChange = form.statusChanges.subscribe((status) => {
+                this._updateValue(form, opts, status);
+            });
+        }
+        return this.value;
+    }
+    ngOnDestroy() {
+        this._dispose();
+    }
+    _updateValue(form, opts, status) {
+        if (status === 'INVALID' || form.invalid) {
+            this.value = this.adapter.translateErrors(form, opts);
+            this._ref.markForCheck();
+        }
+        else if (this.value !== undefined) {
+            this.value = undefined;
+            this._ref.markForCheck();
+        }
+    }
+    /**
+     * Clean any existing subscription to change events
+     */
+    _dispose() {
+        if (typeof this._onFormStatusChange !== 'undefined') {
+            this._onFormStatusChange.unsubscribe();
+            this._onFormStatusChange = undefined;
+        }
     }
 }
 FormErrorTranslatePipe.decorators = [
     { type: Pipe, args: [{
                 name: 'translateFormError',
+                pure: false
             },] }
 ];
 FormErrorTranslatePipe.ctorParameters = () => [
-    { type: FormErrorTranslator }
+    { type: FormErrorTranslator },
+    { type: ChangeDetectorRef }
 ];
 
 class SharedPipesModule {
@@ -9579,7 +9608,7 @@ class LocalSettingsService extends StartableService {
                 yield this.ready();
             const data = Object.assign(Object.assign({}, this._data), settings);
             if (equals(data, this._data))
-                return; // SKip if same
+                return; // Skip if no changes
             this._data = data;
             // Save locally
             if (opts && opts.persistImmediate) {
@@ -9642,9 +9671,11 @@ class LocalSettingsService extends StartableService {
         if (!feature)
             return; // Not found
         if (typeof feature === 'string') {
+            const lastSyncDate = feature.substring(featurePrefix.length);
+            console.debug(`[${featureName}] Last synchronization date: ${lastSyncDate}`);
             return {
                 name: featureName,
-                lastSyncDate: feature.substring(featurePrefix.length)
+                lastSyncDate
             };
         }
         return feature;
@@ -12642,7 +12673,10 @@ class GraphqlService extends StartableService {
         const message = err && err.message || err;
         if (typeof message === 'string' && message.trim().indexOf('{"code":') === 0) {
             try {
-                error = JSON.parse(err.message);
+                error = JSON.parse(message
+                    // Remove special characters before parsing (e.g. SQL errors from an Oracle database)
+                    .replace('\n', ' ')
+                    .replace('\r', ''));
             }
             catch (parseError) {
                 console.error('Unable to parse error as JSON: ', parseError);
@@ -12931,6 +12965,7 @@ const LoadQuery$1 = gql `
     }
   }
   ${Fragments$1.account}
+  ${Fragments$1.settings}
 `;
 // Check email query
 const IsEmailExistsQuery = gql `
@@ -12989,14 +13024,14 @@ const AuthChallengeQuery = gql `
     }
   }
 `;
-const UpdateSubscription = gql `
-  subscription updateAccount($interval: Int){
+const AccountSubscriptions = {
+    listenChanges: gql `subscription updateAccount($interval: Int){
     data: updateAccount(interval: $interval) {
       id
       updateDate
     }
-  }
-`;
+  }`
+};
 class AccountService extends BaseGraphqlService {
     constructor(cryptoService, network, graphql, settings, storage, file, environment) {
         super(graphql, environment);
@@ -13534,9 +13569,9 @@ class AccountService extends BaseGraphqlService {
         if (!this._cache.pubkey)
             return Subscription.EMPTY;
         const self = this;
-        console.debug('[account] [WS] Listening account changes');
+        console.debug('[account] [WS] Listening changes');
         const subscription = this.graphql.subscribe({
-            query: UpdateSubscription,
+            query: AccountSubscriptions.listenChanges,
             variables: {
                 interval: 10
             },
@@ -13573,7 +13608,7 @@ class AccountService extends BaseGraphqlService {
             }
         });
         // Add log when closing WS
-        subscription.add(() => console.debug('[account] [WS] Stop listening account changes'));
+        subscription.add(() => console.debug('[account] [WS] Stop listening changes'));
         return subscription;
     }
     get additionalFields() {
@@ -15364,20 +15399,30 @@ ComponentDirtyGuard.ctorParameters = () => [
 ];
 
 class CustomReuseStrategy extends IonicRouteStrategy {
+    /**
+     * Force to reuse the route when:
+     *  - path change from [/new] -> [/:id]
+     *  - or path change from [/new] -> [/new?id=:id]
+     * @param future
+     * @param curr
+     */
     shouldReuseRoute(future, curr) {
         const result = super.shouldReuseRoute(future, curr);
-        // Force to reuse the route when:
-        // - path change from [/new] -> [/:id]
-        // - or path change from [/new] -> [/new?id=:id]
+        // Is sam route config
         if (!result && future.routeConfig && future.routeConfig === curr.routeConfig) {
+            // Read the parameter name, where id is stored
             const pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
-            const futureId = future.params[pathIdParam] === 'new' ?
-                (future.queryParams[pathIdParam] || future.queryParams['id']) : future.params[pathIdParam];
-            const currId = curr.params[pathIdParam] === 'new' ?
-                (curr.queryParams[pathIdParam] || curr.queryParams['id']) : curr.params[pathIdParam];
-            return futureId === currId &&
-                // Always reload 'new' page
-                currId !== 'new';
+            // Read the current route id
+            const currId = curr.params[pathIdParam] === 'new'
+                ? (curr.queryParams[pathIdParam] || curr.queryParams['id'] || 'new') // e.g. path like '/new/?id=<ID>'
+                : curr.params[pathIdParam]; // e.g. path like '/<ID>'
+            // Read the future route id
+            const futureId = future.params[pathIdParam] === 'new'
+                ? (future.queryParams[pathIdParam] || future.queryParams['id'] || 'new') // e.g. path like '/new/?id=<ID>'
+                : future.params[pathIdParam]; // e.g. path like '/<ID>'
+            // Reuse if same ID, but never when 'new' expected
+            return futureId !== 'new' && currId !== 'new'
+                && futureId === currId;
         }
         return result;
     }