@beinformed/ui 1.19.0 → 1.19.4

package/lib/models/attributes/PasswordAttributeModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"PasswordAttributeModel.js","names":["PasswordAttributeModel","value","updateLastModification","inputvalue","getContribution","constraints","upperAndLowerCaseMandatory","maxSequenceOfIdenticalCharacters","maxSequenceOfUsernameCharacters","minNumberOfNumericCharacters","minNumberOfSpecialCharacters","regexConstraint","isConfirmPassword","getConfirmPasswordConstraints","getStandardPasswordConstraints","ConstraintCollection","add","PasswordConfirmConstraint","confirmValue","otherLabel","PasswordLowerAndUpperCaseConstraint","PasswordThreeConsecutiveCharactersNotAllowedConstraint","PasswordMinNumericCharactersConstraint","PasswordMinSpecialCharactersConstraint","regexConstraints","length","forEach","RegexConstraint","layouthint","has","CONFIRM_PASSWORD","addConstraints","_isConfirmPassword","_confirmValue","validate","_otherLabel","useClientsideValidation","isOptionalAndEmpty","_isValid","_validatedValue","constraintCollection","inError","name","contributions","type","Array","isArray","StringAttributeModel"],"sources":["../../../src/models/attributes/PasswordAttributeModel.js"],"sourcesContent":["// @flow\nimport StringAttributeModel from \"./StringAttributeModel\";\nimport ConstraintCollection from \"./input-constraints/ConstraintCollection\";\n\nimport PasswordLowerAndUpperCaseConstraint from \"./input-constraints/PasswordLowerAndUpperCaseConstraint\";\nimport PasswordThreeConsecutiveCharactersNotAllowedConstraint from \"./input-constraints/PasswordThreeConsecutiveCharactersNotAllowedConstraint\";\nimport PasswordMinNumericCharactersConstraint from \"./input-constraints/PasswordMinNumericCharactersConstraint\";\nimport PasswordMinSpecialCharactersConstraint from \"./input-constraints/PasswordMinSpecialCharactersConstraint\";\nimport RegexConstraint from \"./input-constraints/RegexConstraint\";\nimport PasswordConfirmConstraint from \"./input-constraints/PasswordConfirmConstraint\";\n\nimport { CONFIRM_PASSWORD } from \"../../constants/LayoutHints\";\n\nimport type { RegexObject } from \"./input-constraints/RegexConstraint\";\n\n/**\n * Password attribute\n */\nexport default class PasswordAttributeModel extends StringAttributeModel {\n  _confirmValue: string;\n  _isConfirmPassword: boolean;\n  _otherLabel: string;\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    const layouthint = contributions?.layouthint;\n    return (\n      contributions.type === \"password\" ||\n      (Array.isArray(layouthint) && layouthint.includes(\"password\"))\n    );\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"password\";\n  }\n\n  /**\n   * Update the attribute by name and value\n   */\n  update(value: string): PasswordAttributeModel {\n    this.updateLastModification();\n    this.inputvalue = value;\n\n    return this;\n  }\n\n  /**\n   */\n  get constraints(): Object {\n    return this.getContribution(\"constraints\", {});\n  }\n\n  /**\n   */\n  get upperAndLowerCaseMandatory(): ?boolean {\n    return this.constraints.upperAndLowerCaseMandatory;\n  }\n\n  /**\n   */\n  get maxSequenceOfIdenticalCharacters(): ?number {\n    return this.constraints.maxSequenceOfIdenticalCharacters;\n  }\n\n  /**\n   */\n  get maxSequenceOfUsernameCharacters(): ?number {\n    return this.constraints.maxSequenceOfUsernameCharacters;\n  }\n\n  /**\n   */\n  get minNumberOfNumericCharacters(): ?number {\n    return this.constraints.minNumberOfNumericCharacters;\n  }\n\n  /**\n   */\n  get minNumberOfSpecialCharacters(): ?number {\n    return this.constraints.minNumberOfSpecialCharacters;\n  }\n\n  /**\n   */\n  get regexConstraints(): ?Array<RegexObject> {\n    return this.constraints.regexConstraint;\n  }\n\n  /**\n   * Add password constraints\n   */\n  addConstraints(): ConstraintCollection {\n    if (this.isConfirmPassword) {\n      return this.getConfirmPasswordConstraints();\n    }\n    return this.getStandardPasswordConstraints();\n  }\n\n  /**\n   * Constraints for a confirmation password\n   */\n  getConfirmPasswordConstraints(): ConstraintCollection {\n    const constraints = new ConstraintCollection();\n    constraints.add(\n      new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n    );\n    return constraints;\n  }\n\n  /**\n   * Constrains for a standard password\n   */\n  getStandardPasswordConstraints(): ConstraintCollection {\n    const constraints = new ConstraintCollection();\n\n    if (this.upperAndLowerCaseMandatory) {\n      constraints.add(new PasswordLowerAndUpperCaseConstraint());\n    }\n\n    if (this.maxSequenceOfIdenticalCharacters) {\n      constraints.add(\n        new PasswordThreeConsecutiveCharactersNotAllowedConstraint(\n          this.maxSequenceOfIdenticalCharacters\n        )\n      );\n    }\n\n    if (this.minNumberOfNumericCharacters) {\n      constraints.add(\n        new PasswordMinNumericCharactersConstraint(\n          this.minNumberOfNumericCharacters\n        )\n      );\n    }\n\n    if (this.minNumberOfSpecialCharacters) {\n      constraints.add(\n        new PasswordMinSpecialCharactersConstraint(\n          this.minNumberOfSpecialCharacters\n        )\n      );\n    }\n\n    if (this.regexConstraints && this.regexConstraints.length > 0) {\n      this.regexConstraints.forEach((regexConstraint) => {\n        constraints.add(new RegexConstraint(regexConstraint));\n      });\n    }\n\n    if (this.layouthint.has(CONFIRM_PASSWORD) && this.confirmValue !== \"\") {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    }\n\n    return constraints;\n  }\n\n  /**\n   * Retrieve applicable constraint for this attribute\n   */\n  get constraintCollection(): ConstraintCollection {\n    if (this.isConfirmPassword) {\n      const constraints = new ConstraintCollection();\n      constraints.add(this.addConstraints());\n      return constraints;\n    }\n\n    return super.constraintCollection;\n  }\n\n  /**\n   */\n  get isConfirmPassword(): boolean {\n    return this._isConfirmPassword || false;\n  }\n\n  /**\n   */\n  set isConfirmPassword(isConfirmPassword: boolean) {\n    this._isConfirmPassword = isConfirmPassword;\n  }\n\n  /**\n   */\n  get confirmValue(): string {\n    return this._confirmValue || \"\";\n  }\n\n  /**\n   */\n  set confirmValue(confirmValue: string) {\n    this._confirmValue = confirmValue;\n\n    this.validate(this.inputvalue);\n  }\n\n  /**\n   */\n  get otherLabel(): string {\n    return this._otherLabel;\n  }\n\n  /**\n   */\n  set otherLabel(otherLabel: string) {\n    this._otherLabel = otherLabel;\n  }\n\n  /**\n   * Validate input\n   */\n  validate(value: string): boolean {\n    // when client side validation is disabled, this attribute is always valid\n    if (!this.useClientsideValidation()) {\n      return true;\n    }\n\n    if (this.isOptionalAndEmpty(value)) {\n      this._isValid = true;\n    } else if (this._validatedValue !== `${this.confirmValue}-${value}`) {\n      this._isValid = this.constraintCollection.validate(value);\n    }\n    this._validatedValue = `${this.confirmValue}-${value}`;\n\n    return this._isValid;\n  }\n\n  /**\n   */\n  getFormData(): { [string]: any } | null {\n    if (this.isConfirmPassword || this.inError()) {\n      return null;\n    }\n\n    return {\n      [this.name]: this.value,\n    };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"PasswordAttributeModel.js","names":["PasswordAttributeModel","value","updateLastModification","inputvalue","getContribution","constraints","upperAndLowerCaseMandatory","maxSequenceOfIdenticalCharacters","maxSequenceOfUsernameCharacters","minNumberOfNumericCharacters","minNumberOfSpecialCharacters","regexConstraint","isConfirmPassword","getConfirmPasswordConstraints","getStandardPasswordConstraints","ConstraintCollection","add","PasswordConfirmConstraint","confirmValue","otherLabel","PasswordLowerAndUpperCaseConstraint","PasswordThreeConsecutiveCharactersNotAllowedConstraint","PasswordMinNumericCharactersConstraint","PasswordMinSpecialCharactersConstraint","regexConstraints","length","forEach","RegexConstraint","layouthint","has","CONFIRM_PASSWORD","_isConfirmPassword","_confirmValue","validate","_otherLabel","useClientsideValidation","isOptionalAndEmpty","_isValid","_validatedValue","constraintCollection","inError","name","contributions","type","Array","isArray","StringAttributeModel"],"sources":["../../../src/models/attributes/PasswordAttributeModel.js"],"sourcesContent":["// @flow\nimport StringAttributeModel from \"./StringAttributeModel\";\nimport ConstraintCollection from \"./input-constraints/ConstraintCollection\";\n\nimport PasswordLowerAndUpperCaseConstraint from \"./input-constraints/PasswordLowerAndUpperCaseConstraint\";\nimport PasswordThreeConsecutiveCharactersNotAllowedConstraint from \"./input-constraints/PasswordThreeConsecutiveCharactersNotAllowedConstraint\";\nimport PasswordMinNumericCharactersConstraint from \"./input-constraints/PasswordMinNumericCharactersConstraint\";\nimport PasswordMinSpecialCharactersConstraint from \"./input-constraints/PasswordMinSpecialCharactersConstraint\";\nimport RegexConstraint from \"./input-constraints/RegexConstraint\";\nimport PasswordConfirmConstraint from \"./input-constraints/PasswordConfirmConstraint\";\n\nimport { CONFIRM_PASSWORD } from \"../../constants/LayoutHints\";\n\nimport type { RegexObject } from \"./input-constraints/RegexConstraint\";\n\n/**\n * Password attribute\n */\nexport default class PasswordAttributeModel extends StringAttributeModel {\n  _confirmValue: string;\n  _isConfirmPassword: boolean;\n  _otherLabel: string;\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    const layouthint = contributions?.layouthint;\n    return (\n      contributions.type === \"password\" ||\n      (Array.isArray(layouthint) && layouthint.includes(\"password\"))\n    );\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"password\";\n  }\n\n  /**\n   * Update the attribute by name and value\n   */\n  update(value: string): PasswordAttributeModel {\n    this.updateLastModification();\n    this.inputvalue = value;\n\n    return this;\n  }\n\n  /**\n   */\n  get constraints(): Object {\n    return this.getContribution(\"constraints\", {});\n  }\n\n  /**\n   */\n  get upperAndLowerCaseMandatory(): ?boolean {\n    return this.constraints.upperAndLowerCaseMandatory;\n  }\n\n  /**\n   */\n  get maxSequenceOfIdenticalCharacters(): ?number {\n    return this.constraints.maxSequenceOfIdenticalCharacters;\n  }\n\n  /**\n   */\n  get maxSequenceOfUsernameCharacters(): ?number {\n    return this.constraints.maxSequenceOfUsernameCharacters;\n  }\n\n  /**\n   */\n  get minNumberOfNumericCharacters(): ?number {\n    return this.constraints.minNumberOfNumericCharacters;\n  }\n\n  /**\n   */\n  get minNumberOfSpecialCharacters(): ?number {\n    return this.constraints.minNumberOfSpecialCharacters;\n  }\n\n  /**\n   */\n  get regexConstraints(): ?Array<RegexObject> {\n    return this.constraints.regexConstraint;\n  }\n\n  /**\n   * Add password constraints\n   */\n  addConstraints(): ConstraintCollection {\n    if (this.isConfirmPassword) {\n      return this.getConfirmPasswordConstraints();\n    }\n    return this.getStandardPasswordConstraints();\n  }\n\n  /**\n   * Constraints for a confirmation password\n   */\n  getConfirmPasswordConstraints(): ConstraintCollection {\n    const constraints = new ConstraintCollection();\n    constraints.add(\n      new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n    );\n    return constraints;\n  }\n\n  /**\n   * Constrains for a standard password\n   */\n  getStandardPasswordConstraints(): ConstraintCollection {\n    const constraints = new ConstraintCollection();\n\n    if (this.upperAndLowerCaseMandatory) {\n      constraints.add(new PasswordLowerAndUpperCaseConstraint());\n    }\n\n    if (this.maxSequenceOfIdenticalCharacters) {\n      constraints.add(\n        new PasswordThreeConsecutiveCharactersNotAllowedConstraint(\n          this.maxSequenceOfIdenticalCharacters\n        )\n      );\n    }\n\n    if (this.minNumberOfNumericCharacters) {\n      constraints.add(\n        new PasswordMinNumericCharactersConstraint(\n          this.minNumberOfNumericCharacters\n        )\n      );\n    }\n\n    if (this.minNumberOfSpecialCharacters) {\n      constraints.add(\n        new PasswordMinSpecialCharactersConstraint(\n          this.minNumberOfSpecialCharacters\n        )\n      );\n    }\n\n    if (this.regexConstraints && this.regexConstraints.length > 0) {\n      this.regexConstraints.forEach((regexConstraint) => {\n        constraints.add(new RegexConstraint(regexConstraint));\n      });\n    }\n\n    if (\n      this.layouthint.has(CONFIRM_PASSWORD) &&\n      this.isConfirmPassword == null\n    ) {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    }\n\n    return constraints;\n  }\n\n  /**\n   * Retrieve applicable constraint for this attribute\n   */\n  get constraintCollection(): ConstraintCollection {\n    if (this.isConfirmPassword) {\n      // confirm password only needs local constraints, no server constraints\n      return this.getConfirmPasswordConstraints();\n    }\n\n    return super.constraintCollection;\n  }\n\n  /**\n   */\n  get isConfirmPassword(): boolean | null {\n    return this._isConfirmPassword;\n  }\n\n  /**\n   */\n  set isConfirmPassword(isConfirmPassword: boolean) {\n    this._isConfirmPassword = isConfirmPassword;\n  }\n\n  /**\n   */\n  get confirmValue(): string {\n    return this._confirmValue || \"\";\n  }\n\n  /**\n   */\n  set confirmValue(confirmValue: string) {\n    this._confirmValue = confirmValue;\n\n    this.validate(this.inputvalue);\n  }\n\n  /**\n   */\n  get otherLabel(): string {\n    return this._otherLabel;\n  }\n\n  /**\n   */\n  set otherLabel(otherLabel: string) {\n    this._otherLabel = otherLabel;\n  }\n\n  /**\n   * Validate input\n   */\n  validate(value: string): boolean {\n    // when client side validation is disabled, this attribute is always valid\n    if (!this.useClientsideValidation()) {\n      return true;\n    }\n\n    if (this.isOptionalAndEmpty(value)) {\n      this._isValid = true;\n    } else if (this._validatedValue !== `${this.confirmValue}-${value}`) {\n      this._isValid = this.constraintCollection.validate(value);\n    }\n    this._validatedValue = `${this.confirmValue}-${value}`;\n\n    return this._isValid;\n  }\n\n  /**\n   */\n  getFormData(): { [string]: any } | null {\n    if (this.isConfirmPassword || this.inError()) {\n      return null;\n    }\n\n    return {\n      [this.name]: this.value,\n    };\n  }\n}\n"],"mappings":"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"}

package/lib/models/types.js.flow

@@ -153,6 +153,13 @@ export interface IModelWithChildModels {
   setChildModels(models: Array<ModularUIModel>): void;
 }
 
+export type AuthenticationType = {
+  name: string,
+  authentication: string,
+  redirectUri: string,
+  isPrimary: boolean,
+};
+
 export type FileEntryType = {
   name: string,
   size?: number,

package/lib/models/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {|\n  _id: string,\n  label: string,\n  value: string,\n|};\n\nexport type propertyJSON = {|\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n|};\n\nexport type textfragmentJSON = {|\n  label: string,\n  text: string,\n  type: string,\n|};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(models: Array<ModularUIModel>): void;\n}\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {|\n  _id: string,\n  label: string,\n  value: string,\n|};\n\nexport type propertyJSON = {|\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n|};\n\nexport type textfragmentJSON = {|\n  label: string,\n  text: string,\n  type: string,\n|};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(models: Array<ModularUIModel>): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n"],"mappings":""}

package/lib/redux/actions/Application.js

@@ -24,6 +24,7 @@ var reloadApplication = function reloadApplication() {
       modelKey = "application(/)(".concat(locale, ")");
     }
 
+    dispatch((0, _actions.removeModelByKey)(modelKey));
     return dispatch((0, _actions.loadModularUI)(modelKey, new _models.Href("/", "Application"), {
       targetModel: _models.ApplicationModel
     }));

package/lib/redux/actions/Application.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import { loadModularUI } from "../_modularui/actions";
+import { loadModularUI, removeModelByKey } from "../_modularui/actions";
 import { keyByHref } from "../_modularui/selectors";
 import { ApplicationModel, Href } from "../../models";
 
@@ -16,6 +16,8 @@ export const reloadApplication =
       modelKey = `application(/)(${locale})`;
     }
 
+    dispatch(removeModelByKey(modelKey));
+
     return dispatch(
       loadModularUI(modelKey, new Href("/", "Application"), {
         targetModel: ApplicationModel,

package/lib/redux/actions/Application.js.map

@@ -1 +1 @@
-{"version":3,"file":"Application.js","names":["reloadApplication","dispatch","getState","modelKey","keyByHref","locale","i18n","loadModularUI","Href","targetModel","ApplicationModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAIA;AACA;AACO,IAAMA,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAG,IAAAC,oBAAA,EAAUF,QAAQ,EAAlB,EAAsB,GAAtB,CAAf;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAME,MAAM,qBAAGH,QAAQ,GAAGI,IAAd,mDAAG,eAAiBD,MAAhC;MACAF,QAAQ,4BAAqBE,MAArB,MAAR;IACD;;IAED,OAAOJ,QAAQ,CACb,IAAAM,sBAAA,EAAcJ,QAAd,EAAwB,IAAIK,YAAJ,CAAS,GAAT,EAAc,aAAd,CAAxB,EAAsD;MACpDC,WAAW,EAAEC;IADuC,CAAtD,CADa,CAAf;EAKD,CAbD;AAAA,CADK"}
+{"version":3,"file":"Application.js","names":["reloadApplication","dispatch","getState","modelKey","keyByHref","locale","i18n","removeModelByKey","loadModularUI","Href","targetModel","ApplicationModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI, removeModelByKey } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    dispatch(removeModelByKey(modelKey));\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAIA;AACA;AACO,IAAMA,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAG,IAAAC,oBAAA,EAAUF,QAAQ,EAAlB,EAAsB,GAAtB,CAAf;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAME,MAAM,qBAAGH,QAAQ,GAAGI,IAAd,mDAAG,eAAiBD,MAAhC;MACAF,QAAQ,4BAAqBE,MAArB,MAAR;IACD;;IAEDJ,QAAQ,CAAC,IAAAM,yBAAA,EAAiBJ,QAAjB,CAAD,CAAR;IAEA,OAAOF,QAAQ,CACb,IAAAO,sBAAA,EAAcL,QAAd,EAAwB,IAAIM,YAAJ,CAAS,GAAT,EAAc,aAAd,CAAxB,EAAsD;MACpDC,WAAW,EAAEC;IADuC,CAAtD,CADa,CAAf;EAKD,CAfD;AAAA,CADK"}

package/lib/redux/actions/Authorization.js

@@ -21,6 +21,8 @@ var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 
 var _actions2 = require("../_modularui/actions");
 
+var _selectors = require("../_modularui/selectors");
+
 var _Application = require("./Application");
 
 var _constants = require("../../constants");
@@ -38,10 +40,12 @@ var handleUnauthorized = function handleUnauthorized(errorResponse) {
     if ((0, _constants.getSetting)("PAGE_RELOAD_ON_UNAUTHORIZED_ERROR", false) && (_errorResponse$respon = errorResponse.response) !== null && _errorResponse$respon !== void 0 && _errorResponse$respon.error) {
       window.location.reload();
       return;
-    } // reload application when flag auth is set
+    } // reload application when flag auth is set or isLogged
+
 
+    var application = (0, _selectors.getApplication)(getState());
 
-    if (_Cache.default.getItem("auth")) {
+    if (_Cache.default.getItem("auth") || application !== null && application !== void 0 && application.isLoggedIn) {
       dispatch((0, _Application.reloadApplication)());
     } // set logged auth
 

package/lib/redux/actions/Authorization.js.flow

@@ -10,6 +10,7 @@ import { showNotification } from "./Notification";
 import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/actions";
+import { getApplication } from "../_modularui/selectors";
 import { reloadApplication } from "./Application";
 
 import { getSetting } from "../../constants";
@@ -33,8 +34,9 @@ export const handleUnauthorized =
       return;
     }
 
-    // reload application when flag auth is set
-    if (Cache.getItem("auth")) {
+    // reload application when flag auth is set or isLogged
+    const application = getApplication(getState());
+    if (Cache.getItem("auth") || application?.isLoggedIn) {
       dispatch(reloadApplication());
     }
 

package/lib/redux/actions/Authorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","names":["handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","Cache","getItem","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","WARNING_TIMEOUT","showNotification","NOTIFICATION_TYPES","WARNING","id","defaultMessage","message","router","pathname","LOGIN_PATH","locationFrom","state","from","replace","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set\n    if (Cache.getItem(\"auth\")) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":";;;;;;;;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AAEA;;AAIA;AACA;AACO,IAAMA,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAAC,IAAAG,0BAAA,EAAiBJ,aAAa,CAACG,UAA/B,CAAD,CAAR;IACD;;IAED,IACE,IAAAE,qBAAA,EAAW,mCAAX,EAAgD,KAAhD,8BACAL,aAAa,CAACM,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAIC,cAAA,CAAMC,OAAN,CAAc,MAAd,CAAJ,EAA2B;MACzBX,QAAQ,CAAC,IAAAY,8BAAA,GAAD,CAAR;IACD,CAhBqB,CAkBtB;;;IACAZ,QAAQ,CAAC,IAAAa,sBAAA,GAAD,CAAR;;IAEAH,cAAA,CAAMI,UAAN,CAAiB,MAAjB;;IAEA,IAAIf,aAAa,CAACgB,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAhB,QAAQ,CACN,IAAAiB,8BAAA,EACEC,6BAAA,CAAmBC,OADrB,EAEE;QACEC,EAAE,EAAErB,aAAa,CAACqB,EADpB;QAEEC,cAAc,EAAEtB,aAAa,CAACuB;MAFhC,CAFF,EAME,IANF,EAOEN,eAPF,CADM,CAAR;IAWD,CApCqB,CAsCtB;;;IACA,IAAMR,QAAQ,GAAGP,QAAQ,GAAGsB,MAAX,CAAkBf,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEgB,QAAV,MAAuBC,qBAA3B,EAAuC;MAAA;;MACrC,IAAMC,YAAY,GAAGlB,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEmB,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAO5B,QAAQ,CACb,IAAA6B,gBAAA,EAAQJ,qBAAR,EAAoB;QAClBG,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkBzB,QAAQ,GAAGsB,MAAX,CAAkBf,QADpC;QAElB;QACAsB,KAAK,EAAE;MAHW,CAApB,CADa,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CArDD;AAAA,CADK"}
+{"version":3,"file":"Authorization.js","names":["handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","application","getApplication","Cache","getItem","isLoggedIn","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","WARNING_TIMEOUT","showNotification","NOTIFICATION_TYPES","WARNING","id","defaultMessage","message","router","pathname","LOGIN_PATH","locationFrom","state","from","replace","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { getApplication } from \"../_modularui/selectors\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":";;;;;;;;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAIA;AACA;AACO,IAAMA,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAAC,IAAAG,0BAAA,EAAiBJ,aAAa,CAACG,UAA/B,CAAD,CAAR;IACD;;IAED,IACE,IAAAE,qBAAA,EAAW,mCAAX,EAAgD,KAAhD,8BACAL,aAAa,CAACM,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAMC,WAAW,GAAG,IAAAC,yBAAA,EAAeV,QAAQ,EAAvB,CAApB;;IACA,IAAIW,cAAA,CAAMC,OAAN,CAAc,MAAd,KAAyBH,WAAzB,aAAyBA,WAAzB,eAAyBA,WAAW,CAAEI,UAA1C,EAAsD;MACpDd,QAAQ,CAAC,IAAAe,8BAAA,GAAD,CAAR;IACD,CAjBqB,CAmBtB;;;IACAf,QAAQ,CAAC,IAAAgB,sBAAA,GAAD,CAAR;;IAEAJ,cAAA,CAAMK,UAAN,CAAiB,MAAjB;;IAEA,IAAIlB,aAAa,CAACmB,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAnB,QAAQ,CACN,IAAAoB,8BAAA,EACEC,6BAAA,CAAmBC,OADrB,EAEE;QACEC,EAAE,EAAExB,aAAa,CAACwB,EADpB;QAEEC,cAAc,EAAEzB,aAAa,CAAC0B;MAFhC,CAFF,EAME,IANF,EAOEN,eAPF,CADM,CAAR;IAWD,CArCqB,CAuCtB;;;IACA,IAAMX,QAAQ,GAAGP,QAAQ,GAAGyB,MAAX,CAAkBlB,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEmB,QAAV,MAAuBC,qBAA3B,EAAuC;MAAA;;MACrC,IAAMC,YAAY,GAAGrB,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEsB,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAO/B,QAAQ,CACb,IAAAgC,gBAAA,EAAQJ,qBAAR,EAAoB;QAClBG,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkB5B,QAAQ,GAAGyB,MAAX,CAAkBlB,QADpC;QAElB;QACAyB,KAAK,EAAE;MAHW,CAApB,CADa,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CAtDD;AAAA,CADK"}

package/lib/redux/actions/SignOut.js.flow

@@ -2,9 +2,9 @@
 import Authenticate from "../../modularui/Authenticate";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
+import { reloadApplication } from "./Application";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
-import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action

package/lib/redux/actions/SignOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignOut.js","names":["logoutSuccess","type","logout","dispatch","startProgress","Authenticate","then","resetModularUI","reloadApplication","finishProgress"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\nimport { reloadApplication } from \"./Application\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AAGA;;AAEA;AACA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;;;;AACO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAAC,IAAAC,gCAAA,GAAD,CAAR;IAEA,OAAO,IAAIC,qBAAJ,GACJH,MADI,GAEJI,IAFI,CAEC;MAAA,OAAMH,QAAQ,CAAC,IAAAI,uBAAA,GAAD,CAAd;IAAA,CAFD,EAGJD,IAHI,CAGC;MAAA,OAAMH,QAAQ,CAAC,IAAAK,8BAAA,GAAD,CAAd;IAAA,CAHD,EAIJF,IAJI,CAIC,YAAM;MACVH,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAAC,IAAAM,iCAAA,GAAD,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}
+{"version":3,"file":"SignOut.js","names":["logoutSuccess","type","logout","dispatch","startProgress","Authenticate","then","resetModularUI","reloadApplication","finishProgress"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AACA;;AAIA;AACA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;;;;AACO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAAC,IAAAC,gCAAA,GAAD,CAAR;IAEA,OAAO,IAAIC,qBAAJ,GACJH,MADI,GAEJI,IAFI,CAEC;MAAA,OAAMH,QAAQ,CAAC,IAAAI,uBAAA,GAAD,CAAd;IAAA,CAFD,EAGJD,IAHI,CAGC;MAAA,OAAMH,QAAQ,CAAC,IAAAK,8BAAA,GAAD,CAAd;IAAA,CAHD,EAIJF,IAJI,CAIC,YAAM;MACVH,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAAC,IAAAM,iCAAA,GAAD,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}

package/lib/redux/actions/__tests__/Application.spec.js.flow

@@ -16,6 +16,10 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -39,6 +43,10 @@ describe("application actions", () => {
     store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "/", status: "LOADING" },

package/lib/redux/actions/__tests__/Authorization.spec.js.flow

@@ -35,6 +35,10 @@ describe("authorization actions", () => {
     store.dispatch(handleUnauthorized(errorResponse));
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.19.0",
+  "version": "1.19.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -51,19 +51,7 @@
     "dist",
     "esm",
     "lib",
-    "codemods",
-    "builder",
-    "exceptions",
-    "hooks",
-    "i18n",
-    "models",
-    "modularui",
-    "react",
-    "react-client",
-    "react-server",
-    "react-theme",
-    "redux",
-    "utils"
+    "codemods"
   ],
   "peerDependencies": {
     "history": "^4.0.0",
@@ -72,10 +60,10 @@
     "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0",
     "react-helmet-async": "^1.0.0",
     "react-redux": "^7.0.0 || ^8.0.0",
-    "react-router": "^5.2.0",
+    "react-router": "^5.0.0",
     "redux": "^4.0.0",
-    "redux-thunk": "^2.3.0",
-    "styled-components": "^5.2.0"
+    "redux-thunk": "^2.0.0",
+    "styled-components": "^5.0.0"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.18.3",
@@ -135,20 +123,20 @@
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.13.1",
     "lint-staged": "^13.0.1",
-    "polished": "^4.2.2",
-    "prettier": "^2.7.0",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-helmet-async": "^1.3.0",
-    "react-redux": "^8.0.2",
-    "react-router": "^5.2.0",
+    "polished": "^4.0.0",
+    "prettier": "^2.7.1",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "react-helmet-async": "^1.0.0",
+    "react-redux": "^8.0.0",
+    "react-router": "^5.0.0",
     "react-test-renderer": "^18.1.0",
-    "redux": "^4.2.0",
+    "redux": "^4.0.0",
     "redux-mock-store": "^1.5.4",
-    "redux-thunk": "^2.4.1",
+    "redux-thunk": "^2.0.0",
     "rimraf": "^3.0.2",
     "standard-version": "^9.5.0",
-    "styled-components": "^5.3.5",
+    "styled-components": "^5.0.0",
     "xhr-mock": "^2.5.1"
   },
   "scarfSettings": {

package/src/constants/Settings.js

@@ -42,6 +42,15 @@ const defaultSettings = {
   // Indicates which locales are enabled
   ENABLED_LOCALES: ["en", "nl"],
 
+  // Renders the global log in page
+  RENDER_GLOBAL_LOGIN_PAGE: false,
+
+  // Renders the global log out page
+  RENDER_GLOBAL_LOGOUT_PAGE: false,
+
+  // Renders the login variants as option on the global logout page
+  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,
+
   // Render forms in a modal
   RENDER_FORMS_IN_MODAL: true,
 

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -61,6 +61,10 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -108,6 +112,10 @@ describe("authentication hooks", () => {
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
       { type: "MODULARUI/RESET" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },

package/src/models/application/ApplicationModel.js

@@ -5,7 +5,7 @@ import UserServicesModel from "../user/UserServicesModel";
 
 import { NotAllowedUriException } from "../../exceptions";
 
-import type { ModularUIModel } from "../types";
+import type { ModularUIModel, AuthenticationType } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type LinkCollection from "../links/LinkCollection";
 import type Href from "../href/Href";
@@ -64,6 +64,12 @@ export default class ApplicationModel extends ResourceModel {
     return this.getContribution("label", "");
   }
 
+  /**
+   * Getting the authentication types of the application
+   */
+  get authenticationTypes(): Array<AuthenticationType> {
+    return this.getContribution("security", []);
+  }
   /**
    * Getting the tab links
    */

package/src/models/attributes/PasswordAttributeModel.js

@@ -150,7 +150,10 @@ export default class PasswordAttributeModel extends StringAttributeModel {
       });
     }
 
-    if (this.layouthint.has(CONFIRM_PASSWORD) && this.confirmValue !== "") {
+    if (
+      this.layouthint.has(CONFIRM_PASSWORD) &&
+      this.isConfirmPassword == null
+    ) {
       constraints.add(
         new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)
       );
@@ -164,9 +167,8 @@ export default class PasswordAttributeModel extends StringAttributeModel {
    */
   get constraintCollection(): ConstraintCollection {
     if (this.isConfirmPassword) {
-      const constraints = new ConstraintCollection();
-      constraints.add(this.addConstraints());
-      return constraints;
+      // confirm password only needs local constraints, no server constraints
+      return this.getConfirmPasswordConstraints();
     }
 
     return super.constraintCollection;
@@ -174,8 +176,8 @@ export default class PasswordAttributeModel extends StringAttributeModel {
 
   /**
    */
-  get isConfirmPassword(): boolean {
-    return this._isConfirmPassword || false;
+  get isConfirmPassword(): boolean | null {
+    return this._isConfirmPassword;
   }
 
   /**

package/src/models/types.js

@@ -153,6 +153,13 @@ export interface IModelWithChildModels {
   setChildModels(models: Array<ModularUIModel>): void;
 }
 
+export type AuthenticationType = {
+  name: string,
+  authentication: string,
+  redirectUri: string,
+  isPrimary: boolean,
+};
+
 export type FileEntryType = {
   name: string,
   size?: number,

package/src/redux/actions/Application.js

@@ -1,5 +1,5 @@
 // @flow
-import { loadModularUI } from "../_modularui/actions";
+import { loadModularUI, removeModelByKey } from "../_modularui/actions";
 import { keyByHref } from "../_modularui/selectors";
 import { ApplicationModel, Href } from "../../models";
 
@@ -16,6 +16,8 @@ export const reloadApplication =
       modelKey = `application(/)(${locale})`;
     }
 
+    dispatch(removeModelByKey(modelKey));
+
     return dispatch(
       loadModularUI(modelKey, new Href("/", "Application"), {
         targetModel: ApplicationModel,

package/src/redux/actions/Authorization.js

@@ -10,6 +10,7 @@ import { showNotification } from "./Notification";
 import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/actions";
+import { getApplication } from "../_modularui/selectors";
 import { reloadApplication } from "./Application";
 
 import { getSetting } from "../../constants";
@@ -33,8 +34,9 @@ export const handleUnauthorized =
       return;
     }
 
-    // reload application when flag auth is set
-    if (Cache.getItem("auth")) {
+    // reload application when flag auth is set or isLogged
+    const application = getApplication(getState());
+    if (Cache.getItem("auth") || application?.isLoggedIn) {
       dispatch(reloadApplication());
     }
 

package/src/redux/actions/SignOut.js

@@ -2,9 +2,9 @@
 import Authenticate from "../../modularui/Authenticate";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
+import { reloadApplication } from "./Application";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
-import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action

package/src/redux/actions/__tests__/Application.spec.js

@@ -16,6 +16,10 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -39,6 +43,10 @@ describe("application actions", () => {
     store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "/", status: "LOADING" },

package/src/redux/actions/__tests__/Authorization.spec.js

@@ -35,6 +35,10 @@ describe("authorization actions", () => {
     store.dispatch(handleUnauthorized(errorResponse));
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",

package/builder/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.builder",
-  "private": true,
-  "main": "../lib/builder/index.js",
-  "jsnext:main": "../esm/builder/index.js",
-  "module": "../esm/builder/index.js",
-  "esnext": "../src/builder/index.js"
-}

package/exceptions/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.exceptions",
-  "private": true,
-  "main": "../lib/exceptions/index.js",
-  "jsnext:main": "../esm/exceptions/index.js",
-  "module": "../esm/exceptions/index.js",
-  "esnext": "../src/exceptions/index.js"
-}

package/hooks/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.hooks",
-  "private": true,
-  "main": "../lib/hooks/index.js",
-  "jsnext:main": "../esm/hooks/index.js",
-  "module": "../esm/hooks/index.js",
-  "esnext": "../src/hooks/index.js"
-}

package/i18n/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.i18n",
-  "private": true,
-  "main": "../lib/i18n/index.js",
-  "jsnext:main": "../esm/i18n/index.js",
-  "module": "../esm/i18n/index.js",
-  "esnext": "../src/i18n/index.js"
-}

package/models/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.models",
-  "private": true,
-  "main": "../lib/models/index.js",
-  "jsnext:main": "../esm/models/index.js",
-  "module": "../esm/models/index.js",
-  "esnext": "../src/models/index.js"
-}

package/modularui/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.modularui",
-  "private": true,
-  "main": "../lib/modularui/index.js",
-  "jsnext:main": "../esm/modularui/index.js",
-  "module": "../esm/modularui/index.js",
-  "esnext": "../src/modularui/index.js"
-}

package/react/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.react",
-  "private": true,
-  "main": "../lib/react/index.js",
-  "jsnext:main": "../esm/react/index.js",
-  "module": "../esm/react/index.js",
-  "esnext": "../src/react/index.js"
-}