@beinformed/ui 1.18.8 → 1.18.9

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.18.9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.18.8...v1.18.9) (2022-06-14)
+
+### Bug Fixes
+
+- **confirm-password:** only validate confirm-password with value ([9190faa](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/9190faa31e50e5a018003e478bcdad2a06b011ef))
+
 ### [1.18.8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.18.7...v1.18.8) (2022-06-13)
 
 ### Bug Fixes

package/esm/models/attributes/PasswordAttributeModel.js

@@ -163,7 +163,7 @@ var PasswordAttributeModel = /*#__PURE__*/function (_StringAttributeModel) {
           });
         }
 
-        if (this.layouthint.has(CONFIRM_PASSWORD)) {
+        if (this.layouthint.has(CONFIRM_PASSWORD) && this.confirmValue !== "") {
           constraints.add(new PasswordConfirmConstraint(this.confirmValue, this.otherLabel));
         }
       }

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

@@ -1 +1 @@
-{"version":3,"file":"PasswordAttributeModel.js","names":["StringAttributeModel","ConstraintCollection","PasswordLowerAndUpperCaseConstraint","PasswordThreeConsecutiveCharactersNotAllowedConstraint","PasswordMinNumericCharactersConstraint","PasswordMinSpecialCharactersConstraint","RegexConstraint","PasswordConfirmConstraint","CONFIRM_PASSWORD","PasswordAttributeModel","value","updateLastModification","inputvalue","getContribution","constraints","upperAndLowerCaseMandatory","maxSequenceOfIdenticalCharacters","maxSequenceOfUsernameCharacters","minNumberOfNumericCharacters","minNumberOfSpecialCharacters","regexConstraint","isConfirmPassword","add","confirmValue","otherLabel","regexConstraints","length","forEach","layouthint","has","addConstraints","_isConfirmPassword","_confirmValue","validate","_otherLabel","useClientsideValidation","isOptionalAndEmpty","_isValid","_validatedValue","constraintCollection","inError","name","contributions","type","Array","isArray"],"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    const constraints = new ConstraintCollection();\n\n    if (this.isConfirmPassword) {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    } else {\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)) {\n        constraints.add(\n          new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n        );\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":["StringAttributeModel","ConstraintCollection","PasswordLowerAndUpperCaseConstraint","PasswordThreeConsecutiveCharactersNotAllowedConstraint","PasswordMinNumericCharactersConstraint","PasswordMinSpecialCharactersConstraint","RegexConstraint","PasswordConfirmConstraint","CONFIRM_PASSWORD","PasswordAttributeModel","value","updateLastModification","inputvalue","getContribution","constraints","upperAndLowerCaseMandatory","maxSequenceOfIdenticalCharacters","maxSequenceOfUsernameCharacters","minNumberOfNumericCharacters","minNumberOfSpecialCharacters","regexConstraint","isConfirmPassword","add","confirmValue","otherLabel","regexConstraints","length","forEach","layouthint","has","addConstraints","_isConfirmPassword","_confirmValue","validate","_otherLabel","useClientsideValidation","isOptionalAndEmpty","_isValid","_validatedValue","constraintCollection","inError","name","contributions","type","Array","isArray"],"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    const constraints = new ConstraintCollection();\n\n    if (this.isConfirmPassword) {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    } else {\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\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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"}

package/lib/models/attributes/PasswordAttributeModel.js

@@ -186,7 +186,7 @@ var PasswordAttributeModel = /*#__PURE__*/function (_StringAttributeModel) {
           });
         }
 
-        if (this.layouthint.has(_LayoutHints.CONFIRM_PASSWORD)) {
+        if (this.layouthint.has(_LayoutHints.CONFIRM_PASSWORD) && this.confirmValue !== "") {
           constraints.add(new _PasswordConfirmConstraint.default(this.confirmValue, this.otherLabel));
         }
       }

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

@@ -134,7 +134,7 @@ export default class PasswordAttributeModel extends StringAttributeModel {
         });
       }
 
-      if (this.layouthint.has(CONFIRM_PASSWORD)) {
+      if (this.layouthint.has(CONFIRM_PASSWORD) && this.confirmValue !== "") {
         constraints.add(
           new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)
         );

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","ConstraintCollection","isConfirmPassword","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    const constraints = new ConstraintCollection();\n\n    if (this.isConfirmPassword) {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    } else {\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)) {\n        constraints.add(\n          new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n        );\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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAIA;AACA;AACA;IACqBA,sB;;;;;;;;;;;;;;;;;;;;;;;;;;IAenB;AACF;IACE,eAAmB;MACjB,OAAO,UAAP;IACD;IAED;AACF;AACA;;;;WACE,gBAAOC,KAAP,EAA8C;MAC5C,KAAKC,sBAAL;MACA,KAAKC,UAAL,GAAkBF,KAAlB;MAEA,OAAO,IAAP;IACD;IAED;AACF;;;;SACE,eAA0B;MACxB,OAAO,KAAKG,eAAL,CAAqB,aAArB,EAAoC,EAApC,CAAP;IACD;IAED;AACF;;;;SACE,eAA2C;MACzC,OAAO,KAAKC,WAAL,CAAiBC,0BAAxB;IACD;IAED;AACF;;;;SACE,eAAgD;MAC9C,OAAO,KAAKD,WAAL,CAAiBE,gCAAxB;IACD;IAED;AACF;;;;SACE,eAA+C;MAC7C,OAAO,KAAKF,WAAL,CAAiBG,+BAAxB;IACD;IAED;AACF;;;;SACE,eAA4C;MAC1C,OAAO,KAAKH,WAAL,CAAiBI,4BAAxB;IACD;IAED;AACF;;;;SACE,eAA4C;MAC1C,OAAO,KAAKJ,WAAL,CAAiBK,4BAAxB;IACD;IAED;AACF;;;;SACE,eAA4C;MAC1C,OAAO,KAAKL,WAAL,CAAiBM,eAAxB;IACD;IAED;AACF;AACA;;;;WACE,0BAAuC;MACrC,IAAMN,WAAW,GAAG,IAAIO,6BAAJ,EAApB;;MAEA,IAAI,KAAKC,iBAAT,EAA4B;QAC1BR,WAAW,CAACS,GAAZ,CACE,IAAIC,kCAAJ,CAA8B,KAAKC,YAAnC,EAAiD,KAAKC,UAAtD,CADF;MAGD,CAJD,MAIO;QACL,IAAI,KAAKX,0BAAT,EAAqC;UACnCD,WAAW,CAACS,GAAZ,CAAgB,IAAII,4CAAJ,EAAhB;QACD;;QAED,IAAI,KAAKX,gCAAT,EAA2C;UACzCF,WAAW,CAACS,GAAZ,CACE,IAAIK,+DAAJ,CACE,KAAKZ,gCADP,CADF;QAKD;;QAED,IAAI,KAAKE,4BAAT,EAAuC;UACrCJ,WAAW,CAACS,GAAZ,CACE,IAAIM,+CAAJ,CACE,KAAKX,4BADP,CADF;QAKD;;QAED,IAAI,KAAKC,4BAAT,EAAuC;UACrCL,WAAW,CAACS,GAAZ,CACE,IAAIO,+CAAJ,CACE,KAAKX,4BADP,CADF;QAKD;;QAED,IAAI,KAAKY,gBAAL,IAAyB,KAAKA,gBAAL,CAAsBC,MAAtB,GAA+B,CAA5D,EAA+D;UAC7D,KAAKD,gBAAL,CAAsBE,OAAtB,CAA8B,UAACb,eAAD,EAAqB;YACjDN,WAAW,CAACS,GAAZ,CAAgB,IAAIW,wBAAJ,CAAoBd,eAApB,CAAhB;UACD,CAFD;QAGD;;QAED,IAAI,KAAKe,UAAL,CAAgBC,GAAhB,CAAoBC,6BAApB,CAAJ,EAA2C;UACzCvB,WAAW,CAACS,GAAZ,CACE,IAAIC,kCAAJ,CAA8B,KAAKC,YAAnC,EAAiD,KAAKC,UAAtD,CADF;QAGD;MACF;;MAED,OAAOZ,WAAP;IACD;IAED;AACF;AACA;;;;SACE,eAAiD;MAC/C,IAAI,KAAKQ,iBAAT,EAA4B;QAC1B,IAAMR,WAAW,GAAG,IAAIO,6BAAJ,EAApB;QACAP,WAAW,CAACS,GAAZ,CAAgB,KAAKe,cAAL,EAAhB;QACA,OAAOxB,WAAP;MACD;;MAED;IACD;IAED;AACF;;;;SACE,eAAiC;MAC/B,OAAO,KAAKyB,kBAAL,IAA2B,KAAlC;IACD;IAED;AACF;;SACE,aAAsBjB,iBAAtB,EAAkD;MAChD,KAAKiB,kBAAL,GAA0BjB,iBAA1B;IACD;IAED;AACF;;;;SACE,eAA2B;MACzB,OAAO,KAAKkB,aAAL,IAAsB,EAA7B;IACD;IAED;AACF;;SACE,aAAiBf,YAAjB,EAAuC;MACrC,KAAKe,aAAL,GAAqBf,YAArB;MAEA,KAAKgB,QAAL,CAAc,KAAK7B,UAAnB;IACD;IAED;AACF;;;;SACE,eAAyB;MACvB,OAAO,KAAK8B,WAAZ;IACD;IAED;AACF;;SACE,aAAehB,UAAf,EAAmC;MACjC,KAAKgB,WAAL,GAAmBhB,UAAnB;IACD;IAED;AACF;AACA;;;;WACE,kBAAShB,KAAT,EAAiC;MAAA;;MAC/B;MACA,IAAI,CAAC,KAAKiC,uBAAL,EAAL,EAAqC;QACnC,OAAO,IAAP;MACD;;MAED,IAAI,KAAKC,kBAAL,CAAwBlC,KAAxB,CAAJ,EAAoC;QAClC,KAAKmC,QAAL,GAAgB,IAAhB;MACD,CAFD,MAEO,IAAI,KAAKC,eAAL,gDAA4B,KAAKrB,YAAjC,wBAAiDf,KAAjD,CAAJ,EAA8D;QACnE,KAAKmC,QAAL,GAAgB,KAAKE,oBAAL,CAA0BN,QAA1B,CAAmC/B,KAAnC,CAAhB;MACD;;MACD,KAAKoC,eAAL,8CAA0B,KAAKrB,YAA/B,wBAA+Cf,KAA/C;MAEA,OAAO,KAAKmC,QAAZ;IACD;IAED;AACF;;;;WACE,uBAAwC;MACtC,IAAI,KAAKvB,iBAAL,IAA0B,KAAK0B,OAAL,EAA9B,EAA8C;QAC5C,OAAO,IAAP;MACD;;MAED,yCACG,KAAKC,IADR,EACe,KAAKvC,KADpB;IAGD;;;;IA3MD;AACF;IACE,2BAAyBwC,aAAzB,EAAyD;MACvD,IAAMf,UAAU,GAAGe,aAAH,aAAGA,aAAH,uBAAGA,aAAa,CAAEf,UAAlC;MACA,OACEe,aAAa,CAACC,IAAd,KAAuB,UAAvB,IACCC,KAAK,CAACC,OAAN,CAAclB,UAAd,KAA6B,uBAAAA,UAAU,MAAV,CAAAA,UAAU,EAAU,UAAV,CAF1C;IAID;;;EAbiDmB,8B"}
+{"version":3,"file":"PasswordAttributeModel.js","names":["PasswordAttributeModel","value","updateLastModification","inputvalue","getContribution","constraints","upperAndLowerCaseMandatory","maxSequenceOfIdenticalCharacters","maxSequenceOfUsernameCharacters","minNumberOfNumericCharacters","minNumberOfSpecialCharacters","regexConstraint","ConstraintCollection","isConfirmPassword","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    const constraints = new ConstraintCollection();\n\n    if (this.isConfirmPassword) {\n      constraints.add(\n        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)\n      );\n    } else {\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\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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -136,7 +136,7 @@
     "jscodeshift": "^0.13.1",
     "lint-staged": "^13.0.1",
     "polished": "^4.2.2",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-helmet-async": "^1.3.0",

package/src/models/attributes/PasswordAttributeModel.js

@@ -134,7 +134,7 @@ export default class PasswordAttributeModel extends StringAttributeModel {
         });
       }
 
-      if (this.layouthint.has(CONFIRM_PASSWORD)) {
+      if (this.layouthint.has(CONFIRM_PASSWORD) && this.confirmValue !== "") {
         constraints.add(
           new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)
         );