diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 4612348f2..403982a83 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -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(); } }); diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index 7d1cb6c5b..a94db9786 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -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(); } }); diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js index 7a66a197c..87235d15a 100644 --- a/src/layouts/estimate/estimate.spec.js +++ b/src/layouts/estimate/estimate.spec.js @@ -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 diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index 89d29c744..25217d74b 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -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 diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue index f675055a5..bc9e5755a 100644 --- a/src/layouts/insurance-company/insurance-company.vue +++ b/src/layouts/insurance-company/insurance-company.vue @@ -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(); } }); diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 94b85a881..308180d20 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -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(); } }); diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue index 379eb5eb1..e2838c27e 100644 --- a/src/layouts/molding-questions/molding-questions.vue +++ b/src/layouts/molding-questions/molding-questions.vue @@ -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(); } }); diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue index 5b225e758..f49f5876c 100644 --- a/src/layouts/part-questions/part-questions.vue +++ b/src/layouts/part-questions/part-questions.vue @@ -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(); } }); diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js index 34041d3c4..2e089415e 100644 --- a/src/layouts/quote/quote.spec.js +++ b/src/layouts/quote/quote.spec.js @@ -671,7 +671,7 @@ describe("quote.vue", () => { inactivePromos: [], }, }, - isExternalParameter: true, + externalParameterState: { isExternalParameter: true }, externalParameterQuote: { isInsurance: true, servicePackage: "glassonly", diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 0d0e30128..a280e5f63 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -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; diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js index 96cde148f..1a22bb03b 100644 --- a/src/layouts/service-zip/service-zip.spec.js +++ b/src/layouts/service-zip/service-zip.spec.js @@ -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({}); diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index 056e67d97..34efac1a1 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/src/layouts/service-zip/service-zip.vue @@ -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(); diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index bc4ab9356..6a94c240b 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -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, diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index cca4f92a6..62da598db 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -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) { diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 5361c5e7e..bf21b1749 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -102,7 +102,7 @@ export default { FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget, }) ); - if (store.getters.isExternalParameter) { + if (store.getters.externalParameterState?.isExternalParameter) { baseMixin.methods.ResetExternalParamsAndHideModal(); } }); diff --git a/src/layouts/vehicle/vehicle.spec.js b/src/layouts/vehicle/vehicle.spec.js index 8aaab5008..d4bc1f726 100644 --- a/src/layouts/vehicle/vehicle.spec.js +++ b/src/layouts/vehicle/vehicle.spec.js @@ -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 diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index 56f966ac7..7f629db0a 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -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); diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index ddb24f924..b63158680 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -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(); } }); diff --git a/src/router/index.js b/src/router/index.js index 23751e43d..4549f9e7c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -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); } diff --git a/src/store/index.js b/src/store/index.js index cf29f5faf..5c04398ac 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -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,