Merge branch 'develop' into feature/SSR-220

This commit is contained in:
Kulbhushan Kaushik 2023-01-18 13:17:30 -05:00
commit ad97d9880e
3 changed files with 16 additions and 3 deletions

View file

@ -12,7 +12,7 @@
isPrimary isPrimary
:buttonText="buttonText" :buttonText="buttonText"
loaderColor="white" loaderColor="white"
:class="isForwardActionDisabled && 'form-test-invalid'" :class="(disableForwardAction || isForwardActionDisabled) && 'form-test-invalid'"
:aria-disabled="isForwardActionDisabled" :aria-disabled="isForwardActionDisabled"
:isDisabled="isForwardActionDisabled" :isDisabled="isForwardActionDisabled"
@click-event="buttonClick" @click-event="buttonClick"
@ -55,6 +55,7 @@ export default {
return { return {
paddingHeight: 0, paddingHeight: 0,
customButtontext: "", customButtontext: "",
disableForwardAction: false,
}; };
}, },
mounted() { mounted() {
@ -111,6 +112,12 @@ export default {
linkClick() { linkClick() {
this.$emit("backClicked"); this.$emit("backClicked");
}, },
disableForwardButton() {
this.disableForwardAction = true;
},
enableForwardAction() {
this.disableForwardAction = false;
}
}, },
}; };
</script> </script>

View file

@ -668,6 +668,8 @@ function setupMocks({
wrapper.vm.setCmsContent = jest.fn(); wrapper.vm.setCmsContent = jest.fn();
wrapper.vm.$refs.siteFooter.updateButtonText = jest.fn(); wrapper.vm.$refs.siteFooter.updateButtonText = jest.fn();
wrapper.vm.$refs.siteFooter.removeLoader = jest.fn(); wrapper.vm.$refs.siteFooter.removeLoader = jest.fn();
wrapper.vm.$refs.siteFooter.disableForwardButton = jest.fn();
wrapper.vm.$refs.siteFooter.enableForwardAction = jest.fn();
return { wrapper }; return { wrapper };
} }

View file

@ -12,7 +12,7 @@
ref="vehicleBanner" ref="vehicleBanner"
:displayGenericVehicleImage="false" /> :displayGenericVehicleImage="false" />
<siteSubHeader cmsWidgetName="SiteSubHeaderWidget" ref="siteSubHeader" /> <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" ref="siteSubHeader" />
<div class="fade-on-route-transition sub-container make-tall overflow-auto"> <div class="fade-on-route-transition sub-container make-tall overflow-auto px-1">
<alert <alert
ref="alertVinNotFound" ref="alertVinNotFound"
v-if="displayVinNotFoundAlert" v-if="displayVinNotFoundAlert"
@ -215,6 +215,7 @@ export default {
if (!resultMap.vinLookupResponse.isStatePermissible) { if (!resultMap.vinLookupResponse.isStatePermissible) {
// State Restrictions forbid lookup by address // State Restrictions forbid lookup by address
this.displayVinLookupByHomeAddressNotAllowedAlert = true; this.displayVinLookupByHomeAddressNotAllowedAlert = true;
this.$refs.siteFooter.disableForwardButton();
return this.$refs.siteFooter.removeLoader(); return this.$refs.siteFooter.removeLoader();
} }
@ -268,6 +269,7 @@ export default {
} else { } else {
// No VINS found. // No VINS found.
this.displayVinNotFoundAlert = true; this.displayVinNotFoundAlert = true;
this.$refs.siteFooter.disableForwardButton();
return this.$refs.siteFooter.removeLoader(); return this.$refs.siteFooter.removeLoader();
} }
@ -275,6 +277,7 @@ export default {
this.isZipServiceable = resultMap.serviceZipValidationResponse.isServiceable; this.isZipServiceable = resultMap.serviceZipValidationResponse.isServiceable;
if (!this.isZipServiceable) { if (!this.isZipServiceable) {
this.displayNonServiceableZipAlert = true; this.displayNonServiceableZipAlert = true;
this.$refs.siteFooter.disableForwardButton();
this.showServiceZipField = true; this.showServiceZipField = true;
return this.$refs.siteFooter.removeLoader(); return this.$refs.siteFooter.removeLoader();
} }
@ -353,6 +356,7 @@ export default {
this.displayNonServiceableZipAlert = false; this.displayNonServiceableZipAlert = false;
this.displayMatchedDifferentVehicleAlert = false; this.displayMatchedDifferentVehicleAlert = false;
this.displayVinLookupByHomeAddressNotAllowedAlert = false; this.displayVinLookupByHomeAddressNotAllowedAlert = false;
this.$refs.siteFooter.enableForwardAction();
}, },
}, },
mounted() { mounted() {
@ -404,7 +408,7 @@ export default {
serviceZipCode: { serviceZipCode: {
handler(newValue) { handler(newValue) {
// If they modify the service zip code, then hide the error message. // If they modify the service zip code, then hide the error message.
this.displayNonServiceableZipAlert = false; this.resetWarningsAndErrors();
}, },
}, },
showServiceZipField: { showServiceZipField: {