@sumaris-net/ngx-components 18.5.12 → 18.5.13

package/esm2022/src/app/core/services/model/account.model.mjs

@@ -122,7 +122,12 @@ let UserSettings = class UserSettings extends Entity {
             // 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]);
+                    if (typeof source[key] === 'object' && source[key] !== null) {
+                        this.content[key] = { ...source[key] }; // Copy object
+                    }
+                    else {
+                        this.content[key] = source[key];
+                    }
                     hasChanges = true;
                 }
             }
@@ -137,6 +142,10 @@ let UserSettings = class UserSettings extends Entity {
         Object.keys(this.content).forEach((key) => {
             target[key] = this.content[key];
         });
+        // Clear properties if empty, to avoid to reset the existing properties - See issue sumaris-app#897
+        if (Object.keys(target['properties'] || {}).length === 0) {
+            delete target['properties'];
+        }
         return target;
     }
 };
@@ -147,4 +156,4 @@ export { UserSettings };
 export function accountToString(data) {
     return (data && ((data.firstName && data.firstName + ' ') || '') + (data.lastName || '')) || '';
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/account.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { LocalSettings } from './settings.model';\nimport { Person, PersonUtils, UserProfileLabel } from './person.model';\nimport { Entity, EntityAsObjectOptions } from './entity.model';\nimport { EntityClass } from './entity.decorators';\nimport { StatusIds } from './model.enum';\nimport { LatLongPattern } from '../../../shared/material/latlong/latlong.utils';\nimport { equals, isNil } from '../../../shared/functions';\nimport { UserToken } from './token.model';\n\n/**\n * A user account\n */\n// @dynamic\n@EntityClass({ typename: 'AccountVO' })\nexport class Account extends Person<Account> {\n  static fromObject: (source: any, opts?: any) => Account;\n\n  settings: UserSettings = null;\n  tokens: UserToken[] = [];\n\n  constructor() {\n    super(Account.TYPENAME);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): any {\n    const target: any = super.asObject({ ...opts, minify: false /*disable Person minify (too restrictive) */ });\n    target.settings = this.settings?.asObject(opts);\n    target.tokens = this.tokens?.map((value) => value.asObject(opts));\n    if (opts?.minify) {\n      delete target.mainProfile; // Not known on server\n    }\n    return target;\n  }\n\n  fromObject(source: any) {\n    super.fromObject(source);\n    this.settings = source.settings && UserSettings.fromObject(source.settings);\n    this.tokens = source.tokens?.map((value) => UserToken.fromObject(value)) || [];\n  }\n\n  /**\n   * Convert into a Person. This will fill __typename with a right value, for data cache\n   */\n  asPerson(): Person {\n    const person = Person.fromObject(\n      this.asObject({\n        keepTypename: true, // This is need for the department object\n      })\n    );\n    person.__typename = Person.TYPENAME; // Do not keep AccountVO as typename\n    return person;\n  }\n\n  get displayName(): string {\n    return accountToString(this);\n  }\n}\n\nexport abstract class AccountUtils {\n  static accountToString = accountToString;\n\n  static hasMinProfile(account: Account | null, userProfile: UserProfileLabel): boolean {\n    // should be login, and status ENABLE or TEMPORARY\n    if (!account || !account.pubkey || (account.statusId !== StatusIds.ENABLE && account.statusId !== StatusIds.TEMPORARY)) {\n      return false;\n    }\n    return PersonUtils.hasUpperOrEqualsProfile(account.profiles, userProfile);\n  }\n\n  static hasExactProfile(account: Account | null, label: UserProfileLabel): boolean {\n    // should be login, and status ENABLE or TEMPORARY\n    if (!account || !account.pubkey || (account.statusId !== StatusIds.ENABLE && account.statusId !== StatusIds.TEMPORARY)) return false;\n    return account.profiles.some((profile) => profile === label);\n  }\n\n  static hasProfileAndIsEnable(account: Account | null, userProfile: UserProfileLabel): boolean {\n    // should be login, and status ENABLE\n    if (!account || !account.pubkey || account.statusId !== StatusIds.ENABLE) return false;\n    return PersonUtils.hasUpperOrEqualsProfile(account.profiles, userProfile);\n  }\n}\n\n// @dynamic\n@EntityClass({ typename: 'UserSettingsVO' })\nexport class UserSettings extends Entity<UserSettings> {\n  static SETTINGS_PROPERTIES = [<keyof UserSettings>'locale', <keyof UserSettings>'latLongFormat'] as string[];\n  static fromObject: (source: any, opts?: any) => UserSettings;\n\n  locale: string;\n  latLongFormat: LatLongPattern;\n  content: any;\n  nonce: string;\n\n  constructor() {\n    super(UserSettings.TYPENAME);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): any {\n    const target = super.asObject(opts);\n    if (opts?.minify) {\n      // Stringify content\n      target.content = this.content ? JSON.stringify(this.content) : undefined;\n    }\n    return target;\n  }\n\n  fromObject(source: any, opts?: any) {\n    super.fromObject(source);\n    this.locale = source.locale;\n    this.latLongFormat = source.latLongFormat as LatLongPattern;\n    if (isNil(source.content) || typeof source.content === 'object') {\n      this.content = source.content || {};\n    } else {\n      this.content = (source.content && JSON.parse(source.content)) || {};\n    }\n    this.nonce = source.nonce;\n  }\n\n  merge<S = LocalSettings>(source: S, includesProperties: (keyof S)[]): boolean {\n    if (!source) return; // Skip\n\n    // Reset content\n    this.content = {};\n    let hasChanges = false;\n\n    // For each property of source object\n    Object.keys(source).forEach((key) => {\n      // If property exists in UserSettings class: store it directly\n      if (UserSettings.SETTINGS_PROPERTIES.includes(key)) {\n        if (!equals(this[key], source[key])) {\n          this[key] = source[key];\n          hasChanges = true;\n        }\n      }\n      // Else, store property into the 'content' map\n      else if (includesProperties && includesProperties.includes(key as keyof S)) {\n        if (!equals(this.content[key], source[key])) {\n          this.content[key] = Object.assign({}, source[key]);\n          hasChanges = true;\n        }\n      }\n    });\n    return hasChanges;\n  }\n\n  asLocalSettings(): Partial<LocalSettings> {\n    const target = {};\n    UserSettings.SETTINGS_PROPERTIES.forEach((key) => {\n      target[key] = this[key];\n    });\n    Object.keys(this.content).forEach((key) => {\n      target[key] = this.content[key];\n    });\n    return target;\n  }\n}\n\nexport function accountToString(data: Account): string {\n  return (data && ((data.firstName && data.firstName + ' ') || '') + (data.lastName || '')) || '';\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/account.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { LocalSettings } from './settings.model';\nimport { Person, PersonUtils, UserProfileLabel } from './person.model';\nimport { Entity, EntityAsObjectOptions } from './entity.model';\nimport { EntityClass } from './entity.decorators';\nimport { StatusIds } from './model.enum';\nimport { LatLongPattern } from '../../../shared/material/latlong/latlong.utils';\nimport { equals, isNil } from '../../../shared/functions';\nimport { UserToken } from './token.model';\n\n/**\n * A user account\n */\n// @dynamic\n@EntityClass({ typename: 'AccountVO' })\nexport class Account extends Person<Account> {\n  static fromObject: (source: any, opts?: any) => Account;\n\n  settings: UserSettings = null;\n  tokens: UserToken[] = [];\n\n  constructor() {\n    super(Account.TYPENAME);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): any {\n    const target: any = super.asObject({ ...opts, minify: false /*disable Person minify (too restrictive) */ });\n    target.settings = this.settings?.asObject(opts);\n    target.tokens = this.tokens?.map((value) => value.asObject(opts));\n    if (opts?.minify) {\n      delete target.mainProfile; // Not known on server\n    }\n    return target;\n  }\n\n  fromObject(source: any) {\n    super.fromObject(source);\n    this.settings = source.settings && UserSettings.fromObject(source.settings);\n    this.tokens = source.tokens?.map((value) => UserToken.fromObject(value)) || [];\n  }\n\n  /**\n   * Convert into a Person. This will fill __typename with a right value, for data cache\n   */\n  asPerson(): Person {\n    const person = Person.fromObject(\n      this.asObject({\n        keepTypename: true, // This is need for the department object\n      })\n    );\n    person.__typename = Person.TYPENAME; // Do not keep AccountVO as typename\n    return person;\n  }\n\n  get displayName(): string {\n    return accountToString(this);\n  }\n}\n\nexport abstract class AccountUtils {\n  static accountToString = accountToString;\n\n  static hasMinProfile(account: Account | null, userProfile: UserProfileLabel): boolean {\n    // should be login, and status ENABLE or TEMPORARY\n    if (!account || !account.pubkey || (account.statusId !== StatusIds.ENABLE && account.statusId !== StatusIds.TEMPORARY)) {\n      return false;\n    }\n    return PersonUtils.hasUpperOrEqualsProfile(account.profiles, userProfile);\n  }\n\n  static hasExactProfile(account: Account | null, label: UserProfileLabel): boolean {\n    // should be login, and status ENABLE or TEMPORARY\n    if (!account || !account.pubkey || (account.statusId !== StatusIds.ENABLE && account.statusId !== StatusIds.TEMPORARY)) return false;\n    return account.profiles.some((profile) => profile === label);\n  }\n\n  static hasProfileAndIsEnable(account: Account | null, userProfile: UserProfileLabel): boolean {\n    // should be login, and status ENABLE\n    if (!account || !account.pubkey || account.statusId !== StatusIds.ENABLE) return false;\n    return PersonUtils.hasUpperOrEqualsProfile(account.profiles, userProfile);\n  }\n}\n\n// @dynamic\n@EntityClass({ typename: 'UserSettingsVO' })\nexport class UserSettings extends Entity<UserSettings> {\n  static SETTINGS_PROPERTIES = [<keyof UserSettings>'locale', <keyof UserSettings>'latLongFormat'] as string[];\n  static fromObject: (source: any, opts?: any) => UserSettings;\n\n  locale: string;\n  latLongFormat: LatLongPattern;\n  content: any;\n  nonce: string;\n\n  constructor() {\n    super(UserSettings.TYPENAME);\n  }\n\n  asObject(opts?: EntityAsObjectOptions): any {\n    const target = super.asObject(opts);\n    if (opts?.minify) {\n      // Stringify content\n      target.content = this.content ? JSON.stringify(this.content) : undefined;\n    }\n    return target;\n  }\n\n  fromObject(source: any, opts?: any) {\n    super.fromObject(source);\n    this.locale = source.locale;\n    this.latLongFormat = source.latLongFormat as LatLongPattern;\n    if (isNil(source.content) || typeof source.content === 'object') {\n      this.content = source.content || {};\n    } else {\n      this.content = (source.content && JSON.parse(source.content)) || {};\n    }\n    this.nonce = source.nonce;\n  }\n\n  merge<S = LocalSettings>(source: S, includesProperties: (keyof S)[]): boolean {\n    if (!source) return; // Skip\n\n    // Reset content\n    this.content = {};\n    let hasChanges = false;\n\n    // For each property of source object\n    Object.keys(source).forEach((key) => {\n      // If property exists in UserSettings class: store it directly\n      if (UserSettings.SETTINGS_PROPERTIES.includes(key)) {\n        if (!equals(this[key], source[key])) {\n          this[key] = source[key];\n          hasChanges = true;\n        }\n      }\n      // Else, store property into the 'content' map\n      else if (includesProperties && includesProperties.includes(key as keyof S)) {\n        if (!equals(this.content[key], source[key])) {\n          if (typeof source[key] === 'object' && source[key] !== null) {\n            this.content[key] = { ...source[key] }; // Copy object\n          } else {\n            this.content[key] = source[key];\n          }\n          hasChanges = true;\n        }\n      }\n    });\n    return hasChanges;\n  }\n\n  asLocalSettings(): Partial<LocalSettings> {\n    const target = {};\n    UserSettings.SETTINGS_PROPERTIES.forEach((key) => {\n      target[key] = this[key];\n    });\n    Object.keys(this.content).forEach((key) => {\n      target[key] = this.content[key];\n    });\n    // Clear properties if empty, to avoid to reset the existing properties - See issue sumaris-app#897\n    if (Object.keys(target['properties'] || {}).length === 0) {\n      delete target['properties'];\n    }\n    return target;\n  }\n}\n\nexport function accountToString(data: Account): string {\n  return (data && ((data.firstName && data.firstName + ' ') || '') + (data.lastName || '')) || '';\n}\n"]}

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

@@ -12365,10 +12365,6 @@ class LocalSettingsService extends StartableService {
         const data = {
             ...this._data,
             ...settings,
-            properties: {
-                ...this._data.properties,
-                ...settings.properties,
-            },
         };
         if (equals(data, this._data))
             return; // Skip if no changes
@@ -19526,7 +19522,12 @@ let UserSettings = class UserSettings extends Entity {
             // 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]);
+                    if (typeof source[key] === 'object' && source[key] !== null) {
+                        this.content[key] = { ...source[key] }; // Copy object
+                    }
+                    else {
+                        this.content[key] = source[key];
+                    }
                     hasChanges = true;
                 }
             }
@@ -19541,6 +19542,10 @@ let UserSettings = class UserSettings extends Entity {
         Object.keys(this.content).forEach((key) => {
             target[key] = this.content[key];
         });
+        // Clear properties if empty, to avoid to reset the existing properties - See issue sumaris-app#897
+        if (Object.keys(target['properties'] || {}).length === 0) {
+            delete target['properties'];
+        }
         return target;
     }
 };
@@ -38362,7 +38367,7 @@ class AccountPage extends AppForm {
     ngOnInit() {
         super.ngOnInit();
         // Get user options
-        this.optionDefinitions = this.accountService.optionDefs.filter((definition) => !definition.disabled && (!definition.minProfile || this.accountService.hasMinProfile(definition.minProfile)));
+        this.optionDefinitions = (this.accountService.optionDefs || []).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()));
@@ -38512,6 +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']);
+        }
         if (this.tokensTable) {
             await this.tokensTable.save();
             newAccount.tokens = this.tokensTable.value;