From 26e3023995fe86cc4b74459b5dab31968c6c87f1 Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Mon, 9 May 2022 15:01:57 -0400
Subject: [PATCH 1/7] ui defect

---
 src/layouts/estimate/estimate.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 67b1918e1..8c7db34dc 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -10,9 +10,14 @@
       <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
       <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
       <div class="fade-on-route-transition sub-container make-tall">
+        <alert
+        class=""
+        v-model="customAlertData"
+        alertClass="fs-6 fw-bold"
+        cmsWidgetName="AlertVinLookupQuestion"
+      />
         <buttonQuestion
           cmsWidgetName="VinLookupMethod"
-          :questionText="questionText"
           :answers="answersFromCms"
           groupName="vinLookupMethodOption"
           buttonType="listButton"
@@ -39,6 +44,7 @@ import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import buttonQuestion from "@/common-components/button-question/button-question";
+import alert from "@/ux-components/alert/alert";
 //Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -126,6 +132,15 @@ export default {
     funnelFooter,
     buttonQuestion,
     Form,
+    alert,
   },
 };
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss">
+  .alert p{
+    font-size: 1rem;
+    font-weight: 500; 
+    color: $black; 
+  }
+</style>
\ No newline at end of file

From 89633cec71c50325b0cb3d0b354a46792985f2d0 Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Mon, 9 May 2022 15:07:58 -0400
Subject: [PATCH 2/7] ui defect

---
 src/layouts/estimate/estimate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 8c7db34dc..708e532f1 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -13,7 +13,7 @@
         <alert
         class=""
         v-model="customAlertData"
-        alertClass="fs-6 fw-bold"
+        alertClass=""
         cmsWidgetName="AlertVinLookupQuestion"
       />
         <buttonQuestion

From ea0613c9132734e126a9f0b362d9050f9c262643 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 9 May 2022 15:17:46 -0400
Subject: [PATCH 3/7] CSR-520 remove close modal gold plating

---
 .../loading-modal/loading-modal.spec.js       | 56 +------------------
 .../loading-modal/loading-modal.vue           | 27 +--------
 src/layouts/address-lookup/address-lookup.vue |  2 +-
 .../license-plate-lookup.vue                  |  2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |  2 +-
 5 files changed, 7 insertions(+), 82 deletions(-)

diff --git a/src/common-components/loading-modal/loading-modal.spec.js b/src/common-components/loading-modal/loading-modal.spec.js
index ca7717cca..7a500ce73 100644
--- a/src/common-components/loading-modal/loading-modal.spec.js
+++ b/src/common-components/loading-modal/loading-modal.spec.js
@@ -17,7 +17,7 @@ jest.mock('@/assets/img/windshield.png', () => 'windshield.png')
 describe("loadingModal", () => {
   test("showModal sets modal visible", async () => {
     // Arrange
-    const { wrapper } = setupMocks({ clickOutCloses: false });
+    const { wrapper } = setupMocks();
     wrapper.vm.isModalVisible = false;
 
     //Act
@@ -30,54 +30,7 @@ describe("loadingModal", () => {
 });
 
 
-describe("loadingModal", () => {
-  test("closeModal sets modal not visible", async () => {
-    // Arrange
-    const { wrapper } = setupMocks({ clickOutCloses: false });
-    wrapper.vm.isModalVisible = true;
-
-    //Act
-    wrapper.vm.closeModal();
-    
-    // Assert
-    expect(wrapper.vm.isModalVisible).toEqual(false);
-    wrapper.unmount();
-  });
-});
-
-describe("loadingModal", () => {
-  test("canClose calls closeModal", async () => {
-    // Arrange
-    const { wrapper } = setupMocks({ clickOutCloses: true });
-    wrapper.vm.isModalVisible = true;
-
-    //Act
-    wrapper.vm.canClose();
-    
-    // Assert
-    expect(wrapper.vm.isModalVisible).toEqual(false);
-    wrapper.unmount();
-  });
-});
-
-describe("loadingModal", () => {
-  test("canClose does not call closeModal", async () => {
-    // Arrange
-    const { wrapper } = setupMocks({ clickOutCloses: false });
-    wrapper.vm.isModalVisible = true;
-
-    //Act
-    wrapper.vm.canClose();
-    
-    // Assert
-    expect(wrapper.vm.isModalVisible).toEqual(true);
-    wrapper.unmount();
-  });
-});
-
-function setupMocks({
-  clickOutCloses
-}) {
+function setupMocks() {
 
    //Mock store
    store.dispatch = jest.fn(() => {});
@@ -89,9 +42,6 @@ function setupMocks({
      },
    });
 
-  //Mock props
-  mountOptions.propsData = { clickOutCloses: clickOutCloses };
   const wrapper = shallowMount(loadingModal, mountOptions);
-
   return { wrapper };
-}
+}
\ No newline at end of file
diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue
index 4f1365802..9665c6ea5 100644
--- a/src/common-components/loading-modal/loading-modal.vue
+++ b/src/common-components/loading-modal/loading-modal.vue
@@ -1,7 +1,6 @@
 <template>
-  <div v-show="isModalVisible" class="loading-modal-backdrop" v-on:click="canClose" @close="closeModal">
+  <div v-show="isModalVisible" class="loading-modal-backdrop">
     <div class="loading-modal">
-    <button v-if="showCloseButton" type="button" class="loading-modal-close" @click="closeModal">x</button>
       <section class="loading-modal-body">
         <div class="modal-icon-container text-center">
             <img class="loader-gif" alt="Loading" src="@/assets/img/loader.gif">
@@ -30,20 +29,10 @@
         isModalVisible: false,
       };
     },
-    props: {
-        showCloseButton:  {type: Boolean, default: false},
-        clickOutCloses:  {type: Boolean, default: false},
-    },
     methods: {
       showModal() {
         this.isModalVisible = true;
       },
-      closeModal() {
-        this.isModalVisible = false;
-      },
-      canClose() {
-        this.clickOutCloses ? this.closeModal() : null;
-      }
     },
   };
 </script>
@@ -88,20 +77,6 @@
       padding: 0 24px 0 24px;
   }
 
-  .loading-modal-close {
-    position: absolute;
-    top: 0;
-    right: 0;
-    border: none;
-    font-size: 20px;
-    padding: 10px;
-    cursor: pointer;
-    font-weight: bold;
-    color: $blue;
-    background: transparent;
-    z-index: 999;
-  }
-
   .modal-icon-container {
     position: relative;
     width: 75px;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 395c519b3..6b9840fdd 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -6,7 +6,7 @@
 		v-slot="{ meta }"
 		autocomplete="off" >
 		<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
-			<loadingModal :showCloseButton=false :clickOutCloses=false ref="loadingModal">
+			<loadingModal ref="loadingModal">
 				<template v-slot:body>
 					Please wait...
 				</template>
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 22eec59a3..441675792 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -1,7 +1,7 @@
 <template>
   <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
     <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
-      <loadingModal :showCloseButton=false :clickOutCloses=false ref="loadingModal">
+      <loadingModal ref="loadingModal">
         <template v-slot:body>
           Please wait...
         </template>
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7fe982fdb..658a10f97 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -6,7 +6,7 @@
     v-slot="{ meta }"
   >
     <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
-      <loadingModal :showCloseButton=false :clickOutCloses=false ref="loadingModal">
+      <loadingModal ref="loadingModal">
         <template v-slot:body>
           Please wait...
         </template>

From 8839d08c2381fb8141fa68643bdea42e38af1a47 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 9 May 2022 15:23:04 -0400
Subject: [PATCH 4/7] CSR-520

---
 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 6b9840fdd..ece616db3 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -5,7 +5,7 @@
 		ref="theForm"
 		v-slot="{ meta }"
 		autocomplete="off" >
-		<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
+		<div class="page-container-grouped-styles">
 			<loadingModal ref="loadingModal">
 				<template v-slot:body>
 					Please wait...

From 4f952beaf38801703335f4d08c23870b263edaa4 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 9 May 2022 15:34:50 -0400
Subject: [PATCH 5/7] CSR-520 Remove slots

---
 src/common-components/loading-modal/loading-modal.vue    | 8 ++------
 src/layouts/address-lookup/address-lookup.vue            | 9 +--------
 .../license-plate-lookup/license-plate-lookup.vue        | 9 +--------
 src/layouts/vin-lookup/vin-lookup.vue                    | 9 +--------
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue
index 9665c6ea5..bcdb4454c 100644
--- a/src/common-components/loading-modal/loading-modal.vue
+++ b/src/common-components/loading-modal/loading-modal.vue
@@ -7,14 +7,10 @@
             <img class="modal-icon" alt="" src="@/assets/img/windshield.png">
         </div>
         <div class="text-center fw-bold fs-5 loading-modal-text">
-            <slot name="body">
-                Default text
-            </slot>
+            Please wait...
         </div>
         <div class="text-center fs-5 loading-modal-text">
-            <slot name="subtext">
-                Default subtext
-            </slot>
+            This process can take up 20 seconds.
         </div>
        </section>
     </div>
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index ece616db3..c7c7e9b95 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -6,14 +6,7 @@
 		v-slot="{ meta }"
 		autocomplete="off" >
 		<div class="page-container-grouped-styles">
-			<loadingModal ref="loadingModal">
-				<template v-slot:body>
-					Please wait...
-				</template>
-				<template v-slot:subtext>
-					This process can take up 20 seconds.
-				</template>
-			</loadingModal>
+			<loadingModal ref="loadingModal"/>
 			<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
 			<vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
 			<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />	
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index b8241c21f..90af5b0fe 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -1,14 +1,7 @@
 <template>
   <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
     <div class="page-container-grouped-styles">
-      <loadingModal ref="loadingModal">
-        <template v-slot:body>
-          Please wait...
-        </template>
-        <template v-slot:subtext>
-          This process can take up 20 seconds.
-        </template>
-      </loadingModal>
+      <loadingModal ref="loadingModal"/>
       <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
       <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage="false" />
       <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index b879dc148..17dfcba28 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -6,14 +6,7 @@
     v-slot="{ meta }"
   >
     <div class="page-container-grouped-styles">
-      <loadingModal ref="loadingModal">
-        <template v-slot:body>
-          Please wait...
-        </template>
-        <template v-slot:subtext>
-          This process can take up 20 seconds.
-        </template>
-      </loadingModal>
+      <loadingModal ref="loadingModal"/>
       <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
       <vehicleBanner
         cmsWidgetName="VehicleBannerWidget"

From 71d4a5c91807191e061ba90039fdcc7d12ec51a1 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Mon, 9 May 2022 16:45:06 -0400
Subject: [PATCH 6/7] CSR-101-updates consolidate code.

---
 src/layouts/vin-lookup/vin-lookup.vue | 61 +++++++++++----------------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7fe982fdb..6b0a3f224 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -64,14 +64,6 @@
             />
           </div>
         </div>
-        <alert
-          class="my-3"
-          :manualHeadline="MatchedDifferentVehicleAlertHeader"
-          :manualCopy="MatchedDifferentVehicleAlertBody"
-          v-model="customAlertData"
-          v-if="matchedDifferentVehicle"
-          alertClass="alert-danger"
-        />
         <alert
           class="my-3"
           v-model="customAlertData"
@@ -87,13 +79,6 @@
           v-if="noServiceZip"
           alertClass="alert-warning"
         />
-        <alert
-          class="my-3"
-          v-model="customAlertData"
-          v-if="foundWindshieldAlert"
-          alertClass="alert-warning"
-          cmsWidgetName="FoundWindshieldAlert"
-        />
         <alert
           class="my-3"
           v-model="customAlertData"
@@ -116,13 +101,6 @@
           v-if="isVinFieldReadOnly"
           alertClass="alert-success"
         />
-        <funnelFooter
-          cmsWidgetName="FunnelFooterWidget"
-          ref="funnelFooter"
-          :isForwardActionDisabled="!meta.valid"
-          @back-clicked="backButtonAction"
-          @ForwardClicked="forwardButtonAction"
-        />
       </div>
       <alert
         class="my-3"
@@ -154,6 +132,13 @@
         alertClass="alert-success"
         cmsWidgetName="PerfectMatchNewVinAlert"
       />
+      <funnelFooter
+        cmsWidgetName="FunnelFooterWidget"
+        ref="funnelFooter"
+        :isForwardActionDisabled="!meta.valid"
+        @back-clicked="backButtonAction"
+        @ForwardClicked="forwardButtonAction"
+      />
     </div>
   </Form>
 </template>
@@ -313,34 +298,36 @@ export default {
       this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
     },
     async forwardButtonAction() {
-      const zipValidation = await this.validateZip(this.zip);
-      if (!zipValidation.data.isServiceable) {
+      const zipValidation = this.validateZip(this.zip);
+      const vehicleLookup = this.lookupVehicle(this.vin);
+      const zipValidationResponse = await zipValidation;
+      const vehicleLookupResponse = await vehicleLookup.catch(() => {
+        this.vinNotFound = true;
+        this.$refs.funnelFooter.removeLoader();
+        this.noServiceZip = false;
+        return;
+      });
+      if (!zipValidationResponse.data.isServiceable) {
         this.customAlertData.zip = this.zip;
         this.$refs.funnelFooter.removeLoader();
         this.noServiceZip = true;
         this.invalidZip = this.zip;
         return;
       }
-      const vehicleLookup = await this.lookupVehicle(this.vin).catch(() => {
-        this.vinNotFound = true;
-        this.$refs.funnelFooter.removeLoader();
-        this.noServiceZip = false;
-        return;
-      });
-      this.isCarIdDifferent = vehicleLookup.data.carId !== store.getters.vehicle.carId;
+      this.isCarIdDifferent = vehicleLookupResponse.data.carId !== store.getters.vehicle.carId;
 
-      if (this.isCarIdDifferent && (vehicleLookup.data.carId !== this.previouslyEnteredCarId)) {
-        this.previouslyEnteredCarId = vehicleLookup.data.carId;
+      if (this.isCarIdDifferent && (vehicleLookupResponse.data.carId !== this.previouslyEnteredCarId)) {
+        this.previouslyEnteredCarId = vehicleLookupResponse.data.carId;
         this.noServiceZip = false;
-        this.customAlertData.vehicleInfo = vehicleLookup.data;
-        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookup.data.year} ${vehicleLookup.data.make} ${vehicleLookup.data.model}`);
+        this.customAlertData.vehicleInfo = vehicleLookupResponse.data;
+        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookupResponse.data.year} ${vehicleLookupResponse.data.make} ${vehicleLookupResponse.data.model}`);
         this.isVinValid = true;
-        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookup.data.carId);
+        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookupResponse.data.carId);
         this.$refs.funnelFooter.removeLoader();
         this.isCarIdDifferent = true;
         return;
       }
-      this.updateStore(vehicleLookup.data);
+      this.updateStore(vehicleLookupResponse.data);
       this.navigateForward();
     },
     navigateForward(){

From 7959dbc45365cbffb6a0c51344d24d1457703997 Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Tue, 10 May 2022 10:31:16 -0400
Subject: [PATCH 7/7] ui defect

---
 src/layouts/estimate/estimate.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 708e532f1..4dde1dd61 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -143,4 +143,7 @@ export default {
     font-weight: 500; 
     color: $black; 
   }
+  div .current_car_info-text{
+    padding-bottom: 16px; 
+  }
 </style>
\ No newline at end of file