From 6db315e01af0cfbc88d8eab835ab21d6d992d25f Mon Sep 17 00:00:00 2001
From: Max <maxwell.dempsey@safelite.com>
Date: Fri, 8 Apr 2022 09:25:04 -0400
Subject: [PATCH] Fixing up part question widget retrieval

---
 .../heritage-integration/navigation-helper.js |  2 +-
 .../license-plate-lookup.vue                  |  4 +++-
 src/layouts/part-questions/part-questions.vue | 23 ++++++-------------
 .../windshield-options/windshield-options.vue |  1 +
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 77d6abe92..d9d231541 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -43,7 +43,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
         return 'vehicle-damage'
     } else {
         if (store.getters.vehicle.vin) {
-            return 'vehicle-damage';
+            return 'heritage';
             //return "vin-lookup"; (uncomment)
         } else {
             return 'vehicle-damage';
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 1f99a38bc..b535bbcdb 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -80,6 +80,7 @@ import { storeMutations } from "@/constants/store-mutations";
 import { errorMessages } from "@/constants/error-messages";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
@@ -188,7 +189,8 @@ export default {
            this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_MULTIPLE_PARTS, this.$route, {}, {}, partsData.data);
            return; 
         } else {
-            this.$router.navigate(this.navigationScenarios.CONTINUING_WITH_SINGLE_PART, this.$route);
+            navigateToHeritageFunnel();
+            return;
         }
     },
     validateZip(zip) {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index c1b9142bd..0cb64dcbc 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -1,10 +1,12 @@
 <template>
 <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall">
-    <funnelHeader ref="funnelHeader" />
-    <vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage="false" />
-    <funnelSubHeader ref="funnelSubHeader" />
+    <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
+    <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
+    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
     <h1>Part Questions Page Placeholder</h1>
-    <funnelFooter ref="funnelFooter" @back-clicked="backButtonAction" />
+    <funnel-footer
+            cmsWidgetName="FunnelFooterWidget"
+    />
 </div>
 </template>
 
@@ -49,18 +51,7 @@ export default {
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
-            vm.$refs.funnelHeader.initializeComponent(
-                resultMap.cmsContent.FunnelHeaderWidget
-            );
-            vm.$refs.vehicleBanner.initializeComponent(
-                resultMap.cmsContent.VehicleBannerWidget
-            );
-            vm.$refs.funnelSubHeader.initializeComponent(
-                resultMap.cmsContent.FunnelSubHeaderWidget
-            );
-            vm.$refs.funnelFooter.initializeComponent(
-                resultMap.cmsContent.FunnelFooterWidget
-            );
+            vm.setCmsContent(resultMap.cmsContent);
         });
     },
     methods: {
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 7802dfbff..584242a37 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -102,6 +102,7 @@ export default ({
         initializeComponent( 
             windshieldAvailableReplacementOptions){
             this.windshieldAvailableReplacementOptions = windshieldAvailableReplacementOptions;
+            this.$refs.replaceOptionsQuestion.initializeComponent(windshieldAvailableReplacementOptions);
         },
         getWindshieldOptions(selectedWindshieldDamageType, selectedWindshieldChipCount, selectedWindshieldReplaceOptions){
             // ONLY UPDATE THE NEW VALUE IF IT IS TRUTHY (NOT NULL)