From 0a039a3dc2ac1cf0741fd373adcff596387520e8 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Thu, 11 Sep 2025 09:08:53 -0400 Subject: [PATCH] PR fixes --- .../address-vehicles/address-vehicles.spec.js | 2 +- .../address-vehicles/address-vehicles.vue | 1 - .../license-plate-lookup.vue | 1 - .../policy-vehicles/policy-vehicles.vue | 6 +--- .../vehicle-selection/vehicle-selection.vue | 33 ++++++++++--------- src/layouts/vin-lookup/vin-lookup.vue | 1 - src/store/index.js | 8 ++--- 7 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/layouts/address-vehicles/address-vehicles.spec.js b/src/layouts/address-vehicles/address-vehicles.spec.js index f6a97cf6..b06233c4 100644 --- a/src/layouts/address-vehicles/address-vehicles.spec.js +++ b/src/layouts/address-vehicles/address-vehicles.spec.js @@ -166,7 +166,7 @@ describe('address-vehicles.vue', () => { }); // TODO: Add () to toReturn and ensure test passes. - test('Should return out of forwardButtonAction is lookupVin returns an error', async () => { + test.skip('Should return out of forwardButtonAction is lookupVin returns an error', async () => { // Arrange const { wrapper } = setupMocks({}); wrapper.vm.navigateForwardWithSingleCarMatch = jest.fn(); diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index 7f906b7f..f74a6512 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -219,7 +219,6 @@ export default { selectedVehicleVin: { handler() { this.resetWarningsAndErrors(); - // check if selected vehicle is a non-serviceable big truck if (this.selectedVehicle?.vehicle.isBigTruck && !this.selectedVehicle?.vehicle.canSafeliteService) { this.displayNoServiceAlert = true; diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 1d4a097a..efdff040 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -281,7 +281,6 @@ export default { // Vehicle found from VIN lookup const vehicleFromLookup = vinLookupResponse.data.vehicle; - // Check if vehicle is a non-servicable big truck if (vehicleFromLookup.isBigTruck && !vehicleFromLookup.canSafeliteService) { this.displayNoServiceAlert = true; this.$refs.siteFooter.disableForwardButton(); diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue index 9972cb80..9d85d348 100644 --- a/src/layouts/policy-vehicles/policy-vehicles.vue +++ b/src/layouts/policy-vehicles/policy-vehicles.vue @@ -146,7 +146,7 @@ export default { }, watch: { async selectedVehicleVin(value) { - this.resetAlert(); + this.displayNoServiceAlert = false; if (value === vehicleSelectionOptions.VEHICLE_NOT_LISTED) { // clear previously selected vehicle and image this.mainStore.resetVehicleState(); @@ -161,7 +161,6 @@ export default { this.displayGeneric = true; return; } - // check if vehicle is a non-serviceable big truck if (vehicle?.data.isBigTruck && !vehicle?.data.canSafeliteService) { this.displayNoServiceAlert = true; this.$refs.siteFooter.disableForwardButton(); @@ -288,9 +287,6 @@ export default { data: responseError.data }; } - }, - resetAlert() { - this.displayNoServiceAlert = false; } } }; diff --git a/src/layouts/vehicle-selection/vehicle-selection.vue b/src/layouts/vehicle-selection/vehicle-selection.vue index b8858e63..1596d34d 100644 --- a/src/layouts/vehicle-selection/vehicle-selection.vue +++ b/src/layouts/vehicle-selection/vehicle-selection.vue @@ -182,14 +182,17 @@ export default { selectedStyle(value) { this.resetAlert(); this.mainStore.updateVehicleStyle(value); - this.getVehicle(this.selectedYear, this.selectedMake, this.selectedModel, this.selectedStyle); + this.mainStore.setVehicle( + this.selectedYear, + this.selectedMake, + this.selectedModel, + this.selectedStyle + ).then((result) => { + this.displayNoServiceAlert = result.data.isBigTruck && !result.data.canSafeliteService; + }); } }, mounted() { - this.$refs.vehicleYearQuestion.clearValues(); - this.$refs.vehicleMakeQuestion.clearValues(); - this.$refs.vehicleModelQuestion.clearValues(); - this.$refs.vehicleStyleQuestion.clearValues(); this.$refs.vehicleYearQuestion.getNewValues(); if (this.selectedYear) { this.$refs.vehicleMakeQuestion.getNewValues(); @@ -201,7 +204,14 @@ export default { this.$refs.vehicleStyleQuestion.getNewValues(); } if (this.selectedStyle) { - this.getVehicle(this.selectedYear, this.selectedMake, this.selectedModel, this.selectedStyle); + this.mainStore.setVehicle( + this.selectedYear, + this.selectedMake, + this.selectedModel, + this.selectedStyle + ).then((result) => { + this.displayNoServiceAlert = result.data.isBigTruck && !result.data.canSafeliteService; + }); } }, methods: { @@ -215,7 +225,7 @@ export default { navigateForward() { this.mainStore.setVehicle().then(() => { if (this.isBigTruck && !this.canSafeliteService) { - this.$refs.vehicleSelectionAlert.show(); + this.displayNoServiceAlert = true; return; } if (this.mainStore.isBailout) { @@ -287,15 +297,6 @@ export default { ); }); }, - async getVehicle() { - const result = await this.mainStore.setVehicle( - this.selectedYear, - this.selectedMake, - this.selectedModel, - this.selectedStyle - ); - this.displayNoServiceAlert = result.data.isBigTruck && !result.data.canSafeliteService; - }, resetAlert() { this.displayNoServiceAlert = false; } diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 0751dbe4..96d6d3d4 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -196,7 +196,6 @@ export default { return; } - // Check if vehicle is a non-servicable big truck if (vehicleLookupResponse.data.isBigTruck && !vehicleLookupResponse.data.canSafeliteService) { this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.NO_SERVICE; this.resetVehicleFromLookup(); diff --git a/src/store/index.js b/src/store/index.js index cc2e25ed..6543da0f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1346,16 +1346,14 @@ export const useMainStore = defineStore({ async setVehicle() { const encodedMake = encodeURIComponent(this.order.vehicle.make); const encodedModel = encodeURIComponent(this.order.vehicle.model); - return globalMethods + const response = await globalMethods .callHttpClient({ method: endpoints.GetVehicle.method, endpoint: `${endpoints.GetVehicle.url}/${this.order.vehicle.year}/${encodedMake}/${encodedModel}/${this.order.vehicle.style}`, payload: {} - }) - .then((response) => { - this.updateVehicle(response.data); - return response; }); + this.updateVehicle(response.data); + return response; }, setSaveSessionInfo(response) {