From e5a1bcbdab523a3450275acc25009593edb9e54a Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Mon, 22 Sep 2025 14:28:43 -0400 Subject: [PATCH] CASH-1338 refactor to use base-mixin var pageName --- src/layouts/schedule/schedule.vue | 18 ++++++++---------- .../schedule/shop-location/shop-location.vue | 2 -- .../mobile-location-modal-questions.vue | 1 - .../service-location/service-location.vue | 11 +++++------ .../service-zip-modal-question.vue | 1 - .../shop-question/shop-question-popup.vue | 1 - 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index f3a2c17f1..56a27d15a 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -77,7 +77,6 @@ :carId="carId" :isVehicleHeavyTruck="isVehicleHeavyTruck" :mobileFeePart="mobileFeePart" - pageName="schedule" @updated-mobile-fee-part="setMobileFeePart" @updated-recycle-fee-part="setRecycleFeePart" @updated-serviceability="setServiceabilityDetails" @@ -101,7 +100,6 @@ :shopProviderDataFromParent="shopProviderData" :zipCodeFromParent="zipCode" :isShopQuestionDisplayed="isShopQuestionDisplayed" - pageName="schedule" @shop-selected="onShopSelected" @updated-serviceability="setServiceabilityDetails" /> @@ -499,14 +497,14 @@ export default { ); const serviceZipCode = store.getters.order.serviceLocation.zipCode; - const zipCodeDataPromise = getZipCodeData(serviceZipCode, "schedule"); + const zipCodeDataPromise = getZipCodeData(serviceZipCode, to.name); const serviceabilityDetailsPromise = getServiceabilityDetails( serviceZipCode, null, - "schedule" + to.name ); - const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, "schedule"); - const shopProviderData = await getShopProviderData(serviceZipCode, "schedule"); + const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, to.name); + const shopProviderData = await getShopProviderData(serviceZipCode, to.name); const providerNumber = shopProviderData?.data?.shopProviders[0]?.providerNumber; // Get pricingByDayUpcharge needed for Pricing By Day @@ -517,7 +515,7 @@ export default { const premiumFeePromise = baseMixin.methods.dispatchStoreActionWithLogging( storeActions.GET_MOBILE_PREMIUM_FEE, null, - "schedule" + to.name ); const premiumFeeWithPricePromise = premiumFeePromise.then((result) => { if (result.data) { @@ -526,7 +524,7 @@ export default { { availableLineItems: [result.data], }, - "schedule", + to.name, false ); } else { @@ -1307,7 +1305,7 @@ export default { ) { navigateToHeritageFunnel({ shouldSaveSession: false, - pageNameToLog: "schedule", + pageNameToLog: this.pageName, navType: "back", }); } else { @@ -1632,7 +1630,7 @@ export default { handleZipCodeChange(newZipCode) { this.resetMobileLocation(); - getShopProviderData(newZipCode.zipCode, "schedule").then((result) => { + getShopProviderData(newZipCode.zipCode, this.pageName).then((result) => { this.shopProviderData = result.data; this.resetSelectedProvider(); this.state = newZipCode.state; diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue index e407a7449..33ec097e8 100644 --- a/src/layouts/schedule/shop-location/shop-location.vue +++ b/src/layouts/schedule/shop-location/shop-location.vue @@ -17,7 +17,6 @@ :selectedProviderNumberFromParent="selectedProviderNumberFromParent" :shopProviderDataFromParent="shopProviderDataFromParent" :zipCodeFromParent="zipCodeFromParent" - :pageName="pageName" @shop-selected="onShopSelected" @updated-serviceability="setServiceabilityDetails" cmsWidgetName="YourSafeliteShopWidget" /> @@ -56,7 +55,6 @@ export default { type: String, default: null, }, - pageName: String, }, computed: { questionText() { diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue index 7a761afe6..4e74786f1 100644 --- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue +++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue @@ -127,7 +127,6 @@ export default { type: Object, default: () => ({}), }, - pageName: String, linkWidgetName: String, modalWidgetName: String, alertNonServiceableZipWidgetName: String, diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 62945632a..ee7f1797a 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -14,7 +14,6 @@ :carId="carId" :isVehicleHeavyTruck="isVehicleHeavyTruck" :mobileFeePart="mobileFeePart" - pageName="service-location" @updated-mobile-fee-part="setMobileFeePart" @updated-recycle-fee-part="setRecycleFeePart" @updated-serviceability="setServiceabilityDetails" @@ -227,17 +226,17 @@ export default { const cmsContentPromise = fetchCmsContentForPage(to.name); const serviceZipCode = store.getters.order.serviceLocation.zipCode; - const zipCodeDataPromise = getZipCodeData(serviceZipCode, "service-location"); + const zipCodeDataPromise = getZipCodeData(serviceZipCode, to.name); const serviceabilityDetailsPromise = getServiceabilityDetails( serviceZipCode, null, - "service-location" + to.name ); - const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, "service-location"); + const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, to.name); - const shopProviderDataPromise = getShopProviderData(serviceZipCode, "service-location"); // shopQuestion.methods.loadInitialData(serviceZipCode); + const shopProviderDataPromise = getShopProviderData(serviceZipCode, to.name); // shopQuestion.methods.loadInitialData(serviceZipCode); // Settle promises and get results const promiseResultMap = [ @@ -847,7 +846,7 @@ export default { zipCode: { handler(newValue) { if (!this.navigatingForward) { - getShopProviderData(this.zipCode, "service-location").then(async (result) => { + getShopProviderData(this.zipCode, this.pageName).then(async (result) => { this.shopProviderData = result.data; if (this.selectedAppointmentType === "Mobile") { this.selectedProvider = new Provider( diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue index 2363a2581..d91fcd210 100644 --- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue +++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue @@ -91,7 +91,6 @@ export default { type: Object, default: () => ({}), }, - pageName: String, linkWidgetName: String, modalWidgetName: String, editScreenReaderTextCmsWidgetName: String, diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index e14d96545..430c347e1 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -136,7 +136,6 @@ export default { type: String, default: null, }, - pageName: String, }, computed: { shopQuestionLinkText() {