From 2e4bfaaab6aa48e91189e98f6c6714dfc7e66c7c Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Mon, 16 Mar 2026 10:28:02 -0400 Subject: [PATCH 1/7] bailout before choosing new glass --- src/layouts/vin-lookup/vin-lookup.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index e7470aca..0b9abfb7 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -182,7 +182,6 @@ export default { this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vehicleLookupResponse.data.carId)); this.resetVehicleFromLookup(); showIssLoadingModal(false); - return; } // Add vin bcs the response from the service doesn't contain vin @@ -226,6 +225,9 @@ export default { let isSelectedGlassAvailableForVehicle = true; if (this.isCarIdDifferentFromTheStore) { + if (this.mainStore.isBailout) { + return this.navigateForward(); + } isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(this.vehicleFromLookup.carId); } From cd4cf33db5b9394a89b1b2fdf87c79a3fb65f0d7 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Mon, 16 Mar 2026 11:07:12 -0400 Subject: [PATCH 2/7] reset heavy truck bailout before looking up a new vehicle --- src/layouts/address-lookup/address-lookup.vue | 2 +- src/layouts/license-plate-lookup/license-plate-lookup.vue | 1 + src/layouts/vin-lookup/vin-lookup.vue | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 5a7b9b14..376f1168 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -215,6 +215,7 @@ export default { async forwardButtonAction() { this.resetWarningsAndErrors(); + this.mainStore.resetBailout(); // Vehicle info change in the flow, use a variable to keep track and commit to state at the end. let vehicleInfoToCommit = {}; @@ -361,7 +362,6 @@ export default { this.displayVinNotFoundAlert = false; this.displayMatchedDifferentVehicleAlert = false; this.displayVinLookupByHomeAddressNotAllowedAlert = false; - this.displayNoServiceAlert = false; this.$refs.siteFooter.enableForwardAction(); } } diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index ce7cfb2d..32203b5c 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -239,6 +239,7 @@ export default { // NOTE: If form is not valid, this method is not called when 'Continue' button is clicked async forwardButtonAction() { this.resetWarningsAndErrors(); + this.mainStore.resetBailout(); // Lookup VIN const vinLookupResponse = await useMainStore().lookupVinByPlate( diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 0b9abfb7..38147f87 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -176,12 +176,14 @@ export default { if (this.needToLookupVehicle) { try { + this.mainStore.resetBailout(); const vehicleLookupResponse = await this.lookupVehicleByVin(this.vin); if (!vehicleLookupResponse.data.canSafeliteService) { this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vehicleLookupResponse.data.carId)); this.resetVehicleFromLookup(); showIssLoadingModal(false); + return this.navigateForward(); } // Add vin bcs the response from the service doesn't contain vin @@ -225,9 +227,6 @@ export default { let isSelectedGlassAvailableForVehicle = true; if (this.isCarIdDifferentFromTheStore) { - if (this.mainStore.isBailout) { - return this.navigateForward(); - } isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(this.vehicleFromLookup.carId); } From 5a13165d098ccb6199c4e94fef1bab3df301c67d Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Mon, 16 Mar 2026 11:07:46 -0400 Subject: [PATCH 3/7] remove old alert, bailout with non-serviceable vehicle --- .../address-vehicles/address-vehicles.vue | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index 412072cc..adebf052 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -13,13 +13,6 @@ - Date: Mon, 16 Mar 2026 11:13:11 -0400 Subject: [PATCH 4/7] fixes --- src/layouts/address-vehicles/address-vehicles.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index adebf052..c47169ed 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -84,6 +84,7 @@ import { } from '@/helpers/cms-content-helper.js'; import routerParams from '@/router/router-constants/router-params'; import vinPagesMixin from '@/mixins/vin-pages-mixin'; +import bailoutMessage from '@/constants/bailoutMessage'; // Import Component import baseFormMixin from '@/mixins/base-form-mixin'; @@ -236,7 +237,7 @@ export default { return; } if (!vinLookup.data?.canSafeliteService) { - this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(carFound.carId)); + this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vinLookup.data.carId)); return this.navigateForward(); } this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vinLookup.data.carId); From 8c0c82eeafaaa4d4a92beee2f350b8f67b6af568 Mon Sep 17 00:00:00 2001 From: katiekroell <100247286+katiekroell@users.noreply.github.com> Date: Mon, 16 Mar 2026 11:33:22 -0400 Subject: [PATCH 5/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/layouts/address-lookup/address-lookup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 376f1168..92569c91 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -215,7 +215,7 @@ export default { async forwardButtonAction() { this.resetWarningsAndErrors(); - this.mainStore.resetBailout(); + useMainStore().resetBailout(); // Vehicle info change in the flow, use a variable to keep track and commit to state at the end. let vehicleInfoToCommit = {}; From adbaa7d0cae866d7562002ccbaea8b78d6e0febd Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Mon, 16 Mar 2026 12:57:12 -0400 Subject: [PATCH 6/7] copilot fixes --- src/layouts/address-vehicles/address-vehicles.vue | 6 +++++- src/layouts/vin-lookup/vin-lookup.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index c47169ed..4cfc914b 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -238,7 +238,11 @@ export default { } if (!vinLookup.data?.canSafeliteService) { this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vinLookup.data.carId)); - return this.navigateForward(); + this.$router.navigate( + this.navigationScenarios.BAILOUT, + this.$route + ); + return; } this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vinLookup.data.carId); await useMainStore().saveVin( diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 38147f87..a2efafc8 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -170,13 +170,13 @@ export default { // NOTE: If form is not valid, this method is not called when 'Continue' button is clicked async forwardButtonAction() { this.resetActiveAlert(); + this.mainStore.resetBailout(); // Temp solution to reset the 'disabled' style on the Continue button this.$refs.siteFooter.enableForwardAction(); showIssLoadingModal(true); if (this.needToLookupVehicle) { try { - this.mainStore.resetBailout(); const vehicleLookupResponse = await this.lookupVehicleByVin(this.vin); if (!vehicleLookupResponse.data.canSafeliteService) { From 7b112e0c3d0138734df4d85afee6e3cbb2c320cb Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Mon, 16 Mar 2026 13:21:21 -0400 Subject: [PATCH 7/7] unit test fix --- src/layouts/address-vehicles/address-vehicles.spec.js | 3 ++- src/layouts/address-vehicles/address-vehicles.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layouts/address-vehicles/address-vehicles.spec.js b/src/layouts/address-vehicles/address-vehicles.spec.js index 46077dd0..141519cd 100644 --- a/src/layouts/address-vehicles/address-vehicles.spec.js +++ b/src/layouts/address-vehicles/address-vehicles.spec.js @@ -144,7 +144,8 @@ describe('address-vehicles.vue', () => { const { wrapper } = setupMocks({}); const lookupVinResponse = { data: { - carId: '456' + carId: '456', + canSafeliteService: true } }; diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue index 4cfc914b..a04d1216 100644 --- a/src/layouts/address-vehicles/address-vehicles.vue +++ b/src/layouts/address-vehicles/address-vehicles.vue @@ -236,7 +236,7 @@ export default { if (!vinLookup) { return; } - if (!vinLookup.data?.canSafeliteService) { + if (vinLookup.data?.canSafeliteService === false) { this.mainStore.setBailout(bailoutMessage.HeavyTruckVehicle(vinLookup.data.carId)); this.$router.navigate( this.navigationScenarios.BAILOUT,