From 412b2bebb6e651c09874cd972b36e0bb34213e2e Mon Sep 17 00:00:00 2001 From: brydon1 Date: Wed, 6 Sep 2023 12:06:20 -0400 Subject: [PATCH 1/2] Swapping store call --- src/layouts/address-lookup/address-lookup.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 5f913011..9f86be4e 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -92,7 +92,7 @@ import routerParams from '@/router/router-constants/router-params'; import { getDamageString, isGlassAvailableForCarId } from '@/helpers/damage-helper'; import vinPagesMixin from '@/mixins/vin-pages-mixin'; -import { useMainStore } from '@/store'; +import { useMainStore } from '@/store/index.js'; export default { name: 'address-lookup', @@ -152,7 +152,7 @@ export default { // eslint-disable-next-line max-len `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`; const vinYmmExpected = - `${this.mainStore.order.vehicle.year} ${this.mainStore.order.vehicle.make} ${this.mainStore.order.vehicle.model}`; + `${useMainStore().order.vehicle.year} ${useMainStore().order.vehicle.make} ${useMainStore().order.vehicle.model}`; return this.getCmsContent('AlertMatchedDifferentVehicleWidget', 'BodyText') .replaceAll('{custom:damage}', getDamageString()) @@ -171,7 +171,7 @@ export default { `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model} ${this.customAlertData?.vehicleInfo?.style}`; const vinYmmsExpected = // eslint-disable-next-line max-len - `${this.mainStore.order.vehicle.year} ${this.mainStore.order.vehicle.make} ${this.mainStore.order.vehicle.model} ${this.mainStore.order.vehicle.style}`; + `${useMainStore().order.vehicle.year} ${useMainStore().order.vehicle.make} ${useMainStore().order.vehicle.model} ${useMainStore().order.vehicle.style}`; return this.getCmsContent('AlertMatchedTwoIdenticalYMMVehicleWidget', 'BodyText') .replaceAll('{custom:damage}', getDamageString()) @@ -183,7 +183,7 @@ export default { // eslint-disable-next-line max-len `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`; const vinYmmExpected = - `${this.mainStore.order.vehicle.year} ${this.mainStore.order.vehicle.make} ${this.mainStore.order.vehicle.model}`; + `${useMainStore().order.vehicle.year} ${useMainStore().order.vehicle.make} ${useMainStore().order.vehicle.model}`; return (vinYmmFound.toLowerCase() === vinYmmExpected.toLowerCase()); } }, @@ -203,7 +203,7 @@ export default { }, methods: { arePagePrerequisitesValid() { - return this.mainStore.order.vehicle.carId !== null; + return useMainStore().order.vehicle.carId !== null; }, backButtonAction() { @@ -283,7 +283,7 @@ export default { vehicleInfoToCommit = Object.assign(carFound, { vin: carsFound[0].vin }); } else if (carsFound.length > 1) { // If multiple cars were found and one and only one of them matches the carId entered, save the vehicle info - const matchingCars = carsFound.filter((vin) => vin.vehicle.carId === this.mainStore.order.vehicle.carId); + const matchingCars = carsFound.filter((vin) => vin.vehicle.carId === useMainStore().order.vehicle.carId); if (matchingCars.length === 1) { vehicleInfoToCommit = Object.assign(matchingCars[0].vehicle, { From a511a550bf296d4ed98884231f3ccf0dcb51af01 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Wed, 6 Sep 2023 12:18:57 -0400 Subject: [PATCH 2/2] Fixing store reference in remaining prerequisites --- src/layouts/address-vehicles/address-vehicles.vue | 2 +- src/layouts/license-plate-lookup/license-plate-lookup.vue | 2 +- src/layouts/vehicle-parts/vehicle-parts.vue | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index 63cb3572..4494d938 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -226,7 +226,7 @@ export default { getRouterLinkRouteFromCopy, getRouterLinkDisplayTextFromCopy, arePagePrerequisitesValid() { - if (this.mainStore.order.vehicle.carId) { + if (useMainStore().order.vehicle.carId) { return true; } return false; diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 91d70b2b..a1b46623 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -218,7 +218,7 @@ export default { }, methods: { arePagePrerequisitesValid() { - return this.mainStore.order.vehicle.carId !== null; + return useMainStore().order.vehicle.carId !== null; }, loadDefaultsFromStore() { this.customerQuestions = this.mainStore.customerData.addressQuestions.state; diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 7848c4e3..52b33ed8 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -77,6 +77,7 @@ import issPageValues from '@/router/router-constants/issPage-values'; import { Form } from 'vee-validate'; import vehicleQuestionsMixin from '@/mixins/vehicle-questions-mixin'; import BaseFormMixin from '@/mixins/base-form-mixin.js'; +import { useMainStore } from '@/store'; export default { name: 'vehicle-parts', @@ -178,9 +179,9 @@ export default { arePagePrerequisitesValid() { // Check if isRepair is populated and if the pageData we need is here (Parts data) return ( - this.mainStore.damage.isRepair != null - && this.mainStore.pageData(issPageValues.VEHICLE_PARTS) - && Object.keys(this.mainStore.pageData(issPageValues.VEHICLE_PARTS)).length !== 0 + useMainStore().damage.isRepair != null + && useMainStore().pageData(issPageValues.VEHICLE_PARTS) + && Object.keys(useMainStore().pageData(issPageValues.VEHICLE_PARTS)).length !== 0 ); }, async forwardButtonAction() {