From 0d8ac043d84485178f11d20543d3764d6e192d3d Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Mon, 10 Dec 2018 10:26:21 -0700
Subject: [PATCH] SHIBUI-1015: Fixed issues with forms and labels (assigned
 ARIA labels);

---
 .../manager/component/provider-search.component.html        | 3 ++-
 .../resolver/container/copy-resolver.component.html         | 6 ++++--
 ui/src/app/shared/autocomplete/autocomplete.component.html  | 2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/metadata/manager/component/provider-search.component.html b/ui/src/app/metadata/manager/component/provider-search.component.html
index bedc6ad7d..29479de5d 100644
--- a/ui/src/app/metadata/manager/component/provider-search.component.html
+++ b/ui/src/app/metadata/manager/component/provider-search.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="searchForm">
-    <label for="search" class="sr-only" translate="action.search">Search</label>
     <div class="input-group input-group-sm">
+        <label [for]="search" class="sr-only" translate="action.search">Search</label>
         <input
             id="search"
             type="text"
@@ -9,6 +9,7 @@
             [placeholder]="'label.search-files' | translate"
             aria-label="To search for a source, enter name then press enter"
             formControlName="search"
+            role="textbox"
             (keyup)="search.emit($event.target.value)">
         <div class="input-group-append">
             <button class="btn btn-light"
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
index acbbd1908..688deb9a7 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -23,7 +23,7 @@ <h3 class="tag tag-primary">
             </ul>
             <fieldset class="bg-light border rounded p-4">
                 <div class="form-group">
-                    <label for="serviceProviderName">
+                    <label for="target">
                         <translate-i18n key="label.select-entity-id-to-copy">Select the Entity ID to copy</translate-i18n>
                         <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
                     </label>
@@ -97,7 +97,9 @@ <h3 class="tag tag-primary">
                                     [id]="'section-' + i"
                                     [name]="'section-' + i"
                                     role="checkbox" />
-                                <label class="custom-control-label" for="section-{{ i }}"></label>
+                                <label class="custom-control-label"
+                                    [for]="'section-' + i"
+                                    [attr.aria-label]="item.i18nKey"></label>
                             </div>
                         </fieldset>
                     </td>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 1af9bbe9e..1f59e0ab5 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -1,5 +1,4 @@
 <div id="{{ id }}-container" class="dropdown form-group" (keydown)="handleKeyDown($event)" role='combobox' [attr.aria-expanded]="(menuIsVisible$ | async) ? 'true' : 'false'">
-    <label *ngIf="!fieldId" for="{{ id }}__input" attr.aria-labelledby="{{ id }}__input" class="sr-only"></label>
     <div [ngClass]="{'input-group': dropdown}">
         <input
             #inputField
@@ -9,7 +8,6 @@
             class="form-control"
             autoComplete="off"
             type="text"
-            role="textbox"
             [attr.aria-activedescendant]="activeDescendant"
             [placeholder]="placeholder"
             attr.aria-owns="{{ id }}__listbox"