@sumaris-net/ngx-components 18.18.5 → 18.18.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/doc/changelog.md +3 -0
  2. package/esm2022/src/app/core/services/model/person.model.mjs +5 -4
  3. package/fesm2022/sumaris-net.ngx-components.mjs +4 -3
  4. package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
  5. package/package.json +1 -1
  6. package/src/assets/manifest.json +1 -1
package/doc/changelog.md CHANGED
@@ -1869,3 +1869,6 @@ enh: Environment: add useHash property to configure Angular router to use hash U
1869
1869
  - Old custom type `Function` still exists, but mark as `deprecacted`
1870
1870
  - enh(RxState) Add new type `Statefull<T>` to allow type check, when using `@RxStateProperty()` or `@RxStateSelect()`
1871
1871
  - fix(gallery) Add a call to `markForCheck()` when receiving new rows
1872
+
1873
+ # 18.18.6
1874
+ - fix(person) Fix `personToString()` when lastName or firstName is nil
package/esm2022/src/app/core/services/model/person.model.mjs CHANGED
@@ -98,10 +98,11 @@ export class PersonUtils {
98
98
  static personToString(obj, opts) {
99
99
  if (!obj || isNil(obj.id))
100
100
  return undefined;
101
- if (opts?.withDepartment && obj.department?.label) {
102
- return obj.lastName + ' ' + obj.firstName + ' (' + obj.department.label + ')';
101
+ const departmentSuffix = opts?.withDepartment && obj.department?.label ? ' (' + obj.department.label + ')' : '';
102
+ if (isNotNil(obj.lastName) && isNotNil(obj.firstName)) {
103
+ return obj.lastName + ' ' + obj.firstName + departmentSuffix;
103
104
  }
104
- return obj.lastName + ' ' + obj.firstName;
105
+ return (obj.lastName ?? obj.firstName) + departmentSuffix;
105
106
  }
106
107
  static personsToString(data, separator, opts) {
107
108
  return (data || []).map((p) => PersonUtils.personToString(p, opts)).join(separator || ', ');
@@ -111,4 +112,4 @@ export class PersonUtils {
111
112
  return label || defaultProfile;
112
113
  }
113
114
  }
114
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/person.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { Moment } from 'moment';\nimport { ReferentialAsObjectOptions } from './referential.model';\nimport { Entity } from './entity.model';\nimport { Department } from './department.model';\nimport { fromDateISOString, toDateISOString } from '../../../shared/dates';\nimport { EntityClass } from './entity.decorators';\nimport { isEmptyArray, isNil, isNotNil } from '../../../shared/functions';\n\nexport type UserProfileLabel = 'ADMIN' | 'USER' | 'SUPERVISOR' | 'GUEST';\nexport const PRIORITIZED_AUTHORITIES: Readonly<UserProfileLabel[]> = Object.freeze(['ADMIN', 'SUPERVISOR', 'USER', 'GUEST']);\n\n// @dynamic\n@EntityClass({ typename: 'PersonVO' })\nexport class Person<T extends Person<any> = Person<any>> extends Entity<T, number, ReferentialAsObjectOptions> {\n  static fromObject: (source: any, opts?: any) => Person;\n\n  firstName: string;\n  lastName: string;\n  email: string;\n  pubkey: string;\n  avatar: string;\n  creationDate: Date | Moment;\n  statusId: number;\n  department: Department = null;\n  username: string;\n  usernameExtranet: string;\n  profiles: string[];\n  mainProfile: string;\n\n  constructor(__typename?: string) {\n    super(__typename || Person.TYPENAME);\n  }\n\n  asObject(opts?: ReferentialAsObjectOptions): any {\n    if (opts && opts.minify) {\n      return {\n        id: this.id,\n        __typename: (opts.keepTypename && this.__typename) || undefined,\n        firstName: this.firstName,\n        lastName: this.lastName,\n      };\n    }\n    const target: any = super.asObject(opts);\n    target.department = (this.department && this.department.asObject(opts)) || undefined;\n    target.profiles = (this.profiles && this.profiles.slice(0)) || [];\n    // Set profile list from the main profile\n    target.profiles = (this.mainProfile && [this.mainProfile]) || target.profiles;\n    target.creationDate = toDateISOString(this.creationDate);\n\n    if (!opts || opts.minify !== true) target.mainProfile = PersonUtils.getMainProfile(target.profiles);\n    return target;\n  }\n\n  fromObject(source: any) {\n    super.fromObject(source);\n    this.firstName = source.firstName;\n    this.lastName = source.lastName;\n    this.email = source.email;\n    this.creationDate = fromDateISOString(source.creationDate);\n    this.pubkey = source.pubkey;\n    this.username = source.username;\n    this.usernameExtranet = source.usernameExtranet;\n    this.avatar = source.avatar;\n    this.statusId = source.statusId;\n    this.department = (source.department && Department.fromObject(source.department)) || undefined;\n    this.profiles = (source.profiles && source.profiles.slice(0)) || [];\n    // Add main profile to the list, if need\n    if (source.mainProfile && !this.profiles.find((p) => p === source.mainProfile)) {\n      this.profiles = this.profiles.concat(source.mainProfile);\n    }\n    this.mainProfile = PersonUtils.getMainProfile(this.profiles);\n  }\n\n  equals(other: T): boolean {\n    return (\n      other &&\n      ((isNotNil(this.id) && this.id === other.id) ||\n        // Functional test\n        // Pubkey should be unique\n        (this.pubkey &&\n          this.pubkey === other.pubkey &&\n          // Email should be unique\n          this.email &&\n          this.email === other.email))\n    );\n  }\n}\n\nexport class PersonUtils {\n  static getMainProfile(profiles?: string[]): UserProfileLabel {\n    if (isEmptyArray(profiles)) return 'GUEST';\n    return PRIORITIZED_AUTHORITIES.find((label) => profiles.includes(label)) || 'GUEST';\n  }\n\n  static getMainProfileIndex(profiles?: string[]): number {\n    if (isEmptyArray(profiles)) return PRIORITIZED_AUTHORITIES.length - 1; // return last (lower) profile\n    const index = PRIORITIZED_AUTHORITIES.findIndex((label) => profiles.includes(label));\n    return index !== -1 ? index : PRIORITIZED_AUTHORITIES.length - 1;\n  }\n\n  static hasUpperOrEqualsProfile(actualProfiles: string[], expectedProfile: UserProfileLabel): boolean {\n    const expectedProfileIndex = PRIORITIZED_AUTHORITIES.indexOf(expectedProfile);\n    return expectedProfileIndex !== -1 && PersonUtils.getMainProfileIndex(actualProfiles) <= expectedProfileIndex;\n  }\n\n  static personToString(obj: Person, opts?: { withDepartment?: boolean }): string {\n    if (!obj || isNil(obj.id)) return undefined;\n    if (opts?.withDepartment && obj.department?.label) {\n      return obj.lastName + ' ' + obj.firstName + ' (' + obj.department.label + ')';\n    }\n    return obj.lastName + ' ' + obj.firstName;\n  }\n\n  static personsToString(data: Person[], separator?: string, opts?: { withDepartment?: boolean }): string {\n    return (data || []).map((p) => PersonUtils.personToString(p, opts)).join(separator || ', ');\n  }\n\n  static roleToProfile(role: string, defaultProfile?: UserProfileLabel): UserProfileLabel {\n    const label = role?.replace(/^ROLE_/, '') as UserProfileLabel;\n    return label || defaultProfile;\n  }\n}\n"]}
115
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"person.model.js","sourceRoot":"","sources":["../../../../../../../src/app/core/services/model/person.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { Moment } from 'moment';\nimport { ReferentialAsObjectOptions } from './referential.model';\nimport { Entity } from './entity.model';\nimport { Department } from './department.model';\nimport { fromDateISOString, toDateISOString } from '../../../shared/dates';\nimport { EntityClass } from './entity.decorators';\nimport { isEmptyArray, isNil, isNotNil } from '../../../shared/functions';\n\nexport type UserProfileLabel = 'ADMIN' | 'USER' | 'SUPERVISOR' | 'GUEST';\nexport const PRIORITIZED_AUTHORITIES: Readonly<UserProfileLabel[]> = Object.freeze(['ADMIN', 'SUPERVISOR', 'USER', 'GUEST']);\n\n// @dynamic\n@EntityClass({ typename: 'PersonVO' })\nexport class Person<T extends Person<any> = Person<any>> extends Entity<T, number, ReferentialAsObjectOptions> {\n  static fromObject: (source: any, opts?: any) => Person;\n\n  firstName: string;\n  lastName: string;\n  email: string;\n  pubkey: string;\n  avatar: string;\n  creationDate: Date | Moment;\n  statusId: number;\n  department: Department = null;\n  username: string;\n  usernameExtranet: string;\n  profiles: string[];\n  mainProfile: string;\n\n  constructor(__typename?: string) {\n    super(__typename || Person.TYPENAME);\n  }\n\n  asObject(opts?: ReferentialAsObjectOptions): any {\n    if (opts && opts.minify) {\n      return {\n        id: this.id,\n        __typename: (opts.keepTypename && this.__typename) || undefined,\n        firstName: this.firstName,\n        lastName: this.lastName,\n      };\n    }\n    const target: any = super.asObject(opts);\n    target.department = (this.department && this.department.asObject(opts)) || undefined;\n    target.profiles = (this.profiles && this.profiles.slice(0)) || [];\n    // Set profile list from the main profile\n    target.profiles = (this.mainProfile && [this.mainProfile]) || target.profiles;\n    target.creationDate = toDateISOString(this.creationDate);\n\n    if (!opts || opts.minify !== true) target.mainProfile = PersonUtils.getMainProfile(target.profiles);\n    return target;\n  }\n\n  fromObject(source: any) {\n    super.fromObject(source);\n    this.firstName = source.firstName;\n    this.lastName = source.lastName;\n    this.email = source.email;\n    this.creationDate = fromDateISOString(source.creationDate);\n    this.pubkey = source.pubkey;\n    this.username = source.username;\n    this.usernameExtranet = source.usernameExtranet;\n    this.avatar = source.avatar;\n    this.statusId = source.statusId;\n    this.department = (source.department && Department.fromObject(source.department)) || undefined;\n    this.profiles = (source.profiles && source.profiles.slice(0)) || [];\n    // Add main profile to the list, if need\n    if (source.mainProfile && !this.profiles.find((p) => p === source.mainProfile)) {\n      this.profiles = this.profiles.concat(source.mainProfile);\n    }\n    this.mainProfile = PersonUtils.getMainProfile(this.profiles);\n  }\n\n  equals(other: T): boolean {\n    return (\n      other &&\n      ((isNotNil(this.id) && this.id === other.id) ||\n        // Functional test\n        // Pubkey should be unique\n        (this.pubkey &&\n          this.pubkey === other.pubkey &&\n          // Email should be unique\n          this.email &&\n          this.email === other.email))\n    );\n  }\n}\n\nexport class PersonUtils {\n  static getMainProfile(profiles?: string[]): UserProfileLabel {\n    if (isEmptyArray(profiles)) return 'GUEST';\n    return PRIORITIZED_AUTHORITIES.find((label) => profiles.includes(label)) || 'GUEST';\n  }\n\n  static getMainProfileIndex(profiles?: string[]): number {\n    if (isEmptyArray(profiles)) return PRIORITIZED_AUTHORITIES.length - 1; // return last (lower) profile\n    const index = PRIORITIZED_AUTHORITIES.findIndex((label) => profiles.includes(label));\n    return index !== -1 ? index : PRIORITIZED_AUTHORITIES.length - 1;\n  }\n\n  static hasUpperOrEqualsProfile(actualProfiles: string[], expectedProfile: UserProfileLabel): boolean {\n    const expectedProfileIndex = PRIORITIZED_AUTHORITIES.indexOf(expectedProfile);\n    return expectedProfileIndex !== -1 && PersonUtils.getMainProfileIndex(actualProfiles) <= expectedProfileIndex;\n  }\n\n  static personToString(obj: Person, opts?: { withDepartment?: boolean }): string {\n    if (!obj || isNil(obj.id)) return undefined;\n    const departmentSuffix = opts?.withDepartment && obj.department?.label ? ' (' + obj.department.label + ')' : '';\n    if (isNotNil(obj.lastName) && isNotNil(obj.firstName)) {\n      return obj.lastName + ' ' + obj.firstName + departmentSuffix;\n    }\n    return (obj.lastName ?? obj.firstName) + departmentSuffix;\n  }\n\n  static personsToString(data: Person[], separator?: string, opts?: { withDepartment?: boolean }): string {\n    return (data || []).map((p) => PersonUtils.personToString(p, opts)).join(separator || ', ');\n  }\n\n  static roleToProfile(role: string, defaultProfile?: UserProfileLabel): UserProfileLabel {\n    const label = role?.replace(/^ROLE_/, '') as UserProfileLabel;\n    return label || defaultProfile;\n  }\n}\n"]}
package/fesm2022/sumaris-net.ngx-components.mjs CHANGED
@@ -22668,10 +22668,11 @@ class PersonUtils {
22668
22668
  static personToString(obj, opts) {
22669
22669
  if (!obj || isNil(obj.id))
22670
22670
  return undefined;
22671
- if (opts?.withDepartment && obj.department?.label) {
22672
- return obj.lastName + ' ' + obj.firstName + ' (' + obj.department.label + ')';
22671
+ const departmentSuffix = opts?.withDepartment && obj.department?.label ? ' (' + obj.department.label + ')' : '';
22672
+ if (isNotNil(obj.lastName) && isNotNil(obj.firstName)) {
22673
+ return obj.lastName + ' ' + obj.firstName + departmentSuffix;
22673
22674
  }
22674
- return obj.lastName + ' ' + obj.firstName;
22675
+ return (obj.lastName ?? obj.firstName) + departmentSuffix;
22675
22676
  }
22676
22677
  static personsToString(data, separator, opts) {
22677
22678
  return (data || []).map((p) => PersonUtils.personToString(p, opts)).join(separator || ', ');