batch-fixes-4-dec

ORCID · Dec 5, 2023 · 0fba58d · 0fba58d
1 parent 08c3b93
commit 0fba58d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/app/register2/components/backend-error/backend-error.component.html b/src/app/register2/components/backend-error/backend-error.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="recognizedError[errorCode] === 0">
+<ng-container *ngIf="recognizedError[errorCode] === 0 && !disableInlineAlreadyExistError">
   <ng-container i18n="@@register.emailAlreadyExists"
     >This email already exists in our system. Would you like to</ng-container
   >

diff --git a/src/app/register2/components/backend-error/backend-error.component.ts b/src/app/register2/components/backend-error/backend-error.component.ts
@@ -29,6 +29,8 @@ enum RegisterBackendErrors {
 export class BackendErrorComponent implements OnInit {
   recognizedError = RegisterBackendErrors
   _errorCode: string
+  @Input() disableInlineAlreadyExistError = false
+
   @Input()
   set errorCode(errorCode: string) {
     // This will change the string send by the backend into a code, to handle the error trough a code

diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html
@@ -92,7 +92,7 @@ <h2 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
         class="orc-font-small-print"
         id="email-input-input-label"
         [ngClass]="{
-          error: emailFormTouched && form.hasError('required', 'emails.email')
+          error: emailFormTouched && emails.controls.email.errors
         }"
         id="email-input-label"
         i18n="@@register.primaryEmail"
@@ -124,8 +124,10 @@ <h2 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
       </mat-error>
       <mat-error
         *ngIf="
+          emailFormTouched &&
+          (
           this.emails.hasError('email', 'email') ||
-          this.emails.hasError('pattern', 'email')
+          this.emails.hasError('pattern', 'email'))
         "
         i18n="@@register.invalidEmail2"
       >
@@ -141,6 +143,7 @@ <h2 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
           *ngFor="let error of this.emails.getError('backendError', 'email')"
         >
           <app-backend-error
+            [disableInlineAlreadyExistError]="true"
             [errorCode]="error"
             [value]="emails.get('email').value"
           ></app-backend-error>