jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #993 from Safelite/feature/CSR-1012

Browse source 
CSR-1012 loading spinner and removed updated-service-zip-code event
This commit is contained in:
Matt Caimi 2023-03-06 15:39:48 -05:00 committed by GitHub
commit e2f3bc783c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/digital-components/modal/modal.vue
View file

@ -78,8 +78,9 @@ export default {
const validationResult = await this.form.validate(); const validationResult = await this.form.validate();
if (validationResult.valid) { if (validationResult.valid) {
this.$emit("footer-button-event"); this.$emit("footer-button-event");
} else {
this.resetButtonStyle();
} }
this.resetButtonStyle();
}, },
resetButtonStyle() { resetButtonStyle() {
this.$refs.buttonMain.resetButtonStyle(); this.$refs.buttonMain.resetButtonStyle();

8
src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
View file

@ -94,13 +94,13 @@ export default {
}, },
mobileLocationLinkText() { mobileLocationLinkText() {
if ( if (
this.addressModel.streetAddress !== null && this.addressModel.streetAddress &&
this.addressModel.streetAddress !== "" && this.addressModel.streetAddress !== "" &&
this.addressModel.city !== null && this.addressModel.city &&
this.addressModel.city !== "" && this.addressModel.city !== "" &&
this.addressModel.state !== null && this.addressModel.state &&
this.addressModel.state !== "" && this.addressModel.state !== "" &&
this.addressModel.zipCode !== null && this.addressModel.zipCode &&
this.addressModel.zipCode !== "" this.addressModel.zipCode !== ""
) { ) {
return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`; return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;

1
src/layouts/service-location/service-location.vue
View file

@ -6,7 +6,6 @@
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" /> <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
<serviceZipModalQuestion <serviceZipModalQuestion
v-model="serviceZipCodeQuestion" v-model="serviceZipCodeQuestion"
@updated-service-zip-code="resetMobileLocation"
ref="serviceZipCodeQuestion" ref="serviceZipCodeQuestion"
linkWidgetName="ServiceZipLinkWidget" linkWidgetName="ServiceZipLinkWidget"
modalWidgetName="ServiceZipModalWidget" /> modalWidgetName="ServiceZipModalWidget" />

1
src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
View file

@ -12,6 +12,7 @@ jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
jest.mock("@/digital-components/modal/modal", () => ({ jest.mock("@/digital-components/modal/modal", () => ({
methods: { methods: {
closeModal: jest.fn(), closeModal: jest.fn(),
resetButtonStyle: jest.fn(),
}, },
})); }));

5
src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
View file

@ -116,6 +116,10 @@ export default {
this.$refs[this.modalName].closeModal(); this.$refs[this.modalName].closeModal();
}, },
resetModalButtonStyle() {
this.$refs[this.modalName].resetButtonStyle();
},
onInputIdAssigned(inputId) { onInputIdAssigned(inputId) {
this.serviceZipCodeTextInputId = inputId; this.serviceZipCodeTextInputId = inputId;
}, },
@ -134,6 +138,7 @@ export default {
this.resetAlerts(); this.resetAlerts();
const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode); const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
this.resetModalButtonStyle();
if (!zipCodeData.isValid) { if (!zipCodeData.isValid) {
this.displayInvalidZipAlert = true; this.displayInvalidZipAlert = true;