From 7125b8182d3a8c7ca9154566a8c176f77d66c572 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 10 Mar 2022 15:06:05 -0500
Subject: [PATCH] CSR-319: fix issue where null was overwriting array data

---
 .../windshield-options/windshield-options.vue              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index e94ccc305..c1539e91a 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -91,10 +91,11 @@ export default ({
             this.windshieldAvailableReplacementOptions = windshieldAvailableReplacementOptions;
         },
         getWindshieldOptions(selectedWindshieldDamageType, selectedWindshieldChipCount, selectedWindshieldReplaceOptions){
+            // ONLY UPDATE THE NEW VALUE IF IT IS TRUTHY (NOT NULL)
             return {
-                selectedWindshieldDamageType: selectedWindshieldDamageType,
-                selectedWindshieldChipCount: selectedWindshieldChipCount,
-                selectedWindshieldReplaceOptions: selectedWindshieldReplaceOptions
+                selectedWindshieldDamageType: selectedWindshieldDamageType ? selectedWindshieldDamageType : this.selectedValues.selectedWindshieldDamageType,
+                selectedWindshieldChipCount: selectedWindshieldChipCount ? selectedWindshieldChipCount : this.selectedValues.selectedWindshieldChipCount,
+                selectedWindshieldReplaceOptions: selectedWindshieldReplaceOptions ? selectedWindshieldReplaceOptions : this.selectedValues.selectedWindshieldReplaceOptions,
             }
         },
     },