@sumaris-net/ngx-components 2.6.20 → 2.6.21-beta1

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -31711,7 +31711,7 @@ class AccountPage extends AppForm {
         // Get user options
         this.optionDefinitions = this.accountService.optionDefs
             .slice()
-            .filter((definition) => !definition.minProfile || this.accountService.hasMinProfile(definition.minProfile));
+            .filter((definition) => !definition.disabled && (!definition.minProfile || this.accountService.hasMinProfile(definition.minProfile)));
         // Observed some events
         this.registerSubscription(this.accountService.onLogin.pipe(filter(() => !this.saving)).subscribe((account) => this.onLogin(account)));
         this.registerSubscription(this.accountService.onLogout.subscribe(() => this.onLogout()));
@@ -31782,7 +31782,6 @@ class AccountPage extends AppForm {
         const properties = data?.settings?.asLocalSettings()?.properties || {};
         const propertiesEntities = [];
         this.optionDefinitions
-            .filter((definition) => !definition.minProfile || this.accountService.hasMinProfile(definition.minProfile))
             .map((definition) => definition.key)
             .forEach((key) => {
             if (isNotNil(properties[key])) {
@@ -31859,7 +31858,8 @@ class AccountPage extends AppForm {
                 res[item.id] = item.value;
                 return res;
             }, {});
-            newAccount.settings.merge({ properties }, ['properties']);
+            const newProperties = { ...newAccount.settings.content['properties'], ...properties };
+            newAccount.settings.merge({ properties: newProperties }, ['properties']);
         }
         if (this.tokensTable) {
             await this.tokensTable.save();