Merge pull request #2165 from ORCID/feature/batch-feb-20

batch-feb-20
ORCID · Feb 21, 2024 · 83ca56f · 83ca56f
2 parents 5306d39 + c75e7c4
commit 83ca56f
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 31 deletions.
diff --git a/src/app/register2/components/form-password/form-password.component.html b/src/app/register2/components/form-password/form-password.component.html
@@ -30,9 +30,8 @@ <h3 i18n="@@register.yourPasswords" class="orc-font-body no-top-margin">
     </mat-form-field>
     <mat-error
       *ngIf="passwordTouched && form.hasError('required', 'password')"
-      i18n="@@register.passwordRequired"
     >
-      A password is required
+      {{ passwordIsRequired }}
     </mat-error>
     <mat-error
       *ngIf="
@@ -47,12 +46,12 @@ <h3 i18n="@@register.yourPasswords" class="orc-font-body no-top-margin">
       *ngIf="
         passwordTouched &&
         !form.hasError('required', 'password') &&
+        currentAccesibilityError &&
         (form.hasError('minlength', 'password') ||
           form.hasError('pattern', 'password'))
       "
-      i18n="@@register.wrongPasswordPattern2"
     >
-      Password must meet all requirements
+      {{ currentAccesibilityError }}
     </mat-error>
     <mat-error
       *ngIf="passwordTouched && form.hasError('maxlength', 'password')"

diff --git a/src/app/register2/components/form-password/form-password.component.ts b/src/app/register2/components/form-password/form-password.component.ts
@@ -1,4 +1,11 @@
-import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core'
+import {
+  ChangeDetectorRef,
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+  ViewChild,
+} from '@angular/core'
 import {
   NG_ASYNC_VALIDATORS,
   NG_VALUE_ACCESSOR,
@@ -43,6 +50,14 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
   labelInfo = $localize`:@@register.ariaLabelInfoPassword:info about password`
   labelClose = $localize`:@@register.ariaLabelClose:close`
   labelConfirmPassword = $localize`:@@register.confirmYourPassword:Confirm your password`
+
+  accesibiltiyOnlyThe8OrMoreCharactersConstrainIsMet = $localize`:@@register.accesibiltiyOnlyThe8OrMoreCharactersConstrainIsMet:Your password must include at least 1 letter or symbol and 1 number`
+  accesibiltiyOnlyTheLetterOrSymbolConstrainIsMet = $localize`:@@register.accesibiltiyOnlyTheLetterOrSymbolConstrainIsMet:Your password must be 8 or more characters and include at least 1 number`
+  accesibiltiyOnlyTheNumberConstrainIsMet = $localize`:@@register.accesibiltiyOnlyTheNumberConstrainIsMet:Your password must be 8 or more characters and include at least 1 letter or symbol`
+  accesibilityOnlyTheNumberConstrainIsNotMet = $localize`:@@register.accesibilityOnlyTheNumberConstrainIsNotMet:Your password must include at least 1 number`
+  accesibilityOnlyTheLetterOrSymbolConstrainIsNotMet = $localize`:@@register.accesibilityOnlyTheLetterOrSymbolConstrainIsNotMet:Your password must include at least 1 letter or symbol`
+  accesibilityOnlyThe8OrMoreCharactersConstrainIsNotMet = $localize`:@@register.accesibilityOnlyThe8OrMoreCharactersConstrainIsNotMet:Your password must be 8 or more characters`
+  passwordIsRequired = $localize`:@@register.passwordRequired:A password is required`
   @ViewChild(`#passwordPopover`) passwordPopover
   @ViewChild(`#passwordPopoverTrigger`) passwordPopoverTrigger
   hasNumberPattern = HAS_NUMBER
@@ -53,9 +68,11 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
   ccurentValidateAtLeastALetterOrSymbolStatus: boolean
   currentValidateAtLeastANumber: boolean
   passwordsValidAreValidAlreadyChecked: any
+  _currentAccesibilityError: string
   constructor(
     private _register: Register2Service,
-    private _liveAnnouncer: LiveAnnouncer
+    private _liveAnnouncer: LiveAnnouncer,
+    private _changeDetectorRef: ChangeDetectorRef
   ) {
     super()
   }
@@ -80,6 +97,11 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
         asyncValidators: this._register.backendPasswordValidate(),
       }
     )
+
+    this.form.controls['password'].valueChanges.subscribe(() => {
+      this._changeDetectorRef.detectChanges()
+      this.passwordAccesbiltyError()
+    })
   }
 
   passwordDoesNotContainUserEmails(): ValidatorFn {
@@ -123,6 +145,85 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
     })
   }
 
+  passwordAccesbiltyError() {
+    if (this.form.controls['password'].pristine) {
+      return
+    }
+    if (
+      !this.currentValidate8orMoreCharactersStatus &&
+      this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibiltiyOnlyThe8OrMoreCharactersConstrainIsMet
+    } else if (
+      this.currentValidate8orMoreCharactersStatus &&
+      !this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibiltiyOnlyTheLetterOrSymbolConstrainIsMet
+    } else if (
+      this.currentValidate8orMoreCharactersStatus &&
+      this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      !this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibiltiyOnlyTheNumberConstrainIsMet
+    } else if (
+      !this.currentValidate8orMoreCharactersStatus &&
+      this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      !this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibilityOnlyTheLetterOrSymbolConstrainIsNotMet
+    } else if (
+      !this.currentValidate8orMoreCharactersStatus &&
+      !this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibilityOnlyTheNumberConstrainIsNotMet
+    } else if (
+      this.currentValidate8orMoreCharactersStatus &&
+      !this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      !this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError =
+        this.accesibilityOnlyThe8OrMoreCharactersConstrainIsNotMet
+    } else if (
+      !this.currentValidate8orMoreCharactersStatus &&
+      !this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      !this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError = ''
+    } else if (
+      this.currentValidate8orMoreCharactersStatus &&
+      this.ccurentValidateAtLeastALetterOrSymbolStatus &&
+      this.currentValidateAtLeastANumber
+    ) {
+      this.currentAccesibilityError = this.passwordIsRequired
+    }
+  }
+
+  set currentAccesibilityError(value: string) {
+    if (this._currentAccesibilityError === value) {
+      return
+    }
+    this._currentAccesibilityError = value
+    if (!value) {
+      this.announce(
+        $localize`:@@register.allPasswordContrainsArMet:All password constraints are met`
+      )
+    } else {
+      this.announce(value)
+    }
+  }
+
+  get currentAccesibilityError() {
+    return this._currentAccesibilityError
+  }
+
   get confirmPasswordTouched() {
     return (
       this.form.controls['passwordConfirm'].touched || this.nextButtonWasClicked
@@ -161,13 +262,6 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
       this.form.hasError('required', 'password') ||
       this.form.hasError('minlength', 'password')
 
-    if (this.currentValidate8orMoreCharactersStatus !== status) {
-      this.announce(
-        status
-          ? $localize`:@@register.passwordLengthError:Password must be 8 or more characters`
-          : $localize`:@@register.passwordLengthOk:Password is 8 or more characters`
-      )
-    }
     this.currentValidate8orMoreCharactersStatus = status
 
     return status
@@ -179,13 +273,6 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
       this.form.getError('pattern', 'password')?.requiredPattern ==
         this.hasLetterOrSymbolPattern
 
-    if (this.ccurentValidateAtLeastALetterOrSymbolStatus !== status) {
-      this.announce(
-        status
-          ? $localize`:@@register.passwordLetterOrSymbolError:Password must contain at least a letter or symbol`
-          : $localize`:@@register.passwordLetterOrSymbolOk:Password contains at least a letter or symbol`
-      )
-    }
     this.ccurentValidateAtLeastALetterOrSymbolStatus = status
 
     return status
@@ -197,14 +284,6 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
       this.form.getError('pattern', 'password')?.requiredPattern ==
         this.hasNumberPattern
 
-    if (this.currentValidateAtLeastANumber !== status) {
-      this.announce(
-        status
-          ? $localize`:@@register.passwordNumberError:Password must contain at least a number`
-          : $localize`:@@register.passwordNumberOk:Password contains at least a number`
-      )
-    }
-
     this.currentValidateAtLeastANumber = status
 
     return status

diff --git a/src/app/register2/components/register2.scss-theme.scss b/src/app/register2/components/register2.scss-theme.scss
@@ -54,6 +54,9 @@
         'state-notice-dark'
       ) !important;
     }
+    a {
+      color: mat.get-color-from-palette($primary, 700);
+    }
   }
 
   .announce {

diff --git a/src/app/register2/pages/register/register2.component.html b/src/app/register2/pages/register/register2.component.html
@@ -10,7 +10,7 @@
           (selectionChange)="selectionChange($event)"
           role="tablist"
         >
-          <mat-step [stepControl]="FormGroupStepA">
+          <!-- <mat-step [stepControl]="FormGroupStepA">
             <ng-template matStepLabel i18n="@@register.personalData"
               >Personal data</ng-template
             >
@@ -20,7 +20,7 @@
               #stepComponentA
               [togglzregistration21]="registration21"
             ></app-step-a>
-          </mat-step>
+          </mat-step> -->
           <mat-step [stepControl]="FormGroupStepB">
             <ng-template matStepLabel i18n="@@register.securityAndNotifications"
               >Security and notifications</ng-template

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -171,7 +171,6 @@ register.completeRegistration=Complete registration
 register.passwordRequired2=Please enter a password
 register.weOccasionallySend=We occasionally send out an email with information on new features and tips for getting the best out of your ORCID record.
 register.yourPasswords=Your password
-register.wrongPasswordPattern2=Password must meet all requirements
 register.passwordIsToLongV22=Password must meet be between 8 and 256 characters
 register.yourPasswordHas=Your password has:
 register.passwordLengthError=Password must be 8 or more characters
@@ -219,3 +218,12 @@ register.affiliationFoud=Affiliation found
 register.basedOnYourEmailWeThink=Based on your emails we think you are currently affiliated with
 register.webePreselectedThisOrganizationForYouInTheFormBelow=We’ve pre-selected this organization for you in the form below.
 register.whenYouCompleteRegistrationAnEmployment=When you complete registration an employment affiliation will be automatically added to your new ORCID record.
+
+
+register.accesibiltiyOnlyThe8OrMoreCharactersConstrainIsMet=Your password must include at least 1 letter or symbol and 1 number
+register.accesibiltiyOnlyTheLetterOrSymbolConstrainIsMet=Your password must be 8 or more characters and include at least 1 number
+register.accesibiltiyOnlyTheNumberConstrainIsMet=Your password must be 8 or more characters and include at least 1 letter or symbol
+register.accesibilityOnlyTheNumberConstrainIsNotMet=Your password must include at least 1 number
+register.accesibilityOnlyTheLetterOrSymbolConstrainIsNotMet=Your password must include at least 1 letter or symbol
+register.accesibilityOnlyThe8OrMoreCharactersConstrainIsNotMet=Your password must be 8 or more characters
+register.allPasswordContrainsArMet=All password constraints are met