From 6b326e29d27171f8e8aa1c222be59c963401daab Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 10 Aug 2022 16:32:00 -0400
Subject: [PATCH 01/29] CSR-778 Fix equality check

---
 .../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 85606eb9c..f0450bbca 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -153,12 +153,12 @@ export default ({
         isRepairOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValues) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val.toUpperCase() === damageLocationsSelected.REPAIR) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPAIR) && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
             if (!this.selectedWindshieldDamageTypeValues) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val.toUpperCase() === damageLocationsSelected.REPLACE) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPLACE) && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);

From 2fd175711ae88d1ff41abab65ea97c1eb701cf9a Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 15 Aug 2022 10:15:30 -0400
Subject: [PATCH 02/29] CSR-111 Get capability questions

---
 .../question-chain/question-chain.vue         |  2 ++
 src/constants/endpoints.js                    |  4 +++
 src/constants/store-actions.js                |  1 +
 .../capability-questions.vue                  | 32 +++++++++++--------
 src/layouts/vehicle-parts/vehicle-parts.vue   |  4 +--
 src/mixins/vin-pages-mixin.js                 |  6 +++-
 src/router/router-constants/routing-table.js  |  4 +++
 src/store/index.js                            |  7 ++++
 8 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index 9fa281f50..b79c7f341 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -1,5 +1,7 @@
 <template>
     <div v-for="(q, i) in questions" :key="i">
+    {{ questions }}<br/>
+    {{q}}
         <transition appear name="fade" mode="out-in">
             <buttonQuestion
                 v-if="q.answerSelected || (q.questionSequence === currentQuestionNum)"
diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 3b3bc8bde..01e28d90f 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -59,6 +59,10 @@ const endpoints = {
     url: "/parts/api/v1/parts/parts",
     method: "POST",
   },
+  GetCapabilityQuestions: {
+    url: "/parts/api/v1/parts/capability-questions",
+    method: "GET"
+  },
   SaveOrder: {
     url: "/order/api/v1/order/save",
     method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 9f8ad36f6..3173243e0 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -21,6 +21,7 @@ const storeActions = {
 
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
   GET_PARTS: "getParts",
+  GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",
   SAVE_ORDER: "saveOrder",
   LOAD_ORDER: "loadOrder",
   UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE: "updateStoreWithSaveOrderResponse",
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index a29aa3779..29b4bd78b 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -20,13 +20,12 @@
                     :manualCopy="AlertFewMoreQuestionsCopy"
                     v-bind:isDismissible="false"
                 />
-                <div v-for="(part, i) in capabilityQuestionsData" :key="i">
+                <div v-for="(question, i) in capabilityQuestionsData" :key="i">
                     <questionChain
                         ref="questionChain"
                         v-model="selectedModel"
-                        :questionData="part"
+                        :questionData="question"
                         :partIndex="i"
-                        v-if="showThisPartQuestionChain(part, i)"
                         validationRules="questions-required"
                     />
                 </div>
@@ -71,6 +70,7 @@ export default {
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const getCapabilityQuestions = store.dispatch(storeActions.GET_CAPABILITY_QUESTIONS, store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS));
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -78,6 +78,10 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "capabilityQuestions",
+                promise: getCapabilityQuestions,
+            },
          ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -85,20 +89,14 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.capabilityQuestionsData = resultMap.capabilityQuestions;
+            console.log("CQ: ", resultMap.capabilityQuestions)
         });
     },
     data() {
         return {
             selectedModel: [],
-            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).partsOrQuestions.filter((p) => {
-                if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
-                    return {
-                        glassName: p.glassName,
-                        glassLocation: p.glassLocation,
-                        partQuestions: p.partQuestions,
-                    };
-                }
-            }),
+            capabilityQuestionsData: [],
             currentPartNum: 0,
         };
     },
@@ -112,8 +110,8 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return false; // TODO - DO TRUE TEST OF PAGEDATA
-            // return Object.keys(store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)).length > 0;
+            const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+            return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
         },
         showThisPartQuestionChain(part, i) {
             if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
@@ -129,6 +127,12 @@ export default {
         },
         async forwardButtonAction() {
             // TODO: TO COME
+            // if questions are answered:
+
+            this.$router.navigate(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.$route
+            );
         },
     },
     watch: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index c7f1424a1..cd579fdcb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -132,8 +132,8 @@ export default {
                             ColorAnswerText: p.color,
                             FeatureAnswers: [
                                 {
-                                FeatureAnswerText: p.description === "" ? p.color : p.description,
-                                PartNumber: p.partNumber,
+                                    FeatureAnswerText: p.description === "" ? p.color : p.description,
+                                    PartNumber: p.partNumber,
                                 },
                             ],
                         });
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index a7ba799a2..38f804bc2 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -2,6 +2,7 @@ import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 export default {
     mixins: [vehicleQuestionsMixin],
@@ -26,7 +27,10 @@ export default {
                 this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
             }
             else if (hasCapabilityQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, result.data);
+                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, {
+                    carId: this.$store.getters.vehicle.carId,
+                    partNumber: result.data.partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
+                });
             }
             else {
                 // if single parts only
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 37fb1c13e..99b7c0bb1 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -297,6 +297,10 @@ const routingTable = function(store) {
           scenario: navigationScenarios.CLICKED_BACK,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.QUOTE
+        },
       ]
     },
   ];
diff --git a/src/store/index.js b/src/store/index.js
index 6aeca59eb..f6c8f83d8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -722,6 +722,13 @@ export const actions = {
     });
   },
 
+  getCapabilityQuestions(context, { carId, partNumber }) {
+    return globalMethods.callHttpClient({
+      method: endpoints.GetCapabilityQuestions.method,
+      endpoint: `${endpoints.GetCapabilityQuestions.url}/${carId}/${partNumber}`,
+    })
+  },
+
   // Order API Actions
   saveOrder(context) {
     const vehicle = context.getters.vehicle;

From a2e0d73c11a3bf8f9c286b0fdaac0323c43f201c Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 15 Aug 2022 12:13:18 -0400
Subject: [PATCH 03/29] CSR-111 Map answerResult value for question-chain
 component

---
 .../question-chain/question-chain.vue         |  2 --
 .../capability-questions.vue                  | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index b79c7f341..9fa281f50 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -1,7 +1,5 @@
 <template>
     <div v-for="(q, i) in questions" :key="i">
-    {{ questions }}<br/>
-    {{q}}
         <transition appear name="fade" mode="out-in">
             <buttonQuestion
                 v-if="q.answerSelected || (q.questionSequence === currentQuestionNum)"
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 29b4bd78b..74c79e20a 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -12,6 +12,7 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
                 <h1>CAPABILITY QUESTIONS TEMPORARY PLACEHOLDER</h1>
+                CQD: {{ capabilityQuestionsData }}
                 <alert
                     ref="alertFewMoreQuestions"
                     class="my-5"
@@ -20,15 +21,15 @@
                     :manualCopy="AlertFewMoreQuestionsCopy"
                     v-bind:isDismissible="false"
                 />
-                <div v-for="(question, i) in capabilityQuestionsData" :key="i">
+                <!-- <div v-for="(question, i) in capabilityQuestionsData" :key="i"> -->
                     <questionChain
                         ref="questionChain"
                         v-model="selectedModel"
-                        :questionData="question"
+                        :questionData="capabilityQuestionsData"
                         :partIndex="i"
                         validationRules="questions-required"
                     />
-                </div>
+                <!-- </div> -->
                 <funnel-footer
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
@@ -61,6 +62,7 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { result } from "lodash";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -89,7 +91,20 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.capabilityQuestionsData = resultMap.capabilityQuestions;
+            
+            resultMap.capabilityQuestions.forEach(question => {
+                console.log(question.answers)
+                question.answers = question.answers.map(answer => {
+                    return {
+                        ...answer,
+                        answerResult: answer.answerResult1
+                    }
+                })
+                // question.answers = question.answers
+            })
+            vm.capabilityQuestionsData = {
+                partQuestions: resultMap.capabilityQuestions
+            };
             console.log("CQ: ", resultMap.capabilityQuestions)
         });
     },

From 758496814345fb681e8864d146ab5adee71645cf Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 15 Aug 2022 14:55:12 -0400
Subject: [PATCH 04/29] CSR-111 Refactor navigation between vehicle questions
 pages

---
 .../capability-questions.vue                  | 17 ++--
 src/layouts/part-questions/part-questions.vue | 65 ++++++-------
 src/layouts/vehicle-parts/vehicle-parts.vue   | 71 +++++++-------
 src/mixins/vehicle-questions-mixin.js         | 92 ++++++++++++++++++-
 src/mixins/vin-pages-mixin.js                 | 59 ++++++------
 src/router/index.js                           |  2 +
 .../router-constants/navigation-scenarios.js  | 14 ++-
 src/router/router-constants/routing-table.js  | 86 ++++++++++++-----
 8 files changed, 271 insertions(+), 135 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 74c79e20a..d5086aaf5 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -62,13 +62,14 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { result } from "lodash";
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
     name: "capability-questions",
+    mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
@@ -133,13 +134,13 @@ export default {
             if (this.currentPartNum === i || part.answerData?.answerResult.length > 0) { return true; }
             return false;
         },
-        backButtonAction() {
-            // route to move backwards
-            this.$router.navigate(
-                this.navigationScenarios.CLICKED_BACK,
-                this.$route
-            );
-        },
+        // backButtonAction() {
+        //     // route to move backwards
+        //     this.$router.navigate(
+        //         this.navigationScenarios.CLICKED_BACK,
+        //         this.$route
+        //     );
+        // },
         async forwardButtonAction() {
             // TODO: TO COME
             // if questions are answered:
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 1f8160adf..2d24a3ca9 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -123,13 +123,13 @@ export default {
             if (this.currentPartNum === i || part.answerData?.answerResult?.length > 0) { return true; }
             return false;
         },
-        backButtonAction() {
-            // route to move backwards
-            this.$router.navigate(
-                this.navigationScenarios.CLICKED_BACK,
-                this.$route
-            );
-        },
+        // backButtonAction() {
+        //     // route to move backwards
+        //     this.$router.navigate(
+        //         this.navigationScenarios.CLICKED_BACK,
+        //         this.$route
+        //     );
+        // },
         async forwardButtonAction() {
             const partQuestionAnswersArray = this.partsQuestionsData.map((item) => {
                 return {
@@ -155,32 +155,33 @@ export default {
                 });
 
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
-            const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
+            this.navigateForward(glassNameAndPartsForStore);
+            // const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
+            // const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
+            // const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
 
-            // NAVIGATE FORWARD
-            if (hasGlassLocationWithMultipleParts) {
-                // if multiple parts on any glass
-                // go to vehicle-parts page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else if (hasChildPartQuestions) {
-                // if any childpart questions
-                // go to molding-questions page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.HAS_MOLDING_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else if (hasCapabilityQuestions) {
-                // if has capability questions
-                // go to capability-questions page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            // // NAVIGATE FORWARD
+            // if (hasGlassLocationWithMultipleParts) {
+            //     // if multiple parts on any glass
+            //     // go to vehicle-parts page and pass the partsData
+            //     this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            // } else if (hasChildPartQuestions) {
+            //     // if any childpart questions
+            //     // go to molding-questions page and pass the partsData
+            //     this.$router.navigate(this.navigationScenarios.HAS_MOLDING_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            // } else if (hasCapabilityQuestions) {
+            //     // if has capability questions
+            //     // go to capability-questions page and pass the partsData
+            //     this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            // } else {
+            //     // if single parts only
+            //     const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
+            //     // save to store lineItems.glassParts
+            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+            //     // go to heritage quote page
+            //     this.$refs.loadingModal.showModal();
+            //     navigateToHeritageFunnel();
+            // }
         },
         arePagePrerequisitesValid() {
             const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index cd579fdcb..0035131d3 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -159,15 +159,15 @@ export default {
             return store.getters.damage.isRepair != null && store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
             Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
         },
-        backButtonAction() {
-            const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions);
-            const backNavigationScenario = hasPartQuestions ? this.navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS : this.navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS;
+        // backButtonAction() {
+        //     const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions);
+        //     const backNavigationScenario = hasPartQuestions ? this.navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS : this.navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS;
 
-            this.$router.navigate(
-                backNavigationScenario,
-                this.$route
-            );
-        },
+        //     this.$router.navigate(
+        //         backNavigationScenario,
+        //         this.$route
+        //     );
+        // },
         async forwardButtonAction() {
             const matchedParts = [];
 
@@ -192,8 +192,8 @@ export default {
                 }
             }
 
-            const hasChildPartQuestions = this.hasChildPartQuestions(matchedParts);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(matchedParts);
+            // const hasChildPartQuestions = this.hasChildPartQuestions(matchedParts);
+            // const hasCapabilityQuestions = this.hasCapabilityQuestions(matchedParts);
 
             // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
             if (this.isForwardActionDisabled) {
@@ -202,33 +202,34 @@ export default {
             }
 
             // Navigate to the next page
-            if (hasChildPartQuestions) {
-                this.$router.navigate(
-                    this.navigationScenarios.HAS_MOLDING_QUESTIONS,
-                    this.$route,
-                    {},
-                    {},
-                    {partsOrQuestions: matchedParts}
-                );
-            } else if (hasCapabilityQuestions) {
-                this.$router.navigate(
-                    this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
-                    this.$route,
-                    {},
-                    {},
-                    {partsOrQuestions: matchedParts}
-                );
+            this.navigateForward(matchedParts);
+            // if (hasChildPartQuestions) {
+            //     this.$router.navigate(
+            //         this.navigationScenarios.HAS_MOLDING_QUESTIONS,
+            //         this.$route,
+            //         {},
+            //         {},
+            //         {partsOrQuestions: matchedParts}
+            //     );
+            // } else if (hasCapabilityQuestions) {
+            //     this.$router.navigate(
+            //         this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+            //         this.$route,
+            //         {},
+            //         {},
+            //         {partsOrQuestions: matchedParts}
+            //     );
 
-            } else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+            // } else {
+            //     // if single parts only
+            //     const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
+            //     // save to store lineItems.glassParts
+            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            //     // go to heritage quote page
+            //     this.$refs.loadingModal.showModal();
+            //     navigateToHeritageFunnel();
+            // }
         },
 
         LoadInitialPartsData() {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 1a28fe028..6f218f24b 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,5 +1,10 @@
-export default {
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { storeMutations } from "@/constants/store-mutations.js";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 
+export default {
     methods: {
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some(pq => pq.partQuestions?.length > 0);
@@ -37,7 +42,90 @@ export default {
                 }
             });
             return reducedGlassParts;
+        },
+        comparePageIndices(currentPage, fmgPage) {
+            const orderedVehicleQuestionPages = [
+                fmgPageValues.PART_QUESTIONS,
+                fmgPageValues.VEHICLE_PARTS,
+                fmgPageValues.MOLDING_QUESTIONS,
+                fmgPageValues.CAPABILITY_QUESTIONS,
+                fmgPageValues.QUOTE
+            ]
+
+            return orderedVehicleQuestionPages.indexOf(currentPage) - orderedVehicleQuestionPages.indexOf(fmgPage);
+        },
+        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
+            return this.comparePageIndices(currentPage, fmgPage) < 0;
+        },
+        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
+            console.log(currentPage)
+            console.log(fmgPage)
+            return this.comparePageIndices(currentPage, fmgPage) > 0;
+        },
+        // Can't use `this` because navigateForward is also called from vin-pages-mixin
+        navigateForward(partsOrQuestions, vm) {
+            const self = vm ?? this;
+            const currentPage = self.$route.query.fmgPage;
+            
+            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+
+            if (hasPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)) {
+                self.$router.navigate(self.navigationScenarios.HAS_PART_QUESTIONS, self.$route, {}, {}, {partsOrQuestions: partsOrQuestions});
+            }
+            else if (hasGlassLocationWithMultipleParts && this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
+                // if multiple parts on any glass
+                // go to vehicle-parts page and pass the partsData
+                self.$router.navigate(self.navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
+            } else if (hasChildPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
+                // if any childpart questions
+                // go to molding-questions page and pass the partsData
+                self.$router.navigate(self.navigationScenarios.HAS_MOLDING_QUESTIONS,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
+            } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
+                // if has capability questions
+                // go to capability-questions page and pass the partsData
+                self.$router.navigate(self.navigationScenarios.HAS_CAPABILITY_QUESTIONS, self.$route, {}, {}, {
+                    carId: self.$store.getters.vehicle.carId,
+                    partNumber: partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
+                });
+            } else {
+                // if single parts only
+                const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
+                // save to store lineItems.glassParts
+                self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+                // go to heritage quote page
+                self.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
+            }
+        },
+        backButtonAction() {
+            const partsOrQuestions = this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions;
+            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+            let backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP;
+
+            const currentPage = this.$route.query.fmgPage;
+            if (hasCapabilityQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_CAPABILITY_QUESTIONS;
+            }
+            else if (hasChildPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS;
+            }
+            else if (hasGlassLocationWithMultipleParts && this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS;
+            }
+            else if (hasPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS;
+            }
+
+            this.$router.navigate(
+                backNavigationScenario,
+                this.$route
+            );
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 38f804bc2..8d829dd9f 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -2,7 +2,6 @@ import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
-import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 export default {
     mixins: [vehicleQuestionsMixin],
@@ -11,37 +10,39 @@ export default {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
 
             const partsOrQuestions = result.data.partsOrQuestions;
+            console.log("HI")
+            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
 
-            const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
-            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+            // const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
+            // const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            // const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            // const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
 
-            if (hasPartsQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
-            }
-            else if (hasGlassLocationWithMultipleParts) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, this.$route, {}, {}, result.data);
-            }
-            else if (hasChildPartQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
-            }
-            else if (hasCapabilityQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, {
-                    carId: this.$store.getters.vehicle.carId,
-                    partNumber: result.data.partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
-                });
-            }
-            else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+            // if (hasPartsQuestions) {
+            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
+            // }
+            // else if (hasGlassLocationWithMultipleParts) {
+            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, this.$route, {}, {}, result.data);
+            // }
+            // else if (hasChildPartQuestions) {
+            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
+            // }
+            // else if (hasCapabilityQuestions) {
+            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, {
+            //         carId: this.$store.getters.vehicle.carId,
+            //         partNumber: result.data.partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
+            //     });
+            // }
+            // else {
+            //     // if single parts only
+            //     const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
+            //     // save to store lineItems.glassParts
+            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            //     // go to heritage quote page
+            //     this.$refs.loadingModal.showModal();
+            //     navigateToHeritageFunnel();
+            // }
         },
     }
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index ea4c5cbcc..ea985c390 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -192,7 +192,9 @@ async function navigate(scenario, currentRoute, optionalQuery = {}, optionalPara
 
 // Get navigation map depending on the scenario and the current 'page' you're on.
 function getNavigationMap(scenario, currentRoute) {
+  console.log("scenario: ", scenario)
   const fmgPageValue = currentRoute.query.fmgPage;
+  console.log(routingTable(store))
   const matchedQueryValue = routingTable(store)
     .filter(
       (item) =>
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 2bd259909..8000f45d7 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -8,10 +8,10 @@ const navigationScenarios = {
   CLICKED_FORWARD: "CLICKED_FORWARD",
   CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
   SELECTED_PARTS: "SELECTED_PARTS",
-  SELECTED_VIN_WITH_PART_QUESTIONS: "SELECTED_VIN_WITH_PART_QUESTIONS",
-  SELECTED_VIN_WITH_MULTIPLE_PARTS: "SELECTED_VIN_WITH_MULTIPLE_PARTS",
-  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "SELECTED_VIN_WITH_MOLDING_QUESTIONS",
-  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "SELECTED_VIN_WITH_CAPABILITY_QUESTIONS",
+  SELECTED_VIN_WITH_PART_QUESTIONS: "HAS_PART_QUESTIONS",
+  SELECTED_VIN_WITH_MULTIPLE_PARTS: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
+  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
+  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
   CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
   CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
   SELECTED_VIN_HAS_MISMATCHED_GLASS: "SELECTED_VIN_HAS_MISMATCHED_GLASS",
@@ -24,8 +24,14 @@ const navigationScenarios = {
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
   CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
   CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
+  HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
+  HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
   HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
+  CLICKED_BACK_TO_GO_TO_VIN_LOOKUP: "CLICKED_BACK_TO_GO_TO_VIN_LOOKUP",
+  CLICKED_BACK_TO_GO_TO_PART_QUESTIONS: "CLICKED_BACK_TO_GO_TO_PART_QUESTIONS",
+  CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS: "CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS",
+  CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS: "CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 99b7c0bb1..3e1246250 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -69,27 +69,6 @@ const routingTable = function(store) {
         },
       ],
     },
-    {
-      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-      maps: [
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_FORWARD,
-          destinationFmgPageValue: fmgPageValues.REVEAL,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS,
-          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
-      ],
-    },
     {
       fmgPageValue: fmgPageValues.REVEAL,
       maps: [
@@ -256,11 +235,11 @@ const routingTable = function(store) {
       fmgPageValue: fmgPageValues.PART_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
           destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
@@ -277,26 +256,83 @@ const routingTable = function(store) {
         },
       ]
     },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_PARTS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.REVEAL,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+      ],
+    },
     {
       fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
           scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
+        {
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        }
       ]
     },
     {
       fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
         {
           scenario: navigationScenarios.CLICKED_FORWARD,
           destinationFmgPageValue: fmgPageValues.QUOTE

From d3f7ad68f26ed41bdd54e935b6700f8d945b7171 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 16 Aug 2022 14:44:32 -0400
Subject: [PATCH 05/29] CSR-111 Get part from capability question, save, reset
 answers when part question answer result changes

---
 src/constants/endpoints.js                    |   4 +
 src/constants/store-actions.js                |   2 +
 src/constants/store-mutations.js              |   1 +
 .../capability-questions.vue                  | 104 +++++++-----------
 src/mixins/vehicle-questions-mixin.js         |  29 +++--
 src/mixins/vin-pages-mixin.js                 |   1 -
 .../router-constants/navigation-scenarios.js  |   1 +
 src/router/router-constants/routing-table.js  |   8 +-
 src/store/index.js                            |  35 +++++-
 9 files changed, 108 insertions(+), 77 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 01e28d90f..ea3fdcb62 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -63,6 +63,10 @@ const endpoints = {
     url: "/parts/api/v1/parts/capability-questions",
     method: "GET"
   },
+  ApplyCapabilityAnswerToPart: {
+    url: "/parts/api/v1/parts/apply-capability-answer-to-part",
+    method: "POST"
+  },
   SaveOrder: {
     url: "/order/api/v1/order/save",
     method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 3173243e0..a80694834 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -22,6 +22,7 @@ const storeActions = {
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
   GET_PARTS: "getParts",
   GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",
+  GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer",
   SAVE_ORDER: "saveOrder",
   LOAD_ORDER: "loadOrder",
   UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE: "updateStoreWithSaveOrderResponse",
@@ -56,6 +57,7 @@ const storeActions = {
   SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
   SAVE_GLASS_PARTS: "saveGlassParts",
   SAVE_PART_QUESTION_ANSWERS: "savePartQuestionAnswers",
+  SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers"
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index cce109c43..ba0adc7cb 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -17,6 +17,7 @@ const storeMutations = {
   UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips",
   UPDATE_GLASS_TO_REPLACE: "updateGlassToReplace",
   UPDATE_PART_QUESTION_ANSWERS: "updatePartQuestionAnswers",
+  UPDATE_CAPABILITY_QUESTION_ANSWERS: "updateCapabilityQuestionAnswers",
   UPDATE_GLASS_PARTS: "updateGlassParts",
   UPDATE_OTHER_PARTS: "updateOtherParts",
 
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index d5086aaf5..b2b38d07e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -6,13 +6,10 @@
       v-slot="{ meta }"
     >
         <div class="page-container-grouped-styles capability-questions">
-            <loadingModal ref="loadingModal"/>
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <h1>CAPABILITY QUESTIONS TEMPORARY PLACEHOLDER</h1>
-                CQD: {{ capabilityQuestionsData }}
                 <alert
                     ref="alertFewMoreQuestions"
                     class="my-5"
@@ -21,15 +18,13 @@
                     :manualCopy="AlertFewMoreQuestionsCopy"
                     v-bind:isDismissible="false"
                 />
-                <!-- <div v-for="(question, i) in capabilityQuestionsData" :key="i"> -->
-                    <questionChain
-                        ref="questionChain"
-                        v-model="selectedModel"
-                        :questionData="capabilityQuestionsData"
-                        :partIndex="i"
-                        validationRules="questions-required"
-                    />
-                <!-- </div> -->
+                <questionChain
+                    ref="questionChain"
+                    v-model="selectedAnswer"    
+                    :questionData="capabilityQuestionsData"
+                    :partIndex="i"
+                    validationRules="questions-required"
+                />
                 <funnel-footer
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
@@ -63,6 +58,7 @@ import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -73,7 +69,6 @@ export default {
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-        const getCapabilityQuestions = store.dispatch(storeActions.GET_CAPABILITY_QUESTIONS, store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS));
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -81,10 +76,6 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
-            {
-                resultKey: "capabilityQuestions",
-                promise: getCapabilityQuestions,
-            },
          ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -92,72 +83,57 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            
-            resultMap.capabilityQuestions.forEach(question => {
-                console.log(question.answers)
-                question.answers = question.answers.map(answer => {
-                    return {
-                        ...answer,
-                        answerResult: answer.answerResult1
-                    }
-                })
-                // question.answers = question.answers
-            })
-            vm.capabilityQuestionsData = {
-                partQuestions: resultMap.capabilityQuestions
-            };
-            console.log("CQ: ", resultMap.capabilityQuestions)
         });
     },
     data() {
         return {
-            selectedModel: [],
-            capabilityQuestionsData: [],
-            currentPartNum: 0,
+            selectedAnswer: [],
+            // TODO This shouldn't be an object with property `partQuestions`
+            capabilityQuestionsData: {
+                partQuestions: store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).capabilityQuestions
+            }
         };
     },
     computed: {
         AlertFewMoreQuestionsHeader() {
-			return this.getCmsContent("AlertPartsQuestions", "HeadlineText");
+			return this.getCmsContent("AdditionalPartsQuestionsAlert", "HeadlineText");
 		},
         AlertFewMoreQuestionsCopy() {
-			return this.getCmsContent("AlertPartsQuestions", "BodyText");
+			return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
 		},
+        windshieldPart() {
+            return this.pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD);
+        },
+        windshieldPartInfo() {
+            return this.windshieldPart.parts[0];
+        },
+        pageData() {
+            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+        }
     },
     methods: {
         arePagePrerequisitesValid() {
             const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
             return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
         },
-        showThisPartQuestionChain(part, i) {
-            if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
-            if (this.currentPartNum === i || part.answerData?.answerResult.length > 0) { return true; }
-            return false;
-        },
-        // backButtonAction() {
-        //     // route to move backwards
-        //     this.$router.navigate(
-        //         this.navigationScenarios.CLICKED_BACK,
-        //         this.$route
-        //     );
-        // },
         async forwardButtonAction() {
-            // TODO: TO COME
-            // if questions are answered:
+            console.log(this.windshieldPartInfo);
+            console.log(this.selectedAnswer)
+            const selectedAnswerResult1 = this.selectedAnswer.answerResult;
+            const selectedAnswerResult2 = this.pageData.capabilityQuestions[0].answers.find(x => x.answerResult1 === selectedAnswerResult1).answerResult2;
 
-            this.$router.navigate(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.$route
-            );
-        },
-    },
-    watch: {
-        selectedModel(model) {
-            this.capabilityQuestionsData[model.partIndex].answerData = {
-                answerResult: model.answerResult,
-                answeredQuestions: model.answeredQuestions,
-            }
-            this.currentPartNum = model.partIndex + 1;
+            this.dispatchStoreAction(storeActions.SAVE_CAPABILITY_QUESTION_ANSWERS, {
+                glassName: this.windshieldPart.glassName,
+                glassLocation: this.windshieldPart.glassLocation,
+                result1: selectedAnswerResult1,
+                result2: selectedAnswerResult2
+            });
+
+            const partFromCapabilityQuestionAnswer = (await this.dispatchStoreAction(storeActions.GET_PART_FROM_CAPABILITY_QUESTION_ANSWER)).data;
+            let partsOrQuestions = this.pageData.partsOrQuestions;
+            partsOrQuestions.find(partOrQuestion => partOrQuestion.glassLocation === damageLocationsSelected.WINDSHIELD).parts = partFromCapabilityQuestionAnswer;
+
+            this.navigateForward(partsOrQuestions);
         },
     },
     components: {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 6f218f24b..ab27a6c18 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -3,6 +3,8 @@ import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigat
 import { storeMutations } from "@/constants/store-mutations.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { storeActions } from "@/constants/store-actions";
+import store from "@/store";
 
 export default {
     methods: {
@@ -22,6 +24,7 @@ export default {
                 return pq.parts?.some(part => part.requiresCapabilityQuestions === true);
             });
         },
+        
         // method to only include keys listed for lineItems.glassParts in 
         // https://safelite.atlassian.net/wiki/spaces/DC/pages/17137665/Catalog+Front-End+State#glassParts
         reducedGlassPartsArray(glassParts) {
@@ -63,7 +66,7 @@ export default {
             return this.comparePageIndices(currentPage, fmgPage) > 0;
         },
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
-        navigateForward(partsOrQuestions, vm) {
+        async navigateForward(partsOrQuestions, vm) {
             const self = vm ?? this;
             const currentPage = self.$route.query.fmgPage;
             
@@ -86,18 +89,30 @@ export default {
             } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
-                self.$router.navigate(self.navigationScenarios.HAS_CAPABILITY_QUESTIONS, self.$route, {}, {}, {
-                    carId: self.$store.getters.vehicle.carId,
-                    partNumber: partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
+
+                const windshieldPart = partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0];
+                let capabilityQuestions = (await store.dispatch(storeActions.GET_CAPABILITY_QUESTIONS, {
+                    carId: store.getters.vehicle.carId,
+                    partNumber: windshieldPart.partNumber
+                })).data;
+
+                capabilityQuestions.forEach(question => {
+                    question.answers = question.answers.map(answer => {
+                        return {
+                            ...answer,
+                            answerResult: answer.answerResult1
+                        }
+                    })
                 });
+                
+                self.$router.navigate(self.navigationScenarios.HAS_CAPABILITY_QUESTIONS, self.$route, {}, {}, { partsOrQuestions, capabilityQuestions });
             } else {
                 // if single parts only
                 const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-                // go to heritage quote page
-                self.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
+               
+                self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
             }
         },
         backButtonAction() {
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 8d829dd9f..6e030688d 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -4,7 +4,6 @@ import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigat
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 export default {
-    mixins: [vehicleQuestionsMixin],
     methods: {
         async navigateForwardWithSingleCarMatch() {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 8000f45d7..7cca25d09 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -24,6 +24,7 @@ const navigationScenarios = {
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
   CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
   CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
+  ANSWERED_ALL_QUESTIONS: "ANSWERED_ALL_QUESTIONS",
   HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
   HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 3e1246250..34c5263cf 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -251,7 +251,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ]
@@ -284,7 +284,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ],
@@ -309,7 +309,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         }
       ]
@@ -334,7 +334,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.CLICKED_FORWARD,
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE
         },
       ]
diff --git a/src/store/index.js b/src/store/index.js
index f6c8f83d8..71d508e8d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -49,6 +49,7 @@ const getDefaultState = () => {
         numberOfChips: null,
         glassToReplace: null,
         partQuestionAnswers: null,
+        capabilityQuestionAnswers: null
       },
       lineItems: {
         glassParts: null
@@ -126,6 +127,9 @@ export const mutations = {
   updatePartQuestionAnswers(state, answersArray) {
     state.order.damage.partQuestionAnswers = answersArray;
   },
+  updateCapabilityQuestionAnswers(state, answersArray) {
+    state.order.damage.capabilityQuestionAnswers = answersArray;
+  },
   updateGlassParts(state, partsData) {
     state.order.lineItems.glassParts = partsData;
   },
@@ -277,6 +281,7 @@ export const mutations = {
   resetGlassPartsState(state) {
     state.order.lineItems.glassParts = null;
     state.order.damage.partQuestionAnswers = null;
+    state.order.damage.capabilityQuestionAnswers = null;
     state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
     state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
     state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
@@ -729,6 +734,22 @@ export const actions = {
     })
   },
 
+  getPartFromCapabilityQuestionAnswer(context, selectedAnswerResult1) {
+    const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+
+    const part = pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD).parts[0];
+    const capabilityQuestionAnswers = context.getters.damage.capabilityQuestionAnswers;
+      
+    return globalMethods.callHttpClient({
+      method: endpoints.ApplyCapabilityAnswerToPart.method,
+      endpoint: endpoints.ApplyCapabilityAnswerToPart.url,
+      payload: {
+        part,
+        capabilityAnswerResults: capabilityQuestionAnswers
+      }
+    })
+  },
+
   // Order API Actions
   saveOrder(context) {
     const vehicle = context.getters.vehicle;
@@ -958,10 +979,22 @@ export const actions = {
     }
   },
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
+    // if part question answers have changed, reset subsequent question answers
+    const previousResultsArray = context.getters.damage.partQuestionAnswers;
+    const havePartQuestionAnswersChanged = previousResultsArray.length !== partQuestionAnswersArray.length ||
+      !previousResultsArray.every((x, i) => x.result === partQuestionAnswersArray[i].result);
+
+    if (havePartQuestionAnswersChanged) {
+      context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
+    }
+
     //Save new values
     context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
   },
-
+  saveCapabilityQuestionAnswers(context, capabilityQuestionAnswers) {
+    //Save new values
+    context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, capabilityQuestionAnswers);
+  },
   // Misc order actions
   saveServiceLocation(context, serviceLocationInfo) {
     context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceLocationInfo);

From 4fa36a11001711a2f6bde74ad8a2b2687dfbc52d Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 16 Aug 2022 14:52:48 -0400
Subject: [PATCH 06/29] CSR-111 Cleanup

---
 .../capability-questions.vue                  |  2 -
 src/layouts/part-questions/part-questions.vue | 33 ---------------
 src/layouts/vehicle-parts/vehicle-parts.vue   | 40 -------------------
 src/mixins/vehicle-questions-mixin.js         |  4 +-
 src/mixins/vin-pages-mixin.js                 | 36 +----------------
 src/router/index.js                           |  2 -
 6 files changed, 2 insertions(+), 115 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index b2b38d07e..d38a1d273 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -117,8 +117,6 @@ export default {
             return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
         },
         async forwardButtonAction() {
-            console.log(this.windshieldPartInfo);
-            console.log(this.selectedAnswer)
             const selectedAnswerResult1 = this.selectedAnswer.answerResult;
             const selectedAnswerResult2 = this.pageData.capabilityQuestions[0].answers.find(x => x.answerResult1 === selectedAnswerResult1).answerResult2;
 
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 2d24a3ca9..7aca0e77f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -123,13 +123,6 @@ export default {
             if (this.currentPartNum === i || part.answerData?.answerResult?.length > 0) { return true; }
             return false;
         },
-        // backButtonAction() {
-        //     // route to move backwards
-        //     this.$router.navigate(
-        //         this.navigationScenarios.CLICKED_BACK,
-        //         this.$route
-        //     );
-        // },
         async forwardButtonAction() {
             const partQuestionAnswersArray = this.partsQuestionsData.map((item) => {
                 return {
@@ -156,32 +149,6 @@ export default {
 
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
             this.navigateForward(glassNameAndPartsForStore);
-            // const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
-            // const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
-            // const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
-
-            // // NAVIGATE FORWARD
-            // if (hasGlassLocationWithMultipleParts) {
-            //     // if multiple parts on any glass
-            //     // go to vehicle-parts page and pass the partsData
-            //     this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            // } else if (hasChildPartQuestions) {
-            //     // if any childpart questions
-            //     // go to molding-questions page and pass the partsData
-            //     this.$router.navigate(this.navigationScenarios.HAS_MOLDING_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            // } else if (hasCapabilityQuestions) {
-            //     // if has capability questions
-            //     // go to capability-questions page and pass the partsData
-            //     this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            // } else {
-            //     // if single parts only
-            //     const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
-            //     // save to store lineItems.glassParts
-            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-            //     // go to heritage quote page
-            //     this.$refs.loadingModal.showModal();
-            //     navigateToHeritageFunnel();
-            // }
         },
         arePagePrerequisitesValid() {
             const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 0035131d3..a276ef132 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -159,15 +159,6 @@ export default {
             return store.getters.damage.isRepair != null && store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
             Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
         },
-        // backButtonAction() {
-        //     const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions);
-        //     const backNavigationScenario = hasPartQuestions ? this.navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS : this.navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS;
-
-        //     this.$router.navigate(
-        //         backNavigationScenario,
-        //         this.$route
-        //     );
-        // },
         async forwardButtonAction() {
             const matchedParts = [];
 
@@ -191,10 +182,6 @@ export default {
                     }
                 }
             }
-
-            // const hasChildPartQuestions = this.hasChildPartQuestions(matchedParts);
-            // const hasCapabilityQuestions = this.hasCapabilityQuestions(matchedParts);
-
             // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
             if (this.isForwardActionDisabled) {
                 this.$refs.funnelFooter.removeLoader();
@@ -203,33 +190,6 @@ export default {
 
             // Navigate to the next page
             this.navigateForward(matchedParts);
-            // if (hasChildPartQuestions) {
-            //     this.$router.navigate(
-            //         this.navigationScenarios.HAS_MOLDING_QUESTIONS,
-            //         this.$route,
-            //         {},
-            //         {},
-            //         {partsOrQuestions: matchedParts}
-            //     );
-            // } else if (hasCapabilityQuestions) {
-            //     this.$router.navigate(
-            //         this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
-            //         this.$route,
-            //         {},
-            //         {},
-            //         {partsOrQuestions: matchedParts}
-            //     );
-
-            // } else {
-            //     // if single parts only
-            //     const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
-            //     // save to store lineItems.glassParts
-            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-
-            //     // go to heritage quote page
-            //     this.$refs.loadingModal.showModal();
-            //     navigateToHeritageFunnel();
-            // }
         },
 
         LoadInitialPartsData() {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index ab27a6c18..583c184aa 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -24,7 +24,7 @@ export default {
                 return pq.parts?.some(part => part.requiresCapabilityQuestions === true);
             });
         },
-        
+
         // method to only include keys listed for lineItems.glassParts in 
         // https://safelite.atlassian.net/wiki/spaces/DC/pages/17137665/Catalog+Front-End+State#glassParts
         reducedGlassPartsArray(glassParts) {
@@ -61,8 +61,6 @@ export default {
             return this.comparePageIndices(currentPage, fmgPage) < 0;
         },
         currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
-            console.log(currentPage)
-            console.log(fmgPage)
             return this.comparePageIndices(currentPage, fmgPage) > 0;
         },
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 6e030688d..817aa7b7e 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,47 +1,13 @@
 import { storeActions } from "@/constants/store-actions.js";
-import { storeMutations } from "@/constants/store-mutations.js";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 export default {
     methods: {
         async navigateForwardWithSingleCarMatch() {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
-
             const partsOrQuestions = result.data.partsOrQuestions;
-            console.log("HI")
+
             vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
-
-            // const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
-            // const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
-            // const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-            // const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
-
-            // if (hasPartsQuestions) {
-            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
-            // }
-            // else if (hasGlassLocationWithMultipleParts) {
-            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, this.$route, {}, {}, result.data);
-            // }
-            // else if (hasChildPartQuestions) {
-            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
-            // }
-            // else if (hasCapabilityQuestions) {
-            //     this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, {
-            //         carId: this.$store.getters.vehicle.carId,
-            //         partNumber: result.data.partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0].partNumber
-            //     });
-            // }
-            // else {
-            //     // if single parts only
-            //     const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
-            //     // save to store lineItems.glassParts
-            //     this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-
-            //     // go to heritage quote page
-            //     this.$refs.loadingModal.showModal();
-            //     navigateToHeritageFunnel();
-            // }
         },
     }
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index ea985c390..ea4c5cbcc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -192,9 +192,7 @@ async function navigate(scenario, currentRoute, optionalQuery = {}, optionalPara
 
 // Get navigation map depending on the scenario and the current 'page' you're on.
 function getNavigationMap(scenario, currentRoute) {
-  console.log("scenario: ", scenario)
   const fmgPageValue = currentRoute.query.fmgPage;
-  console.log(routingTable(store))
   const matchedQueryValue = routingTable(store)
     .filter(
       (item) =>

From 653a41abb8788730c0b53fbbe330a5504ce06697 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 16 Aug 2022 14:54:32 -0400
Subject: [PATCH 07/29] CSR-111 Cleanup

---
 src/layouts/capability-questions/capability-questions.vue | 1 -
 src/mixins/vehicle-questions-mixin.js                     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index d38a1d273..5146e7f9e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -52,7 +52,6 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 583c184aa..73b7ae071 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,5 +1,4 @@
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { navigationScenarios } from "../router/router-constants/navigation-scenarios";

From b526fc059fe2e3de4547d375fa37d5901a69f2e6 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 17 Aug 2022 09:25:51 -0400
Subject: [PATCH 08/29] CSR-759 Update how session ID cookies are saved and
 updated

---
 .../heritage-integration/cookie-helper.js     | 39 ++++++++++++++++---
 src/mixins/analytics-mixin.js                 |  8 +++-
 src/router/index.js                           |  5 ++-
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 775a64fec..69d4ee4b5 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -10,7 +10,7 @@ export function updateOrCreateFunnelCookie() {
     const shouldSuppressConceptFunnel = getFunnelCookie()?.SuppressConceptFunnel;
     
     // Create the cookie
-    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}={}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()};`;
+    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}={}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
 
     // Set up cookie with all the props.
     setFunnelCookieProperties({
@@ -106,10 +106,17 @@ export function getSessionIdValue(){
     return '00000000-0000-0000-0000-000000000000';
 }
 
-export function setCookieProperties(properties) {
+/* 
+    Updates session ID cookie with new expiration date
+*/
+export function updateSessionIdCookie() {
+    createCookie(cookieNames.SESSION_ID, getSessionIdValue(), { maxAge: 60 * 30 });
+}
+
+export function setCookieProperties(properties, { useDefaultFunnelCookieAttributes = true, maxAge }) {
     if (typeof properties == "object") {
         Object.keys(properties).forEach(key => {
-            document.cookie = `${key}=${properties[key]}`;
+            createCookie(key, properties[key], { useDefaultFunnelCookieAttributes, maxAge });
         });
     }
 }
@@ -135,12 +142,34 @@ function setFunnelCookieProperties(properties) {
             });
 
             const cookieValueJson = JSON.stringify(cookie);
-
-            document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${cookieValueJson}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
+            
+            createCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
         }
     }
 }
 
+/*
+    Used to create a cookie. 
+    `useDefaultFunnelCookieAttributes` will set the path and domain to our defaults
+*/
+function createCookie(key, value, { useDefaultFunnelCookieAttributes = true, maxAge, isSecure = true }) {
+    let cookieToAdd = `${key}=${value}; `;
+    console.log(isSecure)
+    console.log(useDefaultFunnelCookieAttributes)
+
+    if (useDefaultFunnelCookieAttributes) {
+        cookieToAdd += `path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()} `;
+    }
+    if (isSecure) {
+        cookieToAdd += `secure; `;
+    }
+    if (maxAge) {
+        cookieToAdd += `max-age=${maxAge};`;
+    }
+
+    document.cookie = cookieToAdd;
+}
+
 /*
     Gets current domain without the subdomain for cookie.
 */
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index e24a55e36..f5535188b 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -122,10 +122,14 @@ export default {
       
       if (response.data) {
         if (response.data.sessionKey && skey === 0) {
-          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey});
+          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey}, {
+            useDefaultFunnelCookieAttributes: false
+          });
         }
         if (response.data.sessionId && sid === '00000000-0000-0000-0000-000000000000') {
-          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId});
+          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId}, {
+            maxAge: 60 * 30   // 30 minutes
+          });
         }
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 6fcd48c28..e2c1fe4d1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,7 +10,7 @@ import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 
 // Heritage integration
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { updateOrCreateFunnelCookie, getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { updateOrCreateFunnelCookie, getFunnelCookie, updateSessionIdCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper";
 import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
@@ -31,6 +31,9 @@ const routes = [
         if (analyticsMixin.methods.noSession()) {
           await analyticsMixin.methods.initSession();
         }
+        else {
+          updateSessionIdCookie();
+        }
 
         if (getFunnelCookie()?.SuppressConceptFunnel) {
           await navigateToHeritageFunnel(false);

From d96731a0d29c80dc6210704b870574659f6240b9 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 17 Aug 2022 10:17:21 -0400
Subject: [PATCH 09/29] Added 'undefined' check for when we are attempting to
 pull the ConceptFunnel experiment from the experiments collection as it may
 not be present when running locally

---
 src/layouts/vehicle-year/vehicle-year.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 78fd8b05c..8d70f88d8 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -51,14 +51,17 @@ export default {
 
     const experimentForLogging = store.getters.applicationUser.experiments.find(e => e.universeName === experimentUniverses.CONCEPT_FUNNEL);
 
-    // Log experiment exposure
-    baseMixin.methods.dispatchStoreAction(storeActions.LOG_EXPERIMENT_EXPOSURE, 
-    {
-      userId: getDeviceIdValue(),
-      sessionKey: getSessionKeyValue(),
-      pageName: to.query.fmgPage,
-      experiment: experimentForLogging
-    }, false);
+    // If the concept funnel experiment is found, as it should be when coming from safelite.com, then log the experiment exposure.
+    if (experimentForLogging !== undefined) {
+      // Log experiment exposure
+      baseMixin.methods.dispatchStoreAction(storeActions.LOG_EXPERIMENT_EXPOSURE, 
+      {
+        userId: getDeviceIdValue(),
+        sessionKey: getSessionKeyValue(),
+        pageName: to.query.fmgPage,
+        experiment: experimentForLogging
+      }, false);
+    }
 
     // Settle promises and get results
     const promiseResultMap = [

From 61ccfe268b522b395106cd19203b3c79fc421552 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 17 Aug 2022 11:32:54 -0400
Subject: [PATCH 10/29] CSR-111 Fix tests and cleanup

---
 .../heritage-integration/cookie-helper.js     | 33 ++++++++++---------
 src/helpers/unit-test-helper.js               |  5 +--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 69d4ee4b5..f6f44e3e4 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -10,7 +10,8 @@ export function updateOrCreateFunnelCookie() {
     const shouldSuppressConceptFunnel = getFunnelCookie()?.SuppressConceptFunnel;
     
     // Create the cookie
-    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}={}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
+    // if (!getFunnelCookie())
+    //     createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, {}, {});
 
     // Set up cookie with all the props.
     setFunnelCookieProperties({
@@ -48,14 +49,14 @@ export function getFunnelCookie() {
     Removes cookie from browser.
 */
 export function deleteFunnelCookie() {
-    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=; Max-Age=0; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
+    createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, undefined, { maxAge: 0 });
 }
 
 /*
     Gets cookie domain value. Localhost will be empty "".
 */
 export function getCookieDomainValue() {
-    return location.hostname.includes("localhost") ? "" : `domain=${getDomainWithoutSubdomain()};`;
+    return isLocalhost() ? "" : `domain=${getDomainWithoutSubdomain()};`;
 }
 
 /*
@@ -110,13 +111,13 @@ export function getSessionIdValue(){
     Updates session ID cookie with new expiration date
 */
 export function updateSessionIdCookie() {
-    createCookie(cookieNames.SESSION_ID, getSessionIdValue(), { maxAge: 60 * 30 });
+    createOrUpdateCookie(cookieNames.SESSION_ID, getSessionIdValue(), { maxAge: 60 * 30 });
 }
 
-export function setCookieProperties(properties, { useDefaultFunnelCookieAttributes = true, maxAge }) {
+export function setCookieProperties(properties, { useDefaultFunnelCookieAttributes = true, maxAge, isSecure }) {
     if (typeof properties == "object") {
         Object.keys(properties).forEach(key => {
-            createCookie(key, properties[key], { useDefaultFunnelCookieAttributes, maxAge });
+            createOrUpdateCookie(key, properties[key], { useDefaultFunnelCookieAttributes, maxAge, isSecure });
         });
     }
 }
@@ -133,6 +134,7 @@ export function setCookieProperties(properties, { useDefaultFunnelCookieAttribut
     Takes an object with properties to set. Will overwrite existing properties.
 */
 function setFunnelCookieProperties(properties) {
+    
     if (typeof properties == "object") {
         let cookie = getFunnelCookie();
 
@@ -141,9 +143,8 @@ function setFunnelCookieProperties(properties) {
                 cookie[key] = properties[key];
             });
 
-            const cookieValueJson = JSON.stringify(cookie);
-            
-            createCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
+            const cookieValueJson = JSON.stringify(cookie);            
+            createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
         }
     }
 }
@@ -152,18 +153,16 @@ function setFunnelCookieProperties(properties) {
     Used to create a cookie. 
     `useDefaultFunnelCookieAttributes` will set the path and domain to our defaults
 */
-function createCookie(key, value, { useDefaultFunnelCookieAttributes = true, maxAge, isSecure = true }) {
+function createOrUpdateCookie(key, value = "", { useDefaultFunnelCookieAttributes = true, maxAge, isSecure = true }) {
     let cookieToAdd = `${key}=${value}; `;
-    console.log(isSecure)
-    console.log(useDefaultFunnelCookieAttributes)
 
     if (useDefaultFunnelCookieAttributes) {
         cookieToAdd += `path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()} `;
     }
-    if (isSecure) {
+    if (isSecure && !isLocalhost()) {
         cookieToAdd += `secure; `;
     }
-    if (maxAge) {
+    if (!isNaN(maxAge)) {
         cookieToAdd += `max-age=${maxAge};`;
     }
 
@@ -175,7 +174,7 @@ function createCookie(key, value, { useDefaultFunnelCookieAttributes = true, max
 */
 function getDomainWithoutSubdomain() {
     let url = location.hostname;
-    if (url.includes("localhost")) {
+    if (isLocalhost()) {
         return "localhost";
     }
 
@@ -198,4 +197,8 @@ function getCookieValueByName(name) {
         return parts.pop().split(";").shift();
     }
     return "";
+}
+
+function isLocalhost() {
+    return location.hostname.includes("localhost");
 }
\ No newline at end of file
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 67a3dc8ae..7e26667e7 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -6,7 +6,7 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
-import { getCookieDomainValue } from "@/helpers/heritage-integration/cookie-helper";
+import { getCookieDomainValue, setCookieProperties } from "@/helpers/heritage-integration/cookie-helper";
 import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
 import { routerParams } from "@/router/router-constants/router-params";
@@ -106,7 +106,8 @@ export function setupCookies({ funnelCookieValue = "", includeHeritageCookie = t
   Object.keys(cookies).forEach(key => {
       const cookieValue = key == cookieNames.FUNNEL_SESSION_INFO ? funnelCookieValue : cookies[key];
       if (includeHeritageCookie || key != cookieNames.FUNNEL_SESSION_INFO)
-          document.cookie = `${key}=${cookieValue}; path=/; ${getCookieDomainValue()}`;
+        setCookieProperties({ [key]: cookieValue }, { isSecure: false });
+      // document.cookie = `${key}=${cookieValue}; path=/; ${getCookieDomainValue()}`;
   });
 }
 

From 8d01c6b1b3c296c4e19368294d831f2ad46bd5ee Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 17 Aug 2022 11:35:03 -0400
Subject: [PATCH 11/29] CSR-759 Cleanup

---
 src/helpers/heritage-integration/cookie-helper.js | 4 ----
 src/helpers/unit-test-helper.js                   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index f6f44e3e4..6f4cf1c3b 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -9,10 +9,6 @@ export function updateOrCreateFunnelCookie() {
     const wasClaimRegistrationDelayed = getFunnelCookie()?.HasDelayedClaimRegistration;
     const shouldSuppressConceptFunnel = getFunnelCookie()?.SuppressConceptFunnel;
     
-    // Create the cookie
-    // if (!getFunnelCookie())
-    //     createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, {}, {});
-
     // Set up cookie with all the props.
     setFunnelCookieProperties({
         LastTouched: new Date().toUTCString(),
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 7e26667e7..cc00e49d9 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -107,7 +107,6 @@ export function setupCookies({ funnelCookieValue = "", includeHeritageCookie = t
       const cookieValue = key == cookieNames.FUNNEL_SESSION_INFO ? funnelCookieValue : cookies[key];
       if (includeHeritageCookie || key != cookieNames.FUNNEL_SESSION_INFO)
         setCookieProperties({ [key]: cookieValue }, { isSecure: false });
-      // document.cookie = `${key}=${cookieValue}; path=/; ${getCookieDomainValue()}`;
   });
 }
 

From 264b189a9a2021f63c94a5f2d1982d5b653e58e0 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 17 Aug 2022 11:37:32 -0400
Subject: [PATCH 12/29] CSR-759 Cleanup

---
 src/helpers/heritage-integration/cookie-helper.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 6f4cf1c3b..dc1872e74 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -130,7 +130,6 @@ export function setCookieProperties(properties, { useDefaultFunnelCookieAttribut
     Takes an object with properties to set. Will overwrite existing properties.
 */
 function setFunnelCookieProperties(properties) {
-    
     if (typeof properties == "object") {
         let cookie = getFunnelCookie();
 

From 207d18ab805a402245e813862bd9ae9ce682c792 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 18 Aug 2022 03:15:31 -0400
Subject: [PATCH 13/29] CSR-108: updates for handling duplicate questions and
 loading a previous user state

---
 .../question-chain/question-chain.vue         |  83 ++++----
 src/layouts/part-questions/part-questions.vue | 188 +++++++++++++++---
 src/ux-components/list-button/list-button.vue |  30 ++-
 3 files changed, 218 insertions(+), 83 deletions(-)

diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index 9fa281f50..3ac603eb2 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -7,8 +7,9 @@
                 :class="(q.questionSequence === currentQuestionNum) && 'current-question'"
                 :questionText="q.questionText"
                 :answers="q.answers"
-                :groupName="`${questionData.glassName}-${questionData.glassLocation}-${i}`"
-                v-model="selectedValue"
+                :groupName="`${keyString}-${q.questionSequence}`"
+                v-model="q.answerSelected"
+                @isCheckedChanged="handleChainCompleted"
                 isRequired
                 :validationRules="validationRules"
             />
@@ -24,8 +25,8 @@ export default {
   name: "questionChain",
   data() {
     return {
-      currentQuestionNum: 1,
-      questions: [{ "BlankObject": "NOT USED... placeholder for question #0 to simplify indexing"}],
+      currentQuestionNum: 0,
+      questions: [],
     };
   },
   props: {
@@ -33,13 +34,13 @@ export default {
     validationRules: String,
     modelValue: Array,
     partIndex:  Number,
-    key: String,
+    keyString: String,
   },
   async created() {
     // validate form upon create to prevent out of sync / persistent valid states
     await useValidateForm(); // do a test validation check, without triggering full validation
 
-    this.questionData.partQuestions.map((q, i) => {
+    this.questionData.map((q, i) => {
       let answerPair = [];
       const question = {
         questionText: q.questionText,
@@ -47,7 +48,7 @@ export default {
         answers: q.answers.map((a) => {
             answerPair.push(a.nextQuestionSequence ? a.nextQuestionSequence : a.answerResult);
             return {
-                Text: a.answerText + " (" + a.answerResult + a.nextQuestionSequence + ")",
+                Text: a.answerText,
                 // Name will either be nextQuestionSequence or answerResult
                 // Name will be used by list-button as the input value.
                 // It must be a single string or number, so concatenating together a string with
@@ -59,34 +60,32 @@ export default {
                 nextQuestionSequence: a.nextQuestionSequence,
             }
         }),
-        answerSelected: "",
+        answerSelected: q.answerSelected || "",
       };
       question.answerPair = answerPair;
-      if (!q.suppressQuestion) {
+      if (!q.isDuplicateQuestion) {
         this.questions.push(question);
       }
     });
-    // set this.currentQuestionNum to first valid question
-    this.currentQuestionNum = this.questions[1].questionSequence;
-  },
-  computed: {
-    selectedValue: {
-      get: function() {
-        return this.modelValue[0];
-      },
-      set: function(returnedAnswer) {
-        const isQuestionChainComplete = this.handleReturnedAnswer(returnedAnswer);
 
-        if (isQuestionChainComplete) {
-            this.$emit("update:modelValue", isQuestionChainComplete);
-        }
-      }
-    },
-    currentQuestion() {
-      return this.questions[this.currentQuestionNum];
-    },
+    if (!this.modelValue?.length > 0) {
+      // set this.currentQuestionNum to first valid question
+      this.currentQuestionNum = this.questions[0].questionSequence;
+      // scroll the next question into view
+      this.$nextTick(() => {
+          document.querySelector('.current-question').scrollIntoView({behavior: "smooth"});
+      })
+    }
+
   },
   methods: {
+    handleChainCompleted(returnedAnswer) {
+      const isQuestionChainComplete = this.handleReturnedAnswer(returnedAnswer.value);
+
+      if (isQuestionChainComplete) {
+        this.$emit("update:modelValue", isQuestionChainComplete);
+      }
+    },
     handleReturnedAnswer(returnedAnswer) {   // this method will return either a final answer or Boolean false
       if (!returnedAnswer) { return false }
 
@@ -103,7 +102,7 @@ export default {
       this.questions.forEach((q) => {
         // mark this question as "answered"
         if (q.questionSequence === questionNum) {
-          q.answerSelected = questionAnswerText;
+          q.answerSelected = returnedAnswer;
           q.answerNumber = questionNum;
         }
         // remove all previous answers after the index of this one in questions
@@ -112,11 +111,14 @@ export default {
         }
       });
 
-      // update to next question index
-      this.currentQuestionNum = questionType === "nextQuestion" ? parseInt(questionAnswer) : questionNum; // update count to display next question
-
       // return false if there's a nextQuestion... or return an object with "final" answers
       if (questionType === "nextQuestion") {
+        // update to next question index
+        this.currentQuestionNum = parseInt(questionAnswer); // update count to display next question
+        // scroll the next question into view
+        this.$nextTick(() => {
+            document.querySelector('.current-question').scrollIntoView({behavior: "smooth"});
+        })
         return false;
       } else {
         const answeredQuestions = [];
@@ -124,30 +126,23 @@ export default {
           if (q.answerSelected) {
             answeredQuestions.push({
               questionText: q.questionText,
-              selectedAnswerText: q.answerSelected,
-              questionNum: q.answerNumber,
+              selectedAnswerText: q.answerSelected.split("|")[3],
+              questionNum: q.questionSequence,
             });
           }
         });
+        // reset current question index
+        this.currentQuestionNum = 0; // reset count
+
         return {
             answerResult: questionAnswer,
             answeredQuestions: answeredQuestions,
             partIndex: this.partIndex,
         };
+
       }
     },
   },
-  watch: {
-    currentQuestion: {
-      handler() {
-        // scrolls page to next active question
-        this.$nextTick(() => {
-          document.querySelector('.current-question').scrollIntoView({behavior: "smooth"});
-        })
-      },
-      deep: true
-    }
-  },
   components: {
     buttonQuestion,
   },
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index cfaa97fc8..5ae215a41 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -24,8 +24,9 @@
                     <questionChain
                         ref="questionChain"
                         :key="part.key"
-                        v-model="selectedAnswer"
-                        :questionData="part"
+                        :keyString="part.key"
+                        v-model="selectedAnswers[part.glassLocation + '-' + part.glassName]"
+                        :questionData="part.partQuestions"
                         :partIndex="i"
                         v-if="showThisPartQuestionChain(part, i)"
                         validationRules="questions-required"
@@ -95,7 +96,7 @@ export default {
             partsQuestionsFromApi: this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions.filter((p) => {
                 return Array.isArray(p.partQuestions) && p.partQuestions.length > 0;
             }),
-            selectedAnswer: [],
+            selectedAnswers: {},
             currentPartNum: 0,
             newAnswersArray: [],
             partsQuestionsData: [],
@@ -112,14 +113,11 @@ export default {
     },
     mixins: [vehicleQuestionsMixin],
     mounted() {
-        this.partsQuestionsData = this.partsQuestionsFromApi.map((part, i) => {
-            part.key = part.glassLocation + part.glassName;
-            return part;
-        });
+        this.LoadInitialPartsData();
     },
     methods: {
         showThisPartQuestionChain(part, i) {
-            if (part.partQuestions?.length < 1 || part.suppressPart) { return false; } // return false if no partQuestions or if suppressed
+            if (part.partQuestions?.length < 1 || part.isSuppressedPart) { return false; } // return false if no partQuestions or if suppressed
             if (this.currentPartNum === i || part.answerData?.answerResult?.length > 0) { return true; }
             return false;
         },
@@ -137,6 +135,7 @@ export default {
                     glassName: item.glassName,
                     result: item.answerData.answerResult,
                     answeredQuestions: item.answerData.answeredQuestions,
+                    isSuppressedPart: item.isSuppressedPart,
                 };
             });
 
@@ -185,20 +184,22 @@ export default {
         arePagePrerequisitesValid() {
             return Object.keys(store.getters.pageData(fmgPageValues.PART_QUESTIONS)).length > 0;
         },
-    },
-    watch: {
-        selectedAnswer(answer) {
-            // when selectedAnswer updates, user has completed this part's question chain and has a final answer
+        handleAnswerUpdates(key, answer) { // only runs when all questions in a question-chain have been answered
+            // when selectedAnswers updates, user has completed this part's question chain and has a final answer
                 // (does not get run for each invididual question's answer, only when 
                 //  all relevent questions for the current part have been answered)
-            const glassPart = this.partsQuestionsData[answer.partIndex];
-            const completeAnsweredQuestions = [...answer.answeredQuestions];
+            const glassPartWithAnswer = this.partsQuestionsData[answer.partIndex];
+            const completeAnsweredQuestions = answer.answeredQuestions ? [...answer.answeredQuestions] : [];
             const answeredQuestionIndexes = [];
 
+            // since user has answered a question differently than anything that was preloaded,
+            //     then clear out the preloaded answers
+            this.selectedAnswers = {};
+
             // examine all the answers returned that were part of the user's journey through question-chain
 
             // loop through every answered question on currently answered glass part
-            answer.answeredQuestions.forEach((aq) => {
+            answer.answeredQuestions?.forEach((aq) => {
 
                 // gather all the question numbers of the answered questions
                 answeredQuestionIndexes.push(aq.questionNum);
@@ -215,14 +216,18 @@ export default {
 
                         // loop through this glass part's part questions, looking for a questionText match
                         glassPart.partQuestions.forEach((pq, pqIndex) => {
-                            // does pq.questionText match answeredQuestionText? (do we have a duplicate question?)
+                            // clear out any previously set answers
+                            //delete pq.answerSelected;
+                            pq.answerSelected = null;
 
+                            // does pq.questionText match answeredQuestionText? (aka do we have a duplicate question?)
                             if (pq.questionText.toUpperCase() === answeredQuestionText) {
+                                
                                 // which one of this partQuestions' answers matches our answer?
-
                                 let matchedAnswer;
                                 pq.answers.forEach((ans, ansIndex) => {
-                                    delete pq.answers[ansIndex].selected;
+                                    // delete pq.answers[ansIndex].selected;
+                                    pq.answers[ansIndex].selected = null;
                                     if (ans.answerText.toUpperCase() === answeredQuestionAnswer) {
                                         matchedAnswer = ans;
                                         pq.answers[ansIndex].selected = true;
@@ -233,8 +238,10 @@ export default {
                                     const thisAnsweredPartQuestion = glassPart.partQuestions[pqIndex];
 
                                     // remove answerData from this glass part
-                                    delete glassPart.answerData;
-                                    delete glassPart.suppressPart;
+                                    // delete glassPart.answerData;
+                                    glassPart.answerData = null;
+                                    // delete glassPart.isSuppressedPart;
+                                    glassPart.isSuppressedPart = null;
 
                                     // Update the key to re-render this part's question-chain component
                                     this.partsQuestionsData[i].key = this.partsQuestionsData[i].glassLocation + this.partsQuestionsData[i].glassName + Date.now().toString();
@@ -245,11 +252,11 @@ export default {
                                     });
 
                                     if (rejectedAnswer[0].nextQuestionSequence) {
-                                        glassPart.partQuestions[rejectedAnswer[0].nextQuestionSequence - 1].suppressQuestion = true;
+                                        glassPart.partQuestions[rejectedAnswer[0].nextQuestionSequence - 1].suppressDuplicateQuestion = true;
                                     }
                                     if (matchedAnswer.nextQuestionSequence) {
                                         // ensure that accepted answer is NOT suppressed
-                                        delete glassPart.partQuestions[matchedAnswer.nextQuestionSequence - 1].suppressQuestion;
+                                        glassPart.partQuestions[matchedAnswer.nextQuestionSequence - 1].suppressDuplicateQuestion = null;
                                     }
 
                                     // handle suppressing upstream in this question chain
@@ -259,11 +266,11 @@ export default {
                                             if (thisAns.originalNextQuestionSequence === pq.questionSequence) {
                                                 // restore original nextQuestionSequence
                                                 thisAns.nextQuestionSequence = thisAns.originalNextQuestionSequence;
-                                                delete thisAns.originalNextQuestionSequence;
+                                                this.originalNextQuestionSequence = null;
                                                 // restore original answerResult
                                                 if (thisAns.originalAnswerResult) {
                                                     thisAns.answerResult = thisAns.originalAnswerResult;
-                                                    delete thisAns.originalAnswerResult;
+                                                    thisAns.originalAnswerResult = null;
                                                 }
                                             }
                                             // search for any of the answers that lead to the duplicated question
@@ -283,7 +290,7 @@ export default {
                                     });
                                     
                                     // suppress current question
-                                    thisAnsweredPartQuestion.suppressQuestion = true;
+                                    thisAnsweredPartQuestion.suppressDuplicateQuestion = true;
                                     
                                     const thisGlassPart = "glassPart" + i;
                                     if (this.foundDuplicateQuestions[thisGlassPart]) {
@@ -296,7 +303,7 @@ export default {
 
                                     // are there any questions left that are not suppressed?
                                     const remainingQuestions = glassPart.partQuestions.filter((q) => {
-                                        return !q.suppressQuestion;
+                                        return !q.suppressDuplicateQuestion;
                                     });
 
                                     if (remainingQuestions.length < 1) {
@@ -307,6 +314,7 @@ export default {
                                             questionText: pq.questionText,
                                             selectedAnswerText: matchedAnswer.answerText,
                                             questionNum: pq.questionSequence,
+                                            isDuplicateQuestion: pq.suppressDuplicateQuestion,
                                         };
                                         // set the answerData as 'already answered'
                                         glassPart.answerData = {
@@ -315,7 +323,7 @@ export default {
                                         };
 
                                         // suppress this glassPart because it has an answer
-                                        glassPart.suppressPart = true;
+                                        glassPart.isSuppressedPart = true;
                                     }
 
                                 } // END of if (matchedAnswer)
@@ -323,6 +331,10 @@ export default {
                             }
 
                         });
+
+                        // Update the key to re-render this part's question-chain component
+                        this.partsQuestionsData[i].key = this.partsQuestionsData[i].glassLocation + this.partsQuestionsData[i].glassName + Date.now().toString();
+
                     }
 
                 });
@@ -343,10 +355,10 @@ export default {
 
             thisPartsDupes?.forEach((dupe) => {
                 // dupe is a single integer
-                const dupeQuestion = glassPart.partQuestions[dupe - 1];
+                const dupeQuestion = glassPartWithAnswer.partQuestions[dupe - 1];
                 const dupeQuestionAnswer = dupeQuestion.answers.find((q) => q.selected === true);
 
-                glassPart.partQuestions.forEach((q) => {
+                glassPartWithAnswer.partQuestions.forEach((q) => {
                     let includeThisDupeInAnsweredQuestions = false;
 
                     // did one of the answers of this question point to the duplicated question?
@@ -358,7 +370,7 @@ export default {
                         }
                     });
 
-                    // is this q.questionSequnce listed as the duplicated question's nextQuestionSequence?
+                    // is this q.questionSequence listed as the duplicated question's nextQuestionSequence?
                     if ((q.questionSequence === dupeQuestionAnswer.nextQuestionSequence) && (answeredQuestionIndexes.includes(q.questionSequence))) {
                         includeThisDupeInAnsweredQuestions = true;
                     }
@@ -368,12 +380,13 @@ export default {
                             questionNum: dupeQuestion.questionSequence,
                             questionText: dupeQuestion.questionText,
                             selectedAnswerText: dupeQuestionAnswer.answerText,
+                            isDuplicateQuestion: dupeQuestion.suppressDuplicateQuestion,
                         });
                     }
                 });
             });
 
-            // make sure there are no duplicated dupes...
+            // make sure there are no duplicated dupes in the list...
             const foundInCompleteAnsweredQuestions = new Set();
             let filteredCompleteAnsweredQuestions = completeAnsweredQuestions.filter(el => {
                 const duplicate = foundInCompleteAnsweredQuestions.has(el.questionText);
@@ -383,7 +396,7 @@ export default {
             filteredCompleteAnsweredQuestions = filteredCompleteAnsweredQuestions.sort((a,b) => a.questionNum - b.questionNum);
 
             // set final answer data for the current answered glass part
-            glassPart.answerData = {
+            glassPartWithAnswer.answerData = {
                 answerResult: answer.answerResult,
                 answeredQuestions: filteredCompleteAnsweredQuestions,
             }
@@ -396,6 +409,117 @@ export default {
                     break;
                 }
             }
+
+        },
+        LoadInitialPartsData() {
+            
+            // are there alreadyAnsweredQuestions?
+            const alreadyAnsweredQuestions = store.getters.damage.partQuestionAnswers;
+            
+            this.partsQuestionsData = this.partsQuestionsFromApi.map((part, i) => {
+                part.key = part.glassLocation + "-" + part.glassName;
+                this.selectedAnswers[part.key] = [];
+
+                alreadyAnsweredQuestions?.forEach((savedPart) => {
+                    if (!savedPart.glassLocation || !savedPart.glassName || !savedPart.answeredQuestions || !savedPart.result) {
+                        return;
+                    }
+                    if (part.glassLocation === savedPart.glassLocation && part.glassName === savedPart.glassName) {
+                        let answerString = "";
+
+                        // matches; loop through answeredQuestions for matches
+                        savedPart.answeredQuestions.forEach((aq) => {
+                            if (!aq.questionNum || !aq.selectedAnswerText) {
+                                return;
+                            }
+                            // determine which answer was previously chosen
+                            const theAns = part.partQuestions[aq.questionNum-1].answers.find((a) => {
+                                return a.answerText.toUpperCase() === aq.selectedAnswerText.toUpperCase();
+                            });
+                            if (theAns.nextQuestionSequence) {
+                                answerString = `${aq.questionNum}|nextQuestion|${theAns.nextQuestionSequence}|${theAns.answerText}`
+                            } else {
+                                answerString = `${aq.questionNum}|answer|${theAns.answerResult}|${theAns.answerText}`
+                            }
+
+                            // mark this partQuestion as answered (question-chain will read this)
+                            part.partQuestions[aq.questionNum-1].answerSelected = answerString;
+                            // mark this partQuestion as duplicate if it is (question-chain will read this)
+                            if (aq.isDuplicateQuestion) {
+                                part.partQuestions[aq.questionNum-1].isDuplicateQuestion = true;
+                            }
+                        });
+
+                        // advance the currentPartNum
+                        this.currentPartNum = i;
+
+                        // add answerData to current part
+                        part.answerData = {
+                            answerResult: savedPart.result,
+                            answeredQuestions: savedPart.answeredQuestions
+                        }
+                    }
+                });
+
+                // Set up watch for each set of part questions, which gets updated when all questions for a part have been answered
+                this.$watch("selectedAnswers." + part.key, (newValue) => {
+                    if (newValue) {
+                        this.handleAnswerUpdates(part.key, newValue);
+                    }
+                }, {deep: true})
+
+                return part;
+            });
+
+            // this block is purely for handling duplicate questions
+            alreadyAnsweredQuestions?.forEach((savedPart, partIndex) => {
+                savedPart.answeredQuestions.forEach((aq) => {
+                    if (aq.isDuplicateQuestion) {
+                        // find this one in partsQuestionData
+                        const dupedPartsQuestion = this.partsQuestionsData[partIndex].partQuestions[aq.questionNum - 1];
+                        dupedPartsQuestion.suppressDuplicateQuestion = true;
+
+                        const dupedPartsQuestionAnswer = dupedPartsQuestion.answers.filter((ans) => {
+                            return ans.answerText.toUpperCase() === aq.selectedAnswerText.toUpperCase();
+                        })[0];
+
+                        let isDupedPartsQuestionFirst;
+                        if (aq.questionNum === 1) { isDupedPartsQuestionFirst = true }
+
+                        this.partsQuestionsData.forEach((glassPart, i) => {
+
+                            // loop through this glass part's part questions, looking for a questionText match
+                            glassPart.partQuestions.forEach((pq, pqIndex) => {
+                                // if this dupedQ is the first in the array then 
+                                //     suppress all questions for this part up until the answer's nextQuestionSequence
+                                if (isDupedPartsQuestionFirst && 
+                                    dupedPartsQuestionAnswer.nextQuestionSequence &&
+                                    pq.questionSequence < dupedPartsQuestionAnswer.nextQuestionSequence) {
+                                        pq.suppressDuplicateQuestion = true;
+                                    }
+                                pq.answers.forEach((thisAns) => {
+                                    if (thisAns.nextQuestionSequence === aq.questionNum) {
+                                        // update either the nextQuestionSequence or the answerResult
+                                        if (dupedPartsQuestionAnswer.nextQuestionSequence) {
+                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
+                                            thisAns.nextQuestionSequence = dupedPartsQuestionAnswer.nextQuestionSequence;
+                                            // update this change to answerSelected
+                                            pq.answerSelected = `${pq.questionSequence}|nextQuestion|${thisAns.nextQuestionSequence}|${thisAns.answerText}`;
+                                        } else {
+                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
+                                            thisAns.nextQuestionSequence = null;
+                                            thisAns.originalAnswerResult = thisAns.originalAnswerResult || thisAns.answerResult;
+                                            thisAns.answerResult = dupedPartsQuestionAnswer.answerResult;
+                                        }
+                                    }
+                                })
+                            });
+                            
+                        });
+
+                    }
+                })
+            });
         },
     },
     components: {
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index b82559812..a3dc83af3 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -15,6 +15,7 @@
       :value="value"
       :aria-required="isRequired"
       v-model="checkValue"
+      :checked="checkValue"
       @change="handleInputChange"
       :aria-label="value"
     >
@@ -54,6 +55,7 @@
 
 <script>
 import { useField } from "vee-validate";
+import { toRef } from "vue";
 import loader from "@/ux-components/loader/loader";
 import { queryStrings } from "@/constants/query-strings";
 
@@ -85,17 +87,28 @@ export default {
   data() {
     return {
       isLoaderDisplayed: false,
-      checkValue: Boolean,
+      checkValue: false,
     };
   },
-  created() {
-    if (Array.isArray(this.selectedValues)) {
-      this.checkValue = this.isMultiSelect
-        ? this.selectedValues.includes(this.value)
-        : this.selectedValues[0];
+  mounted() {
+    if (Array.isArray(this.validateValue)) {
+      this.checkValue = this.isValueSelectedByArray(this.selectedValues);
+      const isSelectedByValidator = this.isValueSelectedByArray(this.validateValue);
+      
+      if (this.checkValue != isSelectedByValidator) {
+        this.handleChange(this.value);
+      }
+    }
+    else {
+      this.checkValue = this.selectedValues == this.value;
     }
   },
   methods: {
+    isValueSelectedByArray(arr) {
+      return this.isMultiSelect
+        ? arr.includes(this.value)
+        : arr[0];
+    },
     displayLoader() {
       this.isLoaderDisplayed = true;
     },
@@ -148,11 +161,14 @@ export default {
     const {
       handleChange,
       errors,
-    } = useField(props.groupName, props.validationRules, fieldOptions);
+      value
+    } = useField(toRef(props, "groupName"), toRef(props, "validationRules"), fieldOptions);
 
+    const validateValue = value;
     return {
       handleChange,
       errors,
+      validateValue,
       fieldOptions, // only need to expose this for unit test purposes
     };
   },

From cd2321a93f7356e4ca6e98ed78d15ebf794fc3e6 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 18 Aug 2022 03:21:37 -0400
Subject: [PATCH 14/29] CSR-108: update unit tests

---
 src/ux-components/list-button/list-button.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ux-components/list-button/list-button.spec.js b/src/ux-components/list-button/list-button.spec.js
index 7cce84cd8..53c7f5f65 100644
--- a/src/ux-components/list-button/list-button.spec.js
+++ b/src/ux-components/list-button/list-button.spec.js
@@ -187,7 +187,7 @@ describe("list-button.vue", () => {
     wrapper.vm.handleCheckChange();
 
     // Assert
-    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: Boolean, buttonId: 'list-card-id'}]);
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: false, buttonId: 'list-card-id'}]);
 
   });
 
@@ -204,11 +204,11 @@ describe("list-button.vue", () => {
         isRequired: true,
         isWide: false,
         modelValue: ["List Card Checkbox"],
-        selectedValues: ["Car-Front"]
+        selectedValues: "Car-Front"
       },
     });
     // Assert
-    expect(wrapper.componentVM.checkValue).toEqual("Car-Front");
+    expect(wrapper.componentVM.checkValue).toEqual(false);
   });
 
   it("Should run handleCheckChange if selectingInitiatesLoad is false and handleInputChange is triggered", async () => {

From fa9f4c0ef54ee35fdd03caba9c0a4b3a08188e24 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 08:30:09 -0400
Subject: [PATCH 15/29] CSR-111-part Go to QuoteDetails instead of quote,
 update tests

---
 .../capability-questions.vue                  |   1 +
 .../vehicle-parts/vehicle-parts.spec.js       |  15 +-
 src/mixins/vehicle-questions-mixin.js         |  14 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 991 +++++++++++++++++-
 src/mixins/vin-pages-mixin.spec.js            | 972 +----------------
 5 files changed, 1026 insertions(+), 967 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 5146e7f9e..ea51194e8 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -6,6 +6,7 @@
       v-slot="{ meta }"
     >
         <div class="page-container-grouped-styles capability-questions">
+            <loadingModal ref="loadingModal"/>
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index bd7911da4..2e9110d7a 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -9,6 +9,7 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 import baseMixin from "@/mixins/base-mixin.js";
+import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
@@ -227,7 +228,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS, wrapper.vm.$route);
 
     });
 
@@ -266,7 +267,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP, wrapper.vm.$route);
 
     });
 
@@ -311,6 +312,7 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
+        store.getters.lineItems = { glassParts: {} }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -367,6 +369,8 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
+        store.getters.lineItems = { glassParts: {} }
+        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -382,6 +386,12 @@ describe("vehicle-parts.vue", () => {
                     getters: store.getters,
                     commit: store.commit
                 },
+                actionList: [
+                    {
+                        actionName: storeActions.GET_CAPABILITY_QUESTIONS,
+                        data: []
+                    }
+                ]
             }
         });
 
@@ -406,6 +416,7 @@ describe("vehicle-parts.vue", () => {
         //Arrange
         store.getters.pageData.mockReturnValueOnce(basePartResponse);
         store.getters.lineItems = { glassParts: {} }
+        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 73b7ae071..94fa044fb 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -3,6 +3,8 @@ import { storeMutations } from "@/constants/store-mutations.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 import { storeActions } from "@/constants/store-actions";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 
 export default {
@@ -68,6 +70,9 @@ export default {
             const currentPage = self.$route.query.fmgPage;
             
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
+            console.log("hasPartQuestions: ", hasPartQuestions)
+            console.log("currentPage: ", currentPage)
+            console.log("this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS): ", this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS))
             const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
@@ -86,9 +91,10 @@ export default {
             } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
+                console.log(store.getters.vehicle)
 
                 const windshieldPart = partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0];
-                let capabilityQuestions = (await store.dispatch(storeActions.GET_CAPABILITY_QUESTIONS, {
+                let capabilityQuestions = (await baseMixin.methods.dispatchStoreAction(storeActions.GET_CAPABILITY_QUESTIONS, {
                     carId: store.getters.vehicle.carId,
                     partNumber: windshieldPart.partNumber
                 })).data;
@@ -108,8 +114,12 @@ export default {
                 const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
                
-                self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
+                // For quote pages MVP release
+                // self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
             }
         },
         backButtonAction() {
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 01d41b9c8..13a2f083a 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,8 +1,22 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { storeMutations } from "@/constants/store-mutations";
+import { storeActions } from "@/constants/store-actions";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn()
+}));
 
 describe("vehicle-questions-mixin", () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    })
+
     describe("hasPartQuestions", () => {
         test("has no part questions => return false", () => {
             // Arrange
@@ -139,23 +153,994 @@ describe("vehicle-questions-mixin", () => {
             expect(hasGlassLocationWithMultipleParts).toBe(true);
         });
     });
+
+    describe("navigateForward", () => {
+        describe("should go to parts-questions", () => {
+            test("single glass location has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations have part questions => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 2,
+                                "questionText": "Is this a super awesome question?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144000"
+                                    },
+                                    {
+                                        "answerText": "Super yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143001"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ08162YPYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD08160YPYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08165YPNN",
+                                "description": "heated glass, stationary",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08166GTNN",
+                                "description": "stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167GTNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167YPNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to vehicle-parts", () => {
+            test("single glass location has multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW03647GTNN",
+                                "description": "solar, 3rd visor band",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": [
+                                    {
+                                        "partNumber": "MWF03647",
+                                        "partType": "MOULDING",
+                                        "description": "Upper "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25747GTYN",
+                                "description": "solar, driver side, rear, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25719GTYN",
+                                "description": "solar, driver side, front, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25749GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "DW02101GTYN",
+                                "description": "solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12202GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12202YPYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12198GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12200GTYN",
+                                "description": "solar, driver side, front, laminated, soundproofing",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ12204GTYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12204YPYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205GTYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205YPYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207GTYN",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207YPYNOEM",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208GTYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208YPYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB12209GTYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB12209YPYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to molding-questions", () => {
+            test("single glass location has child part questions => go to molding-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": [
+                                    {
+                                    "questionSequence": 1,
+                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
+                                    "answers": [
+                                        {
+                                        "answerResult": "WKT D1106 C",
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null
+                                        },
+                                        {
+                                        "answerResult": "WKT D1106 B",
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null
+                                        }
+                                    ]
+                                    }
+                                ]
+    
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to capability-questions", () => {
+            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
+            });
+        });
+
+        describe("should go to heritage funnel", () => {
+            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ]
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+
+            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25457GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD27090GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25459GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25460GTYN",
+                                "description": "heated glass, solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                wrapper.vm.$store.commit = jest.fn();
+
+                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+                
+
+                // Assert
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
+                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+        });
+    })
 });
 
-function setupMocks({}) {
-    const baseMixin = setupMocksForJsFiles({});
+function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
+    const baseMixin = setupMocksForJsFiles({
+        actionList: [{
+            actionName: storeActions.GET_CAPABILITY_QUESTIONS,
+            data: [],
+        }]
+    });
 
     const mocks = getMountOptions({
         router: {
             navigate: jest.fn()
         },
+        store: {
+            commit: jest.fn(),
+            dispatch: jest.fn()
+        },
+        route: {
+            query: {
+                fmgPage
+            }
+        }
     });
 
+    // store.dispatch = jest.fn();
+
     const mockVehicleQuestionComponent = {
-        template: '<div></div>',
+        components: { loadingModal },
+        template: '<loadingModal ref="loadingModal" />',
         mixins: [vehicleQuestionsMixin, baseMixin.baseMixin]
     };
 
     const wrapper = shallowMount(mockVehicleQuestionComponent, mocks);
 
+    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+
     return { wrapper };
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index bfb1c4c06..4759eb5dc 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -2,14 +2,11 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
-import store from "@/store";
 import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
-    navigateToHeritageFunnel: jest.fn()
+    navigateForward: jest.fn()
 }));
 
 describe("vin-pages-mixin", () => {
@@ -18,955 +15,17 @@ describe("vin-pages-mixin", () => {
     })
 
     describe("navigateForwardWithSingleCarMatch", () => {
-        describe("should go to parts-questions", () => {
-            test("single glass location has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ];
+        test("should navigateForward", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            vehicleQuestionsMixin.methods.navigateForward = jest.fn();
 
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
+            // Act
+            await wrapper.vm.navigateForwardWithSingleCarMatch();
 
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations have part questions => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 2,
-                                "questionText": "Is this a super awesome question?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144000"
-                                    },
-                                    {
-                                        "answerText": "Super yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143001"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ08162YPYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD08160YPYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08165YPNN",
-                                "description": "heated glass, stationary",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08166GTNN",
-                                "description": "stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167GTNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167YPNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to vehicle-parts", () => {
-            test("single glass location has multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW03647GTNN",
-                                "description": "solar, 3rd visor band",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": [
-                                    {
-                                        "partNumber": "MWF03647",
-                                        "partType": "MOULDING",
-                                        "description": "Upper "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25747GTYN",
-                                "description": "solar, driver side, rear, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25719GTYN",
-                                "description": "solar, driver side, front, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25749GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "DW02101GTYN",
-                                "description": "solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12202GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12202YPYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12198GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12200GTYN",
-                                "description": "solar, driver side, front, laminated, soundproofing",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ12204GTYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12204YPYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205GTYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205YPYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207GTYN",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207YPYNOEM",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208GTYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208YPYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB12209GTYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB12209YPYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to molding-questions", () => {
-            test("single glass location has child part questions => go to molding-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": [
-                                    {
-                                    "questionSequence": 1,
-                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
-                                    "answers": [
-                                        {
-                                        "answerResult": "WKT D1106 C",
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null
-                                        },
-                                        {
-                                        "answerResult": "WKT D1106 B",
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null
-                                        }
-                                    ]
-                                    }
-                                ]
-    
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to capability-questions", () => {
-            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to heritage funnel", () => {
-            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ]
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-
-            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25457GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD27090GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25459GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25460GTYN",
-                                "description": "heated glass, solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                wrapper.vm.$store.commit = jest.fn();
-
-                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-                
-
-                // Assert
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
-                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-        });
+            // Assert            
+            expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalled();
+        })
     });
 });
 
@@ -982,14 +41,7 @@ function setupMocks({ partsOrQuestions = [] }) {
         ],
     });
 
-    const mocks = getMountOptions({
-        router: {
-            navigate: jest.fn()
-        },
-        store: {
-            commit: jest.fn()
-        }
-    });
+    const mocks = getMountOptions({});
 
     const mockVinComponent = {
         components: { loadingModal },

From fca3c566649b0f18fee2bb6ecc9e94c97c073ecc Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 08:49:54 -0400
Subject: [PATCH 16/29] CSR-111-parts Cleanup

---
 src/mixins/vehicle-questions-mixin.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 94fa044fb..a55859567 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -70,9 +70,6 @@ export default {
             const currentPage = self.$route.query.fmgPage;
             
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
-            console.log("hasPartQuestions: ", hasPartQuestions)
-            console.log("currentPage: ", currentPage)
-            console.log("this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS): ", this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS))
             const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
@@ -91,8 +88,6 @@ export default {
             } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
-                console.log(store.getters.vehicle)
-
                 const windshieldPart = partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0];
                 let capabilityQuestions = (await baseMixin.methods.dispatchStoreAction(storeActions.GET_CAPABILITY_QUESTIONS, {
                     carId: store.getters.vehicle.carId,

From 62a3ceb8c53569e50d6a697d91e43705f293295b Mon Sep 17 00:00:00 2001
From: katieoh-safelite <76531609+katieoh-safelite@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:44:20 -0400
Subject: [PATCH 17/29] Revert "Defect/csr 759"

---
 .../heritage-integration/cookie-helper.js     | 49 +++++--------------
 src/helpers/unit-test-helper.js               |  4 +-
 src/mixins/analytics-mixin.js                 |  8 +--
 src/router/index.js                           |  5 +-
 4 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index dc1872e74..775a64fec 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -9,6 +9,9 @@ export function updateOrCreateFunnelCookie() {
     const wasClaimRegistrationDelayed = getFunnelCookie()?.HasDelayedClaimRegistration;
     const shouldSuppressConceptFunnel = getFunnelCookie()?.SuppressConceptFunnel;
     
+    // Create the cookie
+    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}={}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()};`;
+
     // Set up cookie with all the props.
     setFunnelCookieProperties({
         LastTouched: new Date().toUTCString(),
@@ -45,14 +48,14 @@ export function getFunnelCookie() {
     Removes cookie from browser.
 */
 export function deleteFunnelCookie() {
-    createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, undefined, { maxAge: 0 });
+    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=; Max-Age=0; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
 }
 
 /*
     Gets cookie domain value. Localhost will be empty "".
 */
 export function getCookieDomainValue() {
-    return isLocalhost() ? "" : `domain=${getDomainWithoutSubdomain()};`;
+    return location.hostname.includes("localhost") ? "" : `domain=${getDomainWithoutSubdomain()};`;
 }
 
 /*
@@ -103,17 +106,10 @@ export function getSessionIdValue(){
     return '00000000-0000-0000-0000-000000000000';
 }
 
-/* 
-    Updates session ID cookie with new expiration date
-*/
-export function updateSessionIdCookie() {
-    createOrUpdateCookie(cookieNames.SESSION_ID, getSessionIdValue(), { maxAge: 60 * 30 });
-}
-
-export function setCookieProperties(properties, { useDefaultFunnelCookieAttributes = true, maxAge, isSecure }) {
+export function setCookieProperties(properties) {
     if (typeof properties == "object") {
         Object.keys(properties).forEach(key => {
-            createOrUpdateCookie(key, properties[key], { useDefaultFunnelCookieAttributes, maxAge, isSecure });
+            document.cookie = `${key}=${properties[key]}`;
         });
     }
 }
@@ -138,38 +134,19 @@ function setFunnelCookieProperties(properties) {
                 cookie[key] = properties[key];
             });
 
-            const cookieValueJson = JSON.stringify(cookie);            
-            createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
+            const cookieValueJson = JSON.stringify(cookie);
+
+            document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${cookieValueJson}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
         }
     }
 }
 
-/*
-    Used to create a cookie. 
-    `useDefaultFunnelCookieAttributes` will set the path and domain to our defaults
-*/
-function createOrUpdateCookie(key, value = "", { useDefaultFunnelCookieAttributes = true, maxAge, isSecure = true }) {
-    let cookieToAdd = `${key}=${value}; `;
-
-    if (useDefaultFunnelCookieAttributes) {
-        cookieToAdd += `path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()} `;
-    }
-    if (isSecure && !isLocalhost()) {
-        cookieToAdd += `secure; `;
-    }
-    if (!isNaN(maxAge)) {
-        cookieToAdd += `max-age=${maxAge};`;
-    }
-
-    document.cookie = cookieToAdd;
-}
-
 /*
     Gets current domain without the subdomain for cookie.
 */
 function getDomainWithoutSubdomain() {
     let url = location.hostname;
-    if (isLocalhost()) {
+    if (url.includes("localhost")) {
         return "localhost";
     }
 
@@ -192,8 +169,4 @@ function getCookieValueByName(name) {
         return parts.pop().split(";").shift();
     }
     return "";
-}
-
-function isLocalhost() {
-    return location.hostname.includes("localhost");
 }
\ No newline at end of file
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index cc00e49d9..67a3dc8ae 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -6,7 +6,7 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
-import { getCookieDomainValue, setCookieProperties } from "@/helpers/heritage-integration/cookie-helper";
+import { getCookieDomainValue } from "@/helpers/heritage-integration/cookie-helper";
 import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
 import { routerParams } from "@/router/router-constants/router-params";
@@ -106,7 +106,7 @@ export function setupCookies({ funnelCookieValue = "", includeHeritageCookie = t
   Object.keys(cookies).forEach(key => {
       const cookieValue = key == cookieNames.FUNNEL_SESSION_INFO ? funnelCookieValue : cookies[key];
       if (includeHeritageCookie || key != cookieNames.FUNNEL_SESSION_INFO)
-        setCookieProperties({ [key]: cookieValue }, { isSecure: false });
+          document.cookie = `${key}=${cookieValue}; path=/; ${getCookieDomainValue()}`;
   });
 }
 
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 6eb18e462..142131ae1 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -126,14 +126,10 @@ export default {
       
       if (response.data) {
         if (response.data.sessionKey && skey === 0) {
-          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey}, {
-            useDefaultFunnelCookieAttributes: false
-          });
+          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey});
         }
         if (response.data.sessionId && sid === '00000000-0000-0000-0000-000000000000') {
-          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId}, {
-            maxAge: 60 * 30   // 30 minutes
-          });
+          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId});
         }
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 46e26baad..5b5c73d75 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,7 +10,7 @@ import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 
 // Heritage integration
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { updateOrCreateFunnelCookie, getFunnelCookie, updateSessionIdCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { updateOrCreateFunnelCookie, getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper";
 import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
@@ -31,9 +31,6 @@ const routes = [
         if (analyticsMixin.methods.noSession()) {
           await analyticsMixin.methods.initSession();
         }
-        else {
-          updateSessionIdCookie();
-        }
 
         if (getFunnelCookie()?.SuppressConceptFunnel) {
           await navigateToHeritageFunnel(false);

From 37dc16645fec49d2054312afa5a31a2237d64df2 Mon Sep 17 00:00:00 2001
From: katieoh-safelite <76531609+katieoh-safelite@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:44:49 -0400
Subject: [PATCH 18/29] Revert "Feature/csr 111 parts"

---
 src/constants/endpoints.js                    |   8 -
 src/constants/store-actions.js                |   3 -
 src/constants/store-mutations.js              |   1 -
 .../capability-questions.vue                  |  92 +-
 src/layouts/part-questions/part-questions.vue |  34 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  15 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |  45 +-
 src/mixins/vehicle-questions-mixin.js         | 109 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 991 +-----------------
 src/mixins/vin-pages-mixin.js                 |  32 +-
 src/mixins/vin-pages-mixin.spec.js            | 972 ++++++++++++++++-
 .../router-constants/navigation-scenarios.js  |  15 +-
 src/router/router-constants/routing-table.js  |  92 +-
 src/store/index.js                            |  42 +-
 14 files changed, 1153 insertions(+), 1298 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 9cf0b6856..8d5b33bec 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -59,14 +59,6 @@ const endpoints = {
     url: "/parts/api/v1/parts/parts",
     method: "POST",
   },
-  GetCapabilityQuestions: {
-    url: "/parts/api/v1/parts/capability-questions",
-    method: "GET"
-  },
-  ApplyCapabilityAnswerToPart: {
-    url: "/parts/api/v1/parts/apply-capability-answer-to-part",
-    method: "POST"
-  },
   SaveOrder: {
     url: "/order/api/v1/order/save",
     method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index a80694834..9f8ad36f6 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -21,8 +21,6 @@ const storeActions = {
 
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
   GET_PARTS: "getParts",
-  GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",
-  GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer",
   SAVE_ORDER: "saveOrder",
   LOAD_ORDER: "loadOrder",
   UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE: "updateStoreWithSaveOrderResponse",
@@ -57,7 +55,6 @@ const storeActions = {
   SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
   SAVE_GLASS_PARTS: "saveGlassParts",
   SAVE_PART_QUESTION_ANSWERS: "savePartQuestionAnswers",
-  SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers"
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index ba0adc7cb..cce109c43 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -17,7 +17,6 @@ const storeMutations = {
   UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips",
   UPDATE_GLASS_TO_REPLACE: "updateGlassToReplace",
   UPDATE_PART_QUESTION_ANSWERS: "updatePartQuestionAnswers",
-  UPDATE_CAPABILITY_QUESTION_ANSWERS: "updateCapabilityQuestionAnswers",
   UPDATE_GLASS_PARTS: "updateGlassParts",
   UPDATE_OTHER_PARTS: "updateOtherParts",
 
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index ea51194e8..a29aa3779 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -11,6 +11,7 @@
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
+                <h1>CAPABILITY QUESTIONS TEMPORARY PLACEHOLDER</h1>
                 <alert
                     ref="alertFewMoreQuestions"
                     class="my-5"
@@ -19,13 +20,16 @@
                     :manualCopy="AlertFewMoreQuestionsCopy"
                     v-bind:isDismissible="false"
                 />
-                <questionChain
-                    ref="questionChain"
-                    v-model="selectedAnswer"    
-                    :questionData="capabilityQuestionsData"
-                    :partIndex="i"
-                    validationRules="questions-required"
-                />
+                <div v-for="(part, i) in capabilityQuestionsData" :key="i">
+                    <questionChain
+                        ref="questionChain"
+                        v-model="selectedModel"
+                        :questionData="part"
+                        :partIndex="i"
+                        v-if="showThisPartQuestionChain(part, i)"
+                        validationRules="questions-required"
+                    />
+                </div>
                 <funnel-footer
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
@@ -53,19 +57,17 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
-import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
     name: "capability-questions",
-    mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
@@ -87,51 +89,55 @@ export default {
     },
     data() {
         return {
-            selectedAnswer: [],
-            // TODO This shouldn't be an object with property `partQuestions`
-            capabilityQuestionsData: {
-                partQuestions: store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).capabilityQuestions
-            }
+            selectedModel: [],
+            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).partsOrQuestions.filter((p) => {
+                if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
+                    return {
+                        glassName: p.glassName,
+                        glassLocation: p.glassLocation,
+                        partQuestions: p.partQuestions,
+                    };
+                }
+            }),
+            currentPartNum: 0,
         };
     },
     computed: {
         AlertFewMoreQuestionsHeader() {
-			return this.getCmsContent("AdditionalPartsQuestionsAlert", "HeadlineText");
+			return this.getCmsContent("AlertPartsQuestions", "HeadlineText");
 		},
         AlertFewMoreQuestionsCopy() {
-			return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
+			return this.getCmsContent("AlertPartsQuestions", "BodyText");
 		},
-        windshieldPart() {
-            return this.pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD);
-        },
-        windshieldPartInfo() {
-            return this.windshieldPart.parts[0];
-        },
-        pageData() {
-            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
-        }
     },
     methods: {
         arePagePrerequisitesValid() {
-            const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
-            return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
+            return false; // TODO - DO TRUE TEST OF PAGEDATA
+            // return Object.keys(store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)).length > 0;
+        },
+        showThisPartQuestionChain(part, i) {
+            if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
+            if (this.currentPartNum === i || part.answerData?.answerResult.length > 0) { return true; }
+            return false;
+        },
+        backButtonAction() {
+            // route to move backwards
+            this.$router.navigate(
+                this.navigationScenarios.CLICKED_BACK,
+                this.$route
+            );
         },
         async forwardButtonAction() {
-            const selectedAnswerResult1 = this.selectedAnswer.answerResult;
-            const selectedAnswerResult2 = this.pageData.capabilityQuestions[0].answers.find(x => x.answerResult1 === selectedAnswerResult1).answerResult2;
-
-            this.dispatchStoreAction(storeActions.SAVE_CAPABILITY_QUESTION_ANSWERS, {
-                glassName: this.windshieldPart.glassName,
-                glassLocation: this.windshieldPart.glassLocation,
-                result1: selectedAnswerResult1,
-                result2: selectedAnswerResult2
-            });
-
-            const partFromCapabilityQuestionAnswer = (await this.dispatchStoreAction(storeActions.GET_PART_FROM_CAPABILITY_QUESTION_ANSWER)).data;
-            let partsOrQuestions = this.pageData.partsOrQuestions;
-            partsOrQuestions.find(partOrQuestion => partOrQuestion.glassLocation === damageLocationsSelected.WINDSHIELD).parts = partFromCapabilityQuestionAnswer;
-
-            this.navigateForward(partsOrQuestions);
+            // TODO: TO COME
+        },
+    },
+    watch: {
+        selectedModel(model) {
+            this.capabilityQuestionsData[model.partIndex].answerData = {
+                answerResult: model.answerResult,
+                answeredQuestions: model.answeredQuestions,
+            }
+            this.currentPartNum = model.partIndex + 1;
         },
     },
     components: {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 7aca0e77f..1f8160adf 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -123,6 +123,13 @@ export default {
             if (this.currentPartNum === i || part.answerData?.answerResult?.length > 0) { return true; }
             return false;
         },
+        backButtonAction() {
+            // route to move backwards
+            this.$router.navigate(
+                this.navigationScenarios.CLICKED_BACK,
+                this.$route
+            );
+        },
         async forwardButtonAction() {
             const partQuestionAnswersArray = this.partsQuestionsData.map((item) => {
                 return {
@@ -148,7 +155,32 @@ export default {
                 });
 
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
-            this.navigateForward(glassNameAndPartsForStore);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
+            const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
+
+            // NAVIGATE FORWARD
+            if (hasGlassLocationWithMultipleParts) {
+                // if multiple parts on any glass
+                // go to vehicle-parts page and pass the partsData
+                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            } else if (hasChildPartQuestions) {
+                // if any childpart questions
+                // go to molding-questions page and pass the partsData
+                this.$router.navigate(this.navigationScenarios.HAS_MOLDING_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            } else if (hasCapabilityQuestions) {
+                // if has capability questions
+                // go to capability-questions page and pass the partsData
+                this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
+            } else {
+                // if single parts only
+                const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
+            }
         },
         arePagePrerequisitesValid() {
             const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index 2e9110d7a..bd7911da4 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -9,7 +9,6 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 import baseMixin from "@/mixins/base-mixin.js";
-import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
@@ -228,7 +227,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS, wrapper.vm.$route);
 
     });
 
@@ -267,7 +266,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS, wrapper.vm.$route);
 
     });
 
@@ -312,7 +311,6 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
-        store.getters.lineItems = { glassParts: {} }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -369,8 +367,6 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
-        store.getters.lineItems = { glassParts: {} }
-        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -386,12 +382,6 @@ describe("vehicle-parts.vue", () => {
                     getters: store.getters,
                     commit: store.commit
                 },
-                actionList: [
-                    {
-                        actionName: storeActions.GET_CAPABILITY_QUESTIONS,
-                        data: []
-                    }
-                ]
             }
         });
 
@@ -416,7 +406,6 @@ describe("vehicle-parts.vue", () => {
         //Arrange
         store.getters.pageData.mockReturnValueOnce(basePartResponse);
         store.getters.lineItems = { glassParts: {} }
-        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index a276ef132..c7f1424a1 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -132,8 +132,8 @@ export default {
                             ColorAnswerText: p.color,
                             FeatureAnswers: [
                                 {
-                                    FeatureAnswerText: p.description === "" ? p.color : p.description,
-                                    PartNumber: p.partNumber,
+                                FeatureAnswerText: p.description === "" ? p.color : p.description,
+                                PartNumber: p.partNumber,
                                 },
                             ],
                         });
@@ -159,6 +159,15 @@ export default {
             return store.getters.damage.isRepair != null && store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
             Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
         },
+        backButtonAction() {
+            const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions);
+            const backNavigationScenario = hasPartQuestions ? this.navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS : this.navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS;
+
+            this.$router.navigate(
+                backNavigationScenario,
+                this.$route
+            );
+        },
         async forwardButtonAction() {
             const matchedParts = [];
 
@@ -182,6 +191,10 @@ export default {
                     }
                 }
             }
+
+            const hasChildPartQuestions = this.hasChildPartQuestions(matchedParts);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(matchedParts);
+
             // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
             if (this.isForwardActionDisabled) {
                 this.$refs.funnelFooter.removeLoader();
@@ -189,7 +202,33 @@ export default {
             }
 
             // Navigate to the next page
-            this.navigateForward(matchedParts);
+            if (hasChildPartQuestions) {
+                this.$router.navigate(
+                    this.navigationScenarios.HAS_MOLDING_QUESTIONS,
+                    this.$route,
+                    {},
+                    {},
+                    {partsOrQuestions: matchedParts}
+                );
+            } else if (hasCapabilityQuestions) {
+                this.$router.navigate(
+                    this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+                    this.$route,
+                    {},
+                    {},
+                    {partsOrQuestions: matchedParts}
+                );
+
+            } else {
+                // if single parts only
+                const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
+            }
         },
 
         LoadInitialPartsData() {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index a55859567..1a28fe028 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,13 +1,5 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { storeMutations } from "@/constants/store-mutations.js";
-import { damageLocationsSelected } from "@/constants/damage-locations-selected";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
-import { storeActions } from "@/constants/store-actions";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import baseMixin from "@/mixins/base-mixin.js";
-import store from "@/store";
-
 export default {
+
     methods: {
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some(pq => pq.partQuestions?.length > 0);
@@ -25,7 +17,6 @@ export default {
                 return pq.parts?.some(part => part.requiresCapabilityQuestions === true);
             });
         },
-
         // method to only include keys listed for lineItems.glassParts in 
         // https://safelite.atlassian.net/wiki/spaces/DC/pages/17137665/Catalog+Front-End+State#glassParts
         reducedGlassPartsArray(glassParts) {
@@ -46,103 +37,7 @@ export default {
                 }
             });
             return reducedGlassParts;
-        },
-        comparePageIndices(currentPage, fmgPage) {
-            const orderedVehicleQuestionPages = [
-                fmgPageValues.PART_QUESTIONS,
-                fmgPageValues.VEHICLE_PARTS,
-                fmgPageValues.MOLDING_QUESTIONS,
-                fmgPageValues.CAPABILITY_QUESTIONS,
-                fmgPageValues.QUOTE
-            ]
-
-            return orderedVehicleQuestionPages.indexOf(currentPage) - orderedVehicleQuestionPages.indexOf(fmgPage);
-        },
-        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
-            return this.comparePageIndices(currentPage, fmgPage) < 0;
-        },
-        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
-            return this.comparePageIndices(currentPage, fmgPage) > 0;
-        },
-        // Can't use `this` because navigateForward is also called from vin-pages-mixin
-        async navigateForward(partsOrQuestions, vm) {
-            const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
-            
-            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
-            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
-
-            if (hasPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)) {
-                self.$router.navigate(self.navigationScenarios.HAS_PART_QUESTIONS, self.$route, {}, {}, {partsOrQuestions: partsOrQuestions});
-            }
-            else if (hasGlassLocationWithMultipleParts && this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
-                // if multiple parts on any glass
-                // go to vehicle-parts page and pass the partsData
-                self.$router.navigate(self.navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
-            } else if (hasChildPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
-                // if any childpart questions
-                // go to molding-questions page and pass the partsData
-                self.$router.navigate(self.navigationScenarios.HAS_MOLDING_QUESTIONS,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
-            } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
-                // if has capability questions
-                // go to capability-questions page and pass the partsData
-                const windshieldPart = partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0];
-                let capabilityQuestions = (await baseMixin.methods.dispatchStoreAction(storeActions.GET_CAPABILITY_QUESTIONS, {
-                    carId: store.getters.vehicle.carId,
-                    partNumber: windshieldPart.partNumber
-                })).data;
-
-                capabilityQuestions.forEach(question => {
-                    question.answers = question.answers.map(answer => {
-                        return {
-                            ...answer,
-                            answerResult: answer.answerResult1
-                        }
-                    })
-                });
-                
-                self.$router.navigate(self.navigationScenarios.HAS_CAPABILITY_QUESTIONS, self.$route, {}, {}, { partsOrQuestions, capabilityQuestions });
-            } else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
-                // save to store lineItems.glassParts
-                self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-               
-                // For quote pages MVP release
-                // self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
-            }
-        },
-        backButtonAction() {
-            const partsOrQuestions = this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions;
-            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
-            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
-            let backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP;
-
-            const currentPage = this.$route.query.fmgPage;
-            if (hasCapabilityQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
-                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_CAPABILITY_QUESTIONS;
-            }
-            else if (hasChildPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
-                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS;
-            }
-            else if (hasGlassLocationWithMultipleParts && this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
-                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS;
-            }
-            else if (hasPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)) {
-                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS;
-            }
-
-            this.$router.navigate(
-                backNavigationScenario,
-                this.$route
-            );
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 13a2f083a..01d41b9c8 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,22 +1,8 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { storeMutations } from "@/constants/store-mutations";
-import { storeActions } from "@/constants/store-actions";
-import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
-
-jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
-    navigateToHeritageFunnel: jest.fn()
-}));
 
 describe("vehicle-questions-mixin", () => {
-    afterEach(() => {
-        jest.clearAllMocks();
-    })
-
     describe("hasPartQuestions", () => {
         test("has no part questions => return false", () => {
             // Arrange
@@ -153,994 +139,23 @@ describe("vehicle-questions-mixin", () => {
             expect(hasGlassLocationWithMultipleParts).toBe(true);
         });
     });
-
-    describe("navigateForward", () => {
-        describe("should go to parts-questions", () => {
-            test("single glass location has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations have part questions => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 2,
-                                "questionText": "Is this a super awesome question?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144000"
-                                    },
-                                    {
-                                        "answerText": "Super yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143001"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ08162YPYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD08160YPYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08165YPNN",
-                                "description": "heated glass, stationary",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08166GTNN",
-                                "description": "stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167GTNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167YPNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to vehicle-parts", () => {
-            test("single glass location has multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW03647GTNN",
-                                "description": "solar, 3rd visor band",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": [
-                                    {
-                                        "partNumber": "MWF03647",
-                                        "partType": "MOULDING",
-                                        "description": "Upper "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25747GTYN",
-                                "description": "solar, driver side, rear, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25719GTYN",
-                                "description": "solar, driver side, front, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25749GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "DW02101GTYN",
-                                "description": "solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12202GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12202YPYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12198GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12200GTYN",
-                                "description": "solar, driver side, front, laminated, soundproofing",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ12204GTYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12204YPYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205GTYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205YPYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207GTYN",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207YPYNOEM",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208GTYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208YPYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB12209GTYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB12209YPYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to molding-questions", () => {
-            test("single glass location has child part questions => go to molding-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": [
-                                    {
-                                    "questionSequence": 1,
-                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
-                                    "answers": [
-                                        {
-                                        "answerResult": "WKT D1106 C",
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null
-                                        },
-                                        {
-                                        "answerResult": "WKT D1106 B",
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null
-                                        }
-                                    ]
-                                    }
-                                ]
-    
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to capability-questions", () => {
-            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
-            });
-        });
-
-        describe("should go to heritage funnel", () => {
-            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ]
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-
-                // Assert
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-
-            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25457GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD27090GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25459GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25460GTYN",
-                                "description": "heated glass, solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                wrapper.vm.$store.commit = jest.fn();
-
-                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
-
-                // Act
-                await wrapper.vm.navigateForward(partsOrQuestions);
-                
-
-                // Assert
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
-                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-        });
-    })
 });
 
-function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
-    const baseMixin = setupMocksForJsFiles({
-        actionList: [{
-            actionName: storeActions.GET_CAPABILITY_QUESTIONS,
-            data: [],
-        }]
-    });
+function setupMocks({}) {
+    const baseMixin = setupMocksForJsFiles({});
 
     const mocks = getMountOptions({
         router: {
             navigate: jest.fn()
         },
-        store: {
-            commit: jest.fn(),
-            dispatch: jest.fn()
-        },
-        route: {
-            query: {
-                fmgPage
-            }
-        }
     });
 
-    // store.dispatch = jest.fn();
-
     const mockVehicleQuestionComponent = {
-        components: { loadingModal },
-        template: '<loadingModal ref="loadingModal" />',
+        template: '<div></div>',
         mixins: [vehicleQuestionsMixin, baseMixin.baseMixin]
     };
 
     const wrapper = shallowMount(mockVehicleQuestionComponent, mocks);
 
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
-
     return { wrapper };
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 817aa7b7e..a7ba799a2 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,13 +1,43 @@
 import { storeActions } from "@/constants/store-actions.js";
+import { storeMutations } from "@/constants/store-mutations.js";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 export default {
+    mixins: [vehicleQuestionsMixin],
     methods: {
         async navigateForwardWithSingleCarMatch() {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
+
             const partsOrQuestions = result.data.partsOrQuestions;
 
-            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
+            const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+
+            if (hasPartsQuestions) {
+                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
+            }
+            else if (hasGlassLocationWithMultipleParts) {
+                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, this.$route, {}, {}, result.data);
+            }
+            else if (hasChildPartQuestions) {
+                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
+            }
+            else if (hasCapabilityQuestions) {
+                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, result.data);
+            }
+            else {
+                // if single parts only
+                const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
+            }
         },
     }
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 4759eb5dc..bfb1c4c06 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -2,11 +2,14 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import store from "@/store";
 import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
-import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
-    navigateForward: jest.fn()
+    navigateToHeritageFunnel: jest.fn()
 }));
 
 describe("vin-pages-mixin", () => {
@@ -15,17 +18,955 @@ describe("vin-pages-mixin", () => {
     })
 
     describe("navigateForwardWithSingleCarMatch", () => {
-        test("should navigateForward", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({});
-            vehicleQuestionsMixin.methods.navigateForward = jest.fn();
+        describe("should go to parts-questions", () => {
+            test("single glass location has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ];
 
-            // Act
-            await wrapper.vm.navigateForwardWithSingleCarMatch();
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
 
-            // Assert            
-            expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalled();
-        })
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations have part questions => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 2,
+                                "questionText": "Is this a super awesome question?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144000"
+                                    },
+                                    {
+                                        "answerText": "Super yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143001"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ08162YPYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD08160YPYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08165YPNN",
+                                "description": "heated glass, stationary",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08166GTNN",
+                                "description": "stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167GTNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167YPNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to vehicle-parts", () => {
+            test("single glass location has multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW03647GTNN",
+                                "description": "solar, 3rd visor band",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": [
+                                    {
+                                        "partNumber": "MWF03647",
+                                        "partType": "MOULDING",
+                                        "description": "Upper "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25747GTYN",
+                                "description": "solar, driver side, rear, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25719GTYN",
+                                "description": "solar, driver side, front, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25749GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "DW02101GTYN",
+                                "description": "solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12202GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12202YPYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12198GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12200GTYN",
+                                "description": "solar, driver side, front, laminated, soundproofing",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ12204GTYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12204YPYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205GTYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205YPYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207GTYN",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207YPYNOEM",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208GTYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208YPYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB12209GTYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB12209YPYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to molding-questions", () => {
+            test("single glass location has child part questions => go to molding-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": [
+                                    {
+                                    "questionSequence": 1,
+                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
+                                    "answers": [
+                                        {
+                                        "answerResult": "WKT D1106 C",
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null
+                                        },
+                                        {
+                                        "answerResult": "WKT D1106 B",
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null
+                                        }
+                                    ]
+                                    }
+                                ]
+    
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to capability-questions", () => {
+            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to heritage funnel", () => {
+            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ]
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+
+                // Assert
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+
+            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25457GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD27090GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25459GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25460GTYN",
+                                "description": "heated glass, solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                wrapper.vm.$store.commit = jest.fn();
+
+                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
+
+                // Act
+                await wrapper.vm.navigateForwardWithSingleCarMatch();
+                
+
+                // Assert
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
+                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+        });
     });
 });
 
@@ -41,7 +982,14 @@ function setupMocks({ partsOrQuestions = [] }) {
         ],
     });
 
-    const mocks = getMountOptions({});
+    const mocks = getMountOptions({
+        router: {
+            navigate: jest.fn()
+        },
+        store: {
+            commit: jest.fn()
+        }
+    });
 
     const mockVinComponent = {
         components: { loadingModal },
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 7cca25d09..2bd259909 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -8,10 +8,10 @@ const navigationScenarios = {
   CLICKED_FORWARD: "CLICKED_FORWARD",
   CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
   SELECTED_PARTS: "SELECTED_PARTS",
-  SELECTED_VIN_WITH_PART_QUESTIONS: "HAS_PART_QUESTIONS",
-  SELECTED_VIN_WITH_MULTIPLE_PARTS: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
-  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
-  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
+  SELECTED_VIN_WITH_PART_QUESTIONS: "SELECTED_VIN_WITH_PART_QUESTIONS",
+  SELECTED_VIN_WITH_MULTIPLE_PARTS: "SELECTED_VIN_WITH_MULTIPLE_PARTS",
+  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "SELECTED_VIN_WITH_MOLDING_QUESTIONS",
+  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "SELECTED_VIN_WITH_CAPABILITY_QUESTIONS",
   CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
   CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
   SELECTED_VIN_HAS_MISMATCHED_GLASS: "SELECTED_VIN_HAS_MISMATCHED_GLASS",
@@ -24,15 +24,8 @@ const navigationScenarios = {
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
   CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
   CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
-  ANSWERED_ALL_QUESTIONS: "ANSWERED_ALL_QUESTIONS",
-  HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
-  HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
   HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
-  CLICKED_BACK_TO_GO_TO_VIN_LOOKUP: "CLICKED_BACK_TO_GO_TO_VIN_LOOKUP",
-  CLICKED_BACK_TO_GO_TO_PART_QUESTIONS: "CLICKED_BACK_TO_GO_TO_PART_QUESTIONS",
-  CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS: "CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS",
-  CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS: "CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 34c5263cf..37fb1c13e 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -69,6 +69,27 @@ const routingTable = function(store) {
         },
       ],
     },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_PARTS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.REVEAL,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+      ],
+    },
     {
       fmgPageValue: fmgPageValues.REVEAL,
       maps: [
@@ -235,11 +256,11 @@ const routingTable = function(store) {
       fmgPageValue: fmgPageValues.PART_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          scenario: navigationScenarios.CLICKED_BACK,
           destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
         },
         {
-          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
@@ -251,92 +272,31 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ]
     },
-    {
-      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-      maps: [
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_FORWARD,
-          destinationFmgPageValue: fmgPageValues.REVEAL,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
-        {
-          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-        },
-        {
-          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-        },
-        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
-      ],
-    },
     {
       fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
+          scenario: navigationScenarios.CLICKED_BACK,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
           scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
-        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        }
       ]
     },
     {
       fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
+          scenario: navigationScenarios.CLICKED_BACK,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
-        },
-        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
-          destinationFmgPageValue: fmgPageValues.QUOTE
-        },
       ]
     },
   ];
diff --git a/src/store/index.js b/src/store/index.js
index b8b5ffe16..0220bf97e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -49,7 +49,6 @@ const getDefaultState = () => {
         numberOfChips: null,
         glassToReplace: null,
         partQuestionAnswers: null,
-        capabilityQuestionAnswers: null
       },
       lineItems: {
         glassParts: null
@@ -127,9 +126,6 @@ export const mutations = {
   updatePartQuestionAnswers(state, answersArray) {
     state.order.damage.partQuestionAnswers = answersArray;
   },
-  updateCapabilityQuestionAnswers(state, answersArray) {
-    state.order.damage.capabilityQuestionAnswers = answersArray;
-  },
   updateGlassParts(state, partsData) {
     state.order.lineItems.glassParts = partsData;
   },
@@ -281,7 +277,6 @@ export const mutations = {
   resetGlassPartsState(state) {
     state.order.lineItems.glassParts = null;
     state.order.damage.partQuestionAnswers = null;
-    state.order.damage.capabilityQuestionAnswers = null;
     state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
     state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
     state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
@@ -742,29 +737,6 @@ export const actions = {
     });
   },
 
-  getCapabilityQuestions(context, { carId, partNumber }) {
-    return globalMethods.callHttpClient({
-      method: endpoints.GetCapabilityQuestions.method,
-      endpoint: `${endpoints.GetCapabilityQuestions.url}/${carId}/${partNumber}`,
-    })
-  },
-
-  getPartFromCapabilityQuestionAnswer(context, selectedAnswerResult1) {
-    const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
-
-    const part = pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD).parts[0];
-    const capabilityQuestionAnswers = context.getters.damage.capabilityQuestionAnswers;
-      
-    return globalMethods.callHttpClient({
-      method: endpoints.ApplyCapabilityAnswerToPart.method,
-      endpoint: endpoints.ApplyCapabilityAnswerToPart.url,
-      payload: {
-        part,
-        capabilityAnswerResults: capabilityQuestionAnswers
-      }
-    })
-  },
-
   // Order API Actions
   saveOrder(context) {
     const vehicle = context.getters.vehicle;
@@ -995,22 +967,10 @@ export const actions = {
     }
   },
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
-    // if part question answers have changed, reset subsequent question answers
-    const previousResultsArray = context.getters.damage.partQuestionAnswers;
-    const havePartQuestionAnswersChanged = previousResultsArray.length !== partQuestionAnswersArray.length ||
-      !previousResultsArray.every((x, i) => x.result === partQuestionAnswersArray[i].result);
-
-    if (havePartQuestionAnswersChanged) {
-      context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
-    }
-
     //Save new values
     context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
   },
-  saveCapabilityQuestionAnswers(context, capabilityQuestionAnswers) {
-    //Save new values
-    context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, capabilityQuestionAnswers);
-  },
+
   // Misc order actions
   saveServiceLocation(context, serviceLocationInfo) {
     context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceLocationInfo);

From b23361d0a3a5a0419cdf3f10cf8a751715f7f662 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 11:55:45 -0400
Subject: [PATCH 19/29] Revert "Merge pull request #674 from
 Safelite/revert-665-defect/CSR-759"

This reverts commit b890d85c28917d8d681958949c60ff6f6bcea7a0, reversing
changes made to c5f76d24249596eacf0a3cf57ddd54172d2938cf.
---
 .../heritage-integration/cookie-helper.js     | 49 ++++++++++++++-----
 src/helpers/unit-test-helper.js               |  4 +-
 src/mixins/analytics-mixin.js                 |  8 ++-
 src/router/index.js                           |  5 +-
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 775a64fec..dc1872e74 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -9,9 +9,6 @@ export function updateOrCreateFunnelCookie() {
     const wasClaimRegistrationDelayed = getFunnelCookie()?.HasDelayedClaimRegistration;
     const shouldSuppressConceptFunnel = getFunnelCookie()?.SuppressConceptFunnel;
     
-    // Create the cookie
-    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}={}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()};`;
-
     // Set up cookie with all the props.
     setFunnelCookieProperties({
         LastTouched: new Date().toUTCString(),
@@ -48,14 +45,14 @@ export function getFunnelCookie() {
     Removes cookie from browser.
 */
 export function deleteFunnelCookie() {
-    document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=; Max-Age=0; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
+    createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, undefined, { maxAge: 0 });
 }
 
 /*
     Gets cookie domain value. Localhost will be empty "".
 */
 export function getCookieDomainValue() {
-    return location.hostname.includes("localhost") ? "" : `domain=${getDomainWithoutSubdomain()};`;
+    return isLocalhost() ? "" : `domain=${getDomainWithoutSubdomain()};`;
 }
 
 /*
@@ -106,10 +103,17 @@ export function getSessionIdValue(){
     return '00000000-0000-0000-0000-000000000000';
 }
 
-export function setCookieProperties(properties) {
+/* 
+    Updates session ID cookie with new expiration date
+*/
+export function updateSessionIdCookie() {
+    createOrUpdateCookie(cookieNames.SESSION_ID, getSessionIdValue(), { maxAge: 60 * 30 });
+}
+
+export function setCookieProperties(properties, { useDefaultFunnelCookieAttributes = true, maxAge, isSecure }) {
     if (typeof properties == "object") {
         Object.keys(properties).forEach(key => {
-            document.cookie = `${key}=${properties[key]}`;
+            createOrUpdateCookie(key, properties[key], { useDefaultFunnelCookieAttributes, maxAge, isSecure });
         });
     }
 }
@@ -134,19 +138,38 @@ function setFunnelCookieProperties(properties) {
                 cookie[key] = properties[key];
             });
 
-            const cookieValueJson = JSON.stringify(cookie);
-
-            document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${cookieValueJson}; path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()}`;
+            const cookieValueJson = JSON.stringify(cookie);            
+            createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
         }
     }
 }
 
+/*
+    Used to create a cookie. 
+    `useDefaultFunnelCookieAttributes` will set the path and domain to our defaults
+*/
+function createOrUpdateCookie(key, value = "", { useDefaultFunnelCookieAttributes = true, maxAge, isSecure = true }) {
+    let cookieToAdd = `${key}=${value}; `;
+
+    if (useDefaultFunnelCookieAttributes) {
+        cookieToAdd += `path=${applicationConfig.COOKIE_PATH}; ${getCookieDomainValue()} `;
+    }
+    if (isSecure && !isLocalhost()) {
+        cookieToAdd += `secure; `;
+    }
+    if (!isNaN(maxAge)) {
+        cookieToAdd += `max-age=${maxAge};`;
+    }
+
+    document.cookie = cookieToAdd;
+}
+
 /*
     Gets current domain without the subdomain for cookie.
 */
 function getDomainWithoutSubdomain() {
     let url = location.hostname;
-    if (url.includes("localhost")) {
+    if (isLocalhost()) {
         return "localhost";
     }
 
@@ -169,4 +192,8 @@ function getCookieValueByName(name) {
         return parts.pop().split(";").shift();
     }
     return "";
+}
+
+function isLocalhost() {
+    return location.hostname.includes("localhost");
 }
\ No newline at end of file
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 67a3dc8ae..cc00e49d9 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -6,7 +6,7 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
-import { getCookieDomainValue } from "@/helpers/heritage-integration/cookie-helper";
+import { getCookieDomainValue, setCookieProperties } from "@/helpers/heritage-integration/cookie-helper";
 import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
 import { routerParams } from "@/router/router-constants/router-params";
@@ -106,7 +106,7 @@ export function setupCookies({ funnelCookieValue = "", includeHeritageCookie = t
   Object.keys(cookies).forEach(key => {
       const cookieValue = key == cookieNames.FUNNEL_SESSION_INFO ? funnelCookieValue : cookies[key];
       if (includeHeritageCookie || key != cookieNames.FUNNEL_SESSION_INFO)
-          document.cookie = `${key}=${cookieValue}; path=/; ${getCookieDomainValue()}`;
+        setCookieProperties({ [key]: cookieValue }, { isSecure: false });
   });
 }
 
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 142131ae1..6eb18e462 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -126,10 +126,14 @@ export default {
       
       if (response.data) {
         if (response.data.sessionKey && skey === 0) {
-          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey});
+          setCookieProperties({ [cookieNames.SESSION_KEY]: response.data.sessionKey}, {
+            useDefaultFunnelCookieAttributes: false
+          });
         }
         if (response.data.sessionId && sid === '00000000-0000-0000-0000-000000000000') {
-          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId});
+          setCookieProperties({ [cookieNames.SESSION_ID]: response.data.sessionId}, {
+            maxAge: 60 * 30   // 30 minutes
+          });
         }
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 5b5c73d75..46e26baad 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10,7 +10,7 @@ import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 
 // Heritage integration
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { updateOrCreateFunnelCookie, getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { updateOrCreateFunnelCookie, getFunnelCookie, updateSessionIdCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper";
 import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
@@ -31,6 +31,9 @@ const routes = [
         if (analyticsMixin.methods.noSession()) {
           await analyticsMixin.methods.initSession();
         }
+        else {
+          updateSessionIdCookie();
+        }
 
         if (getFunnelCookie()?.SuppressConceptFunnel) {
           await navigateToHeritageFunnel(false);

From 5ca2273b475e0b91316aa643c49f7cd7d2ea2b04 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 11:56:22 -0400
Subject: [PATCH 20/29] CSR-759 Ensure funnel cookie is created if it doesn't
 exist

---
 src/helpers/heritage-integration/cookie-helper.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index dc1872e74..3eed5950b 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -137,10 +137,10 @@ function setFunnelCookieProperties(properties) {
             Object.keys(properties).forEach(key => {
                 cookie[key] = properties[key];
             });
-
-            const cookieValueJson = JSON.stringify(cookie);            
-            createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
         }
+
+        const cookieValueJson = JSON.stringify(cookie ?? {});            
+        createOrUpdateCookie(cookieNames.FUNNEL_SESSION_INFO, cookieValueJson, {});
     }
 }
 

From 668a8affb2376075f88674a57a34a49b32aff2d0 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 12:09:46 -0400
Subject: [PATCH 21/29] Revert "Merge pull request #673 from
 Safelite/revert-672-feature/CSR-111-parts"

This reverts commit c5f76d24249596eacf0a3cf57ddd54172d2938cf, reversing
changes made to 2e0f614e1f7fedb56e6b4e9771e76a1f8125ad1c.
---
 src/constants/endpoints.js                    |   8 +
 src/constants/store-actions.js                |   3 +
 src/constants/store-mutations.js              |   1 +
 .../capability-questions.vue                  |  92 +-
 src/layouts/part-questions/part-questions.vue |  34 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  15 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |  45 +-
 src/mixins/vehicle-questions-mixin.js         | 109 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 991 +++++++++++++++++-
 src/mixins/vin-pages-mixin.js                 |  32 +-
 src/mixins/vin-pages-mixin.spec.js            | 972 +----------------
 .../router-constants/navigation-scenarios.js  |  15 +-
 src/router/router-constants/routing-table.js  |  92 +-
 src/store/index.js                            |  42 +-
 14 files changed, 1298 insertions(+), 1153 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 8d5b33bec..9cf0b6856 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -59,6 +59,14 @@ const endpoints = {
     url: "/parts/api/v1/parts/parts",
     method: "POST",
   },
+  GetCapabilityQuestions: {
+    url: "/parts/api/v1/parts/capability-questions",
+    method: "GET"
+  },
+  ApplyCapabilityAnswerToPart: {
+    url: "/parts/api/v1/parts/apply-capability-answer-to-part",
+    method: "POST"
+  },
   SaveOrder: {
     url: "/order/api/v1/order/save",
     method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 9f8ad36f6..a80694834 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -21,6 +21,8 @@ const storeActions = {
 
   GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
   GET_PARTS: "getParts",
+  GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",
+  GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer",
   SAVE_ORDER: "saveOrder",
   LOAD_ORDER: "loadOrder",
   UPDATE_STORE_WITH_SAVE_ORDER_RESPONSE: "updateStoreWithSaveOrderResponse",
@@ -55,6 +57,7 @@ const storeActions = {
   SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
   SAVE_GLASS_PARTS: "saveGlassParts",
   SAVE_PART_QUESTION_ANSWERS: "savePartQuestionAnswers",
+  SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers"
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index cce109c43..ba0adc7cb 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -17,6 +17,7 @@ const storeMutations = {
   UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips",
   UPDATE_GLASS_TO_REPLACE: "updateGlassToReplace",
   UPDATE_PART_QUESTION_ANSWERS: "updatePartQuestionAnswers",
+  UPDATE_CAPABILITY_QUESTION_ANSWERS: "updateCapabilityQuestionAnswers",
   UPDATE_GLASS_PARTS: "updateGlassParts",
   UPDATE_OTHER_PARTS: "updateOtherParts",
 
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index a29aa3779..ea51194e8 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -11,7 +11,6 @@
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <h1>CAPABILITY QUESTIONS TEMPORARY PLACEHOLDER</h1>
                 <alert
                     ref="alertFewMoreQuestions"
                     class="my-5"
@@ -20,16 +19,13 @@
                     :manualCopy="AlertFewMoreQuestionsCopy"
                     v-bind:isDismissible="false"
                 />
-                <div v-for="(part, i) in capabilityQuestionsData" :key="i">
-                    <questionChain
-                        ref="questionChain"
-                        v-model="selectedModel"
-                        :questionData="part"
-                        :partIndex="i"
-                        v-if="showThisPartQuestionChain(part, i)"
-                        validationRules="questions-required"
-                    />
-                </div>
+                <questionChain
+                    ref="questionChain"
+                    v-model="selectedAnswer"    
+                    :questionData="capabilityQuestionsData"
+                    :partIndex="i"
+                    validationRules="questions-required"
+                />
                 <funnel-footer
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
@@ -57,17 +53,19 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
     name: "capability-questions",
+    mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
@@ -89,55 +87,51 @@ export default {
     },
     data() {
         return {
-            selectedModel: [],
-            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).partsOrQuestions.filter((p) => {
-                if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
-                    return {
-                        glassName: p.glassName,
-                        glassLocation: p.glassLocation,
-                        partQuestions: p.partQuestions,
-                    };
-                }
-            }),
-            currentPartNum: 0,
+            selectedAnswer: [],
+            // TODO This shouldn't be an object with property `partQuestions`
+            capabilityQuestionsData: {
+                partQuestions: store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).capabilityQuestions
+            }
         };
     },
     computed: {
         AlertFewMoreQuestionsHeader() {
-			return this.getCmsContent("AlertPartsQuestions", "HeadlineText");
+			return this.getCmsContent("AdditionalPartsQuestionsAlert", "HeadlineText");
 		},
         AlertFewMoreQuestionsCopy() {
-			return this.getCmsContent("AlertPartsQuestions", "BodyText");
+			return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
 		},
+        windshieldPart() {
+            return this.pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD);
+        },
+        windshieldPartInfo() {
+            return this.windshieldPart.parts[0];
+        },
+        pageData() {
+            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+        }
     },
     methods: {
         arePagePrerequisitesValid() {
-            return false; // TODO - DO TRUE TEST OF PAGEDATA
-            // return Object.keys(store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)).length > 0;
-        },
-        showThisPartQuestionChain(part, i) {
-            if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
-            if (this.currentPartNum === i || part.answerData?.answerResult.length > 0) { return true; }
-            return false;
-        },
-        backButtonAction() {
-            // route to move backwards
-            this.$router.navigate(
-                this.navigationScenarios.CLICKED_BACK,
-                this.$route
-            );
+            const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+            return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
         },
         async forwardButtonAction() {
-            // TODO: TO COME
-        },
-    },
-    watch: {
-        selectedModel(model) {
-            this.capabilityQuestionsData[model.partIndex].answerData = {
-                answerResult: model.answerResult,
-                answeredQuestions: model.answeredQuestions,
-            }
-            this.currentPartNum = model.partIndex + 1;
+            const selectedAnswerResult1 = this.selectedAnswer.answerResult;
+            const selectedAnswerResult2 = this.pageData.capabilityQuestions[0].answers.find(x => x.answerResult1 === selectedAnswerResult1).answerResult2;
+
+            this.dispatchStoreAction(storeActions.SAVE_CAPABILITY_QUESTION_ANSWERS, {
+                glassName: this.windshieldPart.glassName,
+                glassLocation: this.windshieldPart.glassLocation,
+                result1: selectedAnswerResult1,
+                result2: selectedAnswerResult2
+            });
+
+            const partFromCapabilityQuestionAnswer = (await this.dispatchStoreAction(storeActions.GET_PART_FROM_CAPABILITY_QUESTION_ANSWER)).data;
+            let partsOrQuestions = this.pageData.partsOrQuestions;
+            partsOrQuestions.find(partOrQuestion => partOrQuestion.glassLocation === damageLocationsSelected.WINDSHIELD).parts = partFromCapabilityQuestionAnswer;
+
+            this.navigateForward(partsOrQuestions);
         },
     },
     components: {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 1f8160adf..7aca0e77f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -123,13 +123,6 @@ export default {
             if (this.currentPartNum === i || part.answerData?.answerResult?.length > 0) { return true; }
             return false;
         },
-        backButtonAction() {
-            // route to move backwards
-            this.$router.navigate(
-                this.navigationScenarios.CLICKED_BACK,
-                this.$route
-            );
-        },
         async forwardButtonAction() {
             const partQuestionAnswersArray = this.partsQuestionsData.map((item) => {
                 return {
@@ -155,32 +148,7 @@ export default {
                 });
 
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
-            const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
-
-            // NAVIGATE FORWARD
-            if (hasGlassLocationWithMultipleParts) {
-                // if multiple parts on any glass
-                // go to vehicle-parts page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else if (hasChildPartQuestions) {
-                // if any childpart questions
-                // go to molding-questions page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.HAS_MOLDING_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else if (hasCapabilityQuestions) {
-                // if has capability questions
-                // go to capability-questions page and pass the partsData
-                this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
-            } else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            this.navigateForward(glassNameAndPartsForStore);
         },
         arePagePrerequisitesValid() {
             const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index bd7911da4..2e9110d7a 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -9,6 +9,7 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 import baseMixin from "@/mixins/base-mixin.js";
+import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
@@ -227,7 +228,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS, wrapper.vm.$route);
 
     });
 
@@ -266,7 +267,7 @@ describe("vehicle-parts.vue", () => {
         wrapper.vm.backButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS, wrapper.vm.$route);
+        expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP, wrapper.vm.$route);
 
     });
 
@@ -311,6 +312,7 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
+        store.getters.lineItems = { glassParts: {} }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -367,6 +369,8 @@ describe("vehicle-parts.vue", () => {
                 }
             ]
         });
+        store.getters.lineItems = { glassParts: {} }
+        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
@@ -382,6 +386,12 @@ describe("vehicle-parts.vue", () => {
                     getters: store.getters,
                     commit: store.commit
                 },
+                actionList: [
+                    {
+                        actionName: storeActions.GET_CAPABILITY_QUESTIONS,
+                        data: []
+                    }
+                ]
             }
         });
 
@@ -406,6 +416,7 @@ describe("vehicle-parts.vue", () => {
         //Arrange
         store.getters.pageData.mockReturnValueOnce(basePartResponse);
         store.getters.lineItems = { glassParts: {} }
+        store.getters.vehicle = { carId: "TEST_CAR_ID" }
         
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index c7f1424a1..a276ef132 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -132,8 +132,8 @@ export default {
                             ColorAnswerText: p.color,
                             FeatureAnswers: [
                                 {
-                                FeatureAnswerText: p.description === "" ? p.color : p.description,
-                                PartNumber: p.partNumber,
+                                    FeatureAnswerText: p.description === "" ? p.color : p.description,
+                                    PartNumber: p.partNumber,
                                 },
                             ],
                         });
@@ -159,15 +159,6 @@ export default {
             return store.getters.damage.isRepair != null && store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
             Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
         },
-        backButtonAction() {
-            const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions);
-            const backNavigationScenario = hasPartQuestions ? this.navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS : this.navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS;
-
-            this.$router.navigate(
-                backNavigationScenario,
-                this.$route
-            );
-        },
         async forwardButtonAction() {
             const matchedParts = [];
 
@@ -191,10 +182,6 @@ export default {
                     }
                 }
             }
-
-            const hasChildPartQuestions = this.hasChildPartQuestions(matchedParts);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(matchedParts);
-
             // If no parts could be matched, throw an error (isForwardActionDisabled is based off of matchedParts)
             if (this.isForwardActionDisabled) {
                 this.$refs.funnelFooter.removeLoader();
@@ -202,33 +189,7 @@ export default {
             }
 
             // Navigate to the next page
-            if (hasChildPartQuestions) {
-                this.$router.navigate(
-                    this.navigationScenarios.HAS_MOLDING_QUESTIONS,
-                    this.$route,
-                    {},
-                    {},
-                    {partsOrQuestions: matchedParts}
-                );
-            } else if (hasCapabilityQuestions) {
-                this.$router.navigate(
-                    this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
-                    this.$route,
-                    {},
-                    {},
-                    {partsOrQuestions: matchedParts}
-                );
-
-            } else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            this.navigateForward(matchedParts);
         },
 
         LoadInitialPartsData() {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 1a28fe028..a55859567 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,5 +1,13 @@
-export default {
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { storeMutations } from "@/constants/store-mutations.js";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { storeActions } from "@/constants/store-actions";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import baseMixin from "@/mixins/base-mixin.js";
+import store from "@/store";
 
+export default {
     methods: {
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some(pq => pq.partQuestions?.length > 0);
@@ -17,6 +25,7 @@ export default {
                 return pq.parts?.some(part => part.requiresCapabilityQuestions === true);
             });
         },
+
         // method to only include keys listed for lineItems.glassParts in 
         // https://safelite.atlassian.net/wiki/spaces/DC/pages/17137665/Catalog+Front-End+State#glassParts
         reducedGlassPartsArray(glassParts) {
@@ -37,7 +46,103 @@ export default {
                 }
             });
             return reducedGlassParts;
+        },
+        comparePageIndices(currentPage, fmgPage) {
+            const orderedVehicleQuestionPages = [
+                fmgPageValues.PART_QUESTIONS,
+                fmgPageValues.VEHICLE_PARTS,
+                fmgPageValues.MOLDING_QUESTIONS,
+                fmgPageValues.CAPABILITY_QUESTIONS,
+                fmgPageValues.QUOTE
+            ]
+
+            return orderedVehicleQuestionPages.indexOf(currentPage) - orderedVehicleQuestionPages.indexOf(fmgPage);
+        },
+        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
+            return this.comparePageIndices(currentPage, fmgPage) < 0;
+        },
+        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
+            return this.comparePageIndices(currentPage, fmgPage) > 0;
+        },
+        // Can't use `this` because navigateForward is also called from vin-pages-mixin
+        async navigateForward(partsOrQuestions, vm) {
+            const self = vm ?? this;
+            const currentPage = self.$route.query.fmgPage;
+            
+            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+
+            if (hasPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)) {
+                self.$router.navigate(self.navigationScenarios.HAS_PART_QUESTIONS, self.$route, {}, {}, {partsOrQuestions: partsOrQuestions});
+            }
+            else if (hasGlassLocationWithMultipleParts && this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
+                // if multiple parts on any glass
+                // go to vehicle-parts page and pass the partsData
+                self.$router.navigate(self.navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
+            } else if (hasChildPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
+                // if any childpart questions
+                // go to molding-questions page and pass the partsData
+                self.$router.navigate(self.navigationScenarios.HAS_MOLDING_QUESTIONS,self.$route,{},{},{partsOrQuestions: partsOrQuestions});
+            } else if (hasCapabilityQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
+                // if has capability questions
+                // go to capability-questions page and pass the partsData
+                const windshieldPart = partsOrQuestions.filter(x => x.glassLocation === damageLocationsSelected.WINDSHIELD)[0].parts[0];
+                let capabilityQuestions = (await baseMixin.methods.dispatchStoreAction(storeActions.GET_CAPABILITY_QUESTIONS, {
+                    carId: store.getters.vehicle.carId,
+                    partNumber: windshieldPart.partNumber
+                })).data;
+
+                capabilityQuestions.forEach(question => {
+                    question.answers = question.answers.map(answer => {
+                        return {
+                            ...answer,
+                            answerResult: answer.answerResult1
+                        }
+                    })
+                });
+                
+                self.$router.navigate(self.navigationScenarios.HAS_CAPABILITY_QUESTIONS, self.$route, {}, {}, { partsOrQuestions, capabilityQuestions });
+            } else {
+                // if single parts only
+                const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
+                // save to store lineItems.glassParts
+                self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
+               
+                // For quote pages MVP release
+                // self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
+            }
+        },
+        backButtonAction() {
+            const partsOrQuestions = this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions;
+            const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
+            let backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP;
+
+            const currentPage = this.$route.query.fmgPage;
+            if (hasCapabilityQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_CAPABILITY_QUESTIONS;
+            }
+            else if (hasChildPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS;
+            }
+            else if (hasGlassLocationWithMultipleParts && this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS;
+            }
+            else if (hasPartQuestions && this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)) {
+                backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS;
+            }
+
+            this.$router.navigate(
+                backNavigationScenario,
+                this.$route
+            );
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 01d41b9c8..13a2f083a 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,8 +1,22 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { storeMutations } from "@/constants/store-mutations";
+import { storeActions } from "@/constants/store-actions";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn()
+}));
 
 describe("vehicle-questions-mixin", () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    })
+
     describe("hasPartQuestions", () => {
         test("has no part questions => return false", () => {
             // Arrange
@@ -139,23 +153,994 @@ describe("vehicle-questions-mixin", () => {
             expect(hasGlassLocationWithMultipleParts).toBe(true);
         });
     });
+
+    describe("navigateForward", () => {
+        describe("should go to parts-questions", () => {
+            test("single glass location has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations have part questions => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 2,
+                                "questionText": "Is this a super awesome question?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144000"
+                                    },
+                                    {
+                                        "answerText": "Super yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143001"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": null,
+                        "partQuestions": [
+                            {
+                                "questionSequence": 1,
+                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
+                                "answers": [
+                                    {
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01144"
+                                    },
+                                    {
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null,
+                                        "answerResult": "DW01143"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08158GTYN",
+                                "description": "driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ08162GTYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ08162YPYN",
+                                "description": "driver side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "SideDoor",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD08160GTYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD08160YPYN",
+                                "description": "driver side, body side, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB08165GTNN",
+                                "description": "heated glass, stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08165YPNN",
+                                "description": "heated glass, stationary",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08166GTNN",
+                                "description": "stationary",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167GTNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB08167YPNN",
+                                "description": "heated glass, movable, 8 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to vehicle-parts", () => {
+            test("single glass location has multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW03647GTNN",
+                                "description": "solar, 3rd visor band",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": [
+                                    {
+                                        "partNumber": "MWF03647",
+                                        "partType": "MOULDING",
+                                        "description": "Upper "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25747GTYN",
+                                "description": "solar, driver side, rear, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25719GTYN",
+                                "description": "solar, driver side, front, ex models and above",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25749GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "FB25759GTYN",
+                                "description": "heated glass, solar, antenna, w/diversity antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+
+            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "DW02101GTYN",
+                                "description": "solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12202GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12202YPYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DD12198GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DD12200GTYN",
+                                "description": "solar, driver side, front, laminated, soundproofing",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Quarter",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "DQ12204GTYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12204YPYNOEM",
+                                "description": "solar, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205GTYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12205YPYNOEM",
+                                "description": "solar, antenna, driver side, encap",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207GTYN",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12207YPYNOEM",
+                                "description": "solar, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208GTYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DQ12208YPYNOEM",
+                                "description": "solar, antenna, driver side, encap, chrome molding",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "DB12209GTYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            },
+                            {
+                                "partNumber": "DB12209YPYN",
+                                "description": "heated glass, solar, 1 hole",
+                                "color": "Gray Tint Privacy",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to molding-questions", () => {
+            test("single glass location has child part questions => go to molding-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": [
+                                    {
+                                    "questionSequence": 1,
+                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
+                                    "answers": [
+                                        {
+                                        "answerResult": "WKT D1106 C",
+                                        "answerText": "Yes",
+                                        "nextQuestionSequence": null
+                                        },
+                                        {
+                                        "answerResult": "WKT D1106 B",
+                                        "answerText": "No",
+                                        "nextQuestionSequence": null
+                                        }
+                                    ]
+                                    }
+                                ]
+    
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+            });
+        });
+
+        describe("should go to capability-questions", () => {
+            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FB25724GTYN",
+                                "description": "heated glass, solar, antenna",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": true,
+                                "childParts": null,
+                                "childPartQuestions": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
+            });
+        });
+
+        describe("should go to heritage funnel", () => {
+            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ]
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+
+                // Assert
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+
+            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
+                // Arrange
+                const partsOrQuestions = [
+                    {
+                        "glassName": "Single",
+                        "glassLocation": "Windshield",
+                        "parts": [
+                            {
+                                "partNumber": "FW04186GTYN",
+                                "description": "solar, soundproofing, lane keep assist",
+                                "color": "Green Tint",
+                                "requiresRecalibration": true,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": [
+                                    {
+                                        "partNumber": "GGG 3563 KIT",
+                                        "partType": "MOULDING",
+                                        "description": "Kit, Top & Sides "
+                                    }
+                                ]
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Back",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD25457GTYN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Front",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FD27090GTYN",
+                                "description": "solar, driver side, front",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Vent",
+                        "glassLocation": "Driver",
+                        "parts": [
+                            {
+                                "partNumber": "FV25459GTNN",
+                                "description": "solar, driver side, rear",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    },
+                    {
+                        "glassName": "Stationary",
+                        "glassLocation": "Rear",
+                        "parts": [
+                            {
+                                "partNumber": "FB25460GTYN",
+                                "description": "heated glass, solar",
+                                "color": "Green Tint",
+                                "requiresRecalibration": false,
+                                "requiresCapabilityQuestions": false,
+                                "childParts": null
+                            }
+                        ],
+                        "partQuestions": null
+                    }
+                ];
+
+                const { wrapper } = setupMocks({
+                    partsOrQuestions: partsOrQuestions
+                });
+
+                wrapper.vm.$store.commit = jest.fn();
+
+                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
+
+                // Act
+                await wrapper.vm.navigateForward(partsOrQuestions);
+                
+
+                // Assert
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
+                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
+                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+            });
+        });
+    })
 });
 
-function setupMocks({}) {
-    const baseMixin = setupMocksForJsFiles({});
+function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
+    const baseMixin = setupMocksForJsFiles({
+        actionList: [{
+            actionName: storeActions.GET_CAPABILITY_QUESTIONS,
+            data: [],
+        }]
+    });
 
     const mocks = getMountOptions({
         router: {
             navigate: jest.fn()
         },
+        store: {
+            commit: jest.fn(),
+            dispatch: jest.fn()
+        },
+        route: {
+            query: {
+                fmgPage
+            }
+        }
     });
 
+    // store.dispatch = jest.fn();
+
     const mockVehicleQuestionComponent = {
-        template: '<div></div>',
+        components: { loadingModal },
+        template: '<loadingModal ref="loadingModal" />',
         mixins: [vehicleQuestionsMixin, baseMixin.baseMixin]
     };
 
     const wrapper = shallowMount(mockVehicleQuestionComponent, mocks);
 
+    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+
     return { wrapper };
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index a7ba799a2..817aa7b7e 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,43 +1,13 @@
 import { storeActions } from "@/constants/store-actions.js";
-import { storeMutations } from "@/constants/store-mutations.js";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 export default {
-    mixins: [vehicleQuestionsMixin],
     methods: {
         async navigateForwardWithSingleCarMatch() {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
-
             const partsOrQuestions = result.data.partsOrQuestions;
 
-            const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
-            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
-            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
-
-            if (hasPartsQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
-            }
-            else if (hasGlassLocationWithMultipleParts) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, this.$route, {}, {}, result.data);
-            }
-            else if (hasChildPartQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, this.$route, {}, {}, result.data);
-            }
-            else if (hasCapabilityQuestions) {
-                this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, this.$route, {}, {}, result.data);
-            }
-            else {
-                // if single parts only
-                const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
-                // save to store lineItems.glassParts
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-
-                // go to heritage quote page
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
-            }
+            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
         },
     }
 }
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index bfb1c4c06..4759eb5dc 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -2,14 +2,11 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
-import store from "@/store";
 import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
-    navigateToHeritageFunnel: jest.fn()
+    navigateForward: jest.fn()
 }));
 
 describe("vin-pages-mixin", () => {
@@ -18,955 +15,17 @@ describe("vin-pages-mixin", () => {
     })
 
     describe("navigateForwardWithSingleCarMatch", () => {
-        describe("should go to parts-questions", () => {
-            test("single glass location has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ];
+        test("should navigateForward", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            vehicleQuestionsMixin.methods.navigateForward = jest.fn();
 
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
+            // Act
+            await wrapper.vm.navigateForwardWithSingleCarMatch();
 
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations have part questions => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 2,
-                                "questionText": "Is this a super awesome question?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144000"
-                                    },
-                                    {
-                                        "answerText": "Super yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143001"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": null,
-                        "partQuestions": [
-                            {
-                                "questionSequence": 1,
-                                "questionText": "Is there a line running across the bottom, driver's side then up the center of the Windshield?",
-                                "answers": [
-                                    {
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01144"
-                                    },
-                                    {
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null,
-                                        "answerResult": "DW01143"
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08158GTYN",
-                                "description": "driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ08162GTYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ08162YPYN",
-                                "description": "driver side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "SideDoor",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD08160GTYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD08160YPYN",
-                                "description": "driver side, body side, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB08165GTNN",
-                                "description": "heated glass, stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08165YPNN",
-                                "description": "heated glass, stationary",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08166GTNN",
-                                "description": "stationary",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167GTNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB08167YPNN",
-                                "description": "heated glass, movable, 8 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to vehicle-parts", () => {
-            test("single glass location has multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW03647GTNN",
-                                "description": "solar, 3rd visor band",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": [
-                                    {
-                                        "partNumber": "MWF03647",
-                                        "partType": "MOULDING",
-                                        "description": "Upper "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25747GTYN",
-                                "description": "solar, driver side, rear, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25719GTYN",
-                                "description": "solar, driver side, front, ex models and above",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25749GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "FB25759GTYN",
-                                "description": "heated glass, solar, antenna, w/diversity antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-
-            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "DW02101GTYN",
-                                "description": "solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12202GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12202YPYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DD12198GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DD12200GTYN",
-                                "description": "solar, driver side, front, laminated, soundproofing",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Quarter",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "DQ12204GTYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12204YPYNOEM",
-                                "description": "solar, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205GTYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12205YPYNOEM",
-                                "description": "solar, antenna, driver side, encap",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207GTYN",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12207YPYNOEM",
-                                "description": "solar, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208GTYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DQ12208YPYNOEM",
-                                "description": "solar, antenna, driver side, encap, chrome molding",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "DB12209GTYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            },
-                            {
-                                "partNumber": "DB12209YPYN",
-                                "description": "heated glass, solar, 1 hole",
-                                "color": "Gray Tint Privacy",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to molding-questions", () => {
-            test("single glass location has child part questions => go to molding-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": [
-                                    {
-                                    "questionSequence": 1,
-                                    "questionText": "Does the rubber seal around your windshield have a chrome strip running through it?",
-                                    "answers": [
-                                        {
-                                        "answerResult": "WKT D1106 C",
-                                        "answerText": "Yes",
-                                        "nextQuestionSequence": null
-                                        },
-                                        {
-                                        "answerResult": "WKT D1106 B",
-                                        "answerText": "No",
-                                        "nextQuestionSequence": null
-                                        }
-                                    ]
-                                    }
-                                ]
-    
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to capability-questions", () => {
-            test("single glass location has no child part questions but requiresCapabilityQuestions is true => go to capability-questions", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25724GTYN",
-                                "description": "heated glass, solar, antenna",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": true,
-                                "childParts": null,
-                                "childPartQuestions": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
-            });
-        });
-
-        describe("should go to heritage funnel", () => {
-            test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ]
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-
-                // Assert
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-
-            test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
-                // Arrange
-                const partsOrQuestions = [
-                    {
-                        "glassName": "Single",
-                        "glassLocation": "Windshield",
-                        "parts": [
-                            {
-                                "partNumber": "FW04186GTYN",
-                                "description": "solar, soundproofing, lane keep assist",
-                                "color": "Green Tint",
-                                "requiresRecalibration": true,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": [
-                                    {
-                                        "partNumber": "GGG 3563 KIT",
-                                        "partType": "MOULDING",
-                                        "description": "Kit, Top & Sides "
-                                    }
-                                ]
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Back",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD25457GTYN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Front",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FD27090GTYN",
-                                "description": "solar, driver side, front",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Vent",
-                        "glassLocation": "Driver",
-                        "parts": [
-                            {
-                                "partNumber": "FV25459GTNN",
-                                "description": "solar, driver side, rear",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    },
-                    {
-                        "glassName": "Stationary",
-                        "glassLocation": "Rear",
-                        "parts": [
-                            {
-                                "partNumber": "FB25460GTYN",
-                                "description": "heated glass, solar",
-                                "color": "Green Tint",
-                                "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
-                                "childParts": null
-                            }
-                        ],
-                        "partQuestions": null
-                    }
-                ];
-
-                const { wrapper } = setupMocks({
-                    partsOrQuestions: partsOrQuestions
-                });
-
-                wrapper.vm.$store.commit = jest.fn();
-
-                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
-
-                // Act
-                await wrapper.vm.navigateForwardWithSingleCarMatch();
-                
-
-                // Assert
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts)
-                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
-            });
-        });
+            // Assert            
+            expect(vehicleQuestionsMixin.methods.navigateForward).toHaveBeenCalled();
+        })
     });
 });
 
@@ -982,14 +41,7 @@ function setupMocks({ partsOrQuestions = [] }) {
         ],
     });
 
-    const mocks = getMountOptions({
-        router: {
-            navigate: jest.fn()
-        },
-        store: {
-            commit: jest.fn()
-        }
-    });
+    const mocks = getMountOptions({});
 
     const mockVinComponent = {
         components: { loadingModal },
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 2bd259909..7cca25d09 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -8,10 +8,10 @@ const navigationScenarios = {
   CLICKED_FORWARD: "CLICKED_FORWARD",
   CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
   SELECTED_PARTS: "SELECTED_PARTS",
-  SELECTED_VIN_WITH_PART_QUESTIONS: "SELECTED_VIN_WITH_PART_QUESTIONS",
-  SELECTED_VIN_WITH_MULTIPLE_PARTS: "SELECTED_VIN_WITH_MULTIPLE_PARTS",
-  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "SELECTED_VIN_WITH_MOLDING_QUESTIONS",
-  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "SELECTED_VIN_WITH_CAPABILITY_QUESTIONS",
+  SELECTED_VIN_WITH_PART_QUESTIONS: "HAS_PART_QUESTIONS",
+  SELECTED_VIN_WITH_MULTIPLE_PARTS: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
+  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
+  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
   CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
   CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
   SELECTED_VIN_HAS_MISMATCHED_GLASS: "SELECTED_VIN_HAS_MISMATCHED_GLASS",
@@ -24,8 +24,15 @@ const navigationScenarios = {
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
   CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
   CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
+  ANSWERED_ALL_QUESTIONS: "ANSWERED_ALL_QUESTIONS",
+  HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
+  HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
   HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
+  CLICKED_BACK_TO_GO_TO_VIN_LOOKUP: "CLICKED_BACK_TO_GO_TO_VIN_LOOKUP",
+  CLICKED_BACK_TO_GO_TO_PART_QUESTIONS: "CLICKED_BACK_TO_GO_TO_PART_QUESTIONS",
+  CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS: "CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS",
+  CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS: "CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 37fb1c13e..34c5263cf 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -69,27 +69,6 @@ const routingTable = function(store) {
         },
       ],
     },
-    {
-      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-      maps: [
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_FORWARD,
-          destinationFmgPageValue: fmgPageValues.REVEAL,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTION_ANSWERS,
-          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-        },
-        {
-          scenario: navigationScenarios.CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
-      ],
-    },
     {
       fmgPageValue: fmgPageValues.REVEAL,
       maps: [
@@ -256,11 +235,11 @@ const routingTable = function(store) {
       fmgPageValue: fmgPageValues.PART_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
           destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
@@ -272,31 +251,92 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ]
     },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_PARTS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.REVEAL,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+        },
+        {
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+      ],
+    },
     {
       fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
           scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
+        {
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        }
       ]
     },
     {
       fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
       maps: [
         {
-          scenario: navigationScenarios.CLICKED_BACK,
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VIN_LOOKUP,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_MOLDING_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.QUOTE
+        },
       ]
     },
   ];
diff --git a/src/store/index.js b/src/store/index.js
index 0220bf97e..b8b5ffe16 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -49,6 +49,7 @@ const getDefaultState = () => {
         numberOfChips: null,
         glassToReplace: null,
         partQuestionAnswers: null,
+        capabilityQuestionAnswers: null
       },
       lineItems: {
         glassParts: null
@@ -126,6 +127,9 @@ export const mutations = {
   updatePartQuestionAnswers(state, answersArray) {
     state.order.damage.partQuestionAnswers = answersArray;
   },
+  updateCapabilityQuestionAnswers(state, answersArray) {
+    state.order.damage.capabilityQuestionAnswers = answersArray;
+  },
   updateGlassParts(state, partsData) {
     state.order.lineItems.glassParts = partsData;
   },
@@ -277,6 +281,7 @@ export const mutations = {
   resetGlassPartsState(state) {
     state.order.lineItems.glassParts = null;
     state.order.damage.partQuestionAnswers = null;
+    state.order.damage.capabilityQuestionAnswers = null;
     state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
     state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
     state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
@@ -737,6 +742,29 @@ export const actions = {
     });
   },
 
+  getCapabilityQuestions(context, { carId, partNumber }) {
+    return globalMethods.callHttpClient({
+      method: endpoints.GetCapabilityQuestions.method,
+      endpoint: `${endpoints.GetCapabilityQuestions.url}/${carId}/${partNumber}`,
+    })
+  },
+
+  getPartFromCapabilityQuestionAnswer(context, selectedAnswerResult1) {
+    const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+
+    const part = pageData.partsOrQuestions.find(x => x.glassLocation === damageLocationsSelected.WINDSHIELD).parts[0];
+    const capabilityQuestionAnswers = context.getters.damage.capabilityQuestionAnswers;
+      
+    return globalMethods.callHttpClient({
+      method: endpoints.ApplyCapabilityAnswerToPart.method,
+      endpoint: endpoints.ApplyCapabilityAnswerToPart.url,
+      payload: {
+        part,
+        capabilityAnswerResults: capabilityQuestionAnswers
+      }
+    })
+  },
+
   // Order API Actions
   saveOrder(context) {
     const vehicle = context.getters.vehicle;
@@ -967,10 +995,22 @@ export const actions = {
     }
   },
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
+    // if part question answers have changed, reset subsequent question answers
+    const previousResultsArray = context.getters.damage.partQuestionAnswers;
+    const havePartQuestionAnswersChanged = previousResultsArray.length !== partQuestionAnswersArray.length ||
+      !previousResultsArray.every((x, i) => x.result === partQuestionAnswersArray[i].result);
+
+    if (havePartQuestionAnswersChanged) {
+      context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
+    }
+
     //Save new values
     context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
   },
-
+  saveCapabilityQuestionAnswers(context, capabilityQuestionAnswers) {
+    //Save new values
+    context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, capabilityQuestionAnswers);
+  },
   // Misc order actions
   saveServiceLocation(context, serviceLocationInfo) {
     context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceLocationInfo);

From ad4ac40c8b1ba846c3ff361c3a71d66486c227ed Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 12:13:40 -0400
Subject: [PATCH 22/29] CSR-111-parts Fix loadingModal issue for vin-pages

---
 src/mixins/vehicle-questions-mixin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index a55859567..9164045c9 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -110,7 +110,7 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                this.$refs.loadingModal.showModal();
+                self.$refs.loadingModal.showModal();
                 navigateToHeritageFunnel();
                
                 // For quote pages MVP release

From 7fe22d0baecb6df4735d515f5c6ac761e3907865 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 18 Aug 2022 13:27:39 -0400
Subject: [PATCH 23/29] CSR-793 hide content from screen readers when
 collapsed.

---
 src/layouts/vin-lookup/vin-information/vin-information.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index 50194ee7b..ec973b892 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -79,6 +79,7 @@ export default {
       max-height: 500px;
       transition: all 250ms ease-in;
       opacity: 1;
+      visibility: visible;
     }
   }
   .vin-info {
@@ -86,6 +87,7 @@ export default {
     transition: all 250ms ease-out;
     overflow: hidden;
     opacity: 0;
+    visibility: hidden;
     p {
       margin-bottom: .5rem;
     }

From 46c4b355f7edd26b6b016ef3cce3d98e7483df25 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 18 Aug 2022 15:33:54 -0400
Subject: [PATCH 24/29] CSR-794 Fix variable name

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

diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index f26ec5ed0..e3524e3f0 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="windshield-options">
         <windshieldDamageTypeQuestion cmsWidgetName="WindshieldDamageTypeQuestion"
-            :isAvailable=isWindshieldDamageLocation
+            :isAvailable="isWindshieldDamageLocation"
             :suppressError="hasRepairReplaceConflict || showNoReplacementAvailableError"
             groupName="WindshieldDamageTypeQuestion"
             v-model="selectedWindshieldDamageTypeValue"
@@ -13,7 +13,7 @@
             cmsWidgetName="NoReplacementAvailableError"
             alertClass="alert-danger"
             :isDismissible="false"
-          />
+        />
         <windshieldChipCountQuestion cmsWidgetName="WindshieldChipCountQuestion"
             :isAvailable="isRepairOptionSelected && !hasRepairReplaceConflict"
             groupName="WindshieldChipCountQuestion"
@@ -137,20 +137,17 @@ export default ({
             }
         },
         isWindshieldDamageLocation() {
-            return this.selectedDamageLocations.some(selectedDamages =>
-                {
-                    return Boolean(selectedDamages.toUpperCase() === "WINDSHIELD");
-                });
+            return this.selectedDamageLocations.some(selectedDamageLocation => selectedDamageLocation === damageLocationsSelected.WINDSHIELD);
         },
         isRepairOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPAIR) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPAIR && this.isWindshieldDamageLocation;
         },
         isReplaceOptionSelected(){
-            if (!this.selectedWindshieldDamageTypeValues) return false;
+            if (!this.selectedWindshieldDamageTypeValue) return false;
 
-            return this.selectedWindshieldDamageTypeValues.some(val => val === damageLocationsSelected.REPLACE) && this.isWindshieldDamageLocation;
+            return this.selectedWindshieldDamageTypeValue === damageLocationsSelected.REPLACE && this.isWindshieldDamageLocation;
         },
         isWindshieldReplaceAvailable() {
             return !(Array.isArray(this.windshieldAvailableReplacementOptions) && this.windshieldAvailableReplacementOptions.length < 1);

From 53f1b6117681f826d8f242bda553751e370bdd0c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 19 Aug 2022 10:37:07 -0400
Subject: [PATCH 25/29] CSR-108: remove no longer needed code block

---
 src/layouts/part-questions/part-questions.vue | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index bbd71fbd5..8082e42f7 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -207,9 +207,7 @@ export default {
                                     const thisAnsweredPartQuestion = glassPart.partQuestions[pqIndex];
 
                                     // remove answerData from this glass part
-                                    // delete glassPart.answerData;
                                     glassPart.answerData = null;
-                                    // delete glassPart.isSuppressedPart;
                                     glassPart.isSuppressedPart = null;
 
                                     // Update the key to re-render this part's question-chain component
@@ -440,55 +438,6 @@ export default {
                 return part;
             });
 
-            // this block is purely for handling duplicate questions
-            alreadyAnsweredQuestions?.forEach((savedPart, partIndex) => {
-                savedPart.answeredQuestions.forEach((aq) => {
-                    if (aq.isDuplicateQuestion) {
-                        // find this one in partsQuestionData
-                        const dupedPartsQuestion = this.partsQuestionsData[partIndex].partQuestions[aq.questionNum - 1];
-                        dupedPartsQuestion.suppressDuplicateQuestion = true;
-
-                        const dupedPartsQuestionAnswer = dupedPartsQuestion.answers.filter((ans) => {
-                            return ans.answerText.toUpperCase() === aq.selectedAnswerText.toUpperCase();
-                        })[0];
-
-                        let isDupedPartsQuestionFirst;
-                        if (aq.questionNum === 1) { isDupedPartsQuestionFirst = true }
-
-                        this.partsQuestionsData.forEach((glassPart, i) => {
-
-                            // loop through this glass part's part questions, looking for a questionText match
-                            glassPart.partQuestions.forEach((pq, pqIndex) => {
-                                // if this dupedQ is the first in the array then 
-                                //     suppress all questions for this part up until the answer's nextQuestionSequence
-                                if (isDupedPartsQuestionFirst && 
-                                    dupedPartsQuestionAnswer.nextQuestionSequence &&
-                                    pq.questionSequence < dupedPartsQuestionAnswer.nextQuestionSequence) {
-                                        pq.suppressDuplicateQuestion = true;
-                                    }
-                                pq.answers.forEach((thisAns) => {
-                                    if (thisAns.nextQuestionSequence === aq.questionNum) {
-                                        // update either the nextQuestionSequence or the answerResult
-                                        if (dupedPartsQuestionAnswer.nextQuestionSequence) {
-                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
-                                            thisAns.nextQuestionSequence = dupedPartsQuestionAnswer.nextQuestionSequence;
-                                            // update this change to answerSelected
-                                            pq.answerSelected = `${pq.questionSequence}|nextQuestion|${thisAns.nextQuestionSequence}|${thisAns.answerText}`;
-                                        } else {
-                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
-                                            thisAns.nextQuestionSequence = null;
-                                            thisAns.originalAnswerResult = thisAns.originalAnswerResult || thisAns.answerResult;
-                                            thisAns.answerResult = dupedPartsQuestionAnswer.answerResult;
-                                        }
-                                    }
-                                })
-                            });
-                            
-                        });
-
-                    }
-                })
-            });
         },
     },
     components: {

From 813cd3400991db39e87af842913eeaddd52a70f3 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 19 Aug 2022 10:37:57 -0400
Subject: [PATCH 26/29] CSR-108: allow for cases where there is no damage state
 saved

---
 src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index b8b5ffe16..359d9cb3b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -997,7 +997,7 @@ export const actions = {
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
     // if part question answers have changed, reset subsequent question answers
     const previousResultsArray = context.getters.damage.partQuestionAnswers;
-    const havePartQuestionAnswersChanged = previousResultsArray.length !== partQuestionAnswersArray.length ||
+    const havePartQuestionAnswersChanged = previousResultsArray?.length !== partQuestionAnswersArray.length ||
       !previousResultsArray.every((x, i) => x.result === partQuestionAnswersArray[i].result);
 
     if (havePartQuestionAnswersChanged) {

From 64e046dd006b5290f583f5d9dbdd7f11ef159ea2 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 19 Aug 2022 11:31:52 -0400
Subject: [PATCH 27/29] CSR-748 Cleanup routing and navigation-scenarios

---
 src/mixins/vehicle-questions-mixin.js         |  2 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 18 +++----
 .../router-constants/navigation-scenarios.js  | 23 +++++----
 src/router/router-constants/routing-table.js  | 48 ++++++++-----------
 4 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 9164045c9..1e6330a60 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -114,7 +114,7 @@ export default {
                 navigateToHeritageFunnel();
                
                 // For quote pages MVP release
-                // self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
+                // self.$router.navigate(self.navigationScenarios.HAS_NO_MORE_QUESTIONS, self.$route);
             }
         },
         backButtonAction() {
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 13a2f083a..52b6ac787 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -193,7 +193,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
 
             test("multiple glass locations have part questions => go to parts-questions", async () => {
@@ -301,7 +301,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
 
             test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
@@ -401,7 +401,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
 
             test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
@@ -549,7 +549,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
         });
 
@@ -591,7 +591,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
 
             test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
@@ -697,7 +697,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
 
             test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
@@ -869,7 +869,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
         });
 
@@ -922,7 +922,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
             });
         });
 
@@ -957,7 +957,7 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
             });
         });
 
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 7cca25d09..25b749212 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -1,34 +1,33 @@
 const navigationScenarios = {
+  // General
+  CLICKED_BACK: "CLICKED_BACK",
+  CLICKED_FORWARD: "CLICKED_FORWARD",
+
+  // YMMS
   SELECTED_YEAR: "SELECTED_YEAR",
   SELECTED_MODEL: "SELECTED_MODEL",
   SELECTED_MAKE: "SELECTED_MAKE",
   SELECTED_STYLE: "SELECTED_STYLE",
-  CLICKED_BACK: "CLICKED_BACK",
+  
+  // Vin pages
   CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-  CLICKED_FORWARD: "CLICKED_FORWARD",
   CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-  SELECTED_PARTS: "SELECTED_PARTS",
-  SELECTED_VIN_WITH_PART_QUESTIONS: "HAS_PART_QUESTIONS",
-  SELECTED_VIN_WITH_MULTIPLE_PARTS: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
-  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
-  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
-  CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
+  CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN", 
   CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
   SELECTED_VIN_HAS_MISMATCHED_GLASS: "SELECTED_VIN_HAS_MISMATCHED_GLASS",
-  CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN", 
   SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN", 
   SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE", 
   SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
   ANSWERED_QUESTIONS_WITH_SINGLE_PART: "ANSWERED_QUESTIONS_WITH_SINGLE_PART",
   ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS: "ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS",
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
-  CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
-  CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
-  ANSWERED_ALL_QUESTIONS: "ANSWERED_ALL_QUESTIONS",
+
+  // Question pages
   HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
   HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
   HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
+  HAS_NO_MORE_QUESTIONS: "HAS_NO_MORE_QUESTIONS",
   CLICKED_BACK_TO_GO_TO_VIN_LOOKUP: "CLICKED_BACK_TO_GO_TO_VIN_LOOKUP",
   CLICKED_BACK_TO_GO_TO_PART_QUESTIONS: "CLICKED_BACK_TO_GO_TO_PART_QUESTIONS",
   CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS: "CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 34c5263cf..733931acf 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -76,10 +76,6 @@ const routingTable = function(store) {
           scenario: navigationScenarios.CLICKED_BACK,
           destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
         },
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
       ],
     },
     {
@@ -98,19 +94,19 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
@@ -127,19 +123,19 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
@@ -160,19 +156,19 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
@@ -189,19 +185,19 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
         },   
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         },
         {
@@ -251,7 +247,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ]
@@ -259,10 +255,6 @@ const routingTable = function(store) {
     {
       fmgPageValue: fmgPageValues.VEHICLE_PARTS,
       maps: [
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
         {
           scenario: navigationScenarios.CLICKED_FORWARD,
           destinationFmgPageValue: fmgPageValues.REVEAL,
@@ -284,7 +276,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
       ],
@@ -309,7 +301,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
         },
         {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
         }
       ]
@@ -334,7 +326,7 @@ const routingTable = function(store) {
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
         },
         {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.QUOTE
         },
       ]

From 14c85c8eb710c1f15527d6ee43668c62f45bf8b8 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 19 Aug 2022 12:52:46 -0400
Subject: [PATCH 28/29] CSR-748 Remove more unused navigation scenarios

---
 src/router/router-constants/navigation-scenarios.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 25b749212..7578a0295 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -18,9 +18,6 @@ const navigationScenarios = {
   SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN", 
   SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE", 
   SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-  ANSWERED_QUESTIONS_WITH_SINGLE_PART: "ANSWERED_QUESTIONS_WITH_SINGLE_PART",
-  ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS: "ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS",
-  SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
 
   // Question pages
   HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",

From 1255375de32c0315ae830273a5d0dddf1e5b0619 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 19 Aug 2022 12:53:36 -0400
Subject: [PATCH 29/29] CSR-748 Remove more unused navigation scenarios

---
 src/router/router-constants/routing-table.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 733931acf..d17530145 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -200,10 +200,6 @@ const routingTable = function(store) {
           scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         },
-        {
-          scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
-          destinationFmgPageValue: fmgPageValues.ESTIMATE
-        }
       ],
     },
     {