Merge pull request #2431 from Safelite/feature/CASH-353-Revert

CASH-353- Reverting back the 353 changes

src/layouts/address-lookup/address-lookup.spec.js

@@ -182,39 +182,6 @@ describe("address-lookup.vue", () => {
             // Assert
             expect(wrapper.findComponent({ ref: "alertVinNotFound" }).isVisible()).toBe(true);
         });
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
     });
 
     describe("navigation", () => {
@@ -774,18 +741,6 @@ function setupMocks({
     wrapper.vm.setCmsContent = jest.fn();
     wrapper.vm.$refs.navbar.updateButtonText = jest.fn();
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
-    const closestShops = {
-        data: {
-            providers: [
-                { id: 1, name: "Shop 1" },
-                { id: 2, name: "Shop 2" },
-            ],
-        },
-    };
-
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return new Promise((resolve) => resolve(closestShops));
-    });
 
     return { wrapper };
 }

src/layouts/address-lookup/address-lookup.vue

@@ -81,20 +81,13 @@
                             </div>
                         </div>
                     </transition>
-                    <alert
-                        ref="AlertNoService"
-                        v-if="displayNoServiceAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertNoServiceWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isDisabled="!meta.valid"
                         @ForwardClicked="forwardButtonAction"
                         @back-clicked="backButtonAction"
-                        :isForwardActionDisabled="!meta.valid || displayNoServiceAlert" />
+                        :isForwardActionDisabled="!meta.valid" />
                 </div>
             </div>
         </div>
@@ -171,8 +164,6 @@ export default {
                 emailOrSms: this.getEmailOrSmsFromStore(),
             },
             serviceZipCode: this.getServiceZipFromStore(),
-            carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
             displayNonServiceableZipAlert: false,
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
@@ -184,7 +175,6 @@ export default {
             displayInvalidZipAlert: false,
             showServiceZipField: this.getServiceZipFromStore(),
             isZipServiceable: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -229,19 +219,6 @@ export default {
         getServiceZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },
-        getCarIdfromStore() {
-            return store.getters.vehicle.carId;
-        },
-        getIsVehicleHeavyTruckFromStore() {
-            return store.getters.isHeavyTruckVehicle;
-        },
-        async findClosestApplicableShops() {
-            return await this.dispatchStoreActionWithLogging(
-                storeActions.GET_CLOSEST_APPLICABLE_SHOPS,
-                { zip: this.serviceZipCode, carId: this.carId },
-                "address-lookup"
-            );
-        },
         async forwardButtonAction() {
             this.resetWarningsAndErrors();
 
@@ -301,17 +278,6 @@ export default {
                 return this.$refs.navbar.removeLoader();
             }
             this.displayInvalidZipAlert = false;
-            if (this.serviceZipCode != null && this.isHeavyTruck) {
-                const closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-            }
-
             const carsFound = resultMap.vinLookupResponse.vinVehicles;
 
             // Handle cases for different amounts of VINS found for the address.
@@ -463,7 +429,6 @@ export default {
             this.displayNonServiceableZipAlert = false;
             this.displayMatchedDifferentVehicleAlert = false;
             this.displayVinLookupByHomeAddressNotAllowedAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     mounted() {
@@ -515,7 +480,6 @@ export default {
             handler(newValue) {
                 // If they modify the service zip code, then hide the error message.
                 this.displayNonServiceableZipAlert = false;
-                this.displayNoServiceAlert = false;
             },
         },
         showServiceZipField: {

src/layouts/license-plate-lookup/license-plate-lookup.spec.js

@@ -611,42 +611,6 @@ describe("license-plate-lookup.vue", () => {
             expect(arePagePrerequisitesValid).toBe(false);
         });
     });
-
-    describe("alerts", () => {
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
-    });
 });
 
 function setupMocks({
@@ -752,18 +716,5 @@ function setupMocks({
     wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => "");
     wrapper.vm.$refs.navbar.updateButtonText = jest.fn();
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
-    const closestShops = {
-        data: {
-            providers: [
-                { id: 1, name: "Shop 1" },
-                { id: 2, name: "Shop 2" },
-            ],
-        },
-    };
-
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return new Promise((resolve) => resolve(closestShops));
-    });
-
     return { wrapper, apiPromise };
 }

src/layouts/license-plate-lookup/license-plate-lookup.vue

@@ -77,14 +77,6 @@
                         alertClass="alert-warning"
                         v-bind:isDismissible="false" />
 
-                    <alert
-                        ref="AlertNoService"
-                        v-if="displayNoServiceAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertNoServiceWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
-
                     <navbar
                         ref="navbar"
                         cmsWidgetName="FunnelFooterWidget"
@@ -166,8 +158,6 @@ export default {
             registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
-            carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
             displayNonServiceableZipAlert: false,
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
@@ -178,7 +168,6 @@ export default {
             displayInvalidZipAlert: false,
             showServiceZipField: this.getServiceZipFromStore(),
             isZipServiceable: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -211,19 +200,6 @@ export default {
         getServiceZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },
-        getCarIdfromStore() {
-            return store.getters.vehicle.carId;
-        },
-        getIsVehicleHeavyTruckFromStore() {
-            return store.getters.isHeavyTruckVehicle;
-        },
-        async findClosestApplicableShops() {
-            return await this.dispatchStoreActionWithLogging(
-                storeActions.GET_CLOSEST_APPLICABLE_SHOPS,
-                { zip: this.serviceZipCode, carId: this.carId },
-                "license-plate-lookup"
-            );
-        },
         async forwardButtonAction() {
             this.resetWarningsAndErrors();
 
@@ -281,17 +257,6 @@ export default {
                 this.displayInvalidZipAlert = true;
                 return this.$refs.navbar.removeLoader();
             }
-            if (this.isHeavyTruck) {
-                const closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-            }
-
             // Check if the CarId has changed.
             this.isCarIdDifferent =
                 vinLookup.data.vehicle.carId !== this.$store.getters.vehicle.carId;
@@ -406,7 +371,6 @@ export default {
             this.displayMatchedDifferentVehicleAlert = false;
             this.displayVinLookupByHomeAddressNotAllowedAlert = false;
             this.displayInvalidZipAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     mounted() {
@@ -451,7 +415,6 @@ export default {
         serviceZipCode() {
             // If they modify the service zip code, then hide the error message.
             this.displayNonServiceableZipAlert = false;
-            this.displayNoServiceAlert = false;
             this.$refs.navbar.updateButtonText(
                 this.getCmsContent("FunnelFooterWidget", "ForwardButtonText")
             );

src/layouts/service-zip/service-zip.spec.js

@@ -415,33 +415,6 @@ describe("service-zip.vue", () => {
             expect(wrapper.vm.displayInvalidZipAlert).toBe(false);
             expect(wrapper.vm.displayNonServiceableZipAlert).toBe(false);
         });
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            const wrapper = setupMocks({});
-            wrapper.vm.serviceZipCode = "12345";
-
-            // Act
-            wrapper.vm.displayNoServiceAlert = true;
-
-            // Check if the AlertNoService component is rendered
-            expect(wrapper.vm.displayNoServiceAlert).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            const wrapper = setupMocks({});
-            wrapper.vm.serviceZipCode = "12345";
-            //ACT
-            wrapper.vm.displayNoServiceAlert = false;
-
-            // Check if the AlertNoService component is rendered
-            expect(wrapper.vm.displayNoServiceAlert).toBe(false);
-        });
     });
 });
 
@@ -538,16 +511,5 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse
     ];
 
     const wrapper = shallowMount(serviceZip, mountOptions);
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return Promise.resolve({
-            data: {
-                providers: [
-                    { id: 1, name: "Shop 1" },
-                    { id: 2, name: "Shop 2" },
-                ],
-            },
-        });
-    });
-
     return wrapper;
 }

src/layouts/service-zip/service-zip.vue

@@ -47,18 +47,10 @@
                             v-if="displayNonServiceableZipAlert"
                             alertClass="alert-danger" />
 
-                        <alert
-                            ref="AlertNoService"
-                            v-if="displayNoServiceAlert"
-                            class="my-4"
-                            cmsWidgetName="AlertNoServiceWidget"
-                            alertClass="alert-danger"
-                            v-bind:isDismissible="false" />
-
                         <navbar
                             cmsWidgetName="FunnelFooterWidget"
                             ref="navbar"
-                            :isForwardActionDisabled="!meta.valid || displayNoServiceAlert"
+                            :isForwardActionDisabled="!meta.valid"
                             @back-clicked="backButtonAction"
                             @ForwardClicked="forwardButtonAction" />
                     </div>
@@ -118,11 +110,8 @@ export default {
         return {
             serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
-            carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            displayNoServiceAlert: false,
         };
     },
 
@@ -195,19 +184,6 @@ export default {
         arePagePrerequisitesValid() {
             return store.getters.damage.isRepair || store.getters.damage.glassToReplace?.length > 0;
         },
-        getCarIdfromStore() {
-            return store.getters.vehicle.carId;
-        },
-        getIsVehicleHeavyTruckFromStore() {
-            return store.getters.isHeavyTruckVehicle;
-        },
-        async findClosestApplicableShops() {
-            return await this.dispatchStoreActionWithLogging(
-                storeActions.GET_CLOSEST_APPLICABLE_SHOPS,
-                { zip: this.serviceZipCode, carId: this.carId },
-                "service-zip"
-            );
-        },
         async backButtonAction() {
             const skipVin = await skipVinLookup();
             // route to move backwards
@@ -276,16 +252,6 @@ export default {
                 return this.$refs.navbar.removeLoader();
             }
             this.displayNonServiceableZipAlert = false;
-            if (this.isHeavyTruck) {
-                const closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-            }
 
             const payment = this.$store.getters.payment;
             const policy = this.$store.getters.policy;
@@ -343,7 +309,6 @@ export default {
     watch: {
         serviceZipCode() {
             this.displayNonServiceableZipAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     components: {

src/layouts/vin-lookup/vin-lookup.spec.js

@@ -258,39 +258,6 @@ describe("vin-lookup.vue", () => {
             // Assert
             expect(wrapper.findAllComponents({ name: "alert" }).length).toBe(1);
         });
-
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
     });
 
     describe("getVinFromImage", () => {

src/layouts/vin-lookup/vin-lookup.vue

@@ -71,8 +71,7 @@
                             vinPopulatedOnPageLoad &&
                             isInsuranceVerified &&
                             !displayInvalidZipAlert &&
-                            !displayNonServiceableZipAlert &&
+                            !displayNonServiceableZipAlert
-                            !displayNoServiceAlert
                         "
                         alertClass="alert-success" />
 
@@ -108,23 +107,14 @@
                             vinPopulatedOnPageLoad &&
                             !isInsuranceVerified &&
                             !displayInvalidZipAlert &&
-                            !displayNonServiceableZipAlert &&
+                            !displayNonServiceableZipAlert
-                            !displayNoServiceAlert
                         "
                         alertClass="alert-success" />
 
-                    <alert
-                        ref="AlertNoService"
-                        v-if="displayNoServiceAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertNoServiceWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
-
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || displayNoServiceAlert"
+                        :isForwardActionDisabled="!meta.valid"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -207,8 +197,6 @@ export default {
             vin: this.getVinFromStore(),
             serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
-            carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
             isCarIdDifferent: false,
             customAlertData: {},
             previouslyEnteredCarId: "",
@@ -219,7 +207,6 @@ export default {
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
             displayVinScanFailedAlert: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -235,12 +222,6 @@ export default {
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },
-        getCarIdfromStore() {
-            return store.getters.vehicle.carId;
-        },
-        getIsVehicleHeavyTruckFromStore() {
-            return store.getters.isHeavyTruckVehicle;
-        },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
                 this.pushEventToGA(
@@ -264,13 +245,6 @@ export default {
                 );
             }
         },
-        async findClosestApplicableShops() {
-            return await this.dispatchStoreActionWithLogging(
-                storeActions.GET_CLOSEST_APPLICABLE_SHOPS,
-                { zip: this.serviceZipCode, carId: this.carId },
-                "vin-lookup"
-            );
-        },
         async forwardButtonAction() {
             this.resetAlerts();
 
@@ -303,18 +277,6 @@ export default {
                     return this.$refs.navbar.removeLoader();
                 }
                 this.displayInvalidZipAlert = false;
-                if (this.isHeavyTruck) {
-                    // If a VIN has already been found. Validate the Service Zip (in case of changes)
-                    var closestShops = await this.findClosestApplicableShops(
-                        this.serviceZipCode,
-                        this.carId
-                    );
-                    this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                    if (this.displayNoServiceAlert) {
-                        return this.$refs.navbar.removeLoader();
-                    }
-                }
-
                 // If either lookup fails, remove the loader and stop processing the page.
                 if (!resultMap.vehicleLookupResponse || !resultMap.zipCodeData.isServiceable) {
                     // If the vehicle result is undefined, the vin entered was invalid.
@@ -431,16 +393,6 @@ export default {
                     );
                 }
 
-                closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-
-                // if no value due to field being optional, blank both phone and email address
                 if (!this.emailOrSms) {
                     await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
                     await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
@@ -522,7 +474,6 @@ export default {
             this.displayInvalidZipAlert = false;
             this.displayVinNotFoundAlert = false;
             this.displayVinScanFailedAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     mounted() {
@@ -599,7 +550,6 @@ export default {
         },
         serviceZipCode() {
             this.displayNonServiceableZipAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     components: {