fix/batch-fixes-dec-5

ORCID · Dec 6, 2023 · a4c7c76 · a4c7c76
1 parent 54ccb89
commit a4c7c76
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 12 deletions.
diff --git a/src/app/core/register2/register2.form-adapter.ts b/src/app/core/register2/register2.form-adapter.ts
@@ -125,8 +125,8 @@ export function Register2FormAdapterMixin<T extends Constructor<any>>(base: T) {
       return {
         ...StepA.value.personal,
         ...StepB.value.password,
-        ...StepC.value.sendOrcidNews,
-        ...StepD.value.activitiesVisibilityDefault,
+        ...StepC.value.activitiesVisibilityDefault,
+        ...StepD.value.sendOrcidNews,
         ...StepD.value.termsOfUse,
         ...StepD.value.captcha,
       }

diff --git a/src/app/register2/components/form-password/form-password.component.html b/src/app/register2/components/form-password/form-password.component.html
@@ -15,12 +15,10 @@ <h2 i18n="@@register.yourPasswords" class="orc-font-body no-top-margin">
       appearance="outline"
       [hideRequiredMarker]="true"
       [ngClass]="{
-        'valid-password-input': confirmPasswordValid && passwordValid
+        'valid-password-input': passwordsValid
       }"
     >
-      <mat-icon *ngIf="confirmPasswordValid && passwordValid" matSuffix
-        >done</mat-icon
-      >
+      <mat-icon *ngIf="passwordsValid" matSuffix>done</mat-icon>
       <input
         aria-label="password-label"
         formControlName="password"
@@ -77,12 +75,10 @@ <h2 i18n="@@register.yourPasswords" class="orc-font-body no-top-margin">
       appearance="outline"
       [hideRequiredMarker]="true"
       [ngClass]="{
-        'valid-password-input': confirmPasswordValid && passwordValid
+        'valid-password-input': passwordsValid
       }"
     >
-      <mat-icon *ngIf="confirmPasswordValid && passwordValid" matSuffix
-        >done</mat-icon
-      >
+      <mat-icon *ngIf="passwordsValid" matSuffix>done</mat-icon>
       <input
         id="password-confirm-input-label"
         formControlName="passwordConfirm"

diff --git a/src/app/register2/components/form-password/form-password.component.ts b/src/app/register2/components/form-password/form-password.component.ts
@@ -52,6 +52,7 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
   currentValidate8orMoreCharactersStatus: boolean
   ccurentValidateAtLeastALetterOrSymbolStatus: boolean
   currentValidateAtLeastANumber: boolean
+  passwordsValidAreValidAlreadyChecked: any
   constructor(
     private _register: Register2Service,
     private _liveAnnouncer: LiveAnnouncer
@@ -138,6 +139,21 @@ export class FormPasswordComponent extends BaseForm implements OnInit {
     return this.form.controls['password'].valid
   }
 
+  get passwordsValid() {
+    const validStatus = this.confirmPasswordValid && this.passwordValid
+
+    if (!this.passwordsValidAreValidAlreadyChecked && validStatus) {
+      this.announce($localize`:@@register.passwordAreValid:Your password match`)
+    } else if (this.passwordsValidAreValidAlreadyChecked && !validStatus) {
+      this.announce(
+        $localize`:@@register.passwordAreNotValid:Your password do not match`
+      )
+    }
+    this.passwordsValidAreValidAlreadyChecked = validStatus
+
+    return validStatus
+  }
+
   get validate8orMoreCharacters() {
     const status =
       this.form.hasError('required', 'password') ||

diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts
@@ -37,6 +37,8 @@ import { ErrorStateMatcher } from '@angular/material/core'
 import { PlatformInfoService } from 'src/app/cdk/platform-info'
 import { Router } from '@angular/router'
 import { ApplicationRoutes } from 'src/app/constants'
+import { LiveAnnouncer } from '@angular/cdk/a11y'
+import { environment } from 'src/environments/environment'
 export class MyErrorStateMatcher implements ErrorStateMatcher {
   isErrorState(
     control: FormControl | null,
@@ -89,11 +91,13 @@ export class FormPersonalComponent extends BaseForm implements OnInit {
   professionalEmail: boolean
   personalEmail: boolean
   undefinedEmail: boolean
+  emailsAreValidAlreadyChecked: boolean
   constructor(
     private _register: Register2Service,
     private _reactivationService: ReactivationService,
     private _platform: PlatformInfoService,
-    private _router: Router
+    private _router: Router,
+    private _liveAnnouncer: LiveAnnouncer
   ) {
     super()
   }
@@ -266,7 +270,33 @@ export class FormPersonalComponent extends BaseForm implements OnInit {
   }
 
   get emailsAreValid() {
-    return this.emailConfirmationValid && this.emailValid
+    const validStatus = this.emailConfirmationValid && this.emailValid
+    if (!this.emailsAreValidAlreadyChecked && validStatus) {
+      this.announce(
+        $localize`:@@register.emailsAreValid:Your` +
+          ' ' +
+          this.emails.controls['email'].value +
+          ' ' +
+          $localize`:@@register.emailMatch:match`
+      )
+    } else if (this.emailsAreValidAlreadyChecked && !validStatus) {
+      this.announce(
+        $localize`:@@register.emailsAreValid:Your` +
+          ' ' +
+          this.emails.controls['email'].value +
+          ' ' +
+          $localize`:@@register.emailNotMatch:not match`
+      )
+    }
+    this.emailsAreValidAlreadyChecked = validStatus
+    return validStatus
+  }
+
+  private announce(announcement: string) {
+    if (environment.debugger) {
+      console.debug('📢' + announcement)
+    }
+    this._liveAnnouncer.announce(announcement, 'assertive')
   }
 
   navigateToSignin(email) {

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -182,3 +182,8 @@ register.step2.3=Step 3 of 4 - Visibility
 shared.previousStep=Previous Step
 register.addAnAdditionalEmail=Add an additional email
 register.personalEmail=personal email
+register.passwordAreValid=Your password match
+register.passwordAreNotValid=Your password do not match
+register.emailsAreValid=Your
+register.emailMatch=match
+register.emailNotMatch=not match