From aec70a397f9f5a36c79d7283619fb76da81f0792 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 8 Mar 2022 09:24:45 -0500
Subject: [PATCH] CSR-96: fixed aria labels

---
 .../dropdown-question/dropdown-question.vue                 | 6 +++---
 src/common-components/textbox-question/textbox-question.vue | 5 ++---
 .../address-questions/address-questions.vue                 | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/common-components/dropdown-question/dropdown-question.vue
index 3b8a53e45..91924c1db 100644
--- a/src/common-components/dropdown-question/dropdown-question.vue
+++ b/src/common-components/dropdown-question/dropdown-question.vue
@@ -1,9 +1,8 @@
 <template>
   <div class="dropdown-question">
-    <label :for="inputId" class="form-label">{{labelText}}</label>
+    <label :for="inputId" :aria-label="ariaLabelText" class="form-label">{{labelText}}</label>
     <select v-model="selectedOption"
             class="form-select" 
-            aria-label="Default select example" 
             :id="inputId"
             :name="inputId" 
             :aria-disabled="isDisabled" 
@@ -33,7 +32,8 @@ export default {
       required: true
     },
     isDisabled: Boolean,
-    isRequired: Boolean,    
+    isRequired: Boolean,
+    ariaLabelText: String,
   },
   data() {
 
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 42c865c06..ce45d0ff4 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="textbox-question" :class="hasError ? 'has-error' : ''">
-    <label :for="inputId" class="form-label">{{labelText}}</label>
+    <label :for="inputId" :aria-label="ariaLabelText" class="form-label">{{labelText}}</label>
     <input v-model="value" v-maska="mask"
       :type="type" 
       class="form-control" 
@@ -10,8 +10,7 @@
       :placeholder="placeholderText" 
       :aria-disabled="isDisabled" 
       :disabled="isDisabled" 
-      :aria-required="isRequired"
-      :aria-label="ariaLabelText"     
+      :aria-required="isRequired"     
       autocomplete="off"   
       :class="[hasIcon ? 'has-icon' : '', iconRight ? 'icon-right' : '']" />
     <p class="mt-2 form-test-error" v-if="!suppressError">
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index c6ea0feca..4e4971f12 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -14,7 +14,7 @@
                 </div>
                 <div class="row my-4">
                     <div class="col-6">
-                        <dropdownQuestion v-model="state" ref="state" inputId="8fdf9dc2e13e430eb57529499dceb3eb" :options="stateOptions" labelText="S&NoBreak;tate"  />
+                        <dropdownQuestion v-model="state" ref="state" inputId="8fdf9dc2e13e430eb57529499dceb3eb" :options="stateOptions" labelText="S&NoBreak;tate" ariaLabelText="State"  />
                     </div>            
                     <div class="col-6">
                         <textboxQuestion v-model="zip" ref="zip" inputId="01a9a1c2de0b4c9da8e023c9ae3be498" labelText="Z&NoBreak;IP code" ariaLabelText="ZIP code" mask="#####" />