@sumaris-net/ngx-components 18.5.13 → 18.5.14

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

@@ -38435,16 +38435,16 @@ class AccountPage extends AppForm {
     async setValue(data, opts) {
         super.setValue(data, opts);
         // Set options
-        const properties = data?.settings?.asLocalSettings()?.properties || {};
-        const propertiesEntities = [];
-        this.optionDefinitions
-            .map((definition) => definition.key)
-            .forEach((key) => {
-            if (isNotNil(properties[key])) {
-                propertiesEntities.push(PropertyEntity.fromObject({ id: key, value: properties[key] }));
-            }
-        });
-        if (this.propertiesTable) {
+        if (isNotEmptyArray(this.optionDefinitions) && this.propertiesTable) {
+            const properties = data?.settings?.asLocalSettings()?.properties || {};
+            const propertiesEntities = [];
+            this.optionDefinitions
+                .map((definition) => definition.key)
+                .forEach((key) => {
+                if (isNotNil(properties[key])) {
+                    propertiesEntities.push(PropertyEntity.fromObject({ id: key, value: properties[key] }));
+                }
+            });
             await this.propertiesTable.ready();
             this.propertiesTable.value = propertiesEntities;
         }
@@ -38506,7 +38506,7 @@ class AccountPage extends AppForm {
             ...this.accountService.account.asObject(),
             ...this.form.value,
         });
-        if (this.propertiesTable) {
+        if (isNotEmptyArray(this.optionDefinitions) && this.propertiesTable) {
             // merge properties
             await this.propertiesTable.save();
             const propertyEntities = this.propertiesTable.value || [];
@@ -38517,8 +38517,9 @@ class AccountPage extends AppForm {
             const newProperties = { ...newAccount.settings.content['properties'], ...properties };
             newAccount.settings.merge({ properties: newProperties }, ['properties']);
         }
-        else {
-            newAccount.settings.merge({ properties: this.settings.settings.properties }, ['properties']);
+        else if (newAccount.settings.content['properties']) {
+            // Clean properties
+            delete newAccount.settings.content['properties'];
         }
         if (this.tokensTable) {
             await this.tokensTable.save();