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

Merge pull request #1673 from Safelite/feature/Digital/CSR-1898

Browse source 
CSR-1898
This commit is contained in:
hiteshkumar87 2024-01-04 15:30:47 +05:30 committed by GitHub
commit 3f09827121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,7 +89,7 @@ export default {
document.getElementById(this.modalId)?.focus(); document.getElementById(this.modalId)?.focus();
}, },
resetButtonStyle() { resetButtonStyle() {
this.$refs.modalButtonMain.resetButtonStyle(); this.$refs.modalButtonMain?.resetButtonStyle();
}, },
onModalOpened() { onModalOpened() {
this.onModalOpenedCallback?.(); this.onModalOpenedCallback?.();

2
src/layouts/schedule/schedule.vue
View file

@ -49,7 +49,7 @@
" "
@time-slot-modal-closed="timeSlotModalClosed" @time-slot-modal-closed="timeSlotModalClosed"
validationRules="time-slot-selection-required" validationRules="time-slot-selection-required"
@ForwardClicked="forwardButtonAction" /> @TimeSlotSelected="forwardButtonAction" />
<navbar <navbar
cmsWidgetName="FunnelFooterWidget" cmsWidgetName="FunnelFooterWidget"
ref="navbar" ref="navbar"

2
src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.spec.js
View file

@ -97,7 +97,7 @@ describe("time-slot-modal-question.vue", () => {
//Assert //Assert
expect(wrapper.emitted()["update:modelValue"]).toEqual(expectedEmit); expect(wrapper.emitted()["update:modelValue"]).toEqual(expectedEmit);
expect(wrapper.emitted()).toHaveProperty("ForwardClicked"); expect(wrapper.emitted()).toHaveProperty("TimeSlotSelected");
}); });
}); });

7
src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
View file

@ -82,7 +82,7 @@ defineRule("time-slot-required", required(errorMessages.OPTION_REQUIRED));
export default { export default {
name: "time-slot-modal-question", name: "time-slot-modal-question",
emits: ["update:modelValue", "ForwardClicked"], emits: ["update:modelValue", "TimeSlotSelected"],
props: { props: {
modelValue: { modelValue: {
type: Object, type: Object,
@ -351,7 +351,7 @@ export default {
"update:modelValue", "update:modelValue",
this.getSelectedTimeSlotInfoObject(this.selectedRouteCode) this.getSelectedTimeSlotInfoObject(this.selectedRouteCode)
); );
this.$emit("ForwardClicked"); this.$emit("TimeSlotSelected");
}, },
getRelevantDropOffCmsWidgetNameForSelectedTimeSlot( getRelevantDropOffCmsWidgetNameForSelectedTimeSlot(
selectedRouteCode, selectedRouteCode,
@ -494,6 +494,9 @@ export default {
}; };
}, },
}, },
unmounted() {
if (this.isModalOpened) this.closeModal();
},
watch: { watch: {
modelValue: { modelValue: {
handler(newValue) { handler(newValue) {

6
src/router/index.js
View file

@ -169,11 +169,7 @@ router.beforeEach(async (to, from, next) => {
if (fromQueryPage === undefined) { if (fromQueryPage === undefined) {
showFmgLoadingModal(true); showFmgLoadingModal(true);
} }
// remove modal backdrop if one exists
let modalBackground = document.querySelector(".modal-backdrop");
if (modalBackground) {
modalBackground.remove();
}
const toQueryPage = to.query?.fmgPage; const toQueryPage = to.query?.fmgPage;
const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN; const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
const isInIframe = window !== window.top; const isInIframe = window !== window.top;