@sumaris-net/ngx-components 0.28.5 → 1.0.0

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

@@ -7757,6 +7757,9 @@ class StartableService {
         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
             ? () => prerequisiteService.ready()
             : () => Promise.resolve();
@@ -7786,6 +7789,10 @@ class StartableService {
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                if (this._subscription) {
+                    this._subscription.unsubscribe();
+                    this._subscription = null;
+                }
                 yield this.ngOnStop();
                 this._started = false;
                 this._startPromise = undefined;
@@ -7820,6 +7827,10 @@ class StartableService {
         return waitFor(() => this._started)
             .then(() => this._data);
     }
+    registerSubscription(sub) {
+        this._subscription = this._subscription || new Subscription();
+        return this._subscription.add(sub);
+    }
     ngOnStop() {
         return __awaiter(this, void 0, void 0, function* () {
             // Can be override by subclasses
@@ -10023,7 +10034,6 @@ class NetworkService extends StartableService {
         this.onPeerChanges = this.onStart.pipe(map(peer => peer && peer.url), filter(isNotNilOrBlank), distinctUntilChanged());
         this.onNetworkStatusChanges = new BehaviorSubject(null);
         this.onResetNetworkCache = new EventEmitter(true);
-        this._subscription = new Subscription();
         this._listeners = {};
         this._mobile = this.platform.is('mobile');
         if (this._mobile) {
@@ -10184,7 +10194,8 @@ class NetworkService extends StartableService {
     /**
      * Check if the peer is alive
      *
-     * @param email
+     * @param peer
+     * @param opts
      */
     checkPeerAlive(peer, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -10324,8 +10335,8 @@ class NetworkService extends StartableService {
             this.startRefreshTimer();
             // Listen for device network changes
             if (this.network) {
-                this._subscription.add(this.network.onDisconnect().subscribe(() => this.onDeviceConnectionChanged('none')));
-                this._subscription.add(this.network.onConnect().subscribe(() => this.onDeviceConnectionChanged(this.network.type)));
+                this.registerSubscription(this.network.onDisconnect().subscribe(() => this.onDeviceConnectionChanged('none')));
+                this.registerSubscription(this.network.onConnect().subscribe(() => this.onDeviceConnectionChanged(this.network.type)));
             }
         });
     }
@@ -10336,8 +10347,6 @@ class NetworkService extends StartableService {
             if (this._timerRefreshCondition() === false) {
                 this.stopRefreshTimer();
             }
-            this._subscription.unsubscribe();
-            this._subscription = new Subscription();
         });
     }
     /**
@@ -11032,7 +11041,6 @@ class EntitiesStorage extends StartableService {
         this.progressBarService = progressBarService;
         this.storage = storage;
         this.environment = environment;
-        this._subscription = new Subscription();
         this._$save = new EventEmitter(true);
         this._dirty = false;
         this._saving = false;
@@ -11325,7 +11333,7 @@ class EntitiesStorage extends StartableService {
             // Restore sequences
             yield this.restoreLocally();
             // Start a save timer
-            this._subscription.add(merge(this._$save, timer(this._saveTimerPeriod, this._saveTimerPeriod))
+            this.registerSubscription(merge(this._$save, timer(this._saveTimerPeriod, this._saveTimerPeriod))
                 .pipe(
             // Avoid to many call (e.g. when $save AND timer are triggered
             throttleTime(this._saveTimerPeriod))
@@ -11336,8 +11344,6 @@ class EntitiesStorage extends StartableService {
     }
     ngOnStop() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._subscription.unsubscribe();
-            this._subscription = new Subscription();
             if (this.dirty) {
                 yield this.storeLocally();
             }
@@ -11519,7 +11525,34 @@ let UserSettings = UserSettings_1 = class UserSettings extends Entity {
         }
         this.nonce = source.nonce;
     }
+    merge(source, includesProperties) {
+        if (!source)
+            return; // Skip
+        // Reset content
+        this.content = {};
+        let hasChanges = false;
+        // For each property of source object
+        Object.keys(source)
+            .forEach(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;
+    }
 };
+UserSettings.SETTINGS_PROPERTIES = ['locale', 'latLongFormat'];
 UserSettings = UserSettings_1 = __decorate([
     EntityClass({ typename: 'UserSettingsVO' })
 ], UserSettings);
@@ -11932,7 +11965,6 @@ class GraphqlService extends StartableService {
         this.cryptoService = cryptoService;
         this.environment = environment;
         this.typePolicies = typePolicies;
-        this._subscription = new Subscription();
         this.connectionParams = {};
         this.onNetworkError = new Subject();
         this.customErrors = {};
@@ -12432,7 +12464,7 @@ class GraphqlService extends StartableService {
                     });
                     // Creating a mutation queue
                     const queueLink = new QueueLink();
-                    this._subscription.add(this._networkStatusChanged$
+                    this.registerSubscription(this._networkStatusChanged$
                         .subscribe(type => {
                         // Network is offline: start buffering into queue
                         if (type === 'none') {
@@ -12495,9 +12527,9 @@ class GraphqlService extends StartableService {
                 }
             }
             // Listen for network restart
-            this._subscription.add(this.network.on('start', () => this.restart()));
+            this.registerSubscription(this.network.on('start', () => this.restart()));
             // Listen for clear cache request, from network
-            this._subscription.add(this.network.on('resetCache', () => this.clearCache()));
+            this.registerSubscription(this.network.on('resetCache', () => this.clearCache()));
             console.info('[graphql] Starting graphql [OK]');
             return client;
         });
@@ -12505,8 +12537,6 @@ class GraphqlService extends StartableService {
     ngOnStop() {
         return __awaiter(this, void 0, void 0, function* () {
             console.info('[graphql] Stopping graphql service...');
-            this._subscription.unsubscribe();
-            this._subscription = new Subscription();
             yield this.resetClient();
         });
     }
@@ -12625,8 +12655,9 @@ const sha256 = require('hash.js/lib/hash/sha/256');
 class BaseGraphqlServiceOptions {
 }
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
-class BaseGraphqlService {
+class BaseGraphqlService extends StartableService {
     constructor(graphql, options) {
+        super(graphql);
         this.graphql = graphql;
         this._mutableWatchQueries = [];
         // Max updated queries, for this entity.
@@ -12818,6 +12849,9 @@ class BaseGraphqlService {
             return { query, variables };
         });
     }
+    ngOnStart() {
+        return Promise.resolve(null);
+    }
 }
 BaseGraphqlService.decorators = [
     { type: Directive }
@@ -12951,18 +12985,16 @@ class AccountService extends BaseGraphqlService {
         this.onChange = new Subject();
         this.onAuthTokenChange = new Subject();
         this.onAuthBasicChange = new 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 BehaviorSubject([]);
         this._tokenType$ = new BehaviorSubject(undefined);
         this._debug = !environment.production;
@@ -12972,41 +13004,31 @@ class AccountService extends BaseGraphqlService {
         // Send auth token to the graphql layer, when changed
         this.onAuthTokenChange.subscribe((token) => this.graphql.setAuthToken(token));
         this.onAuthBasicChange.subscribe((basic) => this.graphql.setAuthBasic(basic));
-        // Listen graphql start (or restart)
-        this.graphql.onStart.subscribe(() => __awaiter(this, void 0, void 0, function* () {
-            if (!this._started) {
-                this.ready();
-            }
-            if (this._started && this.isLogin()) {
-                console.debug('[account] Restarting, to retry to authenticate...');
-                this.restart();
-            }
-        }));
         // Force network to wait account service, after getting connection to the peer
         this.network.on('beforeTryOnlineFinish', (online) => __awaiter(this, void 0, void 0, function* () {
             // If online, wait a full restart, because it can force offline mode
-            if (online && (!this._started || this.isLogin())) {
-                console.debug('[account] Force networkService.tryOnline() to wait, that account service is restarted...');
-                //await this.stop();
-                yield sleep(500);
-                return this.ready();
+            if (online && (!this.started || this.isLogin())) {
+                console.debug('[account] Force networkService.tryOnline() to wait, that graphql and account service is restarted...');
+                yield sleep(500); // wait graphql service to be restarted
+                if (!this.started)
+                    yield this.ready();
             }
         }));
     }
     get account() {
-        return this._data.loaded ? this._data.account : undefined;
+        return this._cache.loaded ? this._data : undefined;
     }
     get person() {
-        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;
     }
     get department() {
-        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;
     }
     get tokenType() {
         return this._tokenType$.value;
@@ -13016,91 +13038,73 @@ class AccountService extends BaseGraphqlService {
             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);
         }
     }
-    start() {
-        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(() => this.restoreLocally())
-            .then(() => {
-            this._started = true;
-            this._startPromise = undefined;
-            return this.account;
-        });
-        return this._startPromise;
-    }
-    get started() {
-        return this._started;
-    }
-    stop() {
+    ngOnStart() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._started || this._startPromise) {
-                this._started = false;
-                this._startPromise = undefined;
-                const hadAuthToken = this._data.authToken && true;
-                const hadAuthBasic = this._data.authBasic && true;
-                const 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);
+            yield Promise.all([
+                this.settings.ready(),
+                // Wait token type to be set
+                firstNotNilPromise(this._tokenType$)
+            ]);
+            // Listen graphql start (or restart)
+            this.registerSubscription(this.graphql.onStart.subscribe(() => {
+                if (this.started && this.isLogin()) {
+                    console.debug('[account] Restarting, to retry to authenticate...');
+                    this.restart();
                 }
-            }
+            }));
+            yield this.restoreLocally();
+            yield this.listenSettings();
+            return this._data;
         });
     }
-    restart() {
+    ngOnStop() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.stop();
-            return this.start();
+            const hadAuthToken = this._cache.authToken && true;
+            const hadAuthBasic = this._cache.authBasic && true;
+            const 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);
+            }
         });
     }
-    ready() {
-        if (this._started)
-            return Promise.resolve(this.account);
-        return this.start();
-    }
     isLogin() {
-        return !!(this._data.pubkey && this._data.loaded);
+        return !!(this._cache.pubkey && this._cache.loaded);
     }
     isAuth() {
-        return !!(this._data.pubkey && this._data.keypair && this._data.keypair.secretKey);
+        return !!(this._cache.pubkey && this._cache.keypair && this._cache.keypair.secretKey);
     }
     hasMinProfile(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);
     }
     hasExactProfile(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(profile => profile === label);
+        return this._data.profiles.some(profile => profile === label);
     }
     hasProfileAndIsEnable(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);
     }
     isAdmin() {
         return this.hasProfileAndIsEnable('ADMIN');
@@ -13120,11 +13124,11 @@ class AccountService extends BaseGraphqlService {
     }
     isOnlyGuest() {
         // 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');
     }
     canUserWriteDataForDepartment(recorderDepartment) {
         if (ReferentialUtils.isEmpty(recorderDepartment)) {
@@ -13133,17 +13137,17 @@ class AccountService extends BaseGraphqlService {
             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');
     }
     register(data) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -13154,7 +13158,7 @@ class AccountService extends BaseGraphqlService {
                 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;
             const now = Date.now();
             try {
                 const keypair = yield this.cryptoService.scryptKeypair(data.username, data.password);
@@ -13164,22 +13168,22 @@ class AccountService extends BaseGraphqlService {
                 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;
                 const account = yield this.saveRemotely(data.account, keypair);
                 // 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
                 yield this.authenticate(data);
-                this._data.loaded = true;
+                this._cache.loaded = true;
                 yield this.saveLocally();
                 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 this._data.account;
+                this.onLogin.next(this._data);
+                this.onChange.next(this._data);
+                return this._data;
             }
             catch (error) {
                 console.error(error && error.message || error);
@@ -13195,20 +13199,20 @@ class AccountService extends BaseGraphqlService {
             // 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);
             }
             // Generate the authToken, if used
             if (tokenType === 'token' || tokenType === 'basic-and-token') {
                 try {
-                    this._data.authToken = yield this.authenticateAndGetToken(this._data.authToken);
+                    this._cache.authToken = yield this.authenticateAndGetToken(this._cache.authToken);
                 }
                 catch (error) {
                     // Never authenticate, or not ready for offline mode => exit
@@ -13219,7 +13223,7 @@ class AccountService extends BaseGraphqlService {
             }
             // Forget authBasic, to switch to authToken
             if (tokenType === 'basic-and-token') {
-                this._data.authBasic = undefined;
+                this._cache.authBasic = undefined;
                 this.onAuthBasicChange.next(undefined);
             }
         });
@@ -13239,18 +13243,18 @@ class AccountService extends BaseGraphqlService {
                 throw { code: ErrorCodes$2.UNKNOWN_ERROR, message: 'ERROR.SCRYPT_ERROR' };
             }
             // 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;
             // Try to load previous token
             let previousToken = yield this.storage.get(TOKEN_STORAGE_KEY);
-            previousToken = previousToken && previousToken.startsWith(this._data.pubkey) && previousToken || null;
+            previousToken = previousToken && previousToken.startsWith(this._cache.pubkey) && previousToken || null;
             // Offline mode
             const offline = this.settings.hasOfflineFeature() && (this.network.offline || data.offline === true);
             if (offline) {
-                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}`);
             }
             // Online mode: try to auth on pod
             else {
@@ -13300,14 +13304,14 @@ class AccountService extends BaseGraphqlService {
                 throw error;
             }
             // Emit event to observers
-            this.onLogin.next(this._data.account);
-            this.onChange.next(this._data.account);
-            return this._data.account;
+            this.onLogin.next(this._data);
+            this.onChange.next(this._data);
+            return this._data;
         });
     }
     refresh() {
         return __awaiter(this, void 0, void 0, function* () {
-            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');
@@ -13315,9 +13319,9 @@ class AccountService extends BaseGraphqlService {
             yield this.saveLocally();
             console.debug('[account] Successfully reload account');
             // Emit login event to subscribers
-            this.onLogin.next(this._data.account);
-            this.onChange.next(this._data.account);
-            return this._data.account;
+            this.onLogin.next(this._data);
+            this.onChange.next(this._data);
+            return this._data;
         });
     }
     /**
@@ -13327,29 +13331,29 @@ class AccountService extends BaseGraphqlService {
      */
     save(account) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._data.pubkey)
+            if (!this._cache.pubkey)
                 return Promise.reject('User not logged');
-            if (this._data.pubkey !== account.pubkey)
+            if (this._cache.pubkey !== account.pubkey)
                 return Promise.reject('Not user account');
-            account = yield this.saveRemotely(account, this._data.keypair);
+            account = yield this.saveRemotely(account, this._cache.keypair);
             // 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)
             yield this.saveLocally();
             // Send event
-            this.onLogin.next(this._data.account);
-            this.onChange.next(this._data.account);
-            return this._data.account;
+            this.onLogin.next(this._data);
+            this.onChange.next(this._data);
+            return this._data;
         });
     }
     logout() {
         return __awaiter(this, void 0, void 0, function* () {
-            const hadAuthToken = this._data.authToken && true;
-            const hadAuthBasic = this._data.authBasic && true;
-            const pubkey = this._data && this._data.pubkey;
+            const hadAuthToken = this._cache.authToken && true;
+            const hadAuthBasic = this._cache.authBasic && true;
+            const pubkey = this._cache && this._cache.pubkey;
             this.resetData();
             if (!this.settings.hasOfflineFeature()) {
                 // Remove all data from the local storage
@@ -13402,9 +13406,9 @@ class AccountService extends BaseGraphqlService {
             if (offline) {
                 json = yield this.storage.get(ACCOUNT_STORAGE_KEY);
                 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) {
-                    json = 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) {
+                    json = yield this.storage.get(ACCOUNT_STORAGE_KEY + '#' + this._cache.pubkey);
                     json = json && (typeof json === 'string') && JSON.parse(json) || json;
                 }
             }
@@ -13499,7 +13503,7 @@ class AccountService extends BaseGraphqlService {
         });
     }
     listenChanges() {
-        if (!this._data.pubkey)
+        if (!this._cache.pubkey)
             return Subscription.EMPTY;
         const self = this;
         console.debug('[account] [WS] Listening account changes');
@@ -13517,7 +13521,7 @@ class AccountService extends BaseGraphqlService {
                 var _a;
                 if (!data)
                     return;
-                const existingUpdateDate = toDateISOString((_a = self._data.account) === null || _a === void 0 ? void 0 : _a.updateDate);
+                const existingUpdateDate = toDateISOString((_a = self._data) === null || _a === void 0 ? void 0 : _a.updateDate);
                 if (existingUpdateDate !== data.updateDate) {
                     console.debug(`[account] [WS] Detected update on {${data.updateDate}}`);
                     yield self.refresh();
@@ -13544,20 +13548,6 @@ class AccountService extends BaseGraphqlService {
         subscription.add(() => console.debug('[account] [WS] Stop listening account changes'));
         return subscription;
     }
-    /**
-     * @deprecated
-     */
-    getPageSettings(pageId, propertyName) {
-        return this.settings.getPageSettings(pageId, propertyName);
-    }
-    /**
-     * @deprecated
-     */
-    savePageSetting(pageId, value, propertyName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.settings.savePageSetting(pageId, value, propertyName);
-        });
-    }
     get additionalFields() {
         return this._$additionalFields.getValue();
     }
@@ -13578,21 +13568,21 @@ class AccountService extends BaseGraphqlService {
     }
     /* -- protected method -- */
     resetData() {
-        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 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 Account();
     }
     loadData(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._data.pubkey)
+            if (!this._cache.pubkey)
                 throw new Error('User not logged');
-            this._data.loaded = false;
+            this._cache.loaded = false;
             try {
                 const account = (yield this.load(opts)) || new Account();
                 // Set defaults
@@ -13600,17 +13590,25 @@ class AccountService extends BaseGraphqlService {
                 account.settings = account.settings || new 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 this._data.account;
+                this._cache.loaded = true;
+                // Apply settings properties, found in remote settings
+                const accountSettingsContentKeys = Object.keys(account.settings.content);
+                if (isNotEmptyArray(accountSettingsContentKeys)) {
+                    const settings = Object.assign(Object.assign(Object.assign({}, this.settings.settings), account.settings.content), account.settings);
+                    delete settings.content; // Remove content attribute
+                    yield this.settings.apply(settings);
+                }
+                return this._data;
             }
             catch (error) {
                 this.resetData();
@@ -13624,6 +13622,14 @@ class AccountService extends BaseGraphqlService {
             }
         });
     }
+    listenSettings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // When settings changed: save it remotely
+            this.registerSubscription(this.settings.onChange
+                .pipe(debounceTime(1000), filter(() => this.isLogin() && this.network.online))
+                .subscribe(settings => this.saveLocalSettingsRemotely(settings)));
+        });
+    }
     restoreLocally() {
         return __awaiter(this, void 0, void 0, function* () {
             // Restore from storage
@@ -13644,9 +13650,9 @@ class AccountService extends BaseGraphqlService {
                 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;
@@ -13654,7 +13660,7 @@ class AccountService extends BaseGraphqlService {
             if (this.network.online) {
                 try {
                     yield this.authenticate();
-                    if (!this._data.authToken && !this._data.authBasic)
+                    if (!this._cache.authToken && !this._cache.authBasic)
                         throw new Error('Authentication failed');
                 }
                 catch (error) {
@@ -13685,14 +13691,14 @@ class AccountService extends BaseGraphqlService {
             // Transform to entity
             const account = 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 account;
         });
     }
@@ -13701,13 +13707,13 @@ class AccountService extends BaseGraphqlService {
      */
     saveLocally() {
         return __awaiter(this, void 0, void 0, function* () {
-            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...`);
+                console.debug(`[account] Saving account {${this._cache.pubkey.substring(0, 6)}} in local storage...`);
             // Convert account to json
-            const json = this._data.account.asObject({ keepTypename: true });
-            const seckey = this._data.keypair && this._data.keypair.secretKey && Base58.encode(this._data.keypair.secretKey) || null;
+            const json = this._data.asObject({ keepTypename: true });
+            const seckey = this._cache.keypair && this._cache.keypair.secretKey && Base58.encode(this._cache.keypair.secretKey) || null;
             // Convert avatar URL to dataUrl (e.g. 'data:image/png:<base64 content>')
             const hasAvatarUrl = json.avatar && !json.avatar.endsWith(DEFAULT_AVATAR_IMAGE) &&
                 (json.avatar.startsWith('http://') || (json.avatar.startsWith('https://')));
@@ -13728,9 +13734,9 @@ class AccountService extends BaseGraphqlService {
             }
             try {
                 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
@@ -13744,6 +13750,22 @@ class AccountService extends BaseGraphqlService {
             }
         });
     }
+    saveLocalSettingsRemotely(source) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!source || !this.isLogin())
+                return; // Skip
+            const account = this.account;
+            // Merge local settings into account's settings
+            const settings = UserSettings.fromObject(account.settings) || new UserSettings();
+            const hasChanges = settings.merge(source, ['locale', 'latLongFormat', 'properties']);
+            if (hasChanges) {
+                if (this._debug)
+                    console.debug('[account] Save local settings remotely', settings);
+                account.settings = settings;
+                yield this.saveRemotely(account);
+            }
+        });
+    }
     /**
      * Create or update an user account
      *
@@ -13788,7 +13810,7 @@ class AccountService extends BaseGraphqlService {
     }
     authenticateAndGetToken(token, counter) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._data.pubkey)
+            if (!this._cache.pubkey)
                 throw new Error('User not logged');
             if (!counter)
                 console.info('[account] Authentication on pod...');
@@ -13814,7 +13836,7 @@ class AccountService extends BaseGraphqlService {
                 if (data && data.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 token; // return the token
                 }
                 // Continue (will retry with another challenge)
@@ -13840,8 +13862,8 @@ class AccountService extends BaseGraphqlService {
             }
             // TODO: check server pubkey as a valid certificate
             // Do the challenge
-            const signature = yield this.cryptoService.sign(data.authChallenge.challenge, this._data.keypair);
-            const newToken = `${this._data.pubkey}:${data.authChallenge.challenge}|${signature}`;
+            const signature = yield this.cryptoService.sign(data.authChallenge.challenge, this._cache.keypair);
+            const newToken = `${this._cache.pubkey}:${data.authChallenge.challenge}|${signature}`;
             // iterate with the new token
             return yield this.authenticateAndGetToken(newToken, (counter || 1) + 1 /* increment */);
         });
@@ -14181,73 +14203,28 @@ class ConfigService extends BaseGraphqlService {
         this.toastController = toastController;
         this.translate = translate;
         this.environment = environment;
-        this._started = false;
-        this._subscription = new Subscription();
         this.$data = new 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(() => this.restart());
-        // Start
-        if (this.graphql.started) {
-            this.start();
-        }
-    }
-    get started() {
-        return this._started;
     }
     get config() {
         // If first call: start loading
-        if (!this._started)
+        if (!this.started)
             this.start();
         return this.$data.pipe(filter(isNotNil));
     }
-    start() {
-        if (this._startPromise)
-            return this._startPromise;
-        if (this._started)
-            return;
-        console.info('[config] Starting configuration...');
-        this._startPromise = this.graphql.ready()
-            .then(() => this.loadOrRestoreLocally())
-            .then((data) => {
-            this._started = true;
-            this._startPromise = undefined;
+    ngOnStart() {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.info('[config] Starting configuration...');
+            const data = yield this.loadOrRestoreLocally();
             this.$data.next(data);
+            // Restart if graphql service restart
+            this.registerSubscription(this.graphql.onStart.subscribe(() => this.restart()));
             return data;
-        })
-            .catch((err) => {
-            console.error(err && err.message || err, err);
-            this._started = false;
-            this._startPromise = undefined;
-            return null;
-        });
-        return this._startPromise;
-    }
-    stop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._subscription.unsubscribe();
-            this._subscription = new Subscription();
-            this._started = false;
-            this._startPromise = undefined;
-        });
-    }
-    restart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.started)
-                yield this.stop();
-            return this.start();
         });
     }
-    ready() {
-        if (this._started)
-            return Promise.resolve(this.$data.value);
-        if (this._startPromise)
-            return this._startPromise;
-        return this.start();
-    }
     loadDefault(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = Date.now();
@@ -19755,12 +19732,6 @@ class BaseEntityService extends BaseGraphqlService {
         this.defaultSortBy = options.defaultSortBy || 'id';
         this.defaultSortDirection = options.defaultSortDirection || 'asc';
         this.watchQueriesUpdatePolicy = options.watchQueriesUpdatePolicy || 'update-cache';
-        platform.ready().then(() => {
-            // No limit for updatable watch queries, if desktop
-            if (!platform.mobile) {
-                this._mutableWatchQueriesMaxCount = -1;
-            }
-        });
         const obj = new dataType();
         this._typename = obj.__typename || 'UnknownVO';
         this._logTypeName = removeEnd(this._typename, 'VO');
@@ -20138,6 +20109,14 @@ class BaseEntityService extends BaseGraphqlService {
         return EntityFilterUtils.fromObject(source, this.filterType);
     }
     /* -- protected functions -- */
+    ngOnStart() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // No limit for updatable watch queries, if desktop
+            if (!this.platform.mobile) {
+                this._mutableWatchQueriesMaxCount = -1;
+            }
+        });
+    }
     fillDefaultProperties(source) {
         // Can be override by subclasses
     }