@sumaris-net/ngx-components 1.0.3 → 1.0.7

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:
@@ -12011,6 +12015,7 @@
         CONFIRM_EMAIL_FAILED: 7,
         SAVE_ACCOUNT_ERROR: 8,
         ACCOUNT_NOT_EXISTS: 9,
+        SAVE_SETTINGS_ERROR: 8,
         SUBSCRIBE_ACCOUNT_ERROR: 10,
         ENTITY_STORAGE_MIGRATION_FAILED: 11,
         LOAD_DATA_ERROR: 12,
@@ -13298,6 +13303,17 @@
             });
             return hasChanges;
         };
+        UserSettings.prototype.asLocalSettings = function () {
+            var _this = this;
+            var target = {};
+            UserSettings_1.SETTINGS_PROPERTIES.forEach(function (key) {
+                target[key] = _this[key];
+            });
+            Object.keys(this.content).forEach(function (key) {
+                target[key] = _this.content[key];
+            });
+            return target;
+        };
         return UserSettings;
     }(Entity));
     exports.UserSettings.SETTINGS_PROPERTIES = ['locale', 'latLongFormat'];
@@ -14766,25 +14782,30 @@
      * GraphQL queries
      * ------------------------------------*/
     var Fragments$1 = {
-        account: core.gql(templateObject_1$4 || (templateObject_1$4 = __makeTemplateObject(["\n    fragment AccountFragment on AccountVO {\n      id\n      firstName\n      lastName\n      email\n      pubkey\n      avatar\n      statusId\n      updateDate\n      creationDate\n      profiles\n      settings {\n        id\n        locale\n        latLongFormat\n        content\n        nonce\n        updateDate\n        __typename\n      }\n      department {\n        id\n        label\n        name\n        __typename\n      }\n      __typename\n    }\n  "], ["\n    fragment AccountFragment on AccountVO {\n      id\n      firstName\n      lastName\n      email\n      pubkey\n      avatar\n      statusId\n      updateDate\n      creationDate\n      profiles\n      settings {\n        id\n        locale\n        latLongFormat\n        content\n        nonce\n        updateDate\n        __typename\n      }\n      department {\n        id\n        label\n        name\n        __typename\n      }\n      __typename\n    }\n  "])))
+        account: core.gql(templateObject_1$4 || (templateObject_1$4 = __makeTemplateObject(["\n    fragment AccountFragment on AccountVO {\n      id\n      firstName\n      lastName\n      email\n      pubkey\n      avatar\n      statusId\n      updateDate\n      creationDate\n      profiles\n      settings {\n        ...UserSettingsFragment\n      }\n      department {\n        id\n        label\n        name\n        __typename\n      }\n      __typename\n    }"], ["\n    fragment AccountFragment on AccountVO {\n      id\n      firstName\n      lastName\n      email\n      pubkey\n      avatar\n      statusId\n      updateDate\n      creationDate\n      profiles\n      settings {\n        ...UserSettingsFragment\n      }\n      department {\n        id\n        label\n        name\n        __typename\n      }\n      __typename\n    }"]))),
+        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_2$4 || (templateObject_2$4 = __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_3$3 || (templateObject_3$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"])));
+    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
-    var SaveMutation$1 = core.gql(templateObject_4$3 || (templateObject_4$3 = __makeTemplateObject(["\n  mutation SaveAccount($data:AccountVOInput){\n    data: saveAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n"], ["\n  mutation SaveAccount($data:AccountVOInput){\n    data: saveAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n"])), Fragments$1.account);
-    // Create account mutation
-    var CreateMutation = core.gql(templateObject_5$2 || (templateObject_5$2 = __makeTemplateObject(["\n  mutation CreateAccount($data:AccountVOInput){\n    data: createAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n"], ["\n  mutation CreateAccount($data:AccountVOInput){\n    data: createAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n"])), Fragments$1.account);
+    var AccountMutations = {
+        save: core.gql(templateObject_5$2 || (templateObject_5$2 = __makeTemplateObject([" mutation SaveAccount($data:AccountVOInput){\n    data: saveAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", ""], [" mutation SaveAccount($data:AccountVOInput){\n    data: saveAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", ""])), Fragments$1.account, Fragments$1.settings),
+        create: core.gql(templateObject_6 || (templateObject_6 = __makeTemplateObject(["mutation CreateAccount($data:AccountVOInput){\n    data: createAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", ""], ["mutation CreateAccount($data:AccountVOInput){\n    data: createAccount(account: $data){\n      ...AccountFragment\n    }\n  }\n  ", "\n  ", ""])), Fragments$1.account, Fragments$1.settings),
+        saveSettings: core.gql(templateObject_7 || (templateObject_7 = __makeTemplateObject(["mutation SaveSettings($data:UserSettingsVOInput){\n    data: saveSettings(settings: $data){\n      ...UserSettingsFragment\n    }\n  }\n  ", ""], ["mutation SaveSettings($data:UserSettingsVOInput){\n    data: saveSettings(settings: $data){\n      ...UserSettingsFragment\n    }\n  }\n  ", ""])), Fragments$1.settings)
+    };
     // Sent confirmation email
-    var SendConfirmEmailMutation = core.gql(templateObject_6 || (templateObject_6 = __makeTemplateObject(["\n  mutation sendAccountConfirmationEmail($email:String, $locale:String){\n    sendAccountConfirmationEmail(email: $email, locale: $locale)\n  }\n"], ["\n  mutation sendAccountConfirmationEmail($email:String, $locale:String){\n    sendAccountConfirmationEmail(email: $email, locale: $locale)\n  }\n"])));
+    var SendConfirmEmailMutation = core.gql(templateObject_8 || (templateObject_8 = __makeTemplateObject(["\n  mutation sendAccountConfirmationEmail($email:String, $locale:String){\n    sendAccountConfirmationEmail(email: $email, locale: $locale)\n  }\n"], ["\n  mutation sendAccountConfirmationEmail($email:String, $locale:String){\n    sendAccountConfirmationEmail(email: $email, locale: $locale)\n  }\n"])));
     // Confirm account email
-    var ConfirmEmailMutation = core.gql(templateObject_7 || (templateObject_7 = __makeTemplateObject(["\n  mutation confirmAccountEmail($email:String, $code:String){\n    confirmAccountEmail(email: $email, code: $code)\n  }\n"], ["\n  mutation confirmAccountEmail($email:String, $code:String){\n    confirmAccountEmail(email: $email, code: $code)\n  }\n"])));
+    var ConfirmEmailMutation = core.gql(templateObject_9 || (templateObject_9 = __makeTemplateObject(["\n  mutation confirmAccountEmail($email:String, $code:String){\n    confirmAccountEmail(email: $email, code: $code)\n  }\n"], ["\n  mutation confirmAccountEmail($email:String, $code:String){\n    confirmAccountEmail(email: $email, code: $code)\n  }\n"])));
     // Authentication  query
-    var AuthQuery = core.gql(templateObject_8 || (templateObject_8 = __makeTemplateObject(["\n  query Auth($token: String){\n    authenticate(token: $token)\n  }\n"], ["\n  query Auth($token: String){\n    authenticate(token: $token)\n  }\n"])));
+    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_9 || (templateObject_9 = __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_10 || (templateObject_10 = __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 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 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) {
@@ -15032,6 +15053,7 @@
                             data.account.settings = data.account.settings || new exports.UserSettings();
                             data.account.settings.locale = this.settings.locale;
                             data.account.settings.latLongFormat = this.settings.latLongFormat;
+                            data.account.settings.content = data.account.settings.content || {};
                             data.account.department.id = data.account.department.id || this.environment.defaultDepartmentId;
                             this._cache.keypair = keypair;
                             return [4 /*yield*/, this.saveRemotely(data.account, keypair)];
@@ -15490,9 +15512,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
                 },
@@ -15594,7 +15616,7 @@
         };
         AccountService.prototype.loadData = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var account, accountSettingsContentKeys, settings, error_6;
+                var account, settings, error_6;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -15623,10 +15645,8 @@
                                 this._data = account;
                             }
                             this._cache.loaded = true;
-                            accountSettingsContentKeys = Object.keys(account.settings.content);
-                            if (!isNotEmptyArray(accountSettingsContentKeys)) return [3 /*break*/, 4];
-                            settings = Object.assign(Object.assign(Object.assign({}, this.settings.settings), account.settings.content), account.settings);
-                            delete settings.content; // Remove content attribute
+                            if (!account.settings) return [3 /*break*/, 4];
+                            settings = Object.assign(Object.assign({}, this.settings.settings), account.settings.asLocalSettings());
                             return [4 /*yield*/, this.settings.apply(settings)];
                         case 3:
                             _b.sent();
@@ -15803,24 +15823,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);
-                            account.settings = settings;
-                            return [4 /*yield*/, this.saveRemotely(account)];
+                            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*/];
                     }
                 });
             });
@@ -15843,7 +15862,7 @@
                             now = this._debug && Date.now();
                             if (this._debug)
                                 console.debug("[account] Saving account remotely...");
-                            isNew = !account.id && account.id !== 0;
+                            isNew = isNil(account.id);
                             if (!!isNew) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.load({ fetchPolicy: 'network-only' })];
                         case 1:
@@ -15858,7 +15877,7 @@
                             // User not allow to change his profiles
                             delete json.profiles;
                             return [4 /*yield*/, this.graphql.mutate({
-                                    mutation: isNew ? CreateMutation : SaveMutation$1,
+                                    mutation: isNew ? AccountMutations.create : AccountMutations.save,
                                     variables: { data: json },
                                     error: {
                                         code: ErrorCodes$2.SAVE_ACCOUNT_ERROR,
@@ -15876,6 +15895,43 @@
                 });
             });
         };
+        /**
+         * Create or update user settings
+         *
+         * @param settings
+         */
+        AccountService.prototype.saveSettingsRemotely = function (settings) {
+            return __awaiter(this, void 0, void 0, function () {
+                var now, json, data;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            now = this._debug && Date.now();
+                            if (this._debug)
+                                console.debug("[account] Saving settings remotely...");
+                            json = settings.asObject(MINIFY_ENTITY_FOR_POD);
+                            return [4 /*yield*/, this.graphql.mutate({
+                                    mutation: AccountMutations.saveSettings,
+                                    variables: { data: json },
+                                    error: {
+                                        code: ErrorCodes$2.SAVE_SETTINGS_ERROR,
+                                        message: 'ERROR.SAVE_SETTINGS_ERROR'
+                                    }
+                                })];
+                        case 1:
+                            data = (_b.sent()).data;
+                            // Copy update properties
+                            this.copyIdAndUpdateDateSettings(data, settings);
+                            if (this._debug)
+                                console.debug("[account] Settings remotely saved in " + (Date.now() - now) + "ms");
+                            // Save into account
+                            if (this.account)
+                                this.account.settings = settings;
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         AccountService.prototype.authenticateAndGetToken = function (token, counter) {
             return __awaiter(this, void 0, void 0, function () {
                 var data_1, challengeError, data, signatureOK, signature, newToken;
@@ -15952,8 +16008,13 @@
                 return;
             target.id = source.id || target.id;
             target.updateDate = source.updateDate || target.updateDate;
-            target.settings.id = source.settings && source.settings.id || target.settings.id;
-            target.settings.updateDate = source.settings && source.settings.updateDate || target.settings.updateDate;
+            this.copyIdAndUpdateDateSettings(source.settings, target.settings);
+        };
+        AccountService.prototype.copyIdAndUpdateDateSettings = function (source, target) {
+            if (!source)
+                return;
+            target.id = source.id || target.id;
+            target.updateDate = source.updateDate || target.updateDate;
         };
         return AccountService;
     }(BaseGraphqlService));
@@ -15970,7 +16031,7 @@
         { type: FileService },
         { type: undefined, decorators: [{ type: i0.Inject, args: [ENVIRONMENT,] }] }
     ]; };
-    var templateObject_1$4, templateObject_2$4, templateObject_3$3, templateObject_4$3, templateObject_5$2, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10;
+    var templateObject_1$4, templateObject_2$4, templateObject_3$3, templateObject_4$3, templateObject_5$2, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10, templateObject_11, templateObject_12;
 
     var Software_1, Configuration_1;
     // @dynamic
@@ -16847,15 +16908,11 @@
                     _this.translate.use(data.locale);
                 }
             });
-            // Use account's locale, when account inheritance enabled in settings
+            // Use account's settings, (like locale), when account inheritance enabled
             this.accountService.onLogin.subscribe(function (account) {
-                if (_this.settings.settings.accountInheritance) {
-                    var accountLocale = account.settings && account.settings.locale;
-                    if (accountLocale && accountLocale !== _this.settings.locale) {
-                        _this.settings.apply({
-                            locale: accountLocale
-                        });
-                    }
+                if (account.settings && _this.settings.settings.accountInheritance) {
+                    var accountSettings = account.settings.asLocalSettings();
+                    _this.settings.apply(accountSettings);
                 }
             });
         };