Merge branch 'release/2022.09.29' into rlsmerge/2022.09.29-to-developv2

src/common-components/button-question/button-question.vue

@@ -175,11 +175,16 @@ export default {
       if(this.selectingInitiatesLoad) {
         this.selectedValues = val.value;
       } else {
-        if(Array.isArray(this.selectedValues)) {
+        if(this.isMultiSelect) {
           const newSelectedValues = this.selectedValues;
           val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1);
           this.selectedValues = newSelectedValues;
         }
+        else if (Array.isArray(this.selectedValues)) {          
+          this.selectedValues[0] = val.value;
+          const temp = this.selectedValues;
+          this.selectedValues = temp;
+        }
         else {
           this.selectedValues = val.value;
         }

src/layouts/estimate/estimate.vue

@@ -181,13 +181,13 @@ export default {
             state: zipCodeData.state,
           }, false);
 
-          if (!zipCodeData.isZipValid) {
+          if (!zipCodeData.isValid) {
             this.displayInvalidZipAlert = true;
             return this.$refs.funnelFooter.removeLoader();
           }
           this.displayInvalidZipAlert = false;
 
-          if (!zipCodeData.isZipServiceable) {
+          if (!zipCodeData.isServiceable) {
             this.displayNonServiceableZipAlert = true;
             return this.$refs.funnelFooter.removeLoader();
           }
@@ -220,7 +220,6 @@ export default {
   },
   computed: {
     AlertNonServiceableZipHeader(){
-      console.log(this.getCmsContent("AlertNonServiceableZipWidget", "HeadlineText"));
       return this.getCmsContent("AlertNonServiceableZipWidget", "HeadlineText").replaceAll("{custom:serviceZip}", this.serviceZipCode);
     },
     AlertNonServiceableZipBody(){

src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue

@@ -47,7 +47,8 @@ export default ({
                 return this.modelValue;
             },
             set: function(newValue) {
-                this.$emit("update:modelValue", newValue);
+                const numberValue = Number(newValue);
+                this.$emit("update:modelValue", numberValue);
             }
         },
     },

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

@@ -239,11 +239,12 @@ function setupMocks({ customMountOptions }) {
 
 function mockOutPromises({carId, isZipValid = true, isZipServiceable = true}) {
     const apiResponses = {
-        serviceZipValidationResponse: {
+        vehicleLookupResponse: {
-            isValid: isZipValid,
+            carId: carId
-            isServiceable: isZipServiceable
         },
-        vehicleLookupResponse: carId ? { carId: carId } : null
+        zipCodeData: {
+            isValid: true, isServiceable: true, state: "OH"
+        }
     };
 
     settleAllPromises.mockImplementation(() => apiResponses);

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

@@ -238,14 +238,16 @@ export default {
             resultKey: "vehicleLookupResponse",
             promise: vehicleLookupResponse,
           },
+          {
+            resultKey: "zipCodeData",
+            promise: this.getZipCodeData(this.serviceZipCode)
+          }
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
 
         // If a Service Zip is entered and it is an invalid zip code (ex. 11111) then show an alert
-        const isZipValid = zipCodeData.isValid;
+        const isZipValid = resultMap.zipCodeData.isValid;
-        
         if (this.serviceZipCode && !isZipValid) {
           this.displayInvalidZipAlert = true;
           return this.$refs.funnelFooter.removeLoader();
@@ -253,14 +255,14 @@ export default {
         this.displayInvalidZipAlert = false;
 
         // If either lookup fails, remove the loader and stop processing the page.
-        if (!resultMap.vehicleLookupResponse || !zipCodeData.isServiceable) {
+        if (!resultMap.vehicleLookupResponse || !resultMap.zipCodeData.isServiceable) {
           // If the vehicle result is undefined, the vin entered was invalid.
           if(!resultMap.vehicleLookupResponse) {
             this.displayVinNotFoundAlert = true;
           }
 
           // Check if Service Zip entered is serviceable, if not display an alert
-          if (!zipCodeData.isServiceable) {
+          if (!resultMap.zipCodeData.isServiceable) {
             this.displayNonServiceableZipAlert = true;
           }
 
@@ -294,7 +296,7 @@ export default {
         await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
         await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, {
             zipCode: this.serviceZipCode,
-            state: zipCodeData.state,
+            state: resultMap.zipCodeData.state,
           }, false);
 
         return await this.navigateForward();

src/mixins/base-mixin.js

@@ -49,21 +49,12 @@ export default {
       return footerInfoBox ? footerInfoBox.offsetHeight : 0;
     },
     async getZipCodeData(zipCode) {
-      const serviceZipValidationResponse = this.dispatchStoreAction(storeActions.VALIDATE_ZIP, { zip: zipCode });
+      const serviceZipValidationResponse = await this.dispatchStoreAction(storeActions.VALIDATE_ZIP, { zip: zipCode });
-
+      
-      const promiseResultMap = [
-        {
-          resultKey: "serviceZipValidationResponse",
-          promise: serviceZipValidationResponse,
-        }
-      ];
-
-      const resultMap = await settleAllPromises(promiseResultMap);
-
       return { 
-        isZipValid: resultMap.serviceZipValidationResponse.isValid, 
+        isValid: serviceZipValidationResponse.data.isValid, 
-        isZipServiceable: resultMap.serviceZipValidationResponse.isServiceable,
+        isServiceable: serviceZipValidationResponse.data.isServiceable,
-        state: resultMap.serviceZipValidationResponse.state
+        state: serviceZipValidationResponse.data.state
       };
     }
   },

src/mixins/base-mixin.spec.js

@@ -99,7 +99,7 @@ describe("baseMixin.js", () => {
   test("getZipCodeData calls dispatch", () => {
     const mixIn = getMixInInstance({});
     mixIn.methods.dispatchStoreAction = jest.fn();
-    mixIn.methods.dispatchStoreAction.mockReturnValue({ isValid:true, isServiceable:true, state:"OH" });
+    mixIn.methods.dispatchStoreAction.mockReturnValue({data: { isValid:true, isServiceable:true, state:"OH" }});
     const type = "";
     const payload = { zip: 43015 };
 

src/store/index.js

@@ -717,7 +717,7 @@ export const actions = {
       endpoint: endpoints.GetPartsOrQuestions.url,
       payload: {
         carId: carId,
-        glass: glassArray,
+        glass: glassArray ?? [],
         zip: zipCode,
         vin: vin
       },
@@ -942,8 +942,14 @@ export const actions = {
         .slice()
         .sort()
         .every((obj, index) => obj.glassLocation === selectedGlassPassedInSorted[index].glassLocation && obj.glassName === selectedGlassPassedInSorted[index].glassName);
+    const isWindshieldRepairTheSame = isWindshieldRepair === context.state.order.damage.isRepair;
+    const isChipCountTheSame = Array.isArray(selectedWindshieldChipCount) //TODO: fix the underlying components so this is never an array
+      ? selectedWindshieldChipCount[0] === context.state.order.damage.numberOfChips
+      : selectedWindshieldChipCount === context.state.order.damage.numberOfChips;
 
-    if (!isGlassToReplaceTheSame) {
+    const isDamageChanging = !isGlassToReplaceTheSame || !isWindshieldRepairTheSame || (isWindshieldRepair && !isChipCountTheSame);
+
+    if (isDamageChanging) {
       //Reset dependent state when changing
       context.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
 

src/ux-components/list-button-horizontal/list-button-horizontal.spec.js

@@ -211,11 +211,12 @@ describe("list-button-horizontal.vue", () => {
         isWide: false,
         modelValue: ["List Card Checkbox"],
         isMultiSelect: false,
+        value: "Car-Front",
         selectedValues: ["Car-Front"]
       },
     });
     // Assert
-    expect(wrapper.componentVM.checkValue).toEqual(["Car-Front"]);
+    expect(wrapper.vm.checkValue).toEqual(true);
   });
 
   it("Should run handleCheckChange if selectingInitiatesLoad is false and handleInputChange is triggered", async () => {

src/ux-components/list-button-horizontal/list-button-horizontal.vue

@@ -1,14 +1,34 @@
 <template>
-  <div class="list-group list-button-horizontal d-flex flex-column w-100"
+  <div
-    :class="[(errors.length > 0 || hasError) ? 'has-error' : '', isCashOrInsurance ? 'radio-fancy' : '']"
+    class="list-group list-button-horizontal d-flex flex-column w-100"
-    @keyup.space="triggerButton()" @keyup.up="handleKeyupArrow()" @keyup.down="handleKeyupArrow()"
+    :class="[(errors.length > 0 || hasError) ? 'has-error' : '']"
-    @keyup.left="handleKeyupArrow()" @keyup.right="handleKeyupArrow()">
+    @keyup.space="triggerButton()"
-    <input :type="isMultiSelect ? 'checkbox' : 'radio'" :id="buttonID" :name="groupName" :value="value"
+    @keyup.up="handleKeyupArrow()"
-      :aria-required="isRequired" v-model="checkValue" @change="handleInputChange()" />
+    @keyup.down="handleKeyupArrow()"
-    <label tabindex="-1" :for="buttonID" :aria-labelledby="buttonID"
+    @keyup.left="handleKeyupArrow()"
-      class="d-flex flex-column justify-content-center p-3" @mouseup="triggerButton()">
+    @keyup.right="handleKeyupArrow()"
-      <span class="m-0" :class="textPosition">
+  >
-        {{  buttonLabel  }}
+    <input
+      :type="isMultiSelect ? 'checkbox' : 'radio'"
+      :id="buttonID"
+      :name="groupName"
+      :aria-required="isRequired"
+      v-model="checkValue"
+      :checked="checkValue"
+      @change="handleInputChange()"
+    />
+    <label
+      tabindex="-1"
+      :for="buttonID"
+      :aria-label="buttonLabel"
+      class="d-flex flex-column justify-content-center py-3 px-4"
+      @mouseup="triggerButton()"
+    >
+      <span
+        class="m-0"
+        :class="textPosition"
+      >
+        {{buttonLabel}}
       </span>
       <span v-if="buttonLabelSubCopy" class="m-0 small" :class="textPosition">
         {{  buttonLabelSubCopy  }}
@@ -58,14 +78,11 @@ export default {
       checkValue: Boolean,
     };
   },
-  mounted() {
+  created() {
-    if (Array.isArray(this.validateValue)) {
+    if (Array.isArray(this.selectedValues)) {
-      this.checkValue = this.isValueSelectedByArray(this.selectedValues);
+      this.checkValue = this.isMultiSelect
-      const isSelectedByValidator = this.isValueSelectedByArray(this.validateValue);
+        ? this.selectedValues.includes(this.value)
-      
+        : this.selectedValues[0] == this.value;
-      if (this.checkValue != isSelectedByValidator) {
-        this.handleChange(this.value);
-      }
     }
     else {
       this.checkValue = this.selectedValues;
@@ -105,7 +122,7 @@ export default {
     handleCheckChange() {
       const emitEvent = {
         checkValue: this.checkValue, // only read on checkboxes, on handleCheckedChanged on button-question
-        value: this.value.toString(),
+        value: this.value,
         buttonId: this.buttonID && this.buttonID.toString(),
       };