@sumaris-net/ngx-components 0.28.2 → 1.0.0

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

@@ -2854,23 +2854,42 @@
         TranslateContextService.prototype.get = function (key, context, interpolateParams) {
             var _this = this;
             // No context: do a normal translate
-            if (!isNil(context))
+            if (!key || !isNil(context))
                 return this.translate.get(key, interpolateParams);
             // Compute a contextual i18n key, using the context as suffix
-            var contextKey = this.contextualKey(key, context);
+            var contextualKeys = this.contextualKeys(key, context);
             // Return the contextual translation, or default of not exists
-            return this.translate.get(contextKey, interpolateParams)
-                .pipe(operators.mergeMap(function (translation) { return (translation !== contextKey) ? rxjs.of(translation) : _this.translate.get(key); }));
+            return this.translate.get(contextualKeys, interpolateParams)
+                .pipe(operators.map(function (translations) { return _this.findFirstValid(contextualKeys, translations); }));
         };
         TranslateContextService.prototype.instant = function (key, context, interpolateParams) {
             // No context: do a normal translate
-            if (isNilOrBlank(context))
+            if (!key || isNilOrBlank(context))
                 return this.translate.instant(key, interpolateParams);
             // Compute a contextual i18n key, using the context as suffix
-            var contextualKey = this.contextualKey(key, context);
-            // Return the contextual translation, or default of not exists
-            var translation = this.translate.instant(contextualKey, interpolateParams);
-            return (translation !== contextualKey) ? translation : this.translate.instant(key, interpolateParams);
+            var contextualKeys = this.contextualKeys(key, context);
+            var translations = this.translate.instant(contextualKeys, interpolateParams);
+            return this.findFirstValid(contextualKeys, translations);
+        };
+        /**
+         * Compute contextual i18n keys, using the context as suffix.<br>
+         * Suffix can be simple name (like 'aaa' - will return ['<key>.aaa']) or complexe (like 'aaa.bbb' - will return ['<key>.aaa.bbb', '<key>.aaa']
+         *
+         * @param key
+         * @param context
+         * @private
+         */
+        TranslateContextService.prototype.contextualKeys = function (key, context) {
+            var _this = this;
+            return context.split('.')
+                .filter(isNotNilOrBlank)
+                .reduce(function (res, item) {
+                var inheritedContext = res.length > 0 ? (res[res.length - 1] + '.') : '';
+                return res.concat(inheritedContext + item);
+            }, [])
+                .reverse() // Start with children, ends with parent key
+                .map(function (contextItem) { return _this.contextualKey(key, contextItem); })
+                .concat(key);
         };
         /**
          * Compute a contextual i18n key, using the context as suffix
@@ -2890,6 +2909,25 @@
                 ? "" + context + key
                 : parts.slice(0, parts.length - 1).concat(context + parts[parts.length - 1]).join('.');
         };
+        TranslateContextService.prototype.findFirstValid = function (keys, translations) {
+            var e_1, _a;
+            try {
+                // For eac contextual key: try to find translation, then use the first valid
+                for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                    var key = keys_1_1.value;
+                    if (translations[key] !== key)
+                        return translations[key];
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return translations[keys[keys.length - 1]]; // Return the last keys translation
+        };
         return TranslateContextService;
     }());
     TranslateContextService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TranslateContextService_Factory() { return new TranslateContextService(i0__namespace.ɵɵinject(i1__namespace$1.TranslateService)); }, token: TranslateContextService, providedIn: "root" });
@@ -8662,6 +8700,9 @@
             this._startByReadyFunction = true; // should start when calling ready() ?
             this._data = null;
             this._started = false;
+            this._startPromise = null;
+            this._startPrerequisite = null;
+            this._subscription = null;
             this._startPrerequisite = prerequisiteService
                 ? function () { return prerequisiteService.ready(); }
                 : function () { return Promise.resolve(); };
@@ -8696,6 +8737,10 @@
                     switch (_a.label) {
                         case 0:
                             _a.trys.push([0, 2, , 3]);
+                            if (this._subscription) {
+                                this._subscription.unsubscribe();
+                                this._subscription = null;
+                            }
                             return [4 /*yield*/, this.ngOnStop()];
                         case 1:
                             _a.sent();
@@ -8758,6 +8803,10 @@
             return waitFor(function () { return _this._started; })
                 .then(function () { return _this._data; });
         };
+        StartableService.prototype.registerSubscription = function (sub) {
+            this._subscription = this._subscription || new rxjs.Subscription();
+            return this._subscription.add(sub);
+        };
         StartableService.prototype.ngOnStop = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -11311,7 +11360,6 @@
             _this.onPeerChanges = _this.onStart.pipe(operators.map(function (peer) { return peer && peer.url; }), operators.filter(isNotNilOrBlank), operators.distinctUntilChanged());
             _this.onNetworkStatusChanges = new rxjs.BehaviorSubject(null);
             _this.onResetNetworkCache = new i0.EventEmitter(true);
-            _this._subscription = new rxjs.Subscription();
             _this._listeners = {};
             _this._mobile = _this.platform.is('mobile');
             if (_this._mobile) {
@@ -11524,7 +11572,8 @@
         /**
          * Check if the peer is alive
          *
-         * @param email
+         * @param peer
+         * @param opts
          */
         NetworkService.prototype.checkPeerAlive = function (peer, opts) {
             return __awaiter(this, void 0, void 0, function () {
@@ -11720,8 +11769,8 @@
                             this.startRefreshTimer();
                             // Listen for device network changes
                             if (this.network) {
-                                this._subscription.add(this.network.onDisconnect().subscribe(function () { return _this.onDeviceConnectionChanged('none'); }));
-                                this._subscription.add(this.network.onConnect().subscribe(function () { return _this.onDeviceConnectionChanged(_this.network.type); }));
+                                this.registerSubscription(this.network.onDisconnect().subscribe(function () { return _this.onDeviceConnectionChanged('none'); }));
+                                this.registerSubscription(this.network.onConnect().subscribe(function () { return _this.onDeviceConnectionChanged(_this.network.type); }));
                             }
                             return [2 /*return*/];
                     }
@@ -11736,8 +11785,6 @@
                     if (this._timerRefreshCondition() === false) {
                         this.stopRefreshTimer();
                     }
-                    this._subscription.unsubscribe();
-                    this._subscription = new rxjs.Subscription();
                     return [2 /*return*/];
                 });
             });
@@ -12537,7 +12584,6 @@
             _this.progressBarService = progressBarService;
             _this.storage = storage;
             _this.environment = environment;
-            _this._subscription = new rxjs.Subscription();
             _this._$save = new i0.EventEmitter(true);
             _this._dirty = false;
             _this._saving = false;
@@ -12986,7 +13032,7 @@
                             // Restore sequences
                             _a.sent();
                             // Start a save timer
-                            this._subscription.add(rxjs.merge(this._$save, rxjs.timer(this._saveTimerPeriod, this._saveTimerPeriod))
+                            this.registerSubscription(rxjs.merge(this._$save, rxjs.timer(this._saveTimerPeriod, this._saveTimerPeriod))
                                 .pipe(
                             // Avoid to many call (e.g. when $save AND timer are triggered
                             operators.throttleTime(this._saveTimerPeriod))
@@ -13002,8 +13048,6 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this._subscription.unsubscribe();
-                            this._subscription = new rxjs.Subscription();
                             if (!this.dirty) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.storeLocally()];
                         case 1:
@@ -13221,8 +13265,36 @@
             }
             this.nonce = source.nonce;
         };
+        UserSettings.prototype.merge = function (source, includesProperties) {
+            var _this = this;
+            if (!source)
+                return; // Skip
+            // Reset content
+            this.content = {};
+            var hasChanges = false;
+            // For each property of source object
+            Object.keys(source)
+                .forEach(function (key) {
+                // If property exists in UserSettings class: store it directly
+                if (UserSettings_1.SETTINGS_PROPERTIES.includes(key)) {
+                    if (!equals(_this[key], source[key])) {
+                        _this[key] = source[key];
+                        hasChanges = true;
+                    }
+                }
+                // Else, store property into the 'content' map
+                else if (includesProperties && includesProperties.includes(key)) {
+                    if (!equals(_this.content[key], source[key])) {
+                        _this.content[key] = Object.assign({}, source[key]);
+                        hasChanges = true;
+                    }
+                }
+            });
+            return hasChanges;
+        };
         return UserSettings;
     }(Entity));
+    exports.UserSettings.SETTINGS_PROPERTIES = ['locale', 'latLongFormat'];
     exports.UserSettings = UserSettings_1 = __decorate([
         EntityClass({ typename: 'UserSettingsVO' })
     ], exports.UserSettings);
@@ -13673,7 +13745,6 @@
             _this.cryptoService = cryptoService;
             _this.environment = environment;
             _this.typePolicies = typePolicies;
-            _this._subscription = new rxjs.Subscription();
             _this.connectionParams = {};
             _this.onNetworkError = new rxjs.Subject();
             _this.customErrors = {};
@@ -14237,7 +14308,7 @@
                                     debug: true
                                 });
                                 queueLink_1 = new QueueLink__default["default"]();
-                                this._subscription.add(this._networkStatusChanged$
+                                this.registerSubscription(this._networkStatusChanged$
                                     .subscribe(function (type) {
                                     // Network is offline: start buffering into queue
                                     if (type === 'none') {
@@ -14305,9 +14376,9 @@
                             return [3 /*break*/, 8];
                         case 8:
                             // Listen for network restart
-                            this._subscription.add(this.network.on('start', function () { return _this.restart(); }));
+                            this.registerSubscription(this.network.on('start', function () { return _this.restart(); }));
                             // Listen for clear cache request, from network
-                            this._subscription.add(this.network.on('resetCache', function () { return _this.clearCache(); }));
+                            this.registerSubscription(this.network.on('resetCache', function () { return _this.clearCache(); }));
                             console.info('[graphql] Starting graphql [OK]');
                             return [2 /*return*/, client];
                     }
@@ -14320,8 +14391,6 @@
                     switch (_a.label) {
                         case 0:
                             console.info('[graphql] Stopping graphql service...');
-                            this._subscription.unsubscribe();
-                            this._subscription = new rxjs.Subscription();
                             return [4 /*yield*/, this.resetClient()];
                         case 1:
                             _a.sent();
@@ -14457,18 +14526,21 @@
         return BaseGraphqlServiceOptions;
     }());
     // eslint-disable-next-line @angular-eslint/directive-class-suffix
-    var BaseGraphqlService = /** @class */ (function () {
+    var BaseGraphqlService = /** @class */ (function (_super) {
+        __extends(BaseGraphqlService, _super);
         function BaseGraphqlService(graphql, options) {
-            this.graphql = graphql;
-            this._mutableWatchQueries = [];
+            var _this = _super.call(this, graphql) || this;
+            _this.graphql = graphql;
+            _this._mutableWatchQueries = [];
             // Max updated queries, for this entity.
             // - Can be override by subclasses (in constructor)
             // - Use value -1 for no max size
             // - Default value to 3, because it usually enough (e.g. OperationService and LandingService need at least 2)
-            this._mutableWatchQueriesMaxCount = 3;
+            _this._mutableWatchQueriesMaxCount = 3;
             // for DEV only
-            this._debug = toBoolean(options && !options.production, !environment.production);
-            this._logPrefix = "[base-graphql-service] ";
+            _this._debug = toBoolean(options && !options.production, !environment.production);
+            _this._logPrefix = "[base-graphql-service] ";
+            return _this;
         }
         BaseGraphqlService.prototype.mutableWatchQuery = function (opts) {
             opts.fetchPolicy = opts.fetchPolicy || this.graphql.defaultFetchPolicy;
@@ -14666,8 +14738,11 @@
                 return { query: query, variables: variables };
             });
         };
+        BaseGraphqlService.prototype.ngOnStart = function () {
+            return Promise.resolve(null);
+        };
         return BaseGraphqlService;
-    }());
+    }(StartableService));
     BaseGraphqlService.decorators = [
         { type: i0.Directive }
     ];
@@ -14720,18 +14795,16 @@
             _this.onChange = new rxjs.Subject();
             _this.onAuthTokenChange = new rxjs.Subject();
             _this.onAuthBasicChange = new rxjs.Subject();
-            _this._data = {
+            _this._cache = {
                 loaded: false,
                 keypair: null,
                 authToken: null,
                 authBasic: null,
                 pubkey: null,
                 mainProfile: null,
-                account: null,
                 person: null,
                 department: null
             };
-            _this._started = false;
             _this._$additionalFields = new rxjs.BehaviorSubject([]);
             _this._tokenType$ = new rxjs.BehaviorSubject(undefined);
             _this._debug = !environment.production;
@@ -14741,33 +14814,22 @@
             // Send auth token to the graphql layer, when changed
             _this.onAuthTokenChange.subscribe(function (token) { return _this.graphql.setAuthToken(token); });
             _this.onAuthBasicChange.subscribe(function (basic) { return _this.graphql.setAuthBasic(basic); });
-            // Listen graphql start (or restart)
-            _this.graphql.onStart.subscribe(function () { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    if (!this._started) {
-                        this.ready();
-                    }
-                    if (this._started && this.isLogin()) {
-                        console.debug('[account] Restarting, to retry to authenticate...');
-                        this.restart();
-                    }
-                    return [2 /*return*/];
-                });
-            }); });
             // Force network to wait account service, after getting connection to the peer
             _this.network.on('beforeTryOnlineFinish', function (online) { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!(online && (!this._started || this.isLogin()))) return [3 /*break*/, 2];
-                            console.debug('[account] Force networkService.tryOnline() to wait, that account service is restarted...');
-                            //await this.stop();
+                            if (!(online && (!this.started || this.isLogin()))) return [3 /*break*/, 3];
+                            console.debug('[account] Force networkService.tryOnline() to wait, that graphql and account service is restarted...');
                             return [4 /*yield*/, sleep(500)];
                         case 1:
-                            //await this.stop();
+                            _b.sent(); // wait graphql service to be restarted
+                            if (!!this.started) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.ready()];
+                        case 2:
                             _b.sent();
-                            return [2 /*return*/, this.ready()];
-                        case 2: return [2 /*return*/];
+                            _b.label = 3;
+                        case 3: return [2 /*return*/];
                     }
                 });
             }); });
@@ -14775,27 +14837,27 @@
         }
         Object.defineProperty(AccountService.prototype, "account", {
             get: function () {
-                return this._data.loaded ? this._data.account : undefined;
+                return this._cache.loaded ? this._data : undefined;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(AccountService.prototype, "person", {
             get: function () {
-                if (this._data.loaded && !this._data.person) {
-                    this._data.person = this._data.loaded ? this._data.account.asPerson() : undefined;
+                if (this._cache.loaded && !this._cache.person) {
+                    this._cache.person = this._cache.loaded ? this._data.asPerson() : undefined;
                 }
-                return this._data.person;
+                return this._cache.person;
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(AccountService.prototype, "department", {
             get: function () {
-                if (this._data.loaded && !this._data.department) {
-                    this._data.department = this._data.loaded ? this._data.account.asPerson().department : undefined;
+                if (this._cache.loaded && !this._cache.department) {
+                    this._cache.department = this._cache.loaded ? this._data.asPerson().department : undefined;
                 }
-                return this._data.department;
+                return this._cache.department;
             },
             enumerable: false,
             configurable: true
@@ -14809,109 +14871,91 @@
                     console.info('[account] Using authentication token type: ' + value);
                     this._tokenType$.next(value);
                     // Reset values
-                    this._data.authToken = undefined;
+                    this._cache.authToken = undefined;
                     this.onAuthTokenChange.next(undefined);
-                    this._data.authBasic = undefined;
+                    this._cache.authBasic = undefined;
                     this.onAuthBasicChange.next(undefined);
                 }
             },
             enumerable: false,
             configurable: true
         });
-        AccountService.prototype.start = function () {
-            var _this = this;
-            if (this._startPromise)
-                return this._startPromise;
-            if (this._started)
-                return Promise.resolve(this.account);
-            // Restoring local settings
-            this._startPromise = Promise.all([
-                this.settings.ready(),
-                // Wait token type to be set
-                firstNotNilPromise(this._tokenType$)
-            ])
-                .then(function () { return _this.restoreLocally(); })
-                .then(function () {
-                _this._started = true;
-                _this._startPromise = undefined;
-                return _this.account;
-            });
-            return this._startPromise;
-        };
-        Object.defineProperty(AccountService.prototype, "started", {
-            get: function () {
-                return this._started;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        AccountService.prototype.stop = function () {
+        AccountService.prototype.ngOnStart = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var hadAuthToken, hadAuthBasic, hadAuth;
+                var _this = this;
                 return __generator(this, function (_b) {
-                    if (this._started || this._startPromise) {
-                        this._started = false;
-                        this._startPromise = undefined;
-                        hadAuthToken = this._data.authToken && true;
-                        hadAuthBasic = this._data.authBasic && true;
-                        hadAuth = hadAuthToken || hadAuthBasic;
-                        this.resetData();
-                        if (hadAuth) {
-                            this.onLogout.next();
-                            this.onChange.next(undefined);
-                            if (hadAuthToken)
-                                this.onAuthTokenChange.next(undefined);
-                            if (hadAuthBasic)
-                                this.onAuthBasicChange.next(undefined);
-                        }
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, Promise.all([
+                                this.settings.ready(),
+                                // Wait token type to be set
+                                firstNotNilPromise(this._tokenType$)
+                            ])];
+                        case 1:
+                            _b.sent();
+                            // Listen graphql start (or restart)
+                            this.registerSubscription(this.graphql.onStart.subscribe(function () {
+                                if (_this.started && _this.isLogin()) {
+                                    console.debug('[account] Restarting, to retry to authenticate...');
+                                    _this.restart();
+                                }
+                            }));
+                            return [4 /*yield*/, this.restoreLocally()];
+                        case 2:
+                            _b.sent();
+                            return [4 /*yield*/, this.listenSettings()];
+                        case 3:
+                            _b.sent();
+                            return [2 /*return*/, this._data];
                     }
-                    return [2 /*return*/];
                 });
             });
         };
-        AccountService.prototype.restart = function () {
+        AccountService.prototype.ngOnStop = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var hadAuthToken, hadAuthBasic, hadAuth;
                 return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.stop()];
-                        case 1:
-                            _b.sent();
-                            return [2 /*return*/, this.start()];
+                    hadAuthToken = this._cache.authToken && true;
+                    hadAuthBasic = this._cache.authBasic && true;
+                    hadAuth = hadAuthToken || hadAuthBasic;
+                    this.resetData();
+                    if (hadAuth) {
+                        this.onLogout.next();
+                        this.onChange.next(undefined);
+                        if (hadAuthToken)
+                            this.onAuthTokenChange.next(undefined);
+                        if (hadAuthBasic)
+                            this.onAuthBasicChange.next(undefined);
                     }
+                    return [2 /*return*/];
                 });
             });
         };
-        AccountService.prototype.ready = function () {
-            if (this._started)
-                return Promise.resolve(this.account);
-            return this.start();
-        };
         AccountService.prototype.isLogin = function () {
-            return !!(this._data.pubkey && this._data.loaded);
+            return !!(this._cache.pubkey && this._cache.loaded);
         };
         AccountService.prototype.isAuth = function () {
-            return !!(this._data.pubkey && this._data.keypair && this._data.keypair.secretKey);
+            return !!(this._cache.pubkey && this._cache.keypair && this._cache.keypair.secretKey);
         };
         AccountService.prototype.hasMinProfile = function (userProfile) {
             // should be login, and status ENABLE or TEMPORARY
-            if (!this._data.account || !this._data.account.pubkey ||
-                (this._data.account.statusId !== StatusIds.ENABLE && this._data.account.statusId !== StatusIds.TEMPORARY)) {
+            if (!this._data || !this._data.pubkey ||
+                (this._data.statusId !== StatusIds.ENABLE && this._data.statusId !== StatusIds.TEMPORARY)) {
                 return false;
             }
-            return PersonUtils.hasUpperOrEqualsProfile(this._data.account.profiles, userProfile);
+            return PersonUtils.hasUpperOrEqualsProfile(this._data.profiles, userProfile);
         };
         AccountService.prototype.hasExactProfile = function (label) {
             // should be login, and status ENABLE or TEMPORARY
-            if (!this._data.account || !this._data.account.pubkey ||
-                (this._data.account.statusId !== StatusIds.ENABLE && this._data.account.statusId !== StatusIds.TEMPORARY))
+            if (!this._data || !this._data.pubkey ||
+                (this._data.statusId !== StatusIds.ENABLE && this._data.statusId !== StatusIds.TEMPORARY))
                 return false;
-            return this._data.account.profiles.some(function (profile) { return profile === label; });
+            return this._data.profiles.some(function (profile) { return profile === label; });
         };
         AccountService.prototype.hasProfileAndIsEnable = function (userProfile) {
             // should be login, and status ENABLE
-            if (!this._data.account || !this._data.account.pubkey || this._data.account.statusId !== StatusIds.ENABLE)
+            if (!this._data || !this._data.pubkey || this._data.statusId !== StatusIds.ENABLE)
                 return false;
-            return PersonUtils.hasUpperOrEqualsProfile(this._data.account.profiles, userProfile);
+            return PersonUtils.hasUpperOrEqualsProfile(this._data.profiles, userProfile);
         };
         AccountService.prototype.isAdmin = function () {
             return this.hasProfileAndIsEnable('ADMIN');
@@ -14931,11 +14975,11 @@
         };
         AccountService.prototype.isOnlyGuest = function () {
             // Should be login, and status ENABLE or TEMPORARY
-            if (!this._data.account || !this._data.account.pubkey ||
-                (this._data.account.statusId !== StatusIds.ENABLE && this._data.account.statusId !== StatusIds.TEMPORARY))
+            if (!this._data || !this._data.pubkey ||
+                (this._data.statusId !== StatusIds.ENABLE && this._data.statusId !== StatusIds.TEMPORARY))
                 return false;
             // Profile less then user
-            return !PersonUtils.hasUpperOrEqualsProfile(this._data.account.profiles, 'USER');
+            return !PersonUtils.hasUpperOrEqualsProfile(this._data.profiles, 'USER');
         };
         AccountService.prototype.canUserWriteDataForDepartment = function (recorderDepartment) {
             if (ReferentialUtils.isEmpty(recorderDepartment)) {
@@ -14944,17 +14988,17 @@
                 return this.isAdmin();
             }
             // Should be login, and status ENABLE
-            if (!this._data.account || !this._data.account.pubkey || this._data.account.statusId !== StatusIds.ENABLE)
+            if (!this._data || !this._data.pubkey || this._data.statusId !== StatusIds.ENABLE)
                 return false;
-            if (!this._data.account.department || !this._data.account.department.id) {
+            if (!this._data.department || !this._data.department.id) {
                 console.warn('User account has no department ! Unable to check write right against recorderDepartment');
                 return false;
             }
             // Same recorder department: OK, user can write
-            if (this._data.account.department.id === recorderDepartment.id)
+            if (this._data.department.id === recorderDepartment.id)
                 return true;
             // Else, check if supervisor (or more)
-            return PersonUtils.hasUpperOrEqualsProfile(this._data.account.profiles, 'SUPERVISOR');
+            return PersonUtils.hasUpperOrEqualsProfile(this._data.profiles, 'SUPERVISOR');
         };
         AccountService.prototype.register = function (data) {
             return __awaiter(this, void 0, void 0, function () {
@@ -14969,7 +15013,7 @@
                                 throw new Error('Missing required username or password');
                             if (this._debug)
                                 console.debug('[account] Register new user account...', data.account);
-                            this._data.loaded = false;
+                            this._cache.loaded = false;
                             now = Date.now();
                             _b.label = 1;
                         case 1:
@@ -14983,29 +15027,29 @@
                             data.account.settings.locale = this.settings.locale;
                             data.account.settings.latLongFormat = this.settings.latLongFormat;
                             data.account.department.id = data.account.department.id || this.environment.defaultDepartmentId;
-                            this._data.keypair = keypair;
+                            this._cache.keypair = keypair;
                             return [4 /*yield*/, this.saveRemotely(data.account, keypair)];
                         case 3:
                             account = _b.sent();
                             // Default values
                             account.avatar = account.avatar || (this.environment.baseUrl + DEFAULT_AVATAR_IMAGE);
-                            this._data.mainProfile = PersonUtils.getMainProfile(account.profiles);
-                            this._data.account = account;
-                            this._data.pubkey = account.pubkey;
+                            this._cache.mainProfile = PersonUtils.getMainProfile(account.profiles);
+                            this._data = account;
+                            this._cache.pubkey = account.pubkey;
                             // Try to auth on pod
                             return [4 /*yield*/, this.authenticate(data)];
                         case 4:
                             // Try to auth on pod
                             _b.sent();
-                            this._data.loaded = true;
+                            this._cache.loaded = true;
                             return [4 /*yield*/, this.saveLocally()];
                         case 5:
                             _b.sent();
                             console.debug("[account] Account successfully registered in " + (Date.now() - now) + "ms");
                             // Emit events
-                            this.onLogin.next(this._data.account);
-                            this.onChange.next(this._data.account);
-                            return [2 /*return*/, this._data.account];
+                            this.onLogin.next(this._data);
+                            this.onChange.next(this._data);
+                            return [2 /*return*/, this._data];
                         case 6:
                             error_1 = _b.sent();
                             console.error(error_1 && error_1.message || error_1);
@@ -15027,22 +15071,22 @@
                             // Basic auth
                             if (tokenType === 'basic' || tokenType === 'basic-and-token') {
                                 // Generate the authBasic, if used
-                                if (!this._data.authBasic) {
+                                if (!this._cache.authBasic) {
                                     // Skip if token already provided
-                                    if (!(this._data.authToken && tokenType === 'basic-and-token')) {
+                                    if (!(this._cache.authToken && tokenType === 'basic-and-token')) {
                                         if (!data || !data.username || !data.password)
                                             throw new Error('Missing username and password');
-                                        this._data.authBasic = this.cryptoService.encodeBase64(data.username + ":" + data.password);
+                                        this._cache.authBasic = this.cryptoService.encodeBase64(data.username + ":" + data.password);
                                     }
                                 }
-                                this.onAuthBasicChange.next(this._data.authBasic);
+                                this.onAuthBasicChange.next(this._cache.authBasic);
                             }
                             if (!(tokenType === 'token' || tokenType === 'basic-and-token')) return [3 /*break*/, 5];
                             _c.label = 2;
                         case 2:
                             _c.trys.push([2, 4, , 5]);
-                            _b = this._data;
-                            return [4 /*yield*/, this.authenticateAndGetToken(this._data.authToken)];
+                            _b = this._cache;
+                            return [4 /*yield*/, this.authenticateAndGetToken(this._cache.authToken)];
                         case 3:
                             _b.authToken = _c.sent();
                             return [3 /*break*/, 5];
@@ -15055,7 +15099,7 @@
                         case 5:
                             // Forget authBasic, to switch to authToken
                             if (tokenType === 'basic-and-token') {
-                                this._data.authBasic = undefined;
+                                this._cache.authBasic = undefined;
                                 this.onAuthBasicChange.next(undefined);
                             }
                             return [2 /*return*/];
@@ -15086,18 +15130,18 @@
                             throw { code: ErrorCodes$2.UNKNOWN_ERROR, message: 'ERROR.SCRYPT_ERROR' };
                         case 4:
                             // Store pubkey+keypair
-                            this._data.pubkey = Base58.encode(keypair.publicKey);
-                            this._data.keypair = keypair;
+                            this._cache.pubkey = Base58.encode(keypair.publicKey);
+                            this._cache.keypair = keypair;
                             return [4 /*yield*/, this.storage.get(TOKEN_STORAGE_KEY)];
                         case 5:
                             previousToken = _b.sent();
-                            previousToken = previousToken && previousToken.startsWith(this._data.pubkey) && previousToken || null;
+                            previousToken = previousToken && previousToken.startsWith(this._cache.pubkey) && previousToken || null;
                             offline = this.settings.hasOfflineFeature() && (this.network.offline || data.offline === true);
                             if (!offline) return [3 /*break*/, 6];
-                            this._data.authToken = previousToken;
+                            this._cache.authToken = previousToken;
                             // Make sure network if set as offline
                             this.network.setForceOffline(true, { showToast: false });
-                            console.info("[account] Login [OK] {pubkey: " + this._data.pubkey.substr(0, 8) + "}, {offline: true}");
+                            console.info("[account] Login [OK] {pubkey: " + this._cache.pubkey.substr(0, 8) + "}, {offline: true}");
                             return [3 /*break*/, 9];
                         case 6:
                             _b.trys.push([6, 8, , 9]);
@@ -15157,9 +15201,9 @@
                             throw error_5;
                         case 21:
                             // Emit event to observers
-                            this.onLogin.next(this._data.account);
-                            this.onChange.next(this._data.account);
-                            return [2 /*return*/, this._data.account];
+                            this.onLogin.next(this._data);
+                            this.onChange.next(this._data);
+                            return [2 /*return*/, this._data];
                     }
                 });
             });
@@ -15169,7 +15213,7 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!this._data.pubkey)
+                            if (!this._cache.pubkey)
                                 throw new Error('User not logged');
                             if (this.network.offline)
                                 throw new Error('Cannot check account in offline mode');
@@ -15181,9 +15225,9 @@
                             _b.sent();
                             console.debug('[account] Successfully reload account');
                             // Emit login event to subscribers
-                            this.onLogin.next(this._data.account);
-                            this.onChange.next(this._data.account);
-                            return [2 /*return*/, this._data.account];
+                            this.onLogin.next(this._data);
+                            this.onChange.next(this._data);
+                            return [2 /*return*/, this._data];
                     }
                 });
             });
@@ -15198,27 +15242,27 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!this._data.pubkey)
+                            if (!this._cache.pubkey)
                                 return [2 /*return*/, Promise.reject('User not logged')];
-                            if (this._data.pubkey !== account.pubkey)
+                            if (this._cache.pubkey !== account.pubkey)
                                 return [2 /*return*/, Promise.reject('Not user account')];
-                            return [4 /*yield*/, this.saveRemotely(account, this._data.keypair)];
+                            return [4 /*yield*/, this.saveRemotely(account, this._cache.keypair)];
                         case 1:
                             account = _b.sent();
                             // Set defaults
                             account.avatar = account.avatar || (this.environment.baseUrl + DEFAULT_AVATAR_IMAGE);
-                            this._data.mainProfile = PersonUtils.getMainProfile(account.profiles);
-                            this._data.account = account;
-                            this._data.loaded = true;
+                            this._cache.mainProfile = PersonUtils.getMainProfile(account.profiles);
+                            this._data = account;
+                            this._cache.loaded = true;
                             // Save locally (in storage)
                             return [4 /*yield*/, this.saveLocally()];
                         case 2:
                             // Save locally (in storage)
                             _b.sent();
                             // Send event
-                            this.onLogin.next(this._data.account);
-                            this.onChange.next(this._data.account);
-                            return [2 /*return*/, this._data.account];
+                            this.onLogin.next(this._data);
+                            this.onChange.next(this._data);
+                            return [2 /*return*/, this._data];
                     }
                 });
             });
@@ -15229,9 +15273,9 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            hadAuthToken = this._data.authToken && true;
-                            hadAuthBasic = this._data.authBasic && true;
-                            pubkey = this._data && this._data.pubkey;
+                            hadAuthToken = this._cache.authToken && true;
+                            hadAuthBasic = this._cache.authBasic && true;
+                            pubkey = this._cache && this._cache.pubkey;
                             this.resetData();
                             if (!!this.settings.hasOfflineFeature()) return [3 /*break*/, 2];
                             // Remove all data from the local storage
@@ -15303,9 +15347,9 @@
                         case 1:
                             json = _b.sent();
                             json = json && (typeof json === 'string') && JSON.parse(json) || json;
-                            json = json && this._data.pubkey && (json.pubkey === this._data.pubkey) && json || null;
-                            if (!(!json && this._data.pubkey)) return [3 /*break*/, 3];
-                            return [4 /*yield*/, this.storage.get(ACCOUNT_STORAGE_KEY + '#' + this._data.pubkey)];
+                            json = json && this._cache.pubkey && (json.pubkey === this._cache.pubkey) && json || null;
+                            if (!(!json && this._cache.pubkey)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.storage.get(ACCOUNT_STORAGE_KEY + '#' + this._cache.pubkey)];
                         case 2:
                             json = _b.sent();
                             json = json && (typeof json === 'string') && JSON.parse(json) || json;
@@ -15437,7 +15481,7 @@
         };
         AccountService.prototype.listenChanges = function () {
             var _this = this;
-            if (!this._data.pubkey)
+            if (!this._cache.pubkey)
                 return rxjs.Subscription.EMPTY;
             var self = this;
             console.debug('[account] [WS] Listening account changes');
@@ -15460,7 +15504,7 @@
                                 case 0:
                                     if (!data)
                                         return [2 /*return*/];
-                                    existingUpdateDate = toDateISOString((_a = self._data.account) === null || _a === void 0 ? void 0 : _a.updateDate);
+                                    existingUpdateDate = toDateISOString((_a = self._data) === null || _a === void 0 ? void 0 : _a.updateDate);
                                     if (!(existingUpdateDate !== data.updateDate)) return [3 /*break*/, 2];
                                     console.debug("[account] [WS] Detected update on {" + data.updateDate + "}");
                                     return [4 /*yield*/, self.refresh()];
@@ -15504,27 +15548,6 @@
             subscription.add(function () { return console.debug('[account] [WS] Stop listening account changes'); });
             return subscription;
         };
-        /**
-         * @deprecated
-         */
-        AccountService.prototype.getPageSettings = function (pageId, propertyName) {
-            return this.settings.getPageSettings(pageId, propertyName);
-        };
-        /**
-         * @deprecated
-         */
-        AccountService.prototype.savePageSetting = function (pageId, value, propertyName) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.settings.savePageSetting(pageId, value, propertyName)];
-                        case 1:
-                            _b.sent();
-                            return [2 /*return*/];
-                    }
-                });
-            });
-        };
         Object.defineProperty(AccountService.prototype, "additionalFields", {
             get: function () {
                 return this._$additionalFields.getValue();
@@ -15553,28 +15576,28 @@
         };
         /* -- protected method -- */
         AccountService.prototype.resetData = function () {
-            this._data.loaded = false;
-            this._data.keypair = null;
-            this._data.authToken = null;
-            this._data.authBasic = null;
-            this._data.pubkey = null;
-            this._data.mainProfile = null;
-            this._data.account = new exports.Account();
-            this._data.person = null;
-            this._data.department = null;
+            this._cache.loaded = false;
+            this._cache.keypair = null;
+            this._cache.authToken = null;
+            this._cache.authBasic = null;
+            this._cache.pubkey = null;
+            this._cache.mainProfile = null;
+            this._cache.person = null;
+            this._cache.department = null;
+            this._data = new exports.Account();
         };
         AccountService.prototype.loadData = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var account, error_6;
+                var account, accountSettingsContentKeys, settings, error_6;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!this._data.pubkey)
+                            if (!this._cache.pubkey)
                                 throw new Error('User not logged');
-                            this._data.loaded = false;
+                            this._cache.loaded = false;
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 5, , 6]);
                             return [4 /*yield*/, this.load(opts)];
                         case 2:
                             account = (_b.sent()) || new exports.Account();
@@ -15583,18 +15606,27 @@
                             account.settings = account.settings || new exports.UserSettings();
                             account.settings.locale = account.settings.locale || this.settings.locale;
                             account.settings.latLongFormat = account.settings.latLongFormat || this.settings.latLongFormat || 'DDMM';
+                            account.settings.content = account.settings.content || {};
                             // Read main profile
-                            this._data.mainProfile = PersonUtils.getMainProfile(account.profiles);
+                            this._cache.mainProfile = PersonUtils.getMainProfile(account.profiles);
                             // Update, instead of replace it
-                            if (this._data.account) {
-                                this._data.account.fromObject(account);
+                            if (this._data) {
+                                this._data.fromObject(account);
                             }
                             else {
-                                this._data.account = account;
+                                this._data = account;
                             }
-                            this._data.loaded = true;
-                            return [2 /*return*/, 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
+                            return [4 /*yield*/, this.settings.apply(settings)];
                         case 3:
+                            _b.sent();
+                            _b.label = 4;
+                        case 4: return [2 /*return*/, this._data];
+                        case 5:
                             error_6 = _b.sent();
                             this.resetData();
                             if (error_6.code && error_6.message)
@@ -15604,11 +15636,23 @@
                                 code: ErrorCodes$2.LOAD_ACCOUNT_ERROR,
                                 message: 'ERROR.LOAD_ACCOUNT_ERROR'
                             };
-                        case 4: return [2 /*return*/];
+                        case 6: return [2 /*return*/];
                     }
                 });
             });
         };
+        AccountService.prototype.listenSettings = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_b) {
+                    // When settings changed: save it remotely
+                    this.registerSubscription(this.settings.onChange
+                        .pipe(operators.debounceTime(1000), operators.filter(function () { return _this.isLogin() && _this.network.online; }))
+                        .subscribe(function (settings) { return _this.saveLocalSettingsRemotely(settings); }));
+                    return [2 /*return*/];
+                });
+            });
+        };
         AccountService.prototype.restoreLocally = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var values, pubkey, token, seckey, canRemoteAuth, error_7, jsonAccount, accountStr, account;
@@ -15632,9 +15676,9 @@
                                 return [2 /*return*/];
                             if (this._debug)
                                 console.debug("[account] Account restoration...");
-                            this._data.authToken = token;
-                            this._data.pubkey = pubkey;
-                            this._data.keypair = seckey && {
+                            this._cache.authToken = token;
+                            this._cache.pubkey = pubkey;
+                            this._cache.keypair = seckey && {
                                 publicKey: Base58.decode(pubkey),
                                 secretKey: Base58.decode(seckey)
                             } || null;
@@ -15645,7 +15689,7 @@
                             return [4 /*yield*/, this.authenticate()];
                         case 3:
                             _b.sent();
-                            if (!this._data.authToken && !this._data.authBasic)
+                            if (!this._cache.authToken && !this._cache.authBasic)
                                 throw new Error('Authentication failed');
                             return [3 /*break*/, 5];
                         case 4:
@@ -15678,14 +15722,14 @@
                                 return [2 /*return*/];
                             account = exports.Account.fromObject(jsonAccount);
                             // Update data
-                            this._data.account = account;
-                            this._data.mainProfile = PersonUtils.getMainProfile(account.profiles);
-                            this._data.loaded = true;
+                            this._data = account;
+                            this._cache.mainProfile = PersonUtils.getMainProfile(account.profiles);
+                            this._cache.loaded = true;
                             // Emit event
-                            this.onLogin.next(this._data.account);
-                            this.onChange.next(this._data.account);
+                            this.onLogin.next(this._data);
+                            this.onChange.next(this._data);
                             if (this._debug)
-                                console.debug("[account] Account restoration [OK] {pubkey: " + pubkey.substr(0, 8) + "}, {profile: " + this._data.mainProfile + "}");
+                                console.debug("[account] Account restoration [OK] {pubkey: " + pubkey.substr(0, 8) + "}, {profile: " + this._cache.mainProfile + "}");
                             return [2 /*return*/, account];
                     }
                 });
@@ -15701,12 +15745,12 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!this._data.pubkey)
+                            if (!this._cache.pubkey)
                                 throw new Error('User not logged');
                             if (this._debug)
-                                console.debug("[account] Saving account {" + this._data.pubkey.substring(0, 6) + "} in local storage...");
-                            json = this._data.account.asObject({ keepTypename: true });
-                            seckey = this._data.keypair && this._data.keypair.secretKey && Base58.encode(this._data.keypair.secretKey) || null;
+                                console.debug("[account] Saving account {" + this._cache.pubkey.substring(0, 6) + "} in local storage...");
+                            json = this._data.asObject({ keepTypename: true });
+                            seckey = this._cache.keypair && this._cache.keypair.secretKey && Base58.encode(this._cache.keypair.secretKey) || null;
                             hasAvatarUrl = json.avatar && !json.avatar.endsWith(DEFAULT_AVATAR_IMAGE) &&
                                 (json.avatar.startsWith('http://') || (json.avatar.startsWith('https://')));
                             if (!(hasAvatarUrl && this.network.online)) return [3 /*break*/, 2];
@@ -15729,9 +15773,9 @@
                         case 2:
                             _b.trys.push([2, 4, , 5]);
                             return [4 /*yield*/, Promise.all([
-                                    this.storage.set(PUBKEY_STORAGE_KEY, this._data.pubkey),
-                                    this.storage.set(TOKEN_STORAGE_KEY, this._data.authToken),
-                                    this.storage.set(ACCOUNT_STORAGE_KEY + "#" + this._data.pubkey, json),
+                                    this.storage.set(PUBKEY_STORAGE_KEY, this._cache.pubkey),
+                                    this.storage.set(TOKEN_STORAGE_KEY, this._cache.authToken),
+                                    this.storage.set(ACCOUNT_STORAGE_KEY + "#" + this._cache.pubkey, json),
                                     // Secret key (optional)
                                     seckey && this.storage.set(SECKEY_STORAGE_KEY, seckey) || this.storage.remove(SECKEY_STORAGE_KEY),
                                     // Remove old storage key
@@ -15751,6 +15795,30 @@
                 });
             });
         };
+        AccountService.prototype.saveLocalSettingsRemotely = function (source) {
+            return __awaiter(this, void 0, void 0, function () {
+                var account, settings, hasChanges;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!source || !this.isLogin())
+                                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)];
+                        case 1:
+                            _b.sent();
+                            _b.label = 2;
+                        case 2: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         /**
          * Create or update an user account
          *
@@ -15808,7 +15876,7 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!this._data.pubkey)
+                            if (!this._cache.pubkey)
                                 throw new Error('User not logged');
                             if (!counter)
                                 console.info('[account] Authentication on pod...');
@@ -15835,7 +15903,7 @@
                             if (data_1 && data_1.authenticate) {
                                 // Store the token
                                 this.onAuthTokenChange.next(token);
-                                console.info("[account] Authentication on pod [OK] {pubkey: '" + this._data.pubkey.substr(0, 8) + "'}");
+                                console.info("[account] Authentication on pod [OK] {pubkey: '" + this._cache.pubkey.substr(0, 8) + "'}");
                                 return [2 /*return*/, token]; // return the token
                             }
                             _b.label = 2;
@@ -15861,10 +15929,10 @@
                             if (!signatureOK) {
                                 console.warn('FIXME: Bad peer signature on auth challenge !', data.authChallenge);
                             }
-                            return [4 /*yield*/, this.cryptoService.sign(data.authChallenge.challenge, this._data.keypair)];
+                            return [4 /*yield*/, this.cryptoService.sign(data.authChallenge.challenge, this._cache.keypair)];
                         case 5:
                             signature = _b.sent();
-                            newToken = this._data.pubkey + ":" + data.authChallenge.challenge + "|" + signature;
+                            newToken = this._cache.pubkey + ":" + data.authChallenge.challenge + "|" + signature;
                             return [4 /*yield*/, this.authenticateAndGetToken(newToken, (counter || 1) + 1 /* increment */)];
                         case 6: 
                         // iterate with the new token
@@ -16169,94 +16237,42 @@
             _this.toastController = toastController;
             _this.translate = translate;
             _this.environment = environment;
-            _this._started = false;
-            _this._subscription = new rxjs.Subscription();
             _this.$data = new rxjs.BehaviorSubject(null);
             _this._debug = !environment.production;
             if (_this._debug)
                 console.debug('[config] Creating service');
             _this._optionDefs = Object.values(Object.assign(Object.assign({}, CORE_CONFIG_OPTIONS), defaultOptionsMap));
-            // Restart if graphql service restart
-            _this.graphql.onStart.subscribe(function () { return _this.restart(); });
-            // Start
-            if (_this.graphql.started) {
-                _this.start();
-            }
             return _this;
         }
-        Object.defineProperty(ConfigService.prototype, "started", {
-            get: function () {
-                return this._started;
-            },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(ConfigService.prototype, "config", {
             get: function () {
                 // If first call: start loading
-                if (!this._started)
+                if (!this.started)
                     this.start();
                 return this.$data.pipe(operators.filter(isNotNil));
             },
             enumerable: false,
             configurable: true
         });
-        ConfigService.prototype.start = function () {
-            var _this = this;
-            if (this._startPromise)
-                return this._startPromise;
-            if (this._started)
-                return;
-            console.info('[config] Starting configuration...');
-            this._startPromise = this.graphql.ready()
-                .then(function () { return _this.loadOrRestoreLocally(); })
-                .then(function (data) {
-                _this._started = true;
-                _this._startPromise = undefined;
-                _this.$data.next(data);
-                return data;
-            })
-                .catch(function (err) {
-                console.error(err && err.message || err, err);
-                _this._started = false;
-                _this._startPromise = undefined;
-                return null;
-            });
-            return this._startPromise;
-        };
-        ConfigService.prototype.stop = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    this._subscription.unsubscribe();
-                    this._subscription = new rxjs.Subscription();
-                    this._started = false;
-                    this._startPromise = undefined;
-                    return [2 /*return*/];
-                });
-            });
-        };
-        ConfigService.prototype.restart = function () {
+        ConfigService.prototype.ngOnStart = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var data;
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!this.started) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.stop()];
+                            console.info('[config] Starting configuration...');
+                            return [4 /*yield*/, this.loadOrRestoreLocally()];
                         case 1:
-                            _a.sent();
-                            _a.label = 2;
-                        case 2: return [2 /*return*/, this.start()];
+                            data = _a.sent();
+                            this.$data.next(data);
+                            // Restart if graphql service restart
+                            this.registerSubscription(this.graphql.onStart.subscribe(function () { return _this.restart(); }));
+                            return [2 /*return*/, data];
                     }
                 });
             });
         };
-        ConfigService.prototype.ready = function () {
-            if (this._started)
-                return Promise.resolve(this.$data.value);
-            if (this._startPromise)
-                return this._startPromise;
-            return this.start();
-        };
         ConfigService.prototype.loadDefault = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var now, query, variables, res, data;
@@ -19139,7 +19155,7 @@
             this.error = null;
             this._enable = false;
             this._$ready = new rxjs.BehaviorSubject(false);
-            this._loading = true;
+            this._$loading = new rxjs.BehaviorSubject(true);
             this.i18nFieldPrefix = null;
             this._subscription = new rxjs.Subscription();
             this.debug = false;
@@ -19155,9 +19171,25 @@
             });
             this.autocompleteFields = this.autocompleteHelper.fields;
         }
-        Object.defineProperty(AppForm.prototype, "_ready", {
+        Object.defineProperty(AppForm.prototype, "_loading", {
+            /**
+             *  @deprecated
+             */
+            get: function () {
+                return this._$loading.value;
+            },
+            /**
+             *  @deprecated
+             */
+            set: function (value) {
+                this._$loading.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppForm.prototype, "loading", {
             get: function () {
-                return this._$ready.value == true;
+                return this._$loading.value;
             },
             enumerable: false,
             configurable: true
@@ -19295,11 +19327,11 @@
             if (this.debug)
                 console.debug('[form] Updating form (using entity)', data);
             // Convert object to json, then apply it to form (e.g. convert 'undefined' into 'null')
-            AppFormUtils.copyEntity2Form(data, this.form, Object.assign({ emitEvent: false, onlySelf: true }, opts));
-            if (this._loading)
-                this.markAsLoaded(Object.assign({ emitEvent: false, onlySelf: true }, opts));
-            if (!opts || opts.emitEvent !== true)
+            AppFormUtils.copyEntity2Form(data, this.form, opts);
+            if (!opts || opts.emitEvent !== false) {
+                this.markAsLoaded({ emitEvent: false });
                 this.markForCheck();
+            }
         };
         AppForm.prototype.reset = function (data, opts) {
             if (data) {
@@ -19348,15 +19380,15 @@
                 this.markForCheck();
         };
         AppForm.prototype.markAsLoading = function (opts) {
-            if (!this._loading) {
-                this._loading = true;
+            if (this._$loading.value !== true) {
+                this._$loading.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppForm.prototype.markAsLoaded = function (opts) {
-            if (this._loading) {
-                this._loading = false;
+            if (this._$loading.value !== false) {
+                this._$loading.next(false);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
@@ -19457,7 +19489,6 @@
             _this.network = network;
             _this.cd = cd;
             _this.environment = environment;
-            _this.loading = false;
             _this.canWorkOffline = false;
             _this.showPwd = false;
             _this.onCancel = new i0.EventEmitter();
@@ -19508,13 +19539,13 @@
             }
             if (this.form.invalid || this.loading)
                 return;
-            this.loading = true;
+            this.markAsLoading();
             var data = this.form.value;
             this.showPwd = false; // Hide password
             this.error = null; // Reset error
             this.registerSubscription(this.onSubmit
                 .pipe(operators.debounceTime(500))
-                .subscribe(function (res) { return _this.loading = false; }));
+                .subscribe(function (res) { return _this.markAsLoaded(); }));
             setTimeout(function () { return _this.onSubmit.emit({
                 username: data.username,
                 password: data.password,
@@ -20269,7 +20300,6 @@
             _this.translate = translate;
             _this.settings = settings;
             _this.cd = cd;
-            _this.loading = true;
             _this.email = {
                 confirmed: false,
                 notConfirmed: false,
@@ -20299,7 +20329,7 @@
                     _this.onLogin(_this.accountService.account);
                 }
                 else {
-                    _this.loading = false;
+                    _this.markAsLoaded();
                 }
             }));
             return _this;
@@ -20317,7 +20347,7 @@
             this.enable();
             this.markAsPristine();
             this.startListenChanges();
-            this.loading = false;
+            this.markAsLoaded();
         };
         AccountPage.prototype.onLogout = function () {
             this.isLogin = false;
@@ -20335,7 +20365,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     this.disable();
-                    this.loading = true;
+                    this.markAsLoading();
                     return [2 /*return*/, this.accountService.refresh()];
                 });
             });
@@ -20869,7 +20899,6 @@
             _this.cd = cd;
             _this.network = network;
             _this.locales = locales;
-            _this.loading = true;
             _this.saving = false;
             _this.usageModes = ['FIELD', 'DESK'];
             _this.propertyDefinitionsByKey = {};
@@ -20959,7 +20988,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.loading = true;
+                            this.markAsLoading();
                             console.debug('[settings] Loading settings...');
                             data = this.settings.settings;
                             // Set defaults
@@ -20995,7 +21024,7 @@
             this.enable({ emitEvent: false });
             // Apply inheritance
             this.setAccountInheritance(data.accountInheritance, { emitEvent: false });
-            this.loading = false;
+            this.markAsLoaded();
             this.error = null;
             this.markForCheck();
         };
@@ -21234,7 +21263,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.definitionsMapByKey = {};
             _this.definitionsByIndex = {};
             return _this;
@@ -21313,7 +21341,7 @@
             this.helper.resize(values.length);
             this.helper.formArray.patchValue(values, { emitEvent: false });
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /* -- protected methods -- */
         AppPropertiesForm.prototype.getPropertyFormGroup = function (data) {
@@ -21359,7 +21387,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.selection = new collections.SelectionModel(true, []);
             _this.displayWithFn = referentialToString;
             _this.onNewItem = new i0.EventEmitter();
@@ -21485,7 +21512,7 @@
             }
             this.selection.clear();
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /** Whether the number of selected elements matches the total number of rows. */
         AppListForm.prototype.isAllSelected = function () {
@@ -22783,12 +22810,6 @@
             _this.defaultSortBy = options.defaultSortBy || 'id';
             _this.defaultSortDirection = options.defaultSortDirection || 'asc';
             _this.watchQueriesUpdatePolicy = options.watchQueriesUpdatePolicy || 'update-cache';
-            platform.ready().then(function () {
-                // No limit for updatable watch queries, if desktop
-                if (!platform.mobile) {
-                    _this._mutableWatchQueriesMaxCount = -1;
-                }
-            });
             var obj = new dataType();
             _this._typename = obj.__typename || 'UnknownVO';
             _this._logTypeName = removeEnd(_this._typename, 'VO');
@@ -23244,6 +23265,17 @@
             return EntityFilterUtils.fromObject(source, this.filterType);
         };
         /* -- protected functions -- */
+        BaseEntityService.prototype.ngOnStart = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    // No limit for updatable watch queries, if desktop
+                    if (!this.platform.mobile) {
+                        this._mutableWatchQueriesMaxCount = -1;
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        };
         BaseEntityService.prototype.fillDefaultProperties = function (source) {
             // Can be override by subclasses
         };