From 17db77bcb3429e5f5cbc65183bc6c2097984b28a Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 1 Jul 2022 08:16:54 -0400
Subject: [PATCH 01/10] CSR-715 WIP

---
 .../button-question/button-question.vue       |  8 +++++
 src/layouts/vehicle-damage/vehicle-damage.vue | 20 +++++------
 .../windshield-damage-type-question.vue       |  6 +++-
 .../windshield-options/windshield-options.vue | 36 ++++++++++++++++---
 src/ux-components/list-card/list-card.vue     | 18 ++++++++--
 5 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 0cc7d5e03..52a7da34e 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -11,6 +11,8 @@
         </legend>
         <div :class="getComponentLoopWrapperClasses">
           <div :class="getComponentWrapperClasses" v-for="answer in answers" :key="answer.Name ? answer.Name : answer">
+            BQ: {{ getValues(answer) }}
+            BQ MV: {{ modelValue }}
             <component
               :is="buttonType"
               @isCheckedChanged="handleCheckedChanged"
@@ -152,6 +154,8 @@ export default {
         return this.modelValue;
       },
       set: function(newValue) {
+        console.log("selectedValues")
+        console.log(newValue)
         this.$emit("update:modelValue", newValue);
       }
     },
@@ -178,6 +182,10 @@ export default {
         }
       }
 
+      console.log("handling")
+      console.log(val)
+      console.log(this.selectedValues)
+
       this.$emit("isCheckedChanged", val);
     },
   },
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 77b28d3be..419220dcb 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -5,6 +5,7 @@
       ref="theForm"
       v-slot="{ meta }"
     >
+    {{ selectedDamageLocations }}
       <div class="page-container-grouped-styles">
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
         <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
@@ -201,32 +202,32 @@ export default {
     },
 
     getWindshieldOptionsFromStore() {
-      var windShieldOptions = { selectedWindshieldDamageType: [], selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: []};
+      var windShieldOptions = { selectedWindshieldDamageType: "", selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: []};
 
       if (store.getters.damage.isRepair === undefined) return windshieldOptions;
 
       if (!store.getters.damage.isRepair) {
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.location === damageLocationsSelected.WINDSHIELD &&
             glass.name === damageLocationsSelected.SINGLE })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.SINGLE);
         }
 
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.location === damageLocationsSelected.WINDSHIELD &&
             glass.name === damageLocationsSelected.DRIVER })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.DRIVER);
         }
 
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.location === damageLocationsSelected.WINDSHIELD &&
             glass.name === damageLocationsSelected.PASSENGER })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.PASSENGER);
         }
       }
 
       if (store.getters.damage.isRepair) {
-          windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPAIR);
+          windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPAIR;
           windShieldOptions.selectedWindshieldChipCount.push(store.getters.damage.numberOfChips);
       }
 
@@ -284,6 +285,7 @@ export default {
     },
 
     async forwardButtonAction() {
+      // TODO CSR-715 look here
       store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair);
 
       if (this.isWindshieldRepair){
@@ -311,6 +313,7 @@ export default {
     },
 
     selectedGlassToReplace() {
+      // TODO CSR-715
       const selectedGlassToReplace = [];
       if (this.isWindshieldDamageLocation && !this.isWindshieldRepair){
           this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.forEach(wsItem => {
@@ -361,10 +364,7 @@ export default {
     isWindshieldRepair() {
       if (!this.isWindshieldDamageLocation) return false;
 
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType && this.selectedWindshieldOptions.selectedWindshieldDamageType.some(selectedDamageType =>
-        {
-            return selectedDamageType.toUpperCase() === "REPAIR";
-        });
+      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === "REPAIR";
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
@@ -386,7 +386,7 @@ export default {
       return this.isWindshieldDamageLocation && this.selectedDamageLocations.length > 1 && this.isWindshieldRepair;
     },
     hasSplitSingleConflict() {
-      if (!this.selectedDamageLocations || !this.selectedDamageLocations.includes("Windshield") || !this.selectedWindshieldOptions.selectedWindshieldDamageType || !this.selectedWindshieldOptions.selectedWindshieldDamageType.includes("Replace") || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
+      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === "REPAIR" || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
 
       return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield =>
         {
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 455c27361..4d390e1f2 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -1,6 +1,7 @@
 <template>
     <transition name="fade" mode="out-in">
         <div class="windshield-damage-type-question" v-if="isAvailable" aria-live="polite">
+            WDTQ: {{ modelValue }}
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
@@ -22,7 +23,7 @@ import store from "@/store";
 export default ({
     name: "windshieldDamageTypeQuestion",
     props: {
-        modelValue: Array,
+        modelValue: String,
         groupName: String,
         isAvailable: Boolean,
         suppressError: Boolean,
@@ -41,7 +42,10 @@ export default ({
                 return this.modelValue;
             },
             set: function(newValue) {
+                console.log("setting")
+                console.log(newValue)
                 this.$emit("update:modelValue", newValue);
+                this.$nextTick();
             }
         },
     },
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index bdbe25195..118ee26ff 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="windshield-options">
+        {{ windshieldDamageTypeQuestionValidationRules }}
         <windshieldDamageTypeQuestion cmsWidgetName="WindshieldDamageTypeQuestion"
             :isAvailable=isWindshieldDamageLocation
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
@@ -14,6 +15,10 @@
             alertClass="alert-danger"
             :isDismissible="false"
           />
+          WO:<br>
+          <!-- {{ isRepairOptionSelected }}<br>
+          {{ isReplaceOptionSelected }}<br> -->
+          {{ selectedWindshieldDamageTypeValues }}<br>
         <windshieldChipCountQuestion cmsWidgetName="WindshieldChipCountQuestion"
             :isAvailable="isRepairOptionSelected && !hasRepairReplaceConflict"
             groupName="WindshieldChipCountQuestion"
@@ -21,7 +26,7 @@
             validationRules="windshield-chip-count-required"
         />
         <replaceOptionsQuestion ref="replaceOptionsQuestion" cmsWidgetName="WindshieldReplaceOptionsQuestion"
-            :isAvailable=isReplaceOptionSelected
+            :isAvailable="isReplaceOptionSelected"
             isMultiSelect
             groupName="WindshieldReplaceOptions"
             v-model="selectedWindshieldReplaceOptionsValues"
@@ -51,18 +56,28 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 
 // DEFINE VALIDATION RULES
+console.log("Defining the rules")
 defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_DAMAGE_TYPE_REQUIRED));
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
 defineRule("check-for-repair-and-replace", (value, [otherFieldValue]) => {
+    console.log(value)
+    console.log(otherFieldValue)
+    console.log(value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()))
+    console.log(otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()))
+    console.log(Array.isArray(otherFieldValue))
+    console.log(otherFieldValue.length > 1)
+    // this.$nextTick();
     if (value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()) &&
         otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()) &&
         Array.isArray(otherFieldValue) &&
         otherFieldValue.length > 1)
     {
+        console.log("A")
         return false;
     }
+    console.log("B")
     return true;
 });
 defineRule("repair-only", (value) => {
@@ -91,7 +106,7 @@ export default ({
     },
 
     props: {
-        modelValue: Array,
+        modelValue: String,
         selectedDamageLocations: Array,
         hasRepairReplaceConflict: Boolean,
         hasSplitSingleConflict: Boolean,
@@ -103,6 +118,8 @@ export default ({
             this.$refs.replaceOptionsQuestion.initializeComponent(windshieldAvailableReplacementOptions);
         },
         getWindshieldOptions(selectedWindshieldDamageType, selectedWindshieldChipCount, selectedWindshieldReplaceOptions){
+            console.log("getWindshieldOptions")
+            console.log(selectedWindshieldDamageType)
             // ONLY UPDATE THE NEW VALUE IF IT IS TRUTHY (NOT NULL)
             return {
                 selectedWindshieldDamageType: selectedWindshieldDamageType ? selectedWindshieldDamageType : this.selectedValues.selectedWindshieldDamageType,
@@ -114,18 +131,27 @@ export default ({
     computed: {
         selectedValues: {
             get: function() {
+                console.log("selectedValues in WO")
+                console.log(this.modelValue)
                 return this.modelValue;
             },
             set: function(newValue) {
+                console.log("setting selectedValues in WO")
+                console.log(newValue)
                 this.$emit("update:modelValue", newValue);
             }
         },
-        selectedWindshieldDamageTypeValues:{
+        selectedWindshieldDamageTypeValues: {
             get: function() {
                 return this.selectedValues.selectedWindshieldDamageType;
             },
             set: function(newValue) {
+                console.log("selectedWindshieldDamageTypeValues")
+                console.log("I'm changing!")
+                console.log(newValue)
                 this.selectedValues = this.getWindshieldOptions(newValue, null, null);
+                // console.log(this.selectedValues)
+                console.log(this.getWindshieldOptions(newValue, null, null))
             }
         },
         selectedWindshieldChipCountValues: {
@@ -153,12 +179,12 @@ export default ({
         isRepairOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValues) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val.toUpperCase() === "REPAIR") && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValues.toUpperCase() === "REPAIR" && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValues) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val.toUpperCase() === "REPLACE") && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValues.toUpperCase() === "REPLACE" && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 84762fc91..01ca30a8b 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -1,5 +1,7 @@
 <template>
   <div :class="{'h-100': !isWide}">
+    {{ errors }}
+    <br>{{ hasError }}
     <div
       class="list-card w-100 rounded-3 d-flex align-items-center"
       :class="[
@@ -133,7 +135,9 @@ export default {
     },
   },
   methods: {
-    handleInputChange() {
+    handleInputChange(x) {
+      console.log("handleInputChange")
+      console.log(x)
         if(!this.selectingInitiatesLoad) {
           this.handleCheckChange();
         }
@@ -148,7 +152,9 @@ export default {
       }
       this.handleChange(this.value);
     },
-    triggerButton() {
+    triggerButton(x) {
+      console.log("triggerButton")
+      console.log(x)
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
         this.handleCheckChange();
@@ -157,11 +163,19 @@ export default {
       this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
     },
     handleCheckChange() {
+      console.log("handleCheckChange")
+      console.log("multiselect: " + this.isMultiSelect)
+      
+      
       const emitEvent = {
         checkValue: this.checkValue, // only read on checkboxes, on handleCheckedChanged on button-question
         value: this.value.toString(),
         buttonId: this.buttonID && this.buttonID.toString(),
       };
+
+      console.log(emitEvent)
+      
+      
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
     },

From d9f7be2c628e6cfc141c3fee703e9493c1e59882 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 1 Jul 2022 08:57:02 -0400
Subject: [PATCH 02/10] CSR-715 Fix tests

---
 .../button-question/button-question.vue       |  2 --
 .../vehicle-damage/vehicle-damage.spec.js     | 16 ++++++------
 src/layouts/vehicle-damage/vehicle-damage.vue |  1 -
 .../windshield-damage-type-question.vue       |  1 -
 .../windshield-options/windshield-options.vue | 26 +------------------
 src/ux-components/list-card/list-card.vue     |  2 --
 6 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 52a7da34e..87fa9e26b 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -11,8 +11,6 @@
         </legend>
         <div :class="getComponentLoopWrapperClasses">
           <div :class="getComponentWrapperClasses" v-for="answer in answers" :key="answer.Name ? answer.Name : answer">
-            BQ: {{ getValues(answer) }}
-            BQ MV: {{ modelValue }}
             <component
               :is="buttonType"
               @isCheckedChanged="handleCheckedChanged"
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index fd2d9964a..160952ae7 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -134,7 +134,7 @@ describe("vehicle-damage.vue", () => {
       wrapper.vm.selectedWindshieldOptions = {
         selectedWindshieldChipCount: null,
         selectedWindshieldReplaceOptions: ["Single"],
-        selectedWindshieldDamageType: ["Replace"]
+        selectedWindshieldDamageType: "Replace"
       };
 
       wrapper.vm.sideDoorOptionsData = {
@@ -234,7 +234,7 @@ describe("vehicle-damage.vue", () => {
       wrapper.vm.selectedWindshieldOptions = {
         selectedWindshieldChipCount: null,
         selectedWindshieldReplaceOptions: ["Single"],
-        selectedWindshieldDamageType: ["Replace"]
+        selectedWindshieldDamageType: "Replace"
       };
 
       const expectedGlassToReplace = [{ glassLocation: "Windshield", glassName: "Single" },];
@@ -378,7 +378,7 @@ describe("vehicle-damage.vue", () => {
       );
 
       wrapper.vm.selectedDamageLocations = ["Windshield"];
-      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: ["Repair"] };
+      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: "Repair" };
 
       //Assert
       expect(wrapper.vm.isWindshieldRepair).toEqual(true);
@@ -398,7 +398,7 @@ describe("vehicle-damage.vue", () => {
       );
 
       wrapper.vm.selectedDamageLocations = ["SideDoor"];
-      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: ["Repair"] };
+      wrapper.vm.selectedWindshieldOptions = { selectedWindshieldDamageType: "Repair" };
 
       //Assert
       expect(wrapper.vm.isWindshieldRepair).toEqual(false);
@@ -540,19 +540,19 @@ describe("vehicle-damage.vue", () => {
     });
 
     const storeWindshieldOptions = [[1, false, "Windshield", "Single", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.SINGLE]
     }],
     [2, false, "Windshield", "Driver", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.DRIVER]
     }],
     [3, false, "Windshield", "Passenger", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPLACE],
+      selectedWindshieldDamageType: damageLocationsSelected.REPLACE,
       selectedWindshieldChipCount: [], selectedWindshieldReplaceOptions: [damageLocationsSelected.PASSENGER]
     }],
     [4, true, "", "", {
-      selectedWindshieldDamageType: [damageLocationsSelected.REPAIR],
+      selectedWindshieldDamageType: damageLocationsSelected.REPAIR,
       selectedWindshieldChipCount: [2], selectedWindshieldReplaceOptions: []
     }]
     ];
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 419220dcb..4ca7a49b8 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -5,7 +5,6 @@
       ref="theForm"
       v-slot="{ meta }"
     >
-    {{ selectedDamageLocations }}
       <div class="page-container-grouped-styles">
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
         <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 4d390e1f2..89e5a4b83 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -1,7 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
         <div class="windshield-damage-type-question" v-if="isAvailable" aria-live="polite">
-            WDTQ: {{ modelValue }}
             <buttonQuestion
                 :questionText="questionText"
                 :answers="answersFromCms"
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 118ee26ff..4d799d0cb 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="windshield-options">
-        {{ windshieldDamageTypeQuestionValidationRules }}
         <windshieldDamageTypeQuestion cmsWidgetName="WindshieldDamageTypeQuestion"
             :isAvailable=isWindshieldDamageLocation
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
@@ -15,10 +14,6 @@
             alertClass="alert-danger"
             :isDismissible="false"
           />
-          WO:<br>
-          <!-- {{ isRepairOptionSelected }}<br>
-          {{ isReplaceOptionSelected }}<br> -->
-          {{ selectedWindshieldDamageTypeValues }}<br>
         <windshieldChipCountQuestion cmsWidgetName="WindshieldChipCountQuestion"
             :isAvailable="isRepairOptionSelected && !hasRepairReplaceConflict"
             groupName="WindshieldChipCountQuestion"
@@ -61,25 +56,6 @@ defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
-defineRule("check-for-repair-and-replace", (value, [otherFieldValue]) => {
-    console.log(value)
-    console.log(otherFieldValue)
-    console.log(value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()))
-    console.log(otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()))
-    console.log(Array.isArray(otherFieldValue))
-    console.log(otherFieldValue.length > 1)
-    // this.$nextTick();
-    if (value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()) &&
-        otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()) &&
-        Array.isArray(otherFieldValue) &&
-        otherFieldValue.length > 1)
-    {
-        console.log("A")
-        return false;
-    }
-    console.log("B")
-    return true;
-});
 defineRule("repair-only", (value) => {
     if (value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase()) {
         return true;
@@ -204,7 +180,7 @@ export default ({
         },
         windshieldDamageTypeQuestionValidationRules() {
             // Note: the validation rules string is not dynamic (it cannot be changed once component has been created)
-            let validationRules = "windshield-damage-type-required|check-for-repair-and-replace:@DamageLocationQuestion";
+            let validationRules = "windshield-damage-type-required";
             // if vehicle has no windshield replacement option
             if (!this.isWindshieldReplaceAvailable) {
                 validationRules = validationRules.concat('|repair-only');
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 01ca30a8b..57537668f 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -1,7 +1,5 @@
 <template>
   <div :class="{'h-100': !isWide}">
-    {{ errors }}
-    <br>{{ hasError }}
     <div
       class="list-card w-100 rounded-3 d-flex align-items-center"
       :class="[

From 173f1b495bb58cb665cb4f828cb3c84582d1f50f Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 1 Jul 2022 09:03:33 -0400
Subject: [PATCH 03/10] CSR-715 Cleanup

---
 .../button-question/button-question.vue       |  6 ----
 src/layouts/vehicle-damage/vehicle-damage.vue |  6 ++--
 .../windshield-damage-type-question.vue       |  2 --
 .../windshield-options/windshield-options.vue | 33 +++++--------------
 src/ux-components/list-card/list-card.vue     | 11 -------
 5 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 87fa9e26b..0cc7d5e03 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -152,8 +152,6 @@ export default {
         return this.modelValue;
       },
       set: function(newValue) {
-        console.log("selectedValues")
-        console.log(newValue)
         this.$emit("update:modelValue", newValue);
       }
     },
@@ -180,10 +178,6 @@ export default {
         }
       }
 
-      console.log("handling")
-      console.log(val)
-      console.log(this.selectedValues)
-
       this.$emit("isCheckedChanged", val);
     },
   },
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 4ca7a49b8..1148c2842 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -284,7 +284,6 @@ export default {
     },
 
     async forwardButtonAction() {
-      // TODO CSR-715 look here
       store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair);
 
       if (this.isWindshieldRepair){
@@ -312,7 +311,6 @@ export default {
     },
 
     selectedGlassToReplace() {
-      // TODO CSR-715
       const selectedGlassToReplace = [];
       if (this.isWindshieldDamageLocation && !this.isWindshieldRepair){
           this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.forEach(wsItem => {
@@ -363,7 +361,7 @@ export default {
     isWindshieldRepair() {
       if (!this.isWindshieldDamageLocation) return false;
 
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === "REPAIR";
+      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR;
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
@@ -385,7 +383,7 @@ export default {
       return this.isWindshieldDamageLocation && this.selectedDamageLocations.length > 1 && this.isWindshieldRepair;
     },
     hasSplitSingleConflict() {
-      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === "REPAIR" || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
+      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === damageLocationsSelected.REPAIR || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
 
       return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield =>
         {
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 89e5a4b83..296b3a95a 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -41,8 +41,6 @@ export default ({
                 return this.modelValue;
             },
             set: function(newValue) {
-                console.log("setting")
-                console.log(newValue)
                 this.$emit("update:modelValue", newValue);
                 this.$nextTick();
             }
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 4d799d0cb..e5d790854 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -4,7 +4,7 @@
             :isAvailable=isWindshieldDamageLocation
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
             groupName="WindshieldDamageTypeQuestion"
-            v-model="selectedWindshieldDamageTypeValues"
+            v-model="selectedWindshieldDamageTypeValue"
             :validationRules="windshieldDamageTypeQuestionValidationRules"
         />
         <alert
@@ -51,16 +51,12 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 
 // DEFINE VALIDATION RULES
-console.log("Defining the rules")
 defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_DAMAGE_TYPE_REQUIRED));
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
 defineRule("repair-only", (value) => {
-    if (value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase()) {
-        return true;
-    }
-    return false;
+    return value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
 });
 defineRule("prevent-split-and-single-together", (value) => {
     if (value.toString().toUpperCase().includes(damageLocationsSelected.SINGLE.toUpperCase()) &&
@@ -94,8 +90,6 @@ export default ({
             this.$refs.replaceOptionsQuestion.initializeComponent(windshieldAvailableReplacementOptions);
         },
         getWindshieldOptions(selectedWindshieldDamageType, selectedWindshieldChipCount, selectedWindshieldReplaceOptions){
-            console.log("getWindshieldOptions")
-            console.log(selectedWindshieldDamageType)
             // ONLY UPDATE THE NEW VALUE IF IT IS TRUTHY (NOT NULL)
             return {
                 selectedWindshieldDamageType: selectedWindshieldDamageType ? selectedWindshieldDamageType : this.selectedValues.selectedWindshieldDamageType,
@@ -107,27 +101,18 @@ export default ({
     computed: {
         selectedValues: {
             get: function() {
-                console.log("selectedValues in WO")
-                console.log(this.modelValue)
                 return this.modelValue;
             },
             set: function(newValue) {
-                console.log("setting selectedValues in WO")
-                console.log(newValue)
                 this.$emit("update:modelValue", newValue);
             }
         },
-        selectedWindshieldDamageTypeValues: {
+        selectedWindshieldDamageTypeValue: {
             get: function() {
                 return this.selectedValues.selectedWindshieldDamageType;
             },
             set: function(newValue) {
-                console.log("selectedWindshieldDamageTypeValues")
-                console.log("I'm changing!")
-                console.log(newValue)
                 this.selectedValues = this.getWindshieldOptions(newValue, null, null);
-                // console.log(this.selectedValues)
-                console.log(this.getWindshieldOptions(newValue, null, null))
             }
         },
         selectedWindshieldChipCountValues: {
@@ -135,7 +120,7 @@ export default ({
                 return this.selectedValues.selectedWindshieldChipCount;
             },
             set: function(newValue) {
-                this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValues, newValue, null);
+                this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValue, newValue, null);
             }
         },
         selectedWindshieldReplaceOptionsValues: {
@@ -143,7 +128,7 @@ export default ({
                 return this.selectedValues.selectedWindshieldReplaceOptions;
             },
             set: function(newValue) {
-                this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValues, null, newValue);
+                this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValue, null, newValue);
             }
         },
         isWindshieldDamageLocation() {
@@ -153,14 +138,14 @@ export default ({
                 });
         },
         isRepairOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.toUpperCase() === "REPAIR" && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue.toUpperCase() === "REPAIR" && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.toUpperCase() === "REPLACE" && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue.toUpperCase() === "REPLACE" && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 57537668f..64dd831b9 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -134,8 +134,6 @@ export default {
   },
   methods: {
     handleInputChange(x) {
-      console.log("handleInputChange")
-      console.log(x)
         if(!this.selectingInitiatesLoad) {
           this.handleCheckChange();
         }
@@ -151,8 +149,6 @@ export default {
       this.handleChange(this.value);
     },
     triggerButton(x) {
-      console.log("triggerButton")
-      console.log(x)
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
         this.handleCheckChange();
@@ -161,18 +157,11 @@ export default {
       this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
     },
     handleCheckChange() {
-      console.log("handleCheckChange")
-      console.log("multiselect: " + this.isMultiSelect)
-      
-      
       const emitEvent = {
         checkValue: this.checkValue, // only read on checkboxes, on handleCheckedChanged on button-question
         value: this.value.toString(),
         buttonId: this.buttonID && this.buttonID.toString(),
       };
-
-      console.log(emitEvent)
-      
       
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);

From 75b1640f70ef855cfaf8fac34c661c8f6f69da49 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 08:57:21 -0400
Subject: [PATCH 04/10] CSR-715 Fix validation

---
 src/layouts/vehicle-damage/vehicle-damage.vue | 2 +-
 src/ux-components/list-card/list-card.vue     | 7 ++++---
 src/ux-components/radio/radio.vue             | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 1148c2842..7e53d60ff 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -361,7 +361,7 @@ export default {
     isWindshieldRepair() {
       if (!this.isWindshieldDamageLocation) return false;
 
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR;
+      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 64dd831b9..21ee0686a 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -63,6 +63,7 @@
 
 <script>
 import { useField } from "vee-validate";
+import { toRef } from "vue";
 import { queryStrings } from "@/constants/query-strings";
 
 export default {
@@ -177,7 +178,7 @@ export default {
     },
     selectedValues(newVal) {
       if (typeof newVal === "string") {
-        this.handleChange(this.value);
+        this.handleChange(newVal);
         this.checkValue = newVal == this.value;
       }
       else if (newVal !== undefined) {
@@ -203,8 +204,8 @@ export default {
     const {
         handleChange,
         errors,
-    } = useField(props.groupName, props.validationRules, fieldOptions);
-
+    } = useField(toRef(props, "groupName"), toRef(props, "validationRules"), fieldOptions); 
+    
     return {
       handleChange,
       errors,
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 8b90bd83d..6daf6b972 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-import { toRefs } from "vue";
 import { useField } from "vee-validate";
 export default {
   name: "radio",

From ba1764b9e693a28d154c11730e38464a1f62c91a Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 09:23:18 -0400
Subject: [PATCH 05/10] CSR-715 Replace hardcoded Repair/Replace

---
 .../vehicle-damage/windshield-options/windshield-options.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index e5d790854..da5b594bc 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -140,12 +140,12 @@ export default ({
         isRepairOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValue.toUpperCase() === "REPAIR" && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase() && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValue.toUpperCase() === "REPLACE" && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue.toUpperCase() === damageLocationsSelected.REPLACE.toUpperCase() && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);

From 15718a6403db55645e89ad5e9a9ae3cddd407401 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 10:19:46 -0400
Subject: [PATCH 06/10] CSR-715 Add check-for-repair-and-replace validation
 back in

---
 src/layouts/vehicle-damage/vehicle-damage.vue              | 2 +-
 .../windshield-options/windshield-options.vue              | 7 ++++++-
 src/ux-components/list-card/list-card.vue                  | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7e53d60ff..a24136a22 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -383,7 +383,7 @@ export default {
       return this.isWindshieldDamageLocation && this.selectedDamageLocations.length > 1 && this.isWindshieldRepair;
     },
     hasSplitSingleConflict() {
-      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === damageLocationsSelected.REPAIR || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
+      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase() || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
 
       return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield =>
         {
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index da5b594bc..87abbc2eb 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -55,6 +55,11 @@ defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
+defineRule("check-for-repair-and-replace", (selectedWindshieldDamageType, [selectedDamageLocations]) => {
+    return selectedWindshieldDamageType.toString() != damageLocationsSelected.REPAIR || 
+            !selectedDamageLocations.includes(damageLocationsSelected.WINDSHIELD) ||
+            selectedDamageLocations.length === 1;
+});
 defineRule("repair-only", (value) => {
     return value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
 });
@@ -165,7 +170,7 @@ export default ({
         },
         windshieldDamageTypeQuestionValidationRules() {
             // Note: the validation rules string is not dynamic (it cannot be changed once component has been created)
-            let validationRules = "windshield-damage-type-required";
+            let validationRules = "windshield-damage-type-required|check-for-repair-and-replace:@DamageLocationQuestion";
             // if vehicle has no windshield replacement option
             if (!this.isWindshieldReplaceAvailable) {
                 validationRules = validationRules.concat('|repair-only');
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 21ee0686a..ce62ac476 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -134,7 +134,7 @@ export default {
     },
   },
   methods: {
-    handleInputChange(x) {
+    handleInputChange() {
         if(!this.selectingInitiatesLoad) {
           this.handleCheckChange();
         }
@@ -149,7 +149,7 @@ export default {
       }
       this.handleChange(this.value);
     },
-    triggerButton(x) {
+    triggerButton() {
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
         this.handleCheckChange();

From 9007f99cbcae3b76b7b2ac51c44d83e52ba1c625 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 10:33:09 -0400
Subject: [PATCH 07/10] CSR-715 Remove isUpperCase() for Repair/Replace

---
 src/layouts/vehicle-damage/vehicle-damage.vue               | 4 ++--
 .../windshield-options/windshield-options.vue               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index a24136a22..9804331f4 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -361,7 +361,7 @@ export default {
     isWindshieldRepair() {
       if (!this.isWindshieldDamageLocation) return false;
 
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
+      return this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR;
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
@@ -383,7 +383,7 @@ export default {
       return this.isWindshieldDamageLocation && this.selectedDamageLocations.length > 1 && this.isWindshieldRepair;
     },
     hasSplitSingleConflict() {
-      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType?.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase() || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
+      if (!this.selectedDamageLocations?.includes("Windshield") || this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR || !this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
 
       return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield =>
         {
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 87abbc2eb..925b2e5cc 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -61,7 +61,7 @@ defineRule("check-for-repair-and-replace", (selectedWindshieldDamageType, [selec
             selectedDamageLocations.length === 1;
 });
 defineRule("repair-only", (value) => {
-    return value.toString().toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
+    return value.toString() === damageLocationsSelected.REPAIR;
 });
 defineRule("prevent-split-and-single-together", (value) => {
     if (value.toString().toUpperCase().includes(damageLocationsSelected.SINGLE.toUpperCase()) &&
@@ -145,12 +145,12 @@ export default ({
         isRepairOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValue.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase() && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPAIR && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValue.toUpperCase() === damageLocationsSelected.REPLACE.toUpperCase() && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPLACE && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);

From e080ade54c5dff8cb47ddcb765505344720693f6 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 10:38:15 -0400
Subject: [PATCH 08/10] CSR-715 Cleanup

---
 src/layouts/vehicle-damage/vehicle-damage.vue                 | 4 +---
 .../windshield-damage-type-question.vue                       | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 9804331f4..f4aad38ea 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -359,9 +359,7 @@ export default {
         });
     },
     isWindshieldRepair() {
-      if (!this.isWindshieldDamageLocation) return false;
-
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR;
+      return this.isWindshieldDamageLocation && this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR;
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 296b3a95a..ce162617d 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -42,7 +42,6 @@ export default ({
             },
             set: function(newValue) {
                 this.$emit("update:modelValue", newValue);
-                this.$nextTick();
             }
         },
     },

From 99f5671844a46c116e94b93d7183d67422a397e2 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 10:40:53 -0400
Subject: [PATCH 09/10] CSR-715 Cleanup

---
 .../vehicle-damage/windshield-options/windshield-options.vue  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 925b2e5cc..02670108c 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -143,13 +143,9 @@ export default ({
                 });
         },
         isRepairOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValue) return false;
-
             return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPAIR && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValue) return false;
-
             return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPLACE && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {

From acdf8492af6e3f2f4b6f78e8e88c4e9bb758aac4 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 5 Jul 2022 11:27:43 -0400
Subject: [PATCH 10/10] CSR-715 Fix merge conflicts correctly

---
 src/layouts/vehicle-damage/vehicle-damage.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index bd73347bc..d7887d864 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -204,19 +204,19 @@ export default {
       if (!store.getters.damage.isRepair) {
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.glassLocation === damageLocationsSelected.WINDSHIELD &&
             glass.glassName === damageLocationsSelected.SINGLE })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.SINGLE);
         }
 
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.glassLocation === damageLocationsSelected.WINDSHIELD &&
             glass.glassName === damageLocationsSelected.DRIVER })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.DRIVER);
         }
 
         if (store.getters.damage.glassToReplace?.some(glass =>  { return glass.glassLocation === damageLocationsSelected.WINDSHIELD &&
             glass.glassName === damageLocationsSelected.PASSENGER })) {
-            windShieldOptions.selectedWindshieldDamageType.push(damageLocationsSelected.REPLACE);
+            windShieldOptions.selectedWindshieldDamageType = damageLocationsSelected.REPLACE;
             windShieldOptions.selectedWindshieldReplaceOptions.push(damageLocationsSelected.PASSENGER);
         }
       }