@eo-sdk/client 7.16.10 → 7.16.13

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 (25) hide show
  1. package/app/eo-framework-core/api/plugins.service.d.ts +3 -2
  2. package/bundles/eo-sdk-client-projects-eo-sdk-core.umd.js +9 -6
  3. package/bundles/eo-sdk-client-projects-eo-sdk-core.umd.js.map +1 -1
  4. package/bundles/eo-sdk-client-projects-eo-sdk-core.umd.min.js +2 -2
  5. package/bundles/eo-sdk-client-projects-eo-sdk-core.umd.min.js.map +1 -1
  6. package/bundles/eo-sdk-client.umd.js +15 -8
  7. package/bundles/eo-sdk-client.umd.js.map +1 -1
  8. package/bundles/eo-sdk-client.umd.min.js +1 -1
  9. package/bundles/eo-sdk-client.umd.min.js.map +1 -1
  10. package/eo-sdk-client.metadata.json +1 -1
  11. package/esm2015/app/eo-client/about-state/about-state.component.js +3 -3
  12. package/esm2015/app/eo-client/prepare-state/prepare-state/prepare-state.component.js +2 -2
  13. package/esm2015/app/eo-framework/form-elements/string/string.component.js +2 -2
  14. package/esm2015/app/eo-framework/object-form/object-form/object-form.component.js +2 -2
  15. package/esm2015/app/eo-framework/process/history/process-history.component.js +3 -3
  16. package/esm2015/app/eo-framework-core/api/plugins.service.js +10 -3
  17. package/esm2015/projects/eo-sdk/core/lib/config/translate-json-loader.js +5 -2
  18. package/esm2015/projects/eo-sdk/core/lib/model/eo-user.model.js +2 -2
  19. package/fesm2015/eo-sdk-client-projects-eo-sdk-core.js +5 -2
  20. package/fesm2015/eo-sdk-client-projects-eo-sdk-core.js.map +1 -1
  21. package/fesm2015/eo-sdk-client.js +16 -9
  22. package/fesm2015/eo-sdk-client.js.map +1 -1
  23. package/package.json +2 -2
  24. package/projects/eo-sdk/core/eo-sdk-client-projects-eo-sdk-core.metadata.json +1 -1
  25. package/projects/eo-sdk/core/package.json +1 -1
@@ -16,7 +16,7 @@ export class EoUser {
16
16
  if (jUser.hasimage === true) {
17
17
  this.imageUri = '/organization/image/' + this.id;
18
18
  }
19
- this.userSettings = json['usersettings'];
19
+ this.userSettings = typeof json['usersettings'] === 'object' ? json['usersettings'] : {};
20
20
  this.schema = {
21
21
  version: jSchema.version,
22
22
  supportedLocales: jSchema.supportedlocales
@@ -83,4 +83,4 @@ export class EoUser {
83
83
  return this.schemaLocale;
84
84
  }
85
85
  }
86
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eo-user.model.js","sourceRoot":"","sources":["../../../../../../../../../projects/eo-sdk/core/src/lib/model/eo-user.model.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,MAAM;IAkEjB;;;OAGG;IACH,YAAY,IAAS;QAEnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC7B,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;YAC3B,IAAI,CAAC,QAAQ,GAAG,sBAAsB,GAAG,IAAI,CAAC,EAAE,CAAC;SAClD;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;SAC3C,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,SAAiB;QAE5B,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3C,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;gBAC9C,CAAC,EAAE,CAAC;aACL;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAY;QAClB,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACtC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;gBACpC,CAAC,EAAE,CAAC;aACL;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,IAAY;QAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;SACtC;IACH,CAAC;IAED;;;OAGG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;IACnD,CAAC;IAED;;;OAGG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CAEF","sourcesContent":["\r\nexport interface Privileges {\r\n  id: string;\r\n  type: string;\r\n  name: string;\r\n}\r\n\r\nexport class EoUser {\r\n\r\n  /**\r\n   * The users ID\r\n   */\r\n  public id: string;\r\n  /**\r\n   * The users name\r\n   */\r\n  public name: string;\r\n  /**\r\n   * The users firstname\r\n   */\r\n  public firstname: string;\r\n  /**\r\n   * The users lastname\r\n   */\r\n  public lastname: string;\r\n  /**\r\n   * The users title (generated from backends title pattern)\r\n   */\r\n  public title: string;\r\n  /**\r\n   * The users email address\r\n   */\r\n  public email: string;\r\n  /**\r\n   * Flag indicating whether or not the user is present\r\n   */\r\n  public present: boolean;\r\n  /**\r\n   * URI to the users avatar image\r\n   */\r\n  public imageUri: string;\r\n  /**\r\n   * Custom user settings\r\n   */\r\n  public userSettings: any;\r\n  /**\r\n   * @ignore\r\n   */\r\n  public schema: any;\r\n  /**\r\n   * List of the users privileges\r\n   */\r\n  public privileges: Privileges[];\r\n  /**\r\n   * List of roles the user belongs to\r\n   */\r\n  public roles: any[];\r\n  /**\r\n   * List of the users deputies\r\n   */\r\n  public deputies: any[];\r\n  /**\r\n   * List of the users substitutes\r\n   */\r\n  public substitutesOf: any[];\r\n  /**\r\n   * @ignore\r\n   */public schemaLocale: string;\r\n  /**\r\n   * @ignore\r\n   */\r\n  public uiDirection: string;\r\n\r\n  /**\r\n   * Creates a new instance\r\n   * @param json The JSON object received from the backend. This will be used to construct the new user instance\r\n   */\r\n  constructor(json: any) {\r\n\r\n    const jUser = json['user'];\r\n    const jSchema = json['schema'];\r\n\r\n    this.id = jUser.id;\r\n    this.name = jUser.name;\r\n    this.firstname = jUser.firstname;\r\n    this.lastname = jUser.lastname;\r\n    this.title = jUser.title;\r\n    this.email = jUser.email;\r\n    this.present = jUser.present;\r\n    if (jUser.hasimage === true) {\r\n      this.imageUri = '/organization/image/' + this.id;\r\n    }\r\n    this.userSettings = json['usersettings'];\r\n    this.schema = {\r\n      version: jSchema.version,\r\n      supportedLocales: jSchema.supportedlocales\r\n    };\r\n\r\n    this.privileges = jUser.privileges;\r\n    this.roles = jUser.effectiveroles;\r\n    this.deputies = jUser.deputies || [];\r\n    this.substitutesOf = jUser.substitutesOf || [];\r\n    this.schemaLocale = jUser.locale || this.getClientLocale();\r\n  }\r\n\r\n  /**\r\n   * Checks if the user has a certain privilege\r\n   * @param privilege The privilege to be checked\r\n   * @returns True if the user has this particular privilege, false otherwise\r\n   */\r\n  hasPrivilege(privilege: string): boolean {\r\n\r\n    let match = false;\r\n    if (this.privileges) {\r\n      let i = 0;\r\n      while (!match && i < this.privileges.length) {\r\n        match = this.privileges[i].name === privilege;\r\n        i++;\r\n      }\r\n    }\r\n    return match;\r\n  }\r\n\r\n  /**\r\n   * Checks if the user has a certain role\r\n   * @param role The role to be checked\r\n   * @returns True if the user has this particular role, false otherwise\r\n   */\r\n  hasRole(role: string): boolean {\r\n    let match = false;\r\n    if (this.roles) {\r\n      let i = 0;\r\n      while (!match && i < this.roles.length) {\r\n        match = this.roles[i].name === role;\r\n        i++;\r\n      }\r\n    }\r\n    return match;\r\n  }\r\n\r\n  /**\r\n   * adds the base path for the users image path.\r\n   * @param base The base path\r\n   */\r\n  public setImageBase(base: string) {\r\n    if (this.imageUri) {\r\n      this.imageUri = base + this.imageUri;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Gets the users configured client locale\r\n   * @returns locale string\r\n   */\r\n  public getClientLocale(): string {\r\n    return this.userSettings['clientlocale'] || 'en';\r\n  }\r\n\r\n  /**\r\n   * Gets the users configured schema locale\r\n   * @returns locale string\r\n   */\r\n  public getSchemaLocale(): string {\r\n    return this.schemaLocale;\r\n  }\r\n\r\n}\r\n"]}
86
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"eo-user.model.js","sourceRoot":"","sources":["../../../../../../../../../projects/eo-sdk/core/src/lib/model/eo-user.model.ts"],"names":[],"mappings":"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","sourcesContent":["\r\nexport interface Privileges {\r\n  id: string;\r\n  type: string;\r\n  name: string;\r\n}\r\n\r\nexport class EoUser {\r\n\r\n  /**\r\n   * The users ID\r\n   */\r\n  public id: string;\r\n  /**\r\n   * The users name\r\n   */\r\n  public name: string;\r\n  /**\r\n   * The users firstname\r\n   */\r\n  public firstname: string;\r\n  /**\r\n   * The users lastname\r\n   */\r\n  public lastname: string;\r\n  /**\r\n   * The users title (generated from backends title pattern)\r\n   */\r\n  public title: string;\r\n  /**\r\n   * The users email address\r\n   */\r\n  public email: string;\r\n  /**\r\n   * Flag indicating whether or not the user is present\r\n   */\r\n  public present: boolean;\r\n  /**\r\n   * URI to the users avatar image\r\n   */\r\n  public imageUri: string;\r\n  /**\r\n   * Custom user settings\r\n   */\r\n  public userSettings: any;\r\n  /**\r\n   * @ignore\r\n   */\r\n  public schema: any;\r\n  /**\r\n   * List of the users privileges\r\n   */\r\n  public privileges: Privileges[];\r\n  /**\r\n   * List of roles the user belongs to\r\n   */\r\n  public roles: any[];\r\n  /**\r\n   * List of the users deputies\r\n   */\r\n  public deputies: any[];\r\n  /**\r\n   * List of the users substitutes\r\n   */\r\n  public substitutesOf: any[];\r\n  /**\r\n   * @ignore\r\n   */public schemaLocale: string;\r\n  /**\r\n   * @ignore\r\n   */\r\n  public uiDirection: string;\r\n\r\n  /**\r\n   * Creates a new instance\r\n   * @param json The JSON object received from the backend. This will be used to construct the new user instance\r\n   */\r\n  constructor(json: any) {\r\n\r\n    const jUser = json['user'];\r\n    const jSchema = json['schema'];\r\n\r\n    this.id = jUser.id;\r\n    this.name = jUser.name;\r\n    this.firstname = jUser.firstname;\r\n    this.lastname = jUser.lastname;\r\n    this.title = jUser.title;\r\n    this.email = jUser.email;\r\n    this.present = jUser.present;\r\n    if (jUser.hasimage === true) {\r\n      this.imageUri = '/organization/image/' + this.id;\r\n    }\r\n    this.userSettings = typeof json['usersettings'] === 'object' ? json['usersettings'] : {};\r\n    this.schema = {\r\n      version: jSchema.version,\r\n      supportedLocales: jSchema.supportedlocales\r\n    };\r\n\r\n    this.privileges = jUser.privileges;\r\n    this.roles = jUser.effectiveroles;\r\n    this.deputies = jUser.deputies || [];\r\n    this.substitutesOf = jUser.substitutesOf || [];\r\n    this.schemaLocale = jUser.locale || this.getClientLocale();\r\n  }\r\n\r\n  /**\r\n   * Checks if the user has a certain privilege\r\n   * @param privilege The privilege to be checked\r\n   * @returns True if the user has this particular privilege, false otherwise\r\n   */\r\n  hasPrivilege(privilege: string): boolean {\r\n\r\n    let match = false;\r\n    if (this.privileges) {\r\n      let i = 0;\r\n      while (!match && i < this.privileges.length) {\r\n        match = this.privileges[i].name === privilege;\r\n        i++;\r\n      }\r\n    }\r\n    return match;\r\n  }\r\n\r\n  /**\r\n   * Checks if the user has a certain role\r\n   * @param role The role to be checked\r\n   * @returns True if the user has this particular role, false otherwise\r\n   */\r\n  hasRole(role: string): boolean {\r\n    let match = false;\r\n    if (this.roles) {\r\n      let i = 0;\r\n      while (!match && i < this.roles.length) {\r\n        match = this.roles[i].name === role;\r\n        i++;\r\n      }\r\n    }\r\n    return match;\r\n  }\r\n\r\n  /**\r\n   * adds the base path for the users image path.\r\n   * @param base The base path\r\n   */\r\n  public setImageBase(base: string) {\r\n    if (this.imageUri) {\r\n      this.imageUri = base + this.imageUri;\r\n    }\r\n  }\r\n\r\n  /**\r\n   * Gets the users configured client locale\r\n   * @returns locale string\r\n   */\r\n  public getClientLocale(): string {\r\n    return this.userSettings['clientlocale'] || 'en';\r\n  }\r\n\r\n  /**\r\n   * Gets the users configured schema locale\r\n   * @returns locale string\r\n   */\r\n  public getSchemaLocale(): string {\r\n    return this.schemaLocale;\r\n  }\r\n\r\n}\r\n"]}
@@ -41,6 +41,8 @@ import localeHi from '@angular/common/locales/hi';
41
41
  import localeExtraHi from '@angular/common/locales/extra/hi';
42
42
  import localeBn from '@angular/common/locales/bn';
43
43
  import localeExtraBn from '@angular/common/locales/extra/bn';
44
+ import localeEnGb from '@angular/common/locales/en-GB';
45
+ import localeExtraEnGb from '@angular/common/locales/extra/en-GB';
44
46
  import * as momentImported from 'moment';
45
47
  import { LocalStorage, StorageMap } from '@ngx-pwa/local-storage';
46
48
  import { saveAs } from 'file-saver';
@@ -123,6 +125,7 @@ class EoxTranslateJsonLoader {
123
125
  registerLocaleData(localeHi, 'hi', localeExtraHi); // Hindi
124
126
  registerLocaleData(localeBn, 'bn', localeExtraBn); // Bengalese
125
127
  registerLocaleData(localeDeCh, 'de-CH', localeExtraDeCh); // German (switzerland)
128
+ registerLocaleData(localeEnGb, 'en-GB', localeExtraEnGb); // English (Great-Britain)
126
129
  }
127
130
  /**
128
131
  *
@@ -135,7 +138,7 @@ class EoxTranslateJsonLoader {
135
138
  loadTranslationFile(folder, lang) {
136
139
  return this.http.get(`${folder}${lang}.json`).pipe(catchError((e) => {
137
140
  // ISO codes with more than 2 characters are sub-languages like de-CH.
138
- // If there is no translation file for that sub-language we'll try to load
141
+ // If there is no translation file for that sub-language we'll try to load
139
142
  // the file for the base language (in this case de).
140
143
  return lang.length > 2 ? this.loadTranslationFile(folder, lang.substring(0, 2)) : of({});
141
144
  }));
@@ -744,7 +747,7 @@ class EoUser {
744
747
  if (jUser.hasimage === true) {
745
748
  this.imageUri = '/organization/image/' + this.id;
746
749
  }
747
- this.userSettings = json['usersettings'];
750
+ this.userSettings = typeof json['usersettings'] === 'object' ? json['usersettings'] : {};
748
751
  this.schema = {
749
752
  version: jSchema.version,
750
753
  supportedLocales: jSchema.supportedlocales