Merge pull request #2203 from ORCID/feature/9060-qa-investigation-aff…

…iliation-found-notice-panel-not-announced-to-assistive-tech-users Feature/9060 qa investigation affiliation found notice panel not announced to assistive tech users
ORCID · Mar 18, 2024 · 4654a07 · 4654a07
2 parents 6b65c9d + 78a428c
commit 4654a07
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.html b/src/app/register2/components/form-current-employment/form-current-employment.component.html
@@ -52,7 +52,6 @@ <h3 class="orc-font-body" i18n="@@register.affiliationFoud">
 
     <div class="row">
       <label
-        for="organization-input"
         id="organization-label"
         class="mat-caption"
         [ngClass]="{
@@ -76,6 +75,11 @@ <h3 class="orc-font-body" i18n="@@register.affiliationFoud">
         <input
           aria-labelledby="organizationLabel"
           [readonly]="organizationIsValidAndTouched"
+          [attr.aria-label]="
+            rorIdHasBeenMatched
+              ? ariaLabelPrefilledOrganization
+              : ariaLabelOrganization
+          "
           id="organization-input"
           matInput
           formControlName="organization"

diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.ts b/src/app/register2/components/form-current-employment/form-current-employment.component.ts
@@ -97,6 +97,8 @@ export class FormCurrentEmploymentComponent extends BaseForm implements OnInit {
   ariaLabelStartDate = $localize`:@@shared.startDate:Start date`
   ngOrcidYear = $localize`:@@shared.year:Year`
   ngOrcidMonth = $localize`:@@shared.month:Month`
+  ariaLabelOrganization = $localize`:@@register.organization:Organization`
+  ariaLabelPrefilledOrganization = $localize`:@@register.prefilledOrganization:Organization - We've added an organization based on your email domain`
 
   years = Array(110)
     .fill(0)
@@ -247,6 +249,7 @@ export class FormCurrentEmploymentComponent extends BaseForm implements OnInit {
   }
 
   clearForm() {
+    this.rorIdHasBeenMatched = false
     this.form.patchValue({
       organization: '',
     })

diff --git a/src/locale/properties/register/register.en.properties b/src/locale/properties/register/register.en.properties
@@ -225,3 +225,5 @@ register.accesibilityOnlyTheNumberConstrainIsNotMet=Your password must include a
 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
+register.organization=Organization
+register.prefilledOrganization=Organization - We've added an organization based on your email domain