Merge pull request #1966 from Safelite/feature/Digital/CSR-2216
CSR-2216
This commit is contained in:
commit
2447f34a84
20 changed files with 28 additions and 27 deletions
|
|
@ -150,7 +150,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ describe("estimate.vue", () => {
|
|||
describe("estimate.vue", () => {
|
||||
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
|
||||
store.getters = {
|
||||
isExternalParameter: true,
|
||||
externalParameterState: { isExternalParameter: true },
|
||||
externalParameterEstimate: { vinSelection: "decline" },
|
||||
};
|
||||
// Set up the component
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ export default {
|
|||
}
|
||||
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (store.getters.externalParameterEstimate.vinSelection) {
|
||||
vm.selectedVinLookupMethod = vinPagesMixin.methods.getVinlookupMethod(
|
||||
store.getters.externalParameterEstimate.vinSelection
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ export default {
|
|||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.originalList = resultMap.insuranceCompanyList;
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ describe("quote.vue", () => {
|
|||
inactivePromos: [],
|
||||
},
|
||||
},
|
||||
isExternalParameter: true,
|
||||
externalParameterState: { isExternalParameter: true },
|
||||
externalParameterQuote: {
|
||||
isInsurance: true,
|
||||
servicePackage: "glassonly",
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ export default {
|
|||
}
|
||||
}
|
||||
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (store.getters.externalParameterQuote.isInsurance == true) {
|
||||
vm.isInsuranceSelected = true;
|
||||
vm.servicePackage = store.getters.externalParameterQuote.servicePackage;
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ function resetMockStoreData() {
|
|||
zipCode: null,
|
||||
emailAddress: null,
|
||||
},
|
||||
externalParameterState: { isExternalParameter: false },
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -412,7 +413,7 @@ describe("service-zip.vue", () => {
|
|||
describe("service-zip.vue", () => {
|
||||
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
|
||||
// Set up the store with isExternalParameter as true
|
||||
store.getters.isExternalParameter = true;
|
||||
store.getters.externalParameterState = { isExternalParameter: true };
|
||||
|
||||
// Set up the component
|
||||
const wrapper = setupMocks({});
|
||||
|
|
@ -436,7 +437,7 @@ describe("service-zip.vue", () => {
|
|||
});
|
||||
test("should not call forwardButtonAction if isExternalParameter is true and form is invalid", async () => {
|
||||
// Set up the store with isExternalParameter as true
|
||||
store.getters.isExternalParameter = true;
|
||||
store.getters.externalParameterState = { isExternalParameter: true };
|
||||
|
||||
// Set up the component
|
||||
const wrapper = setupMocks({});
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ export default {
|
|||
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
|
||||
if (isValid) {
|
||||
vm.forwardButtonAction();
|
||||
|
|
@ -188,7 +188,7 @@ export default {
|
|||
|
||||
if (!zipCodeData.isValid) {
|
||||
this.displayInvalidZipAlert = true;
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
return this.$refs.navbar.removeLoader();
|
||||
|
|
@ -197,7 +197,7 @@ export default {
|
|||
|
||||
if (!zipCodeData.isServiceable) {
|
||||
this.displayNonServiceableZipAlert = true;
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
return this.$refs.navbar.removeLoader();
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ jest.mock("@/store", () => ({
|
|||
glassToReplace: [],
|
||||
},
|
||||
},
|
||||
isExternalParameter: false,
|
||||
externalParameterState: { isExternalParameter: false },
|
||||
externalParameterDamage: {
|
||||
damageType: null,
|
||||
isRepair: null,
|
||||
|
|
@ -813,7 +813,7 @@ describe("vehicle-damage.vue", () => {
|
|||
describe("vehicle-damage.vue", () => {
|
||||
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
|
||||
// Set up the store with isExternalParameter as true
|
||||
store.getters.isExternalParameter = true;
|
||||
store.getters.externalParameterState = { isExternalParameter: true };
|
||||
store.getters.externalParameterDamage = {
|
||||
damageType: "windshieldReplace",
|
||||
isRepair: false,
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ export default {
|
|||
vm.$refs.backGlassOptions.initializeComponent(
|
||||
resultMap.damageOptions.backGlassOptions.availableReplacementOptions
|
||||
);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
await nextTick();
|
||||
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
|
||||
if (isValid) {
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ export default {
|
|||
FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
|
||||
})
|
||||
);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ jest.mock("@/store", () => ({
|
|||
applicationUser: {
|
||||
experiments: [{ universeName: "ConceptFunnel" }],
|
||||
},
|
||||
isExternalParameter: false,
|
||||
externalParameterState: { isExternalParameter: false },
|
||||
externalParameterVehicle: {
|
||||
year: null,
|
||||
make: null,
|
||||
|
|
@ -94,7 +94,7 @@ describe("vehicle.vue", () => {
|
|||
|
||||
describe("vehicle.vue", () => {
|
||||
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
|
||||
store.getters.isExternalParameter = true;
|
||||
store.getters.externalParameterState.isExternalParameter = true;
|
||||
// Create a shallow mount of MyComponent
|
||||
const { wrapper } = setupMocks();
|
||||
// Set displayNoServiceAlert to false
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ export default {
|
|||
let resultMap = await settleAllPromises(promiseResultMap);
|
||||
|
||||
//ExternalParameter widget have different case style value so need to parse with NextGen
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (
|
||||
makeQuestionInitialDataPromise &&
|
||||
modelQuestionInitialDataPromise &&
|
||||
|
|
@ -269,7 +269,7 @@ export default {
|
|||
resultMap.modelQuestionInitialData,
|
||||
resultMap.styleQuestionInitialData
|
||||
);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
await vm.getVehicleDetails();
|
||||
if (!vm.displayNoServiceAlert) {
|
||||
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ router.beforeEach(async (to, from, next) => {
|
|||
const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
|
||||
const isInIframe = window !== window.top;
|
||||
|
||||
if (store.getters.isExternalParameter) {
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
// Check if alert event is on the bus
|
||||
const alertEvent = eventBus.readEventFromBus(
|
||||
globalEvents.Categories.GLOBAL_ALERT,
|
||||
|
|
@ -295,7 +295,7 @@ router.afterEach(async (to, from) => {
|
|||
await saveSession({ pageNameToLog: to.query.fmgPage });
|
||||
}
|
||||
}
|
||||
if (!store.getters.isExternalParameter) {
|
||||
if (!store.getters.externalParameterState?.isExternalParameter) {
|
||||
showFmgLoadingModal(false);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -898,7 +898,7 @@ export const getters = {
|
|||
requiresVerifiedRedirecting: (state) => {
|
||||
return state.order?.referralNumber?.length === 6;
|
||||
},
|
||||
isExternalParameter: (state) => externalParameterState?.isExternalParameter,
|
||||
externalParameterState: (state) => externalParameterState,
|
||||
externalParameterVehicle: (state) => externalParameterState?.vehicle,
|
||||
externalParameterDamage: (state) => externalParameterState?.vehicleDamage,
|
||||
externalParameterQuote: (state) => externalParameterState?.quote,
|
||||
|
|
|
|||
Loading…
Reference in a new issue