@sumaris-net/ngx-components 1.0.4 → 1.0.8

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

@@ -10831,6 +10831,7 @@
         };
         LocalSettingsService.prototype.apply = function (settings, opts) {
             return __awaiter(this, void 0, void 0, function () {
+                var data;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -10840,7 +10841,10 @@
                             _a.sent();
                             _a.label = 2;
                         case 2:
-                            this._data = Object.assign(Object.assign({}, this._data), settings);
+                            data = Object.assign(Object.assign({}, this._data), settings);
+                            if (equals(data, this._data))
+                                return [2 /*return*/]; // SKip if same
+                            this._data = data;
                             if (!(opts && opts.persistImmediate)) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.persistLocally(true)];
                         case 3:
@@ -14507,7 +14511,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);
@@ -14782,7 +14789,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
@@ -14799,7 +14806,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) {
@@ -15506,9 +15515,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
                 },
@@ -15817,23 +15826,23 @@
         };
         AccountService.prototype.saveLocalSettingsRemotely = function (source) {
             return __awaiter(this, void 0, void 0, function () {
-                var account, settings, hasChanges;
+                var account, settings, changed;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!source || !this.isLogin())
+                            if (!source || !this.isLogin() || source.accountInheritance === false)
                                 return [2 /*return*/]; // Skip
                             account = this.account;
                             settings = exports.UserSettings.fromObject(account.settings) || new exports.UserSettings();
-                            hasChanges = settings.merge(source, ['locale', 'latLongFormat', 'properties']);
-                            if (!hasChanges) return [3 /*break*/, 2];
-                            if (this._debug)
-                                console.debug('[account] Save local settings remotely', settings);
+                            changed = settings.merge(source, ['locale', 'latLongFormat', 'properties']);
+                            if (!changed)
+                                return [2 /*return*/]; // Skip if unchanged
+                            // Save remotely
+                            this.account.settings = settings;
                             return [4 /*yield*/, this.saveSettingsRemotely(settings)];
                         case 1:
                             _b.sent();
-                            _b.label = 2;
-                        case 2: return [2 /*return*/];
+                            return [2 /*return*/];
                     }
                 });
             });
@@ -15919,9 +15928,8 @@
                             if (this._debug)
                                 console.debug("[account] Settings remotely saved in " + (Date.now() - now) + "ms");
                             // Save into account
-                            if (this.account) {
+                            if (this.account)
                                 this.account.settings = settings;
-                            }
                             return [2 /*return*/];
                     }
                 });