Merge pull request #600 from Safelite/defect/CSR-612

Defect/csr 612
This commit is contained in:
katieoh-safelite 2022-07-13 09:32:08 -04:00 committed by GitHub
commit 4edc2a9e86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 16 deletions

View file

@ -9,7 +9,7 @@
:answers="q.answers" :answers="q.answers"
:groupName="`${questionData.glassName}-${questionData.glassLocation}-${i}`" :groupName="`${questionData.glassName}-${questionData.glassLocation}-${i}`"
v-model="selectedValue" v-model="selectedValue"
:isRequired=true isRequired
:validationRules="validationRules" :validationRules="validationRules"
:clearOnUnmount=false :clearOnUnmount=false
/> />

View file

@ -6,7 +6,7 @@
:questionText="questionText" :questionText="questionText"
:answers="vehicles" :answers="vehicles"
v-model="selectedVehicleVinAsArray" v-model="selectedVehicleVinAsArray"
isRequired=true isRequired
:validation-rules="validationRules" :validation-rules="validationRules"
/> />
<alert <alert

View file

@ -8,7 +8,7 @@
groupName="ChooseVehicleMake" groupName="ChooseVehicleMake"
textPosition="text-start" textPosition="text-start"
v-model="selectedValue" v-model="selectedValue"
isRequired=true isRequired
/> />
</template> </template>

View file

@ -8,7 +8,7 @@
groupName="ChooseVehicleModel" groupName="ChooseVehicleModel"
textPosition="text-start" textPosition="text-start"
v-model="selectedValue" v-model="selectedValue"
isRequired=true isRequired
/> />
</template> </template>

View file

@ -8,7 +8,7 @@
groupName="ChooseVehicleStyle" groupName="ChooseVehicleStyle"
textPosition="text-start" textPosition="text-start"
v-model="selectedValue" v-model="selectedValue"
isRequired=true isRequired
/> />
</template> </template>

View file

@ -8,7 +8,7 @@
groupName="ChooseVehicleYear" groupName="ChooseVehicleYear"
textPosition="text-start" textPosition="text-start"
v-model="selectedValue" v-model="selectedValue"
isRequired=true isRequired
/> />
</template> </template>

View file

@ -6,8 +6,7 @@
@keyup.up="handleKeyupArrow()" @keyup.up="handleKeyupArrow()"
@keyup.down="handleKeyupArrow()" @keyup.down="handleKeyupArrow()"
@keyup.left="handleKeyupArrow()" @keyup.left="handleKeyupArrow()"
@keyup.right="handleKeyupArrow()" @keyup.right="handleKeyupArrow()">
>
<input <input
:type="isMultiSelect ? 'checkbox' : 'radio'" :type="isMultiSelect ? 'checkbox' : 'radio'"
:id="buttonID" :id="buttonID"
@ -107,26 +106,25 @@ export default {
this.isLoaderDisplayed = true; this.isLoaderDisplayed = true;
}, },
handleInputChange() { handleInputChange() {
if(!this.selectingInitiatesLoad) { if(this.selectingInitiatesLoad) {
this.handleCheckChange(); this.triggerButton();
} }
else {
this.handleCheckChange();
}
}, },
handleKeyupArrow() { handleKeyupArrow() {
if (this.isMultiSelect) { if (this.isMultiSelect) {
return; // Prevent arrow keys from doing anything if element is a checkbox return; // Prevent arrow keys from doing anything if element is a checkbox
} }
if(!this.selectingInitiatesLoad) { this.handleInputChange();
this.handleCheckChange();
}
this.handleChange(this.value);
}, },
triggerButton() { triggerButton() {
if(this.selectingInitiatesLoad) { if(this.selectingInitiatesLoad) {
this.displayLoader(); this.displayLoader();
this.handleCheckChange(); this.handleCheckChange();
} }
this.handleChange(this.value);
this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true); this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
}, },
handleCheckChange() { handleCheckChange() {
@ -135,6 +133,7 @@ export default {
value: this.value.toString(), value: this.value.toString(),
buttonId: this.buttonID && this.buttonID.toString(), buttonId: this.buttonID && this.buttonID.toString(),
}; };
this.handleChange(this.value);
this.$emit("isCheckedChanged", emitEvent); this.$emit("isCheckedChanged", emitEvent);
this.$emit("update:modelValue", emitEvent); this.$emit("update:modelValue", emitEvent);
}, },