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

Merge pull request #1966 from Safelite/feature/Digital/CSR-2216

Browse source 
CSR-2216
This commit is contained in:
hiteshkumar87 2024-09-10 19:03:44 +05:30 committed by GitHub
commit 2447f34a84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/layouts/address-lookup/address-lookup.vue
View file

@ -150,7 +150,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/capability-questions/capability-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/estimate/estimate.spec.js
View file

@ -216,7 +216,7 @@ describe("estimate.vue", () => {
describe("estimate.vue", () => { describe("estimate.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => { test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
store.getters = { store.getters = {
isExternalParameter: true, externalParameterState: { isExternalParameter: true },
externalParameterEstimate: { vinSelection: "decline" }, externalParameterEstimate: { vinSelection: "decline" },
}; };
// Set up the component // Set up the component

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

@ -146,7 +146,7 @@ export default {
} }
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterEstimate.vinSelection) { if (store.getters.externalParameterEstimate.vinSelection) {
vm.selectedVinLookupMethod = vinPagesMixin.methods.getVinlookupMethod( vm.selectedVinLookupMethod = vinPagesMixin.methods.getVinlookupMethod(
store.getters.externalParameterEstimate.vinSelection store.getters.externalParameterEstimate.vinSelection

2
src/layouts/insurance-company/insurance-company.vue
View file

@ -76,7 +76,7 @@ export default {
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
vm.originalList = resultMap.insuranceCompanyList; vm.originalList = resultMap.insuranceCompanyList;
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/license-plate-lookup/license-plate-lookup.vue
View file

@ -148,7 +148,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/molding-questions/molding-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/part-questions/part-questions.vue
View file

@ -54,7 +54,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

2
src/layouts/quote/quote.spec.js
View file

@ -671,7 +671,7 @@ describe("quote.vue", () => {
inactivePromos: [], inactivePromos: [],
}, },
}, },
isExternalParameter: true, externalParameterState: { isExternalParameter: true },
externalParameterQuote: { externalParameterQuote: {
isInsurance: true, isInsurance: true,
servicePackage: "glassonly", servicePackage: "glassonly",

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

@ -286,7 +286,7 @@ export default {
} }
} }
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterQuote.isInsurance == true) { if (store.getters.externalParameterQuote.isInsurance == true) {
vm.isInsuranceSelected = true; vm.isInsuranceSelected = true;
vm.servicePackage = store.getters.externalParameterQuote.servicePackage; vm.servicePackage = store.getters.externalParameterQuote.servicePackage;

5
src/layouts/service-zip/service-zip.spec.js
View file

@ -169,6 +169,7 @@ function resetMockStoreData() {
zipCode: null, zipCode: null,
emailAddress: null, emailAddress: null,
}, },
externalParameterState: { isExternalParameter: false },
}; };
} }
@ -412,7 +413,7 @@ describe("service-zip.vue", () => {
describe("service-zip.vue", () => { describe("service-zip.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => { test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
// Set up the store with isExternalParameter as true // Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true; store.getters.externalParameterState = { isExternalParameter: true };
// Set up the component // Set up the component
const wrapper = setupMocks({}); 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 () => { test("should not call forwardButtonAction if isExternalParameter is true and form is invalid", async () => {
// Set up the store with isExternalParameter as true // Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true; store.getters.externalParameterState = { isExternalParameter: true };
// Set up the component // Set up the component
const wrapper = setupMocks({}); const wrapper = setupMocks({});

6
src/layouts/service-zip/service-zip.vue
View file

@ -132,7 +132,7 @@ export default {
next(async (vm) => { next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) { if (isValid) {
vm.forwardButtonAction(); vm.forwardButtonAction();
@ -188,7 +188,7 @@ export default {
if (!zipCodeData.isValid) { if (!zipCodeData.isValid) {
this.displayInvalidZipAlert = true; this.displayInvalidZipAlert = true;
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
@ -197,7 +197,7 @@ export default {
if (!zipCodeData.isServiceable) { if (!zipCodeData.isServiceable) {
this.displayNonServiceableZipAlert = true; this.displayNonServiceableZipAlert = true;
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();

4
src/layouts/vehicle-damage/vehicle-damage.spec.js
View file

@ -66,7 +66,7 @@ jest.mock("@/store", () => ({
glassToReplace: [], glassToReplace: [],
}, },
}, },
isExternalParameter: false, externalParameterState: { isExternalParameter: false },
externalParameterDamage: { externalParameterDamage: {
damageType: null, damageType: null,
isRepair: null, isRepair: null,
@ -813,7 +813,7 @@ describe("vehicle-damage.vue", () => {
describe("vehicle-damage.vue", () => { describe("vehicle-damage.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => { test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
// Set up the store with isExternalParameter as true // Set up the store with isExternalParameter as true
store.getters.isExternalParameter = true; store.getters.externalParameterState = { isExternalParameter: true };
store.getters.externalParameterDamage = { store.getters.externalParameterDamage = {
damageType: "windshieldReplace", damageType: "windshieldReplace",
isRepair: false, isRepair: false,

2
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -151,7 +151,7 @@ export default {
vm.$refs.backGlassOptions.initializeComponent( vm.$refs.backGlassOptions.initializeComponent(
resultMap.damageOptions.backGlassOptions.availableReplacementOptions resultMap.damageOptions.backGlassOptions.availableReplacementOptions
); );
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
await nextTick(); await nextTick();
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) { if (isValid) {

2
src/layouts/vehicle-parts/vehicle-parts.vue
View file

@ -102,7 +102,7 @@ export default {
FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget, FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
}) })
); );
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

4
src/layouts/vehicle/vehicle.spec.js
View file

@ -28,7 +28,7 @@ jest.mock("@/store", () => ({
applicationUser: { applicationUser: {
experiments: [{ universeName: "ConceptFunnel" }], experiments: [{ universeName: "ConceptFunnel" }],
}, },
isExternalParameter: false, externalParameterState: { isExternalParameter: false },
externalParameterVehicle: { externalParameterVehicle: {
year: null, year: null,
make: null, make: null,
@ -94,7 +94,7 @@ describe("vehicle.vue", () => {
describe("vehicle.vue", () => { describe("vehicle.vue", () => {
test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => { 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 // Create a shallow mount of MyComponent
const { wrapper } = setupMocks(); const { wrapper } = setupMocks();
// Set displayNoServiceAlert to false // Set displayNoServiceAlert to false

4
src/layouts/vehicle/vehicle.vue
View file

@ -221,7 +221,7 @@ export default {
let resultMap = await settleAllPromises(promiseResultMap); let resultMap = await settleAllPromises(promiseResultMap);
//ExternalParameter widget have different case style value so need to parse with NextGen //ExternalParameter widget have different case style value so need to parse with NextGen
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
if ( if (
makeQuestionInitialDataPromise && makeQuestionInitialDataPromise &&
modelQuestionInitialDataPromise && modelQuestionInitialDataPromise &&
@ -269,7 +269,7 @@ export default {
resultMap.modelQuestionInitialData, resultMap.modelQuestionInitialData,
resultMap.styleQuestionInitialData resultMap.styleQuestionInitialData
); );
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
await vm.getVehicleDetails(); await vm.getVehicleDetails();
if (!vm.displayNoServiceAlert) { if (!vm.displayNoServiceAlert) {
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);

2
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -192,7 +192,7 @@ export default {
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {
vm.setCmsContent(resultMap.cmsContent); vm.setCmsContent(resultMap.cmsContent);
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} }
}); });

4
src/router/index.js
View file

@ -245,7 +245,7 @@ router.beforeEach(async (to, from, next) => {
const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN; const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
const isInIframe = window !== window.top; const isInIframe = window !== window.top;
if (store.getters.isExternalParameter) { if (store.getters.externalParameterState?.isExternalParameter) {
// Check if alert event is on the bus // Check if alert event is on the bus
const alertEvent = eventBus.readEventFromBus( const alertEvent = eventBus.readEventFromBus(
globalEvents.Categories.GLOBAL_ALERT, globalEvents.Categories.GLOBAL_ALERT,
@ -295,7 +295,7 @@ router.afterEach(async (to, from) => {
await saveSession({ pageNameToLog: to.query.fmgPage }); await saveSession({ pageNameToLog: to.query.fmgPage });
} }
} }
if (!store.getters.isExternalParameter) { if (!store.getters.externalParameterState?.isExternalParameter) {
showFmgLoadingModal(false); showFmgLoadingModal(false);
} }

2
src/store/index.js
View file

@ -898,7 +898,7 @@ export const getters = {
requiresVerifiedRedirecting: (state) => { requiresVerifiedRedirecting: (state) => {
return state.order?.referralNumber?.length === 6; return state.order?.referralNumber?.length === 6;
}, },
isExternalParameter: (state) => externalParameterState?.isExternalParameter, externalParameterState: (state) => externalParameterState,
externalParameterVehicle: (state) => externalParameterState?.vehicle, externalParameterVehicle: (state) => externalParameterState?.vehicle,
externalParameterDamage: (state) => externalParameterState?.vehicleDamage, externalParameterDamage: (state) => externalParameterState?.vehicleDamage,
externalParameterQuote: (state) => externalParameterState?.quote, externalParameterQuote: (state) => externalParameterState?.quote,