@sumaris-net/ngx-components 1.0.6 → 1.0.10

package/bundles/sumaris-net.ngx-components.umd.js

@@ -2945,39 +2945,19 @@
     ]; };
 
     var TranslateContextPipe = /** @class */ (function () {
-        function TranslateContextPipe(translate, _ref) {
+        function TranslateContextPipe(translate) {
             this.translate = translate;
-            this._ref = _ref;
-            this.value = '';
-            this.lastKey = null;
-            this.lastSuffix = null;
-            this.lastParams = [];
         }
         TranslateContextPipe.prototype.transform = function (query) {
             var params = [];
             for (var _i = 1; _i < arguments.length; _i++) {
                 params[_i - 1] = arguments[_i];
             }
-            if (!query || !query.length) {
+            if (!query || !query.length)
                 return query;
-            }
             var 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);
         };
         return TranslateContextPipe;
     }());
@@ -2988,8 +2968,7 @@
                 },] }
     ];
     TranslateContextPipe.ctorParameters = function () { return [
-        { type: TranslateContextService },
-        { type: i0.ChangeDetectorRef }
+        { type: TranslateContextService }
     ]; };
     var TranslatablePipe = /** @class */ (function () {
         function TranslatablePipe() {
@@ -4216,21 +4195,72 @@
     ]; };
 
     var FormErrorTranslatePipe = /** @class */ (function () {
-        function FormErrorTranslatePipe(adapter) {
+        function FormErrorTranslatePipe(adapter, _ref) {
             this.adapter = adapter;
+            this._ref = _ref;
+            this.value = '';
+            this._lastForm = null;
+            this._lastOptions = null;
         }
         FormErrorTranslatePipe.prototype.transform = function (form, opts) {
-            return this.adapter.translateErrors(form, opts);
+            var _this = this;
+            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(function (status) {
+                    _this._updateValue(form, opts, status);
+                });
+            }
+            return this.value;
+        };
+        FormErrorTranslatePipe.prototype.ngOnDestroy = function () {
+            this._dispose();
+        };
+        FormErrorTranslatePipe.prototype._updateValue = function (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
+         */
+        FormErrorTranslatePipe.prototype._dispose = function () {
+            if (typeof this._onFormStatusChange !== 'undefined') {
+                this._onFormStatusChange.unsubscribe();
+                this._onFormStatusChange = undefined;
+            }
         };
         return FormErrorTranslatePipe;
     }());
     FormErrorTranslatePipe.decorators = [
         { type: i0.Pipe, args: [{
                     name: 'translateFormError',
+                    pure: false
                 },] }
     ];
     FormErrorTranslatePipe.ctorParameters = function () { return [
-        { type: FormErrorTranslator }
+        { type: FormErrorTranslator },
+        { type: i0.ChangeDetectorRef }
     ]; };
 
     var SharedPipesModule = /** @class */ (function () {
@@ -10843,7 +10873,7 @@
                         case 2:
                             data = Object.assign(Object.assign({}, this._data), settings);
                             if (equals(data, this._data))
-                                return [2 /*return*/]; // SKip if same
+                                return [2 /*return*/]; // Skip if no changes
                             this._data = data;
                             if (!(opts && opts.persistImmediate)) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.persistLocally(true)];
@@ -10924,9 +10954,11 @@
             if (!feature)
                 return; // Not found
             if (typeof feature === 'string') {
+                var lastSyncDate = feature.substring(featurePrefix.length);
+                console.debug("[" + featureName + "] Last synchronization date: " + lastSyncDate);
                 return {
                     name: featureName,
-                    lastSyncDate: feature.substring(featurePrefix.length)
+                    lastSyncDate: lastSyncDate
                 };
             }
             return feature;
@@ -14511,7 +14543,10 @@
             var 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);
@@ -14786,7 +14821,7 @@
         settings: core.gql(templateObject_2$4 || (templateObject_2$4 = __makeTemplateObject(["fragment UserSettingsFragment on UserSettingsVO {\n    id\n    locale\n    latLongFormat\n    content\n    nonce\n    updateDate\n    __typename\n  }"], ["fragment UserSettingsFragment on UserSettingsVO {\n    id\n    locale\n    latLongFormat\n    content\n    nonce\n    updateDate\n    __typename\n  }"])))
     };
     // Load account query
-    var LoadQuery$1 = core.gql(templateObject_3$3 || (templateObject_3$3 = __makeTemplateObject(["\n  query Account {\n    data: account {\n      ...AccountFragment\n    }\n  }\n  ", "\n"], ["\n  query Account {\n    data: account {\n      ...AccountFragment\n    }\n  }\n  ", "\n"])), Fragments$1.account);
+    var LoadQuery$1 = core.gql(templateObject_3$3 || (templateObject_3$3 = __makeTemplateObject(["\n  query Account {\n    data: account {\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", "\n"], ["\n  query Account {\n    data: account {\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", "\n"])), Fragments$1.account, Fragments$1.settings);
     // Check email query
     var IsEmailExistsQuery = core.gql(templateObject_4$3 || (templateObject_4$3 = __makeTemplateObject(["\n  query IsEmailExists($email: String, $hash: String){\n    isEmailExists(email: $email, hash: $hash)\n  }\n"], ["\n  query IsEmailExists($email: String, $hash: String){\n    isEmailExists(email: $email, hash: $hash)\n  }\n"])));
     // Save (create or update) account mutation
@@ -14803,7 +14838,9 @@
     var AuthQuery = core.gql(templateObject_10 || (templateObject_10 = __makeTemplateObject(["\n  query Auth($token: String){\n    authenticate(token: $token)\n  }\n"], ["\n  query Auth($token: String){\n    authenticate(token: $token)\n  }\n"])));
     // New auth challenge query
     var AuthChallengeQuery = core.gql(templateObject_11 || (templateObject_11 = __makeTemplateObject(["\n  query AuthChallenge{\n    authChallenge{\n      challenge\n      pubkey\n      signature\n    }\n  }\n"], ["\n  query AuthChallenge{\n    authChallenge{\n      challenge\n      pubkey\n      signature\n    }\n  }\n"])));
-    var UpdateSubscription = core.gql(templateObject_12 || (templateObject_12 = __makeTemplateObject(["\n  subscription updateAccount($interval: Int){\n    data: updateAccount(interval: $interval) {\n      id\n      updateDate\n    }\n  }\n"], ["\n  subscription updateAccount($interval: Int){\n    data: updateAccount(interval: $interval) {\n      id\n      updateDate\n    }\n  }\n"])));
+    var AccountSubscriptions = {
+        listenChanges: core.gql(templateObject_12 || (templateObject_12 = __makeTemplateObject(["subscription updateAccount($interval: Int){\n    data: updateAccount(interval: $interval) {\n      id\n      updateDate\n    }\n  }"], ["subscription updateAccount($interval: Int){\n    data: updateAccount(interval: $interval) {\n      id\n      updateDate\n    }\n  }"])))
+    };
     var AccountService = /** @class */ (function (_super) {
         __extends(AccountService, _super);
         function AccountService(cryptoService, network, graphql, settings, storage, file, environment) {
@@ -15510,9 +15547,9 @@
             if (!this._cache.pubkey)
                 return rxjs.Subscription.EMPTY;
             var self = this;
-            console.debug('[account] [WS] Listening account changes');
+            console.debug('[account] [WS] Listening changes');
             var subscription = this.graphql.subscribe({
-                query: UpdateSubscription,
+                query: AccountSubscriptions.listenChanges,
                 variables: {
                     interval: 10
                 },
@@ -15571,7 +15608,7 @@
                 }
             });
             // Add log when closing WS
-            subscription.add(function () { return console.debug('[account] [WS] Stop listening account changes'); });
+            subscription.add(function () { return console.debug('[account] [WS] Stop listening changes'); });
             return subscription;
         };
         Object.defineProperty(AccountService.prototype, "additionalFields", {
@@ -17666,20 +17703,30 @@
         function CustomReuseStrategy() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        /**
+         * Force to reuse the route when:
+         *  - path change from [/new] -> [/:id]
+         *  - or path change from [/new] -> [/new?id=:id]
+         * @param future
+         * @param curr
+         */
         CustomReuseStrategy.prototype.shouldReuseRoute = function (future, curr) {
             var result = _super.prototype.shouldReuseRoute.call(this, 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
                 var pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
-                var futureId = future.params[pathIdParam] === 'new' ?
-                    (future.queryParams[pathIdParam] || future.queryParams['id']) : future.params[pathIdParam];
-                var 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
+                var 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
+                var 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;
         };