From f6ca73d2c076c37fa1bf0dd8b18290eae00493d2 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 12 Jul 2022 15:22:24 -0400
Subject: [PATCH 01/44] change event constant to match gtm trigger

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

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index a3f057150..d4ac3d2ea 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -5,7 +5,7 @@ const analyticsPageEvents = {
 
 // GA Constants
 const GaEvents = {
-  GENERIC_EVENT: 'ga_Event',
+  GENERIC_EVENT: 'event',
   PAGE_VIEW_EVENT : 'logPageview'
 };
 

From 453d086a1dffd0f983bb56d3dcf4c7c797d08563 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 15 Jul 2022 12:14:39 -0400
Subject: [PATCH 02/44] CSR-666 Add experiment-mixin

---
 src/mixins/experiment-mixin.js      | 13 +++++++++++++
 src/mixins/experiment-mixin.spec.js |  0
 2 files changed, 13 insertions(+)
 create mode 100644 src/mixins/experiment-mixin.js
 create mode 100644 src/mixins/experiment-mixin.spec.js

diff --git a/src/mixins/experiment-mixin.js b/src/mixins/experiment-mixin.js
new file mode 100644
index 000000000..de6edd79c
--- /dev/null
+++ b/src/mixins/experiment-mixin.js
@@ -0,0 +1,13 @@
+export default {
+    methods: {
+        hasSettingEqualTo(settingName, settingValue) {
+            
+        },
+        hasSetting(settingName) {
+
+        },
+        getSettingValue(settingName) {
+
+        }
+    },
+}
\ No newline at end of file
diff --git a/src/mixins/experiment-mixin.spec.js b/src/mixins/experiment-mixin.spec.js
new file mode 100644
index 000000000..e69de29bb

From 3f29cc1a89627eae895aeb991134764f640a85ea Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 15 Jul 2022 12:52:44 -0400
Subject: [PATCH 03/44] CSR-734 Fix validation rule

---
 .../windshield-damage-type-question.vue                |  1 -
 .../windshield-options/windshield-options.vue          |  2 +-
 src/ux-components/list-card/list-card.vue              | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index ce162617d..e76536103 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -17,7 +17,6 @@
 
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
-import store from "@/store";
 
 export default ({
     name: "windshieldDamageTypeQuestion",
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index c5d3af741..b226a913d 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -55,7 +55,7 @@ defineRule("windshield-damage-type-required", required(errorMessages.WINDSHIELD_
 defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_CHIP_COUNT_REQUIRED));
 defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
 
-defineRule("check-for-repair-and-replace", (selectedWindshieldDamageType, [selectedDamageLocations]) => {
+defineRule("check-for-repair-and-replace", (selectedWindshieldDamageType, selectedDamageLocations) => {
     return selectedWindshieldDamageType.toString() != damageLocationsSelected.REPAIR || 
             !selectedDamageLocations.includes(damageLocationsSelected.WINDSHIELD) ||
             selectedDamageLocations.length === 1;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index df79fd07f..a4ef7eac8 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -7,11 +7,11 @@
         isWide ? 'horizontal' : '',
         (errors.length > 0 || hasError) ? 'has-error' : '',
       ]"
-      @keyup.space="triggerButton()"
-      @keyup.up="handleKeyupArrow()"
-      @keyup.down="handleKeyupArrow()"
-      @keyup.left="handleKeyupArrow()"
-      @keyup.right="handleKeyupArrow()"
+      @keyup.space="triggerButton"
+      @keyup.up="handleKeyupArrow"
+      @keyup.down="handleKeyupArrow"
+      @keyup.left="handleKeyupArrow"
+      @keyup.right="handleKeyupArrow"
     >
       <input
         :type="isMultiSelect ? 'checkbox' : 'radio'"

From 8217ebd4c797d8fe4cf61313eb0b49af50d0a385 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 18 Jul 2022 08:56:36 -0400
Subject: [PATCH 04/44] CSR-517 Add event for enter key on list-button

---
 src/ux-components/list-button/list-button.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 6f67d6426..34b6f92e0 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -3,6 +3,7 @@
     class="list-group list-button rounded-3 d-flex flex-column w-100 mb-2"
     :class="[(errors.length > 0 || hasError) ? 'has-error' : '']"
     @keyup.space="triggerButton"
+    @keyup.enter="triggerButton"
     @keyup.up="handleKeyupArrow"
     @keyup.down="handleKeyupArrow"
     @keyup.left="handleKeyupArrow"

From 0fdda5b4a2af62fee96b5080ea0c92017bcc6253 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 18 Jul 2022 11:28:34 -0400
Subject: [PATCH 05/44] CSR-666 Add methods to experiment-mixin

---
 src/mixins/experiment-mixin.js      |   6 +-
 src/mixins/experiment-mixin.spec.js | 154 ++++++++++++++++++++++++++++
 src/store/index.js                  |   2 +
 3 files changed, 159 insertions(+), 3 deletions(-)

diff --git a/src/mixins/experiment-mixin.js b/src/mixins/experiment-mixin.js
index de6edd79c..bc35c765e 100644
--- a/src/mixins/experiment-mixin.js
+++ b/src/mixins/experiment-mixin.js
@@ -1,13 +1,13 @@
 export default {
     methods: {
         hasSettingEqualTo(settingName, settingValue) {
-            
+            return this.$store.getters.experimentSettings[settingName] === settingValue;
         },
         hasSetting(settingName) {
-
+            return this.$store.getters.experimentSettings.hasOwnProperty(settingName);
         },
         getSettingValue(settingName) {
-
+            return this.hasSetting(settingName) ? this.$store.getters.experimentSettings[settingName] : null;
         }
     },
 }
\ No newline at end of file
diff --git a/src/mixins/experiment-mixin.spec.js b/src/mixins/experiment-mixin.spec.js
index e69de29bb..f36ce3cba 100644
--- a/src/mixins/experiment-mixin.spec.js
+++ b/src/mixins/experiment-mixin.spec.js
@@ -0,0 +1,154 @@
+import experimentMixin from "@/mixins/experiment-mixin";
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import store from "@/store";
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn()
+}));
+
+describe("experiment-mixin", () => {
+    describe("hasSettingEqualTo", () => {
+        test("setting exists and value matches => return true", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.hasSettingEqualTo("Setting2", "Value2");
+
+            // Assert
+            expect(result).toEqual(true);
+        });
+
+        test("setting exists and value does not match => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.hasSettingEqualTo("Setting2", "Value3");
+
+            // Assert
+            expect(result).toEqual(false);
+        });
+
+        test("setting does not exist => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.hasSettingEqualTo("SettingBoogly", "Woogly");
+
+            // Assert
+            expect(result).toEqual(false);
+        });
+
+        test("there are no settings => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({ experimentSettings: {} });
+
+            // Act
+            const result = wrapper.vm.hasSettingEqualTo("Setting2", "Value3");
+
+            // Assert
+            expect(result).toEqual(false);
+        });
+    });
+
+    describe("hasSetting", () => {
+        test("has setting => return true", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.hasSetting("Setting4");
+
+            // Assert 
+            expect(result).toEqual(true);
+        });
+
+        test("does not have setting => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.hasSetting("BooglyWoogly");
+
+            // Assert 
+            expect(result).toEqual(false);
+        });
+
+        test("experimentSettings is empty => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({ experimentSettings: {} });
+
+            // Act
+            const result = wrapper.vm.hasSetting("Setting4");
+
+            // Assert 
+            expect(result).toEqual(false);
+        });
+    });
+
+    describe("getSettingValue", () => {
+        test("has setting => return correct value", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.getSettingValue("Setting3");
+
+            // Assert
+            expect(result).toEqual("Value3")
+        });
+
+        test("does not have setting => return null", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const result = wrapper.vm.getSettingValue("Hello");
+
+            // Assert
+            expect(result).toBeNull();
+        });
+
+        test("experimentSettings is empty => return null", () => {
+            // Arrange
+            const { wrapper } = setupMocks({ experimentSettings: {} });
+
+            // Act
+            const result = wrapper.vm.getSettingValue("Hello");
+
+            // Assert
+            expect(result).toBeNull();
+        });
+    });
+});
+
+function setupMocks({ experimentSettings }) {
+    const defaultExperimentSettings = experimentSettings ?? {
+        "Setting1": "Value1",
+        "Setting2": "Value2",
+        "Setting3": "Value3",
+        "Setting4": "Value1",
+        "Setting5": "Value2",
+        "Setting6": "Value3"
+    }
+
+    const mocks = getMountOptions({
+        store: {
+            getters: {
+                experimentSettings: defaultExperimentSettings
+            }
+        },
+    });
+
+    const mockComponent = {
+        template: "<div></div>",
+        mixins: [experimentMixin]
+    };
+
+    const wrapper = shallowMount(mockComponent, mocks);
+
+    return { wrapper };
+}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index bac95e3cf..90932c8bb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -69,6 +69,7 @@ const getDefaultState = () => {
       saveQuoteId: null,
       crmCustomerId: null,
       lastPageVisited: null,
+      experiments: []
     },
   }
 };
@@ -333,6 +334,7 @@ export const getters = {
   applicationUser: (state) => state.applicationUser,
   order: (state) => state.order,
   payment: (state) => state.order.payment,
+  experimentSettings: (state) => state.applicationUser.experiments.map(x => x.settings).reduce((r, c) => Object.assign(r, c), {})
 }
 
 // Export Actions

From fd9267593b1285c32b68223057af8038c263c6ab Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 18 Jul 2022 11:30:16 -0400
Subject: [PATCH 06/44] CSR-666 Cleanup

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

diff --git a/src/mixins/experiment-mixin.spec.js b/src/mixins/experiment-mixin.spec.js
index f36ce3cba..6ca0bb7fc 100644
--- a/src/mixins/experiment-mixin.spec.js
+++ b/src/mixins/experiment-mixin.spec.js
@@ -1,11 +1,6 @@
 import experimentMixin from "@/mixins/experiment-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import store from "@/store";
-
-jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
-    navigateToHeritageFunnel: jest.fn()
-}));
 
 describe("experiment-mixin", () => {
     describe("hasSettingEqualTo", () => {

From 79072bb3b5db86d2225337f3a04a3254765b986c Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Mon, 18 Jul 2022 12:08:07 -0400
Subject: [PATCH 07/44] CSR-666 Import store, cleanup

---
 src/mixins/experiment-mixin.js      |  8 +++++---
 src/mixins/experiment-mixin.spec.js | 17 ++++++++---------
 src/mixins/vin-pages-mixin.spec.js  |  9 ---------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/mixins/experiment-mixin.js b/src/mixins/experiment-mixin.js
index bc35c765e..8816b1f0b 100644
--- a/src/mixins/experiment-mixin.js
+++ b/src/mixins/experiment-mixin.js
@@ -1,13 +1,15 @@
+import store from "@/store";
+
 export default {
     methods: {
         hasSettingEqualTo(settingName, settingValue) {
-            return this.$store.getters.experimentSettings[settingName] === settingValue;
+            return store.getters.experimentSettings[settingName] === settingValue;
         },
         hasSetting(settingName) {
-            return this.$store.getters.experimentSettings.hasOwnProperty(settingName);
+            return store.getters.experimentSettings.hasOwnProperty(settingName);
         },
         getSettingValue(settingName) {
-            return this.hasSetting(settingName) ? this.$store.getters.experimentSettings[settingName] : null;
+            return this.hasSetting(settingName) ? store.getters.experimentSettings[settingName] : null;
         }
     },
 }
\ No newline at end of file
diff --git a/src/mixins/experiment-mixin.spec.js b/src/mixins/experiment-mixin.spec.js
index 6ca0bb7fc..b3d68d1b6 100644
--- a/src/mixins/experiment-mixin.spec.js
+++ b/src/mixins/experiment-mixin.spec.js
@@ -1,6 +1,7 @@
 import experimentMixin from "@/mixins/experiment-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import store from "@/store";
 
 describe("experiment-mixin", () => {
     describe("hasSettingEqualTo", () => {
@@ -121,22 +122,20 @@ describe("experiment-mixin", () => {
 });
 
 function setupMocks({ experimentSettings }) {
-    const defaultExperimentSettings = experimentSettings ?? {
+    const mocks = getMountOptions({});
+
+    const testExperimentSettings =  {
         "Setting1": "Value1",
         "Setting2": "Value2",
         "Setting3": "Value3",
         "Setting4": "Value1",
         "Setting5": "Value2",
         "Setting6": "Value3"
-    }
+    };
 
-    const mocks = getMountOptions({
-        store: {
-            getters: {
-                experimentSettings: defaultExperimentSettings
-            }
-        },
-    });
+    store.getters = {
+        experimentSettings: experimentSettings ?? testExperimentSettings
+    };
 
     const mockComponent = {
         template: "<div></div>",
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 62d03971b..0ef66226f 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -895,23 +895,14 @@ function setupMocks({ partsOrQuestions = [] }) {
         router: {
             navigate: jest.fn()
         },
-
     });
 
     const mockVinComponent = {
         components: { loadingModal },
         template: '<loadingModal ref="loadingModal" />',
-        // render() {
-        //     return '<div ref="loadingModal"></div>'
-        // },
         mixins: [vinPagesMixin, baseMixin.baseMixin]
     };
 
-    // const mockVinComponent = Vue.component("mockcomponent", {
-    //     template: '<loadingModal ref="loadingModal" />',
-    //     mixins: [vinPagesMixin, baseMixin.baseMixin]
-    // })
-
     const wrapper = shallowMount(mockVinComponent, mocks);
 
     wrapper.vm.$refs.loadingModal.showModal = jest.fn();

From 34a7cc0e9fe331b724fc5fd3c332b808291d1277 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 19 Jul 2022 09:08:42 -0400
Subject: [PATCH 08/44] CSR-672 Add X-Experiment-Data header to calls

---
 src/constants/header-keys.js | 3 +++
 src/global-methods.js        | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/constants/header-keys.js

diff --git a/src/constants/header-keys.js b/src/constants/header-keys.js
new file mode 100644
index 000000000..895058e48
--- /dev/null
+++ b/src/constants/header-keys.js
@@ -0,0 +1,3 @@
+export const headerKeys = {
+    EXPERIMENT: "X-Experiment-Data"
+}
\ No newline at end of file
diff --git a/src/global-methods.js b/src/global-methods.js
index 5e4d04ea3..ffda1e77f 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,16 +1,21 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
+import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
 import { GaCategories, GaActions, GaLabels } from "@/constants/analytics";
+import { headerKeys } from "@/constants/header-keys";
 
 export default {
   callHttpClient({ method, endpoint, payload, logApiCall = true }) {
     return new Promise((resolve, reject) => {
       const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO;
       const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" });
+      const headers = {
+        [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings)
+      }
 
-      axios({ method: method, url: cfDistroUrl + endpoint, data: payloadAndAnalyticsData, crossDomain: true, responseType: {} })
+      axios({ method: method, url: cfDistroUrl + endpoint, data: payloadAndAnalyticsData, crossDomain: true, responseType: {}, headers: headers })
         .then((response) => {
 
           if (logApiCall) {

From b9ec2a4623073a1200676334ae1b5d6c0b12f4bf Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 19 Jul 2022 12:26:50 -0400
Subject: [PATCH 09/44] CSR-108: refactors

---
 src/layouts/part-questions/part-questions.vue | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 54c1e22ce..f5ec4841d 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -12,6 +12,7 @@
             <div class="fade-on-route-transition sub-container make-tall">
                 <alert
                     ref="alertFewMoreQuestions"
+                    cmsWidgetName="AlertFewMoreQuestionsWidget"
                     class="my-5"
                     alertClass="alert-warning"
                     :manualHeadline="AlertFewMoreQuestionsHeader"
@@ -31,7 +32,7 @@
                 <funnel-footer
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
-                    :isForwardActionDisabled="waitingForLoad || !meta.valid"
+                    :isForwardActionDisabled="!meta.valid"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction"
                 />
@@ -87,11 +88,16 @@ export default {
     data() {
         return {
             selectedModel: [],
-            partsQuestionsData: [],
-            waitingForLoad: true,
+            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.PART_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,
-            glassNameAndParts: [],
-            hasMultipleParts: false,
         };
     },
     computed: {
@@ -102,22 +108,6 @@ export default {
 			return this.getCmsContent("AlertPartsQuestions", "BodyText");
 		},
     },
-    async mounted() {
-        const questionData = await this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS);
-
-        // Map API result data, to part-questions data structure
-        this.partsQuestionsData = questionData.partsOrQuestions.filter((p) => {
-            if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
-                return {
-                    glassName: p.glassName,
-                    glassLocation: p.glassLocation,
-                    partQuestions: p.partQuestions,
-                };
-            }
-        });
-
-        this.waitingForLoad = false;
-    },
     methods: {
         showThisPartQuestionChain(part, i) {
             if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
@@ -152,14 +142,14 @@ export default {
 
             if (!partsLookup) { return }
 
-            this.glassNameAndParts = partsLookup.data.glassNameAndParts;
+            const glassNameAndParts = partsLookup.data.glassNameAndParts;
 
             // test response data for multiple parts
-            this.hasMultipleParts = this.glassNameAndParts.some((glass) => glass.parts?.length > 1);
+            const hasMultipleParts = glassNameAndParts.some((glass) => glass.parts?.length > 1);
 
             // loop through all glass items
             const collectedGlassParts = [];
-            this.glassNameAndParts.forEach((glass) => {
+            glassNameAndParts.forEach((glass) => {
                 if (Array.isArray(glass.parts) && glass.parts.length === 1) {
                     const singlePart = glass.parts[0];
                     collectedGlassParts.push({
@@ -172,14 +162,16 @@ export default {
                     })
                 }
             });
-            store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-            this.navigateForward();
+            if (!hasMultipleParts) {
+                store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+            }
+            this.navigateForward(hasMultipleParts, glassNameAndParts);
         },
-        async navigateForward() {
-            if (this.hasMultipleParts) {
+        async navigateForward(hasMultipleParts, glassNameAndParts) {
+            if (hasMultipleParts) {
                 // 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: this.glassNameAndParts});
+                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndParts});
             } else {
                 // if single parts only
                 // go to quote page
@@ -212,12 +204,12 @@ export default {
 </script>
 
 <style lang="scss">
-  .part-questions {
-      .question-text {
+.part-questions {
+    .question-text {
         margin-bottom: .5rem;
         span {
             text-align: left;
         }
     }
-  }
+}
 </style>

From cefd25399e9fe635e4fdfbfcc6b8eb4ac5adca36 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 19 Jul 2022 15:20:02 -0400
Subject: [PATCH 10/44] CSR-530 Add routing for experiment-integration

---
 src/layouts/test-one.vue                     |  15 +
 src/layouts/test-two.vue                     |  15 +
 src/router/index.js                          |  25 +-
 src/router/router-constants/routing-table.js | 480 ++++++++++---------
 4 files changed, 300 insertions(+), 235 deletions(-)
 create mode 100644 src/layouts/test-one.vue
 create mode 100644 src/layouts/test-two.vue

diff --git a/src/layouts/test-one.vue b/src/layouts/test-one.vue
new file mode 100644
index 000000000..5ba269f2a
--- /dev/null
+++ b/src/layouts/test-one.vue
@@ -0,0 +1,15 @@
+<template>
+    Test1
+</template>
+
+
+<script>
+export default {
+    name: "test1",
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/layouts/test-two.vue b/src/layouts/test-two.vue
new file mode 100644
index 000000000..2ea5fd624
--- /dev/null
+++ b/src/layouts/test-two.vue
@@ -0,0 +1,15 @@
+<template>
+    Test2
+</template>
+
+
+<script>
+export default {
+    name: "test2",
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index b09f734a2..f01fb4ff6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,7 +19,24 @@ import eventBus from "@/helpers/event-bus/event-bus";
 import store from "@/store";
 import analyticsMixin from "@/mixins/analytics-mixin";
 
+import TestOne from "@/layouts/test-one";
+import TestTwo from "@/layouts/test-two";
+
 const routes = [
+  {
+    path: "/test1",
+    name: "test1",
+    components: {
+      default: TestOne
+    } 
+  },
+  {
+    path: "/test2",
+    name: "test2",
+    components: {
+      default: TestTwo
+    } 
+  },
   {
     path: "/",
     name: "root",
@@ -53,7 +70,6 @@ const routes = [
             return next(false);
           }
 
-
           // Assign our fmgPage so it will load normally like the other pages.
           to.query.fmgPage = pageToRedirectTo;
         }
@@ -180,15 +196,16 @@ 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) {
   const fmgPageValue = currentRoute.query.fmgPage;
-  const matchedQueryValue = routingTable
+  let matchedQueryValue = routingTable(store)
     .filter(
       (item) =>
         item.fmgPageValue === fmgPageValue &&
         item.maps.filter((map) => map.scenario === scenario).length > 0
     )
-    .map((m) => m.maps.filter((map) => map.scenario === scenario));
+    .map((m) => m.maps.filter((map) => map.scenario === scenario))[0]
+    .filter(x => x.filter === true || x.filter === undefined);
 
-  return matchedQueryValue[0][0];
+  return matchedQueryValue[0];
 }
 
 //---------------------------------------------------------- Private Functions ----------------------------------------------------------
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 3f81e99ad..5d89daab9 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -1,236 +1,254 @@
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
-const routingTable = [
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_YEAR,
-    maps: [
-      {
-        scenario: navigationScenarios.SELECTED_YEAR,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_MAKE,
-    maps: [
-      {
-        scenario: navigationScenarios.SELECTED_MAKE,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_MODEL,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_YEAR,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_MODEL,
-    maps: [
-      {
-        scenario: navigationScenarios.SELECTED_MODEL,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_STYLE,
-    maps: [
-      {
-        scenario: navigationScenarios.SELECTED_STYLE,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_MODEL,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_PARTS,
-        destinationFmgPageValue: fmgPageValues.QUOTE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_FORWARD,
-        destinationFmgPageValue: fmgPageValues.REVEAL,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.REVEAL,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_PARTS,
-        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.VIN_LOOKUP,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      }
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_FORWARD,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      }
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE,
-      },
-      {
-        scenario: navigationScenarios.CONTINUING_WITH_MULTIPLE_VEHICLES,
-        destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      }
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-      },
-      {
-        scenario: navigationScenarios.CLICKED_FORWARD,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },   
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      },
-      {
-        scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
-        destinationFmgPageValue: fmgPageValues.ESTIMATE
-      }           
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.ESTIMATE,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-        destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-      },
-      {
-        scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-        destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-      },
-    ],
-  },
-  {
-    fmgPageValue: fmgPageValues.PART_QUESTIONS,
-    maps: [
-      {
-        scenario: navigationScenarios.CLICKED_BACK,
-        destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
-      },
-      {
-        scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
-        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      },
-      {
-        scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
-        destinationFmgPageValue: fmgPageValues.QUOTE,
-      },
-    ]
-  },
-];
+// Get store from router/index.js instead of importing it here to get updated values
+const routingTable = function(store) {
+  return [
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_YEAR,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_YEAR,
+          destinationFmgPageValue: "test1",
+          filter: store.getters.vehicle.year > 2010
+        },
+        {
+          scenario: navigationScenarios.SELECTED_YEAR,
+          destinationFmgPageValue: "test2",
+          filter: store.getters.vehicle.year <= 2010
+        },
+        {
+          scenario: navigationScenarios.SELECTED_YEAR,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
+        },
+        
+        {
+          scenario: navigationScenarios.SELECTED_YEAR,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_MAKE,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_MAKE,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_MODEL,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_YEAR,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_MODEL,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_MODEL,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_STYLE,
+      maps: [
+        {
+          scenario: navigationScenarios.SELECTED_STYLE,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_MODEL,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+          destinationFmgPageValue: fmgPageValues.ESTIMATE,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_PARTS,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.REVEAL,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.REVEAL,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_PARTS,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.VIN_LOOKUP,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.ESTIMATE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        }
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.ESTIMATE,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        }
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.ESTIMATE,
+        },
+        {
+          scenario: navigationScenarios.CONTINUING_WITH_MULTIPLE_VEHICLES,
+          destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_HAS_MISMATCHED_GLASS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        }
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.CLICKED_FORWARD,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },   
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
+          destinationFmgPageValue: fmgPageValues.ESTIMATE
+        }           
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.ESTIMATE,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+          destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
+        },
+        {
+          scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+          destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+        },
+      ],
+    },
+    {
+      fmgPageValue: fmgPageValues.PART_QUESTIONS,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP
+        },
+        {
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        },
+        {
+          scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
+          destinationFmgPageValue: fmgPageValues.QUOTE,
+        },
+      ]
+    },
+  ];
+}
 
 export { routingTable };

From f9fa9d154f1d4e828ded9964f10995f3b6080a09 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 19 Jul 2022 15:44:14 -0400
Subject: [PATCH 11/44] CSR-530 Add test cases in

---
 src/router/router-constants/routing-table.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 5d89daab9..25463bd8b 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -10,22 +10,17 @@ const routingTable = function(store) {
         {
           scenario: navigationScenarios.SELECTED_YEAR,
           destinationFmgPageValue: "test1",
-          filter: store.getters.vehicle.year > 2010
+          filter: store.getters.vehicle.year === 2010
         },
         {
           scenario: navigationScenarios.SELECTED_YEAR,
           destinationFmgPageValue: "test2",
-          filter: store.getters.vehicle.year <= 2010
+          filter: store.getters.vehicle.year < 1954
         },
         {
           scenario: navigationScenarios.SELECTED_YEAR,
           destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
         },
-        
-        {
-          scenario: navigationScenarios.SELECTED_YEAR,
-          destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
-        },
       ],
     },
     {

From f3120ef80dde21ad766d67d20f1708dd5426c199 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 19 Jul 2022 15:46:48 -0400
Subject: [PATCH 12/44] CSR-530 Cleanup

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

diff --git a/src/router/index.js b/src/router/index.js
index f01fb4ff6..d2a5ee154 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -196,7 +196,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) {
   const fmgPageValue = currentRoute.query.fmgPage;
-  let matchedQueryValue = routingTable(store)
+  const matchedQueryValue = routingTable(store)
     .filter(
       (item) =>
         item.fmgPageValue === fmgPageValue &&

From c7b775863bc6a0907bd897faca299981dd31ebee Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 20 Jul 2022 09:27:55 -0400
Subject: [PATCH 13/44] CSR-110: navigation/store changes for molding-questions
 page

---
 jest.config.js                                |   1 +
 .../license-plate-lookup.spec.js              |   6 +-
 .../molding-questions/molding-questions.vue   | 288 ++++++++++++++
 src/layouts/part-questions/part-questions.vue |  27 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   | 355 +++++++++---------
 src/mixins/vin-pages-mixin.js                 |   9 +-
 src/router/router-constants/fmgPage-values.js |   1 +
 .../router-constants/navigation-scenarios.js  |   2 +
 src/router/router-constants/routing-table.js  |  29 +-
 9 files changed, 523 insertions(+), 195 deletions(-)
 create mode 100644 src/layouts/molding-questions/molding-questions.vue

diff --git a/jest.config.js b/jest.config.js
index 0a063507d..f4c60e4f7 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -12,6 +12,7 @@ module.exports = {
     "!src/router/**/*.js",
     "!src/helpers/unit-test-helper.js",
     "!src/layouts/vehicle-damage/windshield-options/windshield-options.vue",
+    "!src/layouts/molding-questions/**/*.vue",
     "!src/layouts/part-questions/**/*.vue",
     "!src/layouts/reveal/**/*.vue",
     "!src/ux-components/text-link/**/*.vue",
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
index 2e83c3103..7bfc02eba 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
@@ -235,7 +235,7 @@ describe("license-plate-lookup.vue", () => {
         expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
       });
 
-      test("navigateToHeritageFunnel should be called if isCarIdDifferent is false or isSelectedGlassAvailableForVehicle is true when navigateForward is called", async () => {
+      test("navigateForwardWithSingleCarMatch should be called if isCarIdDifferent is false or isSelectedGlassAvailableForVehicle is true when navigateForward is called", async () => {
 
         // Arrange
         const { wrapper } = setupMocks({});
@@ -247,11 +247,11 @@ describe("license-plate-lookup.vue", () => {
         wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => {
           return '';
         });
-        navigateToHeritage.navigateToHeritageFunnel = jest.fn();
+        wrapper.vm.navigateForwardWithSingleCarMatch = jest.fn();
         await wrapper.vm.navigateForward();
 
         //Assert
-        expect(navigateToHeritage.navigateToHeritageFunnel).toHaveBeenCalled();
+        expect(wrapper.vm.navigateForwardWithSingleCarMatch).toHaveBeenCalled();
       });
 
       test("carId matches returned vehicle => navigateForwardWithSingleCarMatch", async () => {
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
new file mode 100644
index 000000000..04259a3c3
--- /dev/null
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -0,0 +1,288 @@
+<template>
+    <Form
+      @submit="onSubmit"
+      @invalid-submit="onInvalidSubmit"
+      ref="theForm"
+      v-slot="{ meta }"
+    >
+        <div class="page-container-grouped-styles molding-questions">
+            <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
+            <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
+            <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <div class="fade-on-route-transition sub-container make-tall">
+                <h1>MOLDING QUESTIONS TEMPORARY PLACEHOLDER</h1>
+                <alert
+                    ref="alertFewMoreQuestions"
+                    class="my-5"
+                    alertClass="alert-warning"
+                    :manualHeadline="AlertFewMoreQuestionsHeader"
+                    :manualCopy="AlertFewMoreQuestionsCopy"
+                    v-bind:isDismissible="false"
+                />
+                <div v-for="(part, i) in moldingQuestionsData" :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"
+                    :isForwardActionDisabled="!meta.valid"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction"
+                />
+            </div>
+        </div>
+    </Form>
+</template>
+
+<script>
+// Components
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import alert from "@/ux-components/alert/alert";
+import questionChain from "@/common-components/question-chain/question-chain";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+
+// Supporting Files
+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";
+
+// DEFINE VALIDATION RULES
+defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
+
+export default {
+    name: "molding-questions",
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+
+        // Settle promises and get results
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+         ];
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+
+        // Call the "next" function to complete the transition to this page.
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+    data() {
+        return {
+            selectedModel: [],
+            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.MOLDING_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("AlertPartsQuestions", "HeadlineText");
+		},
+        AlertFewMoreQuestionsCopy() {
+			return this.getCmsContent("AlertPartsQuestions", "BodyText");
+		},
+    },
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+            // return Object.keys(store.getters.pageData(fmgPageValues.MOLDING_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 partQuestionAnswersArray = this.partsQuestionsData.map((item) => {
+                return {
+                    glassLocation: item.glassLocation,
+                    glassName: item.glassName,
+                    result: item.answerData.answerResult,
+                    answeredQuestions: item.answerData.answeredQuestions,
+                };
+            });
+
+            // save to vuex store as order.damage.partQuestionAnswers (array)
+            await this.dispatchStoreAction(this.storeActions.SAVE_PART_QUESTION_ANSWERS, partQuestionAnswersArray, false);
+
+            // call API parts method
+            const partsLookup = await this.dispatchStoreAction(storeActions.GET_PARTS)
+                .catch(() => {
+                    this.$refs.funnelFooter.removeLoader();
+                });
+
+            if (!partsLookup) { return }
+
+            const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
+
+            console.log("glassNameAndPartsForStore: ", glassNameAndPartsForStore);
+
+            // HARD CODE RESPONSE FOR NOW...
+
+            this.glassNameAndPartsForStore = [
+                {
+                    "glassName": "Single",
+                    "glassLocation": "Windshield",
+                    "parts": [
+                        {
+                            "partNumber": "FW03861GTYN",
+                            "description": "rain sensor, heated glass, auto dimming mirror, solar, 3rd visor band, condensation sensor",
+                            "color": "Green Tint",
+                            "requiresRecalibration": false,
+                            "requiresCapabilityQuestions": false,
+                            "recalibrationType": null,
+                            "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
+                                    }
+                                ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "glassName": "Stationary",
+                    "glassLocation": "Rear",
+                    "parts": [
+                        {
+                            "partNumber": "FB25992GTNN",
+                            "description": "heated glass, solar",
+                            "color": "Green Tint",
+                            "requiresRecalibration": false,
+                            "requiresCapabilityQuestions": false,
+                            "recalibrationType": null,
+                            "childParts": null,
+                            "childPartQuestions": []
+                        }
+                    ]
+                }
+            ];
+
+
+
+
+
+
+            // test response data for multiple parts
+            const hasMultipleParts = glassNameAndPartsForStore.some((glass) => glass.parts?.length > 1);
+
+            // loop through all glass items
+            const collectedGlassParts = [];
+            glassNameAndPartsForStore.forEach((glass) => {
+                if (Array.isArray(glass.parts) && glass.parts.length === 1) {
+                    const singlePart = glass.parts[0];
+                    collectedGlassParts.push({
+                        "partNumber": singlePart.partNumber,
+                        "description": singlePart.description,
+                        "color": singlePart.color,
+                        "requiresRecalibration": singlePart.requiresRecalibration,
+                        "childParts": singlePart.childParts,
+                        "price": singlePart.price,
+                    });
+                    // check for and collect any molding questions
+                    if (Array.isArray(singlePart.childPartQuestions) && singlePart.childPartQuestions.length > 0) {
+                        this.moldingQuestionsForStore.push({
+                            "glassName": glass.glassName,
+                            "glassLocation": glass.glassLocation,
+                            "childPartQuestions": singlePart.childPartQuestions,
+                        });
+                    }
+                }
+            });
+            if (!hasMultipleParts) {
+                store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+            }
+            this.navigateForward(hasMultipleParts, glassNameAndPartsForStore);
+        },
+        async navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
+            if (hasMultipleParts) {
+                // 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 single parts only
+                // go to quote page
+                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
+            }
+
+        // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
+
+        },
+    },
+    watch: {
+        selectedModel(model) {
+            this.moldingQuestionsData[model.partIndex].answerData = {
+                answerResult: model.answerResult,
+                answeredQuestions: model.answeredQuestions,
+            }
+            this.currentPartNum = model.partIndex + 1;
+        },
+    },
+    components: {
+        funnelHeader,
+        vehicleBanner,
+        alert,
+        questionChain,
+        funnelSubHeader,
+        funnelFooter,
+        Form,
+    },
+};
+</script>
+
+<style lang="scss">
+  .molding-questions {
+      .question-text {
+        margin-bottom: .5rem;
+        span {
+            text-align: left;
+        }
+    }
+  }
+</style>
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index f5ec4841d..856b8a099 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -142,14 +142,14 @@ export default {
 
             if (!partsLookup) { return }
 
-            const glassNameAndParts = partsLookup.data.glassNameAndParts;
+            const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
 
             // test response data for multiple parts
-            const hasMultipleParts = glassNameAndParts.some((glass) => glass.parts?.length > 1);
+            const hasMultipleParts = glassNameAndPartsForStore.some((glass) => glass.parts?.length > 1);
 
             // loop through all glass items
             const collectedGlassParts = [];
-            glassNameAndParts.forEach((glass) => {
+            glassNameAndPartsForStore.forEach((glass) => {
                 if (Array.isArray(glass.parts) && glass.parts.length === 1) {
                     const singlePart = glass.parts[0];
                     collectedGlassParts.push({
@@ -159,24 +159,37 @@ export default {
                         "requiresRecalibration": singlePart.requiresRecalibration,
                         "childParts": singlePart.childParts,
                         "price": singlePart.price,
-                    })
+                    });
+                    // check for and collect any molding questions
+                    if (Array.isArray(singlePart.childPartQuestions) && singlePart.childPartQuestions.length > 0) {
+                        this.moldingQuestionsForStore.push({
+                            "glassName": glass.glassName,
+                            "glassLocation": glass.glassLocation,
+                            "childPartQuestions": singlePart.childPartQuestions,
+                        });
+                    }
                 }
             });
             if (!hasMultipleParts) {
                 store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
             }
-            this.navigateForward(hasMultipleParts, glassNameAndParts);
+            this.navigateForward(hasMultipleParts, glassNameAndPartsForStore);
         },
-        async navigateForward(hasMultipleParts, glassNameAndParts) {
+        async navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
             if (hasMultipleParts) {
                 // 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: glassNameAndParts});
+                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
             } else {
                 // if single parts only
                 // go to quote page
                 this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
             }
+
+        // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
+
+
+
         },
         arePagePrerequisitesValid() {
             return Object.keys(store.getters.pageData(fmgPageValues.PART_QUESTIONS)).length > 0;
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index ce5727ce3..d0af557b0 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -49,217 +49,208 @@
 </template>
 
 <script>
-  // Components
-  import glassPartQuestion from "@/layouts/vehicle-parts/glass-part-question/glass-part-question";
-  import funnelHeader from "@/common-components/funnel-header/funnel-header";
-  import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-  import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-  import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-  import alert from "@/ux-components/alert/alert";
-  // Supporting Files
-  import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-  import { settleAllPromises } from "@/helpers/layout-helper";
-  import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-  import store from "@/store";
-  import { Form } from "vee-validate";
-  import { storeActions } from "@/constants/store-actions";
+// Components
+import glassPartQuestion from "@/layouts/vehicle-parts/glass-part-question/glass-part-question";
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import alert from "@/ux-components/alert/alert";
+// Supporting Files
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import store from "@/store";
+import { Form } from "vee-validate";
+import { storeActions } from "@/constants/store-actions";
 
-  export default {
+export default {
     name: "vehicle-parts",
     async beforeRouteEnter(to, from, next) {
-      // Call APIs
-      const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-      // Settle promises and get results
-      const promiseResultMap = [
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        // Settle promises and get results
+        const promiseResultMap = [
         {
-          resultKey: "cmsContent",
-          promise: cmsContentPromise,
+            resultKey: "cmsContent",
+            promise: cmsContentPromise,
         },
-      ];
-      const resultMap = await settleAllPromises(promiseResultMap);
-      // Call the "next" function to complete the transition to this page.
-      next((vm) => {
+        ];
+        const resultMap = await settleAllPromises(promiseResultMap);
+        // Call the "next" function to complete the transition to this page.
+        next((vm) => {
         vm.setCmsContent(resultMap.cmsContent);
 
         // Glass Part Question dynamic component
         Object.keys(vm.$refs)
-          .filter(
-            (r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined
-          )
-          .forEach((c) =>
+            .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
+            .forEach((c) =>
             vm.$refs[c][0].initializeComponent({
-              ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
-              FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
+                ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
+                FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
             })
-          );
-      });
+            );
+        });
     },
     data() {
-      return {
-        glassParts: {},
-        alertWidgetData: Object,
-        alreadyPopulatedPartsData: {},
-      };
-    },
-    components: {
-      Form,
-      glassPartQuestion,
-      funnelHeader,
-      vehicleBanner,
-      funnelSubHeader,
-      funnelFooter,
-      alert,
+        return {
+            glassParts: {},
+            matchedParts: [],
+            alertWidgetData: Object,
+            alreadyPopulatedPartsData: {},
+        };
     },
     computed: {
-      isForwardActionDisabled() {
-        return (
-          Object.keys(this.matchedParts).length !==
-          this.PartsFromApi.partsOrQuestions.length
-        );
-      },
-      matchedParts() {
-        const matchedParts = [];
+        isForwardActionDisabled() {
+            return (
+                this.selectedGlassPartNumbers.length !== this.PartsFromApi.partsOrQuestions.length
+            );
+        },
+        selectedGlassPartNumbers () {
+            // Compile all selected parts from the page.
+            const numberArray = [];
+            for (let glassPart of Object.values(this.glassParts)) {
+                if (glassPart?.partNumber) { numberArray.push(glassPart.partNumber) }
+            }
+            return numberArray;
+        },
+        PartsOrQuestions() {
+            const partsData = this.PartsFromApi;
 
-        // Match them to the parts from the API.
-        this.PartsFromApi.partsOrQuestions.forEach((part) => {
-          const selectedPartForGlassLocationAndName =
-            this.glassParts[`${part.glassLocation}-${part.glassName}`];
-          const selectedPartData = part.parts.filter(
-            (part) =>
-              selectedPartForGlassLocationAndName &&
-              part.partNumber == selectedPartForGlassLocationAndName?.partNumber
-          )[0];
+            // Map API result data, to vehicle-parts data structure
+            const mappedData = partsData.partsOrQuestions.map((g) => {
+                return {
+                    glassName: g.glassName,
+                    glassLocation: g.glassLocation,
+                    colorAnswers: g.parts.reduce((arr, p) => {
+                        arr.push({
+                            ColorAnswerText: p.color,
+                            FeatureAnswers: [
+                                {
+                                FeatureAnswerText: p.description === "" ? p.color : p.description,
+                                PartNumber: p.partNumber,
+                                },
+                            ],
+                        });
+                        return arr;
+                    }, []),
+                };
+            });
 
-          if (selectedPartData) matchedParts.push(selectedPartData);
-        });
+            return mappedData;
+        },
 
-        return matchedParts;
-      },
-      PartsOrQuestions() {
-        const partsData = this.PartsFromApi;
+        PartsFromApi() {
+            return store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+        },
 
-        // Map API result data, to vehicle-parts data structure
-        const mappedData = partsData.partsOrQuestions.map((g) => {
-          return {
-            glassName: g.glassName,
-            glassLocation: g.glassLocation,
-            colorAnswers: g.parts.reduce((arr, p) => {
-              arr.push({
-                ColorAnswerText: p.color,
-                FeatureAnswers: [
-                  {
-                    FeatureAnswerText:
-                      p.description === "" ? p.color : p.description,
-                    PartNumber: p.partNumber,
-                  },
-                ],
-              });
-              return arr;
-            }, []),
-          };
-        });
-
-        return mappedData;
-      },
-
-      PartsFromApi() {
-        return store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
-      },
-
-      RefPrefix() {
-        return "partQuestion";
-      },
+        RefPrefix() {
+            return "partQuestion";
+        },
     },
     methods: {
-      arePagePrerequisitesValid() {
-        // Check if isRepair is populated and if the pageData we need is here (Parts data)
-        if (
-          store.getters.damage.isRepair != null &&
-          Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS))
-            .length !== 0
-        ) {
-          return true;
-        }
-
-        return false;
-      },
-      backButtonAction() {
-        this.$router.navigate(
-          this.navigationScenarios.CLICKED_BACK,
-          this.$route
-        );
-      },
-      async forwardButtonAction() {
-        const selectedGlassPartNumbers = [];
-        const matchedParts = [];
-
-        // Compile all selected parts from the page.
-        for (let [key, value] of Object.entries(this.glassParts)) {
-          for (let [glassKey, glassValue] of Object.entries(value)) {
-            selectedGlassPartNumbers.push(glassValue[0]);
-          }
-        }
-
-        // Match them to the parts from the API.
-        for (let [key, value] of Object.entries(
-          this.PartsFromApi.partsOrQuestions
-        )) {
-          for (let [partKey, partValue] of Object.entries(value.parts)) {
-            const currentPart =
-              this.PartsFromApi.partsOrQuestions[key].parts[partKey];
-            const isMatched = selectedGlassPartNumbers.some(
-              (p) => p === currentPart.partNumber
-            );
-
-            if (isMatched) {
-              matchedParts.push(currentPart);
+        arePagePrerequisitesValid() {
+            // Check if isRepair is populated and if the pageData we need is here (Parts data)
+            if (store.getters.damage.isRepair != null && Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0) {
+                return true;
             }
-          }
-        }
+            return false;
+        },
+        backButtonAction() {
+            this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
+        },
+        async forwardButtonAction() {
+            let isMoldingQuestions = false;
 
-        // If no parts could be matched, throw an error.
-        if (this.isForwardActionDisabled) {
-          this.$refs.funnelFooter.removeLoader();
-          throw new Error("Could not match any parts to the selected parts");
-        }
+            // Match them to the parts from the API.
+            for (let [key, value] of Object.entries(
+                this.PartsFromApi.partsOrQuestions
+            )) {
+                for (let [partKey, partValue] of Object.entries(value.parts)) {
 
-        // Save parts to the store.
-        await this.dispatchStoreAction(
-          storeActions.SAVE_GLASS_PARTS,
-          matchedParts
-        );
+                    const currentPart = this.PartsFromApi.partsOrQuestions[key].parts[partKey];
 
-        // Navigate to the next page.
-        this.$router.navigate(
-          this.navigationScenarios.SELECTED_PARTS,
-          this.$route
-        );
-      },
+                    const isMatched = this.selectedGlassPartNumbers.some(
+                        (p) => p === currentPart.partNumber
+                    );
 
-      LoadInitialPartsData() {
-        const partsData = this.PartsFromApi;
-        const alreadyPopulatedPartsData =
-          this.$store.getters.lineItems.glassParts === null
-            ? {}
-            : this.$store.getters.lineItems.glassParts;
+                    if (isMatched) {
+                        this.matchedParts.push(currentPart);
+                        // check if there are childPartQuestions (for molding-questions)
+                        if (Array.isArray(currentPart.childPartQuestions) && currentPart.childPartQuestions.length > 0) { 
+                            isMoldingQuestions = true
+                        }
+                    }
+                }
+            }
 
-        partsData.partsOrQuestions.map((g) => {
-          // If the part is already populated, use the value from the store and populate the v-model.
-          Object.keys(alreadyPopulatedPartsData).forEach((key) => {
-            const partNumber = alreadyPopulatedPartsData[key].partNumber;
-            g.parts.forEach((p) => {
-              if (p.partNumber === partNumber) {
-                this.glassParts[g.glassLocation + "-" + g.glassName] = {
-                  [g.glassLocation]: [partNumber],
-                };
-              }
+            // If no parts could be matched, throw an error (isForwardActionDisabled is based off of this.matchedParts)
+            if (this.isForwardActionDisabled) {
+                this.$refs.funnelFooter.removeLoader();
+                throw new Error("Could not match any parts to the selected parts");
+            }
+
+            // Navigate to the next page
+            if (isMoldingQuestions) {
+                this.$router.navigate(
+                    this.navigationScenarios.HAS_MOLDING_QUESTIONS,
+                    this.$route,
+                    {},
+                    {},
+                    this.moldingQuestionsForStore
+                );
+            }
+            else {
+                // Save parts to the store
+                await this.dispatchStoreAction(
+                    storeActions.SAVE_GLASS_PARTS,
+                    this.matchedParts,
+                    false
+                );
+                // Navigate to the quote page
+                this.$router.navigate(
+                    this.navigationScenarios.SELECTED_PARTS,
+                    this.$route
+                );
+            }
+
+            // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
+
+        },
+
+        LoadInitialPartsData() {
+            const partsData = this.PartsFromApi;
+            const alreadyPopulatedPartsData =
+                this.$store.getters.lineItems.glassParts === null
+                ? {}
+                : this.$store.getters.lineItems.glassParts;
+
+            partsData.partsOrQuestions.map((g) => {
+                // If the part is already populated, use the value from the store and populate the v-model.
+                Object.keys(alreadyPopulatedPartsData).forEach((key) => {
+                const partNumber = alreadyPopulatedPartsData[key].partNumber;
+                g.parts.forEach((p) => {
+                    if (p.partNumber === partNumber) {
+                    this.glassParts[g.glassLocation + "-" + g.glassName] = {
+                        [g.glassLocation]: [partNumber],
+                    };
+                    }
+                });
+                });
             });
-          });
-        });
-      },
+        },
     },
     mounted() {
-      this.LoadInitialPartsData();
+        this.LoadInitialPartsData();
     },
-  };
+    components: {
+        Form,
+        glassPartQuestion,
+        funnelHeader,
+        vehicleBanner,
+        funnelSubHeader,
+        funnelFooter,
+        alert,
+    },
+};
 </script>
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index fce96c980..196a21e63 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -7,10 +7,14 @@ export default {
     methods: {
         async navigateForwardWithSingleCarMatch() {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
-     
             const partsOrQuestions = result.data.partsOrQuestions;
             const hasPartsQuestions = partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
             const hasGlassLocationWithMultipleParts = partsOrQuestions.some(pq => pq.parts?.length > 1);
+            const hasChildPartQuestions = partsOrQuestions.some(pq => {
+                return pq.parts?.some(part => part.childPartQuestions?.length > 0);
+            });
+
+            // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
 
             if (hasPartsQuestions) {
                 this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
@@ -18,6 +22,9 @@ export default {
             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 {
                 store.commit(storeMutations.UPDATE_GLASS_PARTS, result.data);
                 this.$refs.loadingModal.showModal();
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index d067895ee..7a38c6b40 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -8,6 +8,7 @@ const fmgPageValues = {
   VIN_LOOKUP: "vin-lookup",
   VEHICLE_PARTS: "vehicle-parts",
   PART_QUESTIONS: "part-questions",
+  MOLDING_QUESTIONS: "molding-questions",
   LICENSE_PLATE_LOOKUP: "license-plate-lookup",
   REVEAL: "reveal",
   ESTIMATE: "estimate",
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 5768c55de..ab1772de3 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -10,6 +10,7 @@ const navigationScenarios = {
   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",
   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",
@@ -19,6 +20,7 @@ const navigationScenarios = {
   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",
+  HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY"
 };
 
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 3f81e99ad..82bb59ff6 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -79,8 +79,8 @@ const routingTable = [
         destinationFmgPageValue: fmgPageValues.QUOTE,
       },
       {
-        scenario: navigationScenarios.CLICKED_FORWARD,
-        destinationFmgPageValue: fmgPageValues.REVEAL,
+        scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
+        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
       },
     ],
   },
@@ -119,6 +119,10 @@ const routingTable = [
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+      },
+      {
+        scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
       }
     ],
   },
@@ -140,6 +144,10 @@ const routingTable = [
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+      },
+      {
+        scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
       }
     ],
   },
@@ -165,6 +173,10 @@ const routingTable = [
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+      },
+      {
+        scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
       }
     ],
   },
@@ -225,12 +237,25 @@ const routingTable = [
         scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
       },
+      {
+        scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
+        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+      },
       {
         scenario: navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,
         destinationFmgPageValue: fmgPageValues.QUOTE,
       },
     ]
   },
+  {
+    fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+    maps: [
+      {
+        scenario: navigationScenarios.CLICKED_BACK,
+        destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+      },
+    ]
+  },
 ];
 
 export { routingTable };

From b21c6171e9d4574f4597a1d9e773074357e9b055 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 25 Jul 2022 09:30:00 -0400
Subject: [PATCH 14/44] CSR-706 | Remove state resetting on loadOrder

As well as making loadOrder await the latest saveOrderPromise
Also clearing saveOrderPromise if entering the funnel fresh to avoid a broken promise object
---
 src/constants/store-actions.js                   | 1 +
 src/constants/store-mutations.js                 | 1 +
 src/helpers/heritage-integration/order-helper.js | 2 ++
 src/router/index.js                              | 3 +++
 src/store/index.js                               | 8 ++++++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 87331daea..6fa81d45f 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -31,6 +31,7 @@ const storeActions = {
   INITIALIZE_SESSION: "initializeSession",
   GET_EXPERIMENTS_BY_USER: "GetExperimentsByUser",
   CLEAR_VIN: "clearVin",
+  RESET_SAVE_ORDER_PROMISE: "resetSaveOrderPromise",
 
   // DEPENDENCY MUTATIONS
   RESET_VEHICLE_STATE_AND_DEPENDENCIES: "resetVehicleAndDependencies",
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 80697cc46..66b9ded0e 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -58,6 +58,7 @@ const storeMutations = {
   UPDATE_STATE_WITH_ORDER_INFORMATION: "updateStateWithOrderInformation",
   UPDATE_SAVE_ORDER_PROMISE: "updateSaveOrderPromise",
   UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
+  RESET_SAVE_ORDER_PROMISE: "resetSaveOrderPromise",
 };
 
 export { storeMutations };
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 9722744f0..2e6fcade0 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -60,6 +60,8 @@ export async function saveOrder() {
     and returns the response.
 */
 async function loadOrder(referralNumber, referralDate, referralCorrelationId, accountNumber) {
+    // await the saveOrderPromise in the store to make sure we're loading up to date information
+    await store.getters.applicationUser.saveOrderPromise;
     const response = await baseMixin.methods.dispatchStoreAction(storeActions.LOAD_ORDER,
         {
             referralNumber: referralNumber.toString(),
diff --git a/src/router/index.js b/src/router/index.js
index d2a5ee154..98b26483b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,6 +60,9 @@ const routes = [
 
         // On entering the funnel "fresh", read cookie information, decide what to do next.
         if (from.redirectedFrom === undefined) {
+          // clear the saveOrderPromise - if it exists in the vuex store but a new instance was created
+          //   the saveOrderPromise will no longer point to a valid promise
+          baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_ORDER_PROMISE);
           const loadOrderResponse = await loadOrderIfPresent();
           const pageToRedirectTo = await getPageToRouteExistingOrderTo(to, loadOrderResponse);
 
diff --git a/src/store/index.js b/src/store/index.js
index 90932c8bb..82d3323d1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -269,7 +269,9 @@ export const mutations = {
   resetState(state) {
     Object.assign(state, getDefaultState());
   },
-
+  resetSaveOrderPromise(state) {
+    state.applicationUser.saveOrderPromise = null;
+  },
   // Misc Mutations
   updateStateWithOrderInformation(state, orderInformation) {
     state.order.referralNumber = orderInformation.referralNumber;
@@ -457,6 +459,9 @@ export const actions = {
   resetState(context) {
     context.commit(storeMutations.RESET_STATE);
   },
+  resetSaveOrderPromise(context) {
+    context.commit(storeMutations.RESET_SAVE_ORDER_PROMISE);
+  },
 
   // Content API Actions
   getRouteInfo(context, { pageName }) {
@@ -701,7 +706,6 @@ export const actions = {
         accountNumber: accountNumber?.toString()
       },
     }).then((response) => {
-      context.commit(storeMutations.RESET_STATE);
       context.commit(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, response.data);
       return response;
     });

From 62b72163d6127a8a09989bc4182e2ce221893b6f Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 25 Jul 2022 15:29:44 -0400
Subject: [PATCH 15/44] CSR-706 | Only clear state if referral does not match

---
 src/store/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/store/index.js b/src/store/index.js
index 82d3323d1..64ba356e6 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -706,6 +706,10 @@ export const actions = {
         accountNumber: accountNumber?.toString()
       },
     }).then((response) => {
+      // clear the state if the existing referral number does not equal what is returned from loadOrder
+      if (context.state.order.referralNumber != response.data.referralNumber) {
+        context.commit(storeMutations.RESET_STATE);
+      }
       context.commit(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, response.data);
       return response;
     });

From e31f415aa4cb5fe06c89ec7579d1d956a1a0943b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 26 Jul 2022 10:38:10 -0400
Subject: [PATCH 16/44] CSR-110: refactoring per PR review

---
 src/layouts/molding-questions/molding-questions.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 04259a3c3..0ffaae411 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -141,11 +141,9 @@ export default {
             // call API parts method
             const partsLookup = await this.dispatchStoreAction(storeActions.GET_PARTS)
                 .catch(() => {
-                    this.$refs.funnelFooter.removeLoader();
+                    return this.$refs.funnelFooter.removeLoader();
                 });
 
-            if (!partsLookup) { return }
-
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
 
             console.log("glassNameAndPartsForStore: ", glassNameAndPartsForStore);
@@ -236,11 +234,11 @@ export default {
                 }
             });
             if (!hasMultipleParts) {
-                store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
             }
             this.navigateForward(hasMultipleParts, glassNameAndPartsForStore);
         },
-        async navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
+        navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
             if (hasMultipleParts) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData

From bb1fa9aede61cd8b894aad40369e468ace6e05af Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 26 Jul 2022 12:02:03 -0400
Subject: [PATCH 17/44] CSR-706 | Refactoring to use SavedSession instead of
 SaveQuote

---
 src/helpers/heritage-integration/navigation-helper.spec.js | 2 +-
 src/store/store.spec.js                                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 1b33c0a6f..7337bf98e 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -309,7 +309,7 @@ describe("navigateToHeritageFunnel", () => {
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
         const mockAccountNumber = "167132";
-        const mockSaveQuoteId = "xxx-xxx-xxx";
+        const mockavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx"
 
         const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSaveQuoteId, mockCrmCustomerId);
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index a9e37dea7..29f8a88ed 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -574,7 +574,7 @@ describe("Actions", () => {
       applicationUser: {
         lastPageVisited: "test-page",
         crmCustomerId: "xxx-xxx-xxx",
-        saveQuoteId: "xxx-xxx-xxx"
+        savedSessionId: "xxx-xxx-xxx"
       }
     };
     context.state = {
@@ -630,7 +630,7 @@ describe("Actions", () => {
         referralDate: new Date().toUTCString(), 
         referralCorrelationId: "xxx-xxx-xxx", 
         accountNumber: "167132",
-        saveQuoteId: "xxx-xxx-xxx",
+        savedSessionId: "xxx-xxx-xxx",
         crmCustomerId: "xxx-xxx-xxx",
       });
 
@@ -639,7 +639,7 @@ describe("Actions", () => {
     expect(commit).toBeCalledWith(storeMutations.UPDATE_REFERRAL_DATE, new Date().toUTCString());
     expect(commit).toBeCalledWith(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, "xxx-xxx-xxx");
     expect(commit).toBeCalledWith(storeMutations.UPDATE_PARENT_ACCT_NUMBER, "167132");
-    expect(commit).toBeCalledWith(storeMutations.UPDATE_SAVE_QUOTE_ID, "xxx-xxx-xxx");
+    expect(commit).toBeCalledWith(storeMutations.UPDATE_SAVED_SESSION_ID, "xxx-xxx-xxx");
     expect(commit).toBeCalledWith(storeMutations.UPDATE_CRM_CUSTOMER_ID, "xxx-xxx-xxx");
   });
 

From c18af60165c0ef85c396287c57c7dc942e085f39 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 26 Jul 2022 12:07:03 -0400
Subject: [PATCH 18/44] CSR-706 | Refactoring savedQuote -> SavedSession

---
 src/constants/store-mutations.js                     |  2 +-
 src/helpers/heritage-integration/cookie-helper.js    |  2 +-
 .../heritage-integration/navigation-helper.spec.js   |  8 ++++----
 src/helpers/heritage-integration/order-helper.js     |  2 +-
 .../heritage-integration/order-helper.spec.js        | 10 +++++-----
 src/helpers/heritage-integration/session-helper.js   |  2 +-
 .../heritage-integration/session-helper.spec.js      |  4 ++--
 src/helpers/unit-test-helper.js                      |  4 ++--
 src/store/index.js                                   | 12 ++++++------
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 66b9ded0e..508f59bf7 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -39,7 +39,7 @@ const storeMutations = {
   UPDATE_REFERRAL_DATE: "updateReferralDate",
   UPDATE_REFERRAL_CORRELATION_ID: "updateReferralCorrelationId",
   UPDATE_PARENT_ACCT_NUMBER: "updateParentAcctNumber",
-  UPDATE_SAVE_QUOTE_ID: "updateSaveQuoteId",
+  UPDATE_SAVED_SESSION_ID: "updateSavedSessionId",
   UPDATE_CRM_CUSTOMER_ID: "updateCrmCustomerId",
 
   // EVENT BUS MUTATIONS
diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 3a8614661..775a64fec 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -15,7 +15,7 @@ export function updateOrCreateFunnelCookie() {
     // Set up cookie with all the props.
     setFunnelCookieProperties({
         LastTouched: new Date().toUTCString(),
-        SavedQuoteTimeoutDate: store.getters.applicationUser.savedSessionTimeout,
+        SavedSessionTimeoutDate: store.getters.applicationUser.savedSessionTimeout,
         DidHeritageFunnelUpdateLast: false,
         ShouldResetState: false,
         ReferralNumber: store.getters.order.referralNumber,
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 7337bf98e..0e615aef5 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -309,10 +309,10 @@ describe("navigateToHeritageFunnel", () => {
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
         const mockAccountNumber = "167132";
-        const mockavedSessionId = "xxx-xxx-xxx";
+        const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx"
 
-        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSaveQuoteId, mockCrmCustomerId);
+        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSavedSessionId, mockCrmCustomerId);
 
         const mockData = {
             actionList: [{
@@ -344,10 +344,10 @@ describe("navigateToHeritageFunnel", () => {
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
         const mockAccountNumber = "167132";
-        const mockSaveQuoteId = "xxx-xxx-xxx";
+        const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx"
 
-        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSaveQuoteId, mockCrmCustomerId);
+        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSavedSessionId, mockCrmCustomerId);
 
         const mockData = {
             actionList: [{
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 2e6fcade0..870ee190b 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -84,7 +84,7 @@ async function saveOrderHelper() {
         referralCorrelationId: savedOrderInfo.data.referralCorrelationId,
         referralDate: savedOrderInfo.data.referralDate,
         accountNumber: savedOrderInfo.data.accountNumber.toString(),
-        saveQuoteId: savedOrderInfo.data.saveQuoteId,
+        savedSessionId: savedOrderInfo.data.savedSessionId,
         crmCustomerId: savedOrderInfo.data.crmCustomerId.toString(),
     }, false);
 
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index c3a581e41..400ab46e4 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -112,10 +112,10 @@ describe("saveOrder", () => {
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
         const mockAccountNumber = "167132";
-        const mockSaveQuoteId = "xxx-xxx-xxx";
+        const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx"
 
-        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSaveQuoteId, mockCrmCustomerId);
+        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, mockAccountNumber, mockSavedSessionId, mockCrmCustomerId);
 
         const mockData = {
             actionList: [
@@ -141,7 +141,7 @@ describe("saveOrder", () => {
             referralDate: mockReferralDate,
             referralCorrelationId: mockCorrelationId,
             accountNumber: mockAccountNumber,
-            saveQuoteId: mockSaveQuoteId,
+            savedSessionId: mockSavedSessionId,
             crmCustomerId: mockCrmCustomerId,
         }, false);
     });
@@ -152,10 +152,10 @@ describe("saveOrder", () => {
         const mockReferralDate = "2022-03-15T10:56:24.597";
         const mockReferralCorrelationId = "404d2b04-f86e-45c3-b373-127b6217b060";
         const mockAccountNumber = "167132";
-        const mockSaveQuoteId = "xxx-xxx-xxx";
+        const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx"
 
-        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockReferralCorrelationId, mockReferralDate, mockAccountNumber, mockSaveQuoteId, mockCrmCustomerId);
+        const mockOrderInfo = getMockOrderInfo(mockReferralNumber, mockReferralCorrelationId, mockReferralDate, mockAccountNumber, mockSavedSessionId, mockCrmCustomerId);
 
         const mockData = {
             actionList: [{
diff --git a/src/helpers/heritage-integration/session-helper.js b/src/helpers/heritage-integration/session-helper.js
index ba816cdb1..ca50a4e7b 100644
--- a/src/helpers/heritage-integration/session-helper.js
+++ b/src/helpers/heritage-integration/session-helper.js
@@ -28,7 +28,7 @@ export function isAnalyticsSessionStillActive() {
 */
 export function isSavedSessionStillActive() {
     if (getFunnelCookie() !== null) {
-        const savedSessionTimeStamp = new Date(getFunnelCookie().SavedQuoteTimeoutDate);
+        const savedSessionTimeStamp = new Date(getFunnelCookie().SavedSessionTimeoutDate);
         const isSavedSessionTimedOut = (new Date(new Date().toUTCString()) > savedSessionTimeStamp);
 
         if (isSavedSessionTimedOut) {
diff --git a/src/helpers/heritage-integration/session-helper.spec.js b/src/helpers/heritage-integration/session-helper.spec.js
index 8a17743d1..b41827bf7 100644
--- a/src/helpers/heritage-integration/session-helper.spec.js
+++ b/src/helpers/heritage-integration/session-helper.spec.js
@@ -41,7 +41,7 @@ describe("isSavedSessionStillActive", () => {
         mockDate.setDate(mockDate.getDate() + 1);
         
         cookieHelper.getFunnelCookie = jest.spyOn(cookieHelper, "getFunnelCookie")
-            .mockReturnValue({ SavedQuoteTimeoutDate: mockDate });
+            .mockReturnValue({ SavedSessionTimeoutDate: mockDate });
 
         // Act
         const result = isSavedSessionStillActive();
@@ -56,7 +56,7 @@ describe("isSavedSessionStillActive", () => {
         mockDate.setDate(mockDate.getDate() - 1)
 
         cookieHelper.getFunnelCookie = jest.spyOn(cookieHelper, "getFunnelCookie")
-            .mockReturnValue({ SavedQuoteTimeoutDate: mockDate });
+            .mockReturnValue({ SavedSessionTimeoutDate: mockDate });
 
         // Act
         const result = isSavedSessionStillActive();
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 36745d28a..13436be78 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -90,13 +90,13 @@ export function removeAllTestCookies() {
   });
 }
 
-export function getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, accountNumber = "0", saveQuoteId, crmCustomerId) {
+export function getMockOrderInfo(mockReferralNumber, mockCorrelationId, mockReferralDate, accountNumber = "0", savedSessionId, crmCustomerId) {
   return {
       referralNumber: mockReferralNumber,
       referralCorrelationId: mockCorrelationId,
       referralDate: mockReferralDate,
       accountNumber: accountNumber,
-      saveQuoteId: saveQuoteId,
+      savedSessionId: savedSessionId,
       crmCustomerId: crmCustomerId,
   }
 }
diff --git a/src/store/index.js b/src/store/index.js
index 64ba356e6..2c507a123 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -66,7 +66,7 @@ const getDefaultState = () => {
       pageData: {},
       savedSessionTimeout: getDateForSavedSessionTimeout(),
       saveOrderPromise: null,
-      saveQuoteId: null,
+      savedSessionId: null,
       crmCustomerId: null,
       lastPageVisited: null,
       experiments: []
@@ -209,8 +209,8 @@ export const mutations = {
   updateSaveOrderPromise(state, saveOrderPromise){
     state.applicationUser.saveOrderPromise = saveOrderPromise;
   },
-  updateSaveQuoteId(state, saveQuoteId) {
-    state.applicationUser.saveQuoteId = saveQuoteId;
+  updateSavedSessionId(state, savedSessionId) {
+    state.applicationUser.savedSessionId = savedSessionId;
   },
   updateCrmCustomerId(state, crmCustomerId) {
     state.applicationUser.crmCustomerId = crmCustomerId;
@@ -502,12 +502,12 @@ export const actions = {
   },
 
   // Misc Actions
-  updateStoreWithSaveOrderResponse(context, { referralNumber, referralDate, referralCorrelationId, accountNumber, saveQuoteId, crmCustomerId }) {
+  updateStoreWithSaveOrderResponse(context, { referralNumber, referralDate, referralCorrelationId, accountNumber, savedSessionId, crmCustomerId }) {
     context.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
     context.commit(storeMutations.UPDATE_REFERRAL_DATE, referralDate);
     context.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, referralCorrelationId);
     context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, accountNumber);
-    context.commit(storeMutations.UPDATE_SAVE_QUOTE_ID, saveQuoteId);
+    context.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
     context.commit(storeMutations.UPDATE_CRM_CUSTOMER_ID, crmCustomerId);
   },
 
@@ -690,7 +690,7 @@ export const actions = {
         existingPromoCode: null,
         lastPage: applicationUser.lastPageVisited,
         crmCustomerId: applicationUser.crmCustomerId,
-        saveQuoteId: applicationUser.saveQuoteId,
+        savedSessionId: applicationUser.savedSessionId,
 
       },
     });

From b41eae1797733e32ec8fc336420d2c7466a9a92b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 26 Jul 2022 14:39:07 -0400
Subject: [PATCH 19/44] CSR-111: set up prerequisite data and navigation for
 capability questions

---
 .../capability-questions.vue                  | 162 ++++++++++++++++++
 .../molding-questions/molding-questions.vue   | 111 ++----------
 src/layouts/part-questions/part-questions.vue |  61 +++----
 src/layouts/vehicle-parts/vehicle-parts.vue   |  54 +++---
 src/mixins/vehicle-questions-mixin.js         |  43 +++++
 src/mixins/vin-pages-mixin.js                 |  25 ++-
 src/mixins/vin-pages-mixin.spec.js            |  12 +-
 src/router/router-constants/fmgPage-values.js |   1 +
 .../router-constants/navigation-scenarios.js  |   2 +
 src/router/router-constants/routing-table.js  |  39 ++++-
 10 files changed, 335 insertions(+), 175 deletions(-)
 create mode 100644 src/layouts/capability-questions/capability-questions.vue
 create mode 100644 src/mixins/vehicle-questions-mixin.js

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
new file mode 100644
index 000000000..025e5aa20
--- /dev/null
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -0,0 +1,162 @@
+<template>
+    <Form
+      @submit="onSubmit"
+      @invalid-submit="onInvalidSubmit"
+      ref="theForm"
+      v-slot="{ meta }"
+    >
+        <div class="page-container-grouped-styles capability-questions">
+            <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>
+                <alert
+                    ref="alertFewMoreQuestions"
+                    class="my-5"
+                    alertClass="alert-warning"
+                    :manualHeadline="AlertFewMoreQuestionsHeader"
+                    :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>
+                <funnel-footer
+                    ref="funnelFooter"
+                    cmsWidgetName="FunnelFooterWidget"
+                    :isForwardActionDisabled="!meta.valid"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction"
+                />
+            </div>
+        </div>
+    </Form>
+</template>
+
+<script>
+// Components
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import alert from "@/ux-components/alert/alert";
+import questionChain from "@/common-components/question-chain/question-chain";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+
+// Supporting Files
+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";
+
+// DEFINE VALIDATION RULES
+defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
+
+export default {
+    name: "capability-questions",
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+
+        // Settle promises and get results
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+         ];
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+
+        // Call the "next" function to complete the transition to this page.
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+    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,
+        };
+    },
+    computed: {
+        AlertFewMoreQuestionsHeader() {
+			return this.getCmsContent("AlertPartsQuestions", "HeadlineText");
+		},
+        AlertFewMoreQuestionsCopy() {
+			return this.getCmsContent("AlertPartsQuestions", "BodyText");
+		},
+    },
+    methods: {
+        arePagePrerequisitesValid() {
+            return true; // 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() {
+            // TODO: TO COME
+        },
+    },
+    watch: {
+        selectedModel(model) {
+            this.capabilityQuestionsData[model.partIndex].answerData = {
+                answerResult: model.answerResult,
+                answeredQuestions: model.answeredQuestions,
+            }
+            this.currentPartNum = model.partIndex + 1;
+        },
+    },
+    components: {
+        funnelHeader,
+        vehicleBanner,
+        alert,
+        questionChain,
+        funnelSubHeader,
+        funnelFooter,
+        Form,
+    },
+};
+</script>
+
+<style lang="scss">
+  .capability-questions {
+      .question-text {
+        margin-bottom: .5rem;
+        span {
+            text-align: left;
+        }
+    }
+  }
+</style>
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 0ffaae411..a0fa5e96d 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -60,6 +60,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 vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -108,9 +109,10 @@ export default {
 			return this.getCmsContent("AlertPartsQuestions", "BodyText");
 		},
     },
+    mixins: [vehicleQuestionsMixin],
     methods: {
         arePagePrerequisitesValid() {
-            return true;
+            return true;  // TODO - DO TRUE TEST OF PAGEDATA
             // return Object.keys(store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)).length > 0;
         },
         showThisPartQuestionChain(part, i) {
@@ -146,111 +148,20 @@ export default {
 
             const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
 
-            console.log("glassNameAndPartsForStore: ", glassNameAndPartsForStore);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
 
-            // HARD CODE RESPONSE FOR NOW...
-
-            this.glassNameAndPartsForStore = [
-                {
-                    "glassName": "Single",
-                    "glassLocation": "Windshield",
-                    "parts": [
-                        {
-                            "partNumber": "FW03861GTYN",
-                            "description": "rain sensor, heated glass, auto dimming mirror, solar, 3rd visor band, condensation sensor",
-                            "color": "Green Tint",
-                            "requiresRecalibration": false,
-                            "requiresCapabilityQuestions": false,
-                            "recalibrationType": null,
-                            "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
-                                    }
-                                ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "glassName": "Stationary",
-                    "glassLocation": "Rear",
-                    "parts": [
-                        {
-                            "partNumber": "FB25992GTNN",
-                            "description": "heated glass, solar",
-                            "color": "Green Tint",
-                            "requiresRecalibration": false,
-                            "requiresCapabilityQuestions": false,
-                            "recalibrationType": null,
-                            "childParts": null,
-                            "childPartQuestions": []
-                        }
-                    ]
-                }
-            ];
-
-
-
-
-
-
-            // test response data for multiple parts
-            const hasMultipleParts = glassNameAndPartsForStore.some((glass) => glass.parts?.length > 1);
-
-            // loop through all glass items
-            const collectedGlassParts = [];
-            glassNameAndPartsForStore.forEach((glass) => {
-                if (Array.isArray(glass.parts) && glass.parts.length === 1) {
-                    const singlePart = glass.parts[0];
-                    collectedGlassParts.push({
-                        "partNumber": singlePart.partNumber,
-                        "description": singlePart.description,
-                        "color": singlePart.color,
-                        "requiresRecalibration": singlePart.requiresRecalibration,
-                        "childParts": singlePart.childParts,
-                        "price": singlePart.price,
-                    });
-                    // check for and collect any molding questions
-                    if (Array.isArray(singlePart.childPartQuestions) && singlePart.childPartQuestions.length > 0) {
-                        this.moldingQuestionsForStore.push({
-                            "glassName": glass.glassName,
-                            "glassLocation": glass.glassLocation,
-                            "childPartQuestions": singlePart.childPartQuestions,
-                        });
-                    }
-                }
-            });
-            if (!hasMultipleParts) {
-                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-            }
-            this.navigateForward(hasMultipleParts, glassNameAndPartsForStore);
-        },
-        navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
-            if (hasMultipleParts) {
-                // 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});
+            if (hasCapabilityQuestions) {
+                // if has capability questions
+                // go to capability-questions page
+                this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
             } else {
                 // if single parts only
+                const collectedGlassParts = this.reduceGlassPartsArray(glassNameAndPartsForStore);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
                 // go to quote page
                 this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
             }
-
-        // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
-
         },
     },
     watch: {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 856b8a099..b22c30ba6 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -60,6 +60,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 vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -108,6 +109,7 @@ export default {
 			return this.getCmsContent("AlertPartsQuestions", "BodyText");
 		},
     },
+    mixins: [vehicleQuestionsMixin],
     methods: {
         showThisPartQuestionChain(part, i) {
             if (part.partQuestions?.length < 1) { return false; } // return false if only one partQuestion
@@ -137,59 +139,36 @@ export default {
             // call API parts method
             const partsLookup = await this.dispatchStoreAction(storeActions.GET_PARTS)
                 .catch(() => {
-                    this.$refs.funnelFooter.removeLoader();
+                    return this.$refs.funnelFooter.removeLoader();
                 });
 
-            if (!partsLookup) { return }
+            const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
 
-            const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(glassNameAndPartsForStore);
+            const hasChildPartQuestions = this.hasChildPartQuestions(glassNameAndPartsForStore);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(glassNameAndPartsForStore);
 
-            // test response data for multiple parts
-            const hasMultipleParts = glassNameAndPartsForStore.some((glass) => glass.parts?.length > 1);
-
-            // loop through all glass items
-            const collectedGlassParts = [];
-            glassNameAndPartsForStore.forEach((glass) => {
-                if (Array.isArray(glass.parts) && glass.parts.length === 1) {
-                    const singlePart = glass.parts[0];
-                    collectedGlassParts.push({
-                        "partNumber": singlePart.partNumber,
-                        "description": singlePart.description,
-                        "color": singlePart.color,
-                        "requiresRecalibration": singlePart.requiresRecalibration,
-                        "childParts": singlePart.childParts,
-                        "price": singlePart.price,
-                    });
-                    // check for and collect any molding questions
-                    if (Array.isArray(singlePart.childPartQuestions) && singlePart.childPartQuestions.length > 0) {
-                        this.moldingQuestionsForStore.push({
-                            "glassName": glass.glassName,
-                            "glassLocation": glass.glassLocation,
-                            "childPartQuestions": singlePart.childPartQuestions,
-                        });
-                    }
-                }
-            });
-            if (!hasMultipleParts) {
-                store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-            }
-            this.navigateForward(hasMultipleParts, glassNameAndPartsForStore);
-        },
-        async navigateForward(hasMultipleParts, glassNameAndPartsForStore) {
-            if (hasMultipleParts) {
+            // 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.reduceGlassPartsArray(glassNameAndPartsForStore);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
                 // go to quote page
                 this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
             }
-
-        // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
-
-
-
         },
         arePagePrerequisitesValid() {
             return Object.keys(store.getters.pageData(fmgPageValues.PART_QUESTIONS)).length > 0;
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index d0af557b0..3cbc07e6f 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -60,9 +60,10 @@ import alert from "@/ux-components/alert/alert";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import store from "@/store";
 import { Form } from "vee-validate";
-import { storeActions } from "@/constants/store-actions";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations.js";
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 export default {
     name: "vehicle-parts",
@@ -95,7 +96,6 @@ export default {
     data() {
         return {
             glassParts: {},
-            matchedParts: [],
             alertWidgetData: Object,
             alreadyPopulatedPartsData: {},
         };
@@ -141,13 +141,14 @@ export default {
         },
 
         PartsFromApi() {
-            return store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            return this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
         },
 
         RefPrefix() {
             return "partQuestion";
         },
     },
+    mixins: [vehicleQuestionsMixin],
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
@@ -160,7 +161,7 @@ export default {
             this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
-            let isMoldingQuestions = false;
+            const matchedParts = [];
 
             // Match them to the parts from the API.
             for (let [key, value] of Object.entries(
@@ -175,47 +176,54 @@ export default {
                     );
 
                     if (isMatched) {
-                        this.matchedParts.push(currentPart);
-                        // check if there are childPartQuestions (for molding-questions)
-                        if (Array.isArray(currentPart.childPartQuestions) && currentPart.childPartQuestions.length > 0) { 
-                            isMoldingQuestions = true
-                        }
+                        matchedParts.push({
+                            "glassLocation": value.glassLocation,
+                            "glassName": value.glassName,
+                            "parts": [currentPart]
+                        });
                     }
                 }
             }
 
-            // If no parts could be matched, throw an error (isForwardActionDisabled is based off of this.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) {
                 this.$refs.funnelFooter.removeLoader();
                 throw new Error("Could not match any parts to the selected parts");
             }
 
             // Navigate to the next page
-            if (isMoldingQuestions) {
+            if (hasChildPartQuestions) {
                 this.$router.navigate(
                     this.navigationScenarios.HAS_MOLDING_QUESTIONS,
                     this.$route,
                     {},
                     {},
-                    this.moldingQuestionsForStore
+                    {partsOrQuestions: matchedParts}
                 );
-            }
-            else {
-                // Save parts to the store
-                await this.dispatchStoreAction(
-                    storeActions.SAVE_GLASS_PARTS,
-                    this.matchedParts,
-                    false
+            } else if (hasCapabilityQuestions) {
+                this.$router.navigate(
+                    this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+                    this.$route,
+                    {},
+                    {},
+                    {partsOrQuestions: matchedParts}
                 );
+
+            } else {
+                // if single parts only
+                const collectedGlassParts = this.reduceGlassPartsArray(matchedParts);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
                 // Navigate to the quote page
                 this.$router.navigate(
                     this.navigationScenarios.SELECTED_PARTS,
                     this.$route
                 );
             }
-
-            // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
-
         },
 
         LoadInitialPartsData() {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
new file mode 100644
index 000000000..5490ea7bf
--- /dev/null
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -0,0 +1,43 @@
+export default {
+
+    methods: {
+        hasPartQuestions(partsOrQuestions) {
+            return partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
+        },
+        hasGlassLocationWithMultipleParts(partsOrQuestions) {
+            return partsOrQuestions.some(pq => pq.parts?.length > 1);
+        },
+        hasChildPartQuestions(partsOrQuestions) {
+            return partsOrQuestions.some(pq => {
+                return pq.parts?.some(part => part.childPartQuestions?.length > 0);
+            });
+        },
+        hasCapabilityQuestions(partsOrQuestions) {
+            return partsOrQuestions.some(pq => {
+                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
+        reduceGlassPartsArray(glassParts) {
+            const reducedGlassParts = [];
+            glassParts.forEach((glass) => {
+                if (Array.isArray(glass.parts) && glass.parts.length === 1) {
+                    const singlePart = glass.parts[0];
+                    reducedGlassParts.push({
+                        "partNumber": singlePart.partNumber,
+                        "description": singlePart.description,
+                        "color": singlePart.color,
+                        "requiresRecalibration": singlePart.requiresRecalibration,
+                        "requiresCapabilityQuestions": singlePart.requiresCapabilityQuestions,
+                        "recalibrationType": singlePart.recalibrationType,
+                        "childParts": singlePart.childParts,
+                        "price": singlePart.price,
+                    });
+                }
+            });
+            return reducedGlassParts;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index 196a21e63..b9d652223 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,18 +1,20 @@
-import store from "@/store";
 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 = partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
-            const hasGlassLocationWithMultipleParts = partsOrQuestions.some(pq => pq.parts?.length > 1);
-            const hasChildPartQuestions = partsOrQuestions.some(pq => {
-                return pq.parts?.some(part => part.childPartQuestions?.length > 0);
-            });
+
+            const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
+            const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
 
             // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
 
@@ -25,8 +27,17 @@ export default {
             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 {
-                store.commit(storeMutations.UPDATE_GLASS_PARTS, result.data);
+                // if single parts only
+                const collectedGlassParts = this.reduceGlassPartsArray(result.data.partsOrQuestions);
+                // save to store lineItems.glassParts
+                this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+
+                // go to quote page
+                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
                 this.$refs.loadingModal.showModal();
                 navigateToHeritageFunnel();
             }
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 0ef66226f..49503d9dc 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -864,14 +864,17 @@ describe("vin-pages-mixin", () => {
                     partsOrQuestions: partsOrQuestions
                 });
 
-                store.commit = jest.fn();
+                wrapper.vm.$store.commit = jest.fn();
+
+                const collectedGlassParts = wrapper.vm.reduceGlassPartsArray(partsOrQuestions);
 
                 // Act
                 await wrapper.vm.navigateForwardWithSingleCarMatch();
+                
 
                 // Assert
-                expect(store.commit).toHaveBeenCalledTimes(1);
-                expect(store.commit).toHaveBeenCalledWith(storeMutations.UPDATE_GLASS_PARTS, { partsOrQuestions })
+                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);
             });
@@ -895,6 +898,9 @@ function setupMocks({ partsOrQuestions = [] }) {
         router: {
             navigate: jest.fn()
         },
+        store: {
+            commit: jest.fn()
+        }
     });
 
     const mockVinComponent = {
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index 7a38c6b40..404a89de9 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -9,6 +9,7 @@ const fmgPageValues = {
   VEHICLE_PARTS: "vehicle-parts",
   PART_QUESTIONS: "part-questions",
   MOLDING_QUESTIONS: "molding-questions",
+  CAPABILITY_QUESTIONS: "capability-questions",
   LICENSE_PLATE_LOOKUP: "license-plate-lookup",
   REVEAL: "reveal",
   ESTIMATE: "estimate",
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index ab1772de3..c252a3d0f 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -11,6 +11,7 @@ const navigationScenarios = {
   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",
@@ -21,6 +22,7 @@ const navigationScenarios = {
   ANSWERED_QUESTIONS_WITH_SINGLE_PART: "ANSWERED_QUESTIONS_WITH_SINGLE_PART",
   ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS: "ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS",
   HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
+  HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
   SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY"
 };
 
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 51ac52efa..73b501493 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -135,6 +135,10 @@ const routingTable = function(store) {
         {
           scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
     },
@@ -160,6 +164,10 @@ const routingTable = function(store) {
         {
           scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
     },
@@ -189,6 +197,10 @@ const routingTable = function(store) {
         {
           scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
           destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
         }
       ],
     },
@@ -211,10 +223,18 @@ const routingTable = function(store) {
           scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
           destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
         },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+        },
+        {
+          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
+        },
         {
           scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
           destinationFmgPageValue: fmgPageValues.ESTIMATE
-        }           
+        }
       ],
     },
     {
@@ -253,6 +273,10 @@ const routingTable = function(store) {
           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,
@@ -261,6 +285,19 @@ const routingTable = function(store) {
     },
     {
       fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+      maps: [
+        {
+          scenario: navigationScenarios.CLICKED_BACK,
+          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
+        },
+        {
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
+          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+        },
+      ]
+    },
+    {
+      fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
       maps: [
         {
           scenario: navigationScenarios.CLICKED_BACK,

From 6a8409cd345863d01037856714a6e72d1d52952b Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 26 Jul 2022 15:03:40 -0400
Subject: [PATCH 20/44] CSR-702 Add basic routing for part-questions

---
 .../button-question/button-question.vue       |  2 +-
 src/layouts/part-questions/part-questions.vue |  2 +-
 .../side-door-options/side-door-options.vue   |  2 +-
 .../glass-part-question.vue                   |  3 ++-
 src/layouts/vehicle-parts/vehicle-parts.vue   | 19 +++++++++----------
 src/mixins/vehicle-questions-mixin.js         | 10 ++++++++++
 src/mixins/vehicle-questions-mixin.spec.js    |  0
 src/mixins/vin-pages-mixin.js                 |  8 +++++---
 src/router/index.js                           |  7 +++++--
 .../router-constants/navigation-scenarios.js  |  4 +++-
 src/router/router-constants/routing-table.js  | 12 ++++++++----
 src/store/index.js                            |  7 ++++++-
 .../list-button-horizontal.vue                |  8 ++++----
 src/ux-components/list-button/list-button.vue |  8 ++++----
 src/ux-components/list-card/list-card.vue     |  6 +-----
 15 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 src/mixins/vehicle-questions-mixin.js
 create mode 100644 src/mixins/vehicle-questions-mixin.spec.js

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index ee9ecdbad..6848285b8 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -89,7 +89,7 @@ export default {
     modelValue: [Array, String],
     validationRules: String,
     suppressError: Boolean,
-    useTextForValue: Boolean
+    useTextForValue: Boolean,
   },
   computed: {
     formattedGroupName() {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index f5ec4841d..ee1d81c09 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -88,7 +88,7 @@ export default {
     data() {
         return {
             selectedModel: [],
-            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions.filter((p) => {
+            partsQuestionsData: store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions.filter((p) => {
                 if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
                     return {
                         glassName: p.glassName,
diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index b4df1121e..284c3eee6 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -112,7 +112,7 @@ export default ({
                 this.selectedValues = this.getSideDoorReplacementOptions(this.selectedValues.selectedDoorSides, this.selectedValues.selectedDriverSideReplaceOptions, newValue);
             }
         },
-         answersToDisplay(){
+        answersToDisplay(){
             const filteredAnswers = Array.isArray(this.answersFromCms) 
                 ? this.answersFromCms.filter(ans => 
                     {
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 608cf55cb..b46a2f9bc 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -48,6 +48,7 @@ import { getCustomTransformValue } from "@/constants/dynamictext-mapper";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import store from "@/store";
 
 export default {
     name: "glass-part-question",
@@ -152,7 +153,7 @@ export default {
         },
 
         PartDataFromApi() {
-            return this.$store.getters.pageData(this.$route.query.fmgPage) ?? {};
+            return store.getters.pageData(this.$route.query.fmgPage) ?? {};
         },
     },
     methods: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index ce5727ce3..c35699c4e 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -63,9 +63,11 @@
   import store from "@/store";
   import { Form } from "vee-validate";
   import { storeActions } from "@/constants/store-actions";
+  import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
   export default {
     name: "vehicle-parts",
+    mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
       // Call APIs
       const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
@@ -173,19 +175,16 @@
     methods: {
       arePagePrerequisitesValid() {
         // Check if isRepair is populated and if the pageData we need is here (Parts data)
-        if (
-          store.getters.damage.isRepair != null &&
-          Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS))
-            .length !== 0
-        ) {
-          return true;
-        }
-
-        return false;
+        return store.getters.damage.isRepair != null &&
+          Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
       },
       backButtonAction() {
+        console.log(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS))
+        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(
-          this.navigationScenarios.CLICKED_BACK,
+          backNavigationScenario,
           this.$route
         );
       },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
new file mode 100644
index 000000000..7a8f3832f
--- /dev/null
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -0,0 +1,10 @@
+export default {
+    methods: {
+        hasPartQuestions(partsOrQuestions) {
+            return partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
+        },
+        hasGlassLocationWithMultipleParts(partsOrQuestions) {
+            return partsOrQuestions.some(pq => pq.parts?.length > 1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index fce96c980..31fa44cf7 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -2,15 +2,17 @@ import store from "@/store";
 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 = partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
-            const hasGlassLocationWithMultipleParts = partsOrQuestions.some(pq => pq.parts?.length > 1);
+            const hasPartsQuestions = this.hasPartQuestions(partsOrQuestions);
+            const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
 
             if (hasPartsQuestions) {
                 this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
@@ -23,6 +25,6 @@ export default {
                 this.$refs.loadingModal.showModal();
                 navigateToHeritageFunnel();
             }
-        }
+        },
     }
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d2a5ee154..d086cc89a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -173,8 +173,11 @@ async function navigate(scenario, currentRoute, optionalQuery = {}, optionalPara
   if (destinationFmgPageValue !== undefined) {
     // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
 
-    // Append page data to the store for the NEXT page, if any. It will be an empty object if none is provided.
-    baseMixin.methods.savePageDataToStore(destinationFmgPageValue, optionalPageData);
+    // Update page data to the store for next page if provided. Otherwise, use existing page data or override with empty object
+    const existingPageData = store.getters.pageData(destinationFmgPageValue) ?? {};
+    if (Object.keys(optionalPageData).length > 0 && Object.keys(existingPageData).length === 0) {
+      baseMixin.methods.savePageDataToStore(destinationFmgPageValue, optionalPageData);
+    }
 
     // if cookie and referralNumber/Date exists OR an emailAddress has been saved
     if ((getFunnelCookie()?.ReferralNumber && getFunnelCookie()?.ReferralDate) || store.getters.order.customer?.emailAddress) {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 5768c55de..61de8147f 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -19,7 +19,9 @@ const navigationScenarios = {
   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"
+  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"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 25463bd8b..0c729607f 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -82,10 +82,6 @@ const routingTable = function(store) {
     {
       fmgPageValue: fmgPageValues.VEHICLE_PARTS,
       maps: [
-        {
-          scenario: navigationScenarios.CLICKED_BACK,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
         {
           scenario: navigationScenarios.SELECTED_PARTS,
           destinationFmgPageValue: fmgPageValues.QUOTE,
@@ -94,6 +90,14 @@ const routingTable = function(store) {
           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,
+        },
       ],
     },
     {
diff --git a/src/store/index.js b/src/store/index.js
index 90932c8bb..200389734 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,6 +5,7 @@ import { getDateForSavedSessionTimeout } from "@/helpers/heritage-integration/se
 import createPersistedState from "vuex-persistedstate";
 import globalMethods from "@/global-methods";
 import { storeActions } from "../constants/store-actions";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 
 // Export State
 const getDefaultState = () => {
@@ -264,7 +265,10 @@ export const mutations = {
     state.order.vehicle.registration.lastName = null;
   },
   resetGlassPartsState(state) {
+    console.log("resetGlassPartsState")
     state.order.lineItems.glassParts = null;
+    state.order.damage.partQuestionAnswers = null;
+    state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
   },
   resetState(state) {
     Object.assign(state, getDefaultState());
@@ -701,7 +705,7 @@ export const actions = {
         accountNumber: accountNumber?.toString()
       },
     }).then((response) => {
-      context.commit(storeMutations.RESET_STATE);
+      // context.commit(storeMutations.RESET_STATE);
       context.commit(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, response.data);
       return response;
     });
@@ -854,6 +858,7 @@ export const actions = {
   },
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
     //Save new values
+    // context.dispatch(storeActions.SAVE_GLASS_PARTS, null);
     context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
   },
 
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 2fef5119f..5bcfcc706 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -92,10 +92,10 @@ export default {
         : this.selectedValues[0];
     }
   },
-  unmounted() { // needed to clear this button's selectedValues if it is removed
-    this.checkValue = false;
-    this.handleCheckChange();
-  },
+  // unmounted() { // needed to clear this button's selectedValues if it is removed
+  //   this.checkValue = false;
+  //   this.handleCheckChange();
+  // },
   methods: {
     displayLoader() {
       this.isLoaderDisplayed = true;
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 34b6f92e0..cef450bb6 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -92,10 +92,10 @@ export default {
         : this.selectedValues[0];
     }
   },
-  unmounted() { // needed to clear this button's selectedValues if it is removed
-    this.checkValue = false;
-    this.handleCheckChange();
-  },
+  // unmounted() { // needed to clear this button's selectedValues if it is removed
+  //   this.checkValue = false;
+  //   this.handleCheckChange();
+  // },
   methods: {
     displayLoader() {
       this.isLoaderDisplayed = true;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index a4ef7eac8..002fb14ac 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -110,10 +110,6 @@ export default {
       this.checkValue = this.selectedValues == this.value || this.modelValue == this.value;
     }
   },
-  unmounted() { // needed to clear this button's selectedValues if it is removed
-    this.checkValue = false;
-    this.handleCheckChange();
-  },
   computed: {
     getLabelClasses() {
       if (this.isWide) {
@@ -185,7 +181,7 @@ export default {
 
     const fieldOptions = {
       type: inputType,
-      checkedValue: props.value, //  EX: "Single" or "Passenger"
+      // checkedValue: props.value, //  EX: "Single" or "Passenger"
       potentialInitialValue: props.selectedValues,
     };
 

From 7e5fb4c906903f2c657553327b50e091e10add72 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 26 Jul 2022 15:31:20 -0400
Subject: [PATCH 21/44] CSR-702 Cleanup

---
 src/layouts/part-questions/part-questions.vue                 | 2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue                   | 3 ---
 src/store/index.js                                            | 2 --
 .../list-button-horizontal/list-button-horizontal.vue         | 4 ----
 src/ux-components/list-button/list-button.vue                 | 4 ----
 src/ux-components/list-card/list-card.vue                     | 2 +-
 6 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 3f779ace8..ff5f494c1 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -142,7 +142,7 @@ export default {
 
             if (!partsLookup) { return }
 
-            const glassNameAndPartsForStore = partsLookup.data.glassNameAndPartsForStore;
+            const glassNameAndPartsForStore = partsLookup.data.glassNameAndParts;
 
             // test response data for multiple parts
             const hasMultipleParts = glassNameAndPartsForStore.some((glass) => glass.parts?.length > 1);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 75ba3df7f..80cdf8a97 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -157,7 +157,6 @@ export default {
           Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
       },
       backButtonAction() {
-        console.log(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS))
         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;
 
@@ -167,8 +166,6 @@ export default {
         );
       },
       async forwardButtonAction() {
-        const selectedGlassPartNumbers = [];
-        const matchedParts = [];
         let isMoldingQuestions = false;
 
         // Match them to the parts from the API.
diff --git a/src/store/index.js b/src/store/index.js
index d6c09b22c..f3e3cf96a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -265,7 +265,6 @@ export const mutations = {
     state.order.vehicle.registration.lastName = null;
   },
   resetGlassPartsState(state) {
-    console.log("resetGlassPartsState")
     state.order.lineItems.glassParts = null;
     state.order.damage.partQuestionAnswers = null;
     state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
@@ -866,7 +865,6 @@ export const actions = {
   },
   savePartQuestionAnswers(context, partQuestionAnswersArray) {
     //Save new values
-    // context.dispatch(storeActions.SAVE_GLASS_PARTS, null);
     context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
   },
 
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 5bcfcc706..4c9670097 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -92,10 +92,6 @@ export default {
         : this.selectedValues[0];
     }
   },
-  // unmounted() { // needed to clear this button's selectedValues if it is removed
-  //   this.checkValue = false;
-  //   this.handleCheckChange();
-  // },
   methods: {
     displayLoader() {
       this.isLoaderDisplayed = true;
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index cef450bb6..aabb06ae5 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -92,10 +92,6 @@ export default {
         : this.selectedValues[0];
     }
   },
-  // unmounted() { // needed to clear this button's selectedValues if it is removed
-  //   this.checkValue = false;
-  //   this.handleCheckChange();
-  // },
   methods: {
     displayLoader() {
       this.isLoaderDisplayed = true;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 002fb14ac..a1c95157f 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -181,7 +181,7 @@ export default {
 
     const fieldOptions = {
       type: inputType,
-      // checkedValue: props.value, //  EX: "Single" or "Passenger"
+      checkedValue: props.value, //  EX: "Single" or "Passenger"
       potentialInitialValue: props.selectedValues,
     };
 

From 18524de9a6fe74b3f2bc4a142861a2db1173c4d4 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 26 Jul 2022 16:02:53 -0400
Subject: [PATCH 22/44] CSR-702 Add vehicle-questions-mixin tests

---
 src/layouts/part-questions/part-questions.vue |   2 +-
 .../glass-part-question.vue                   |   3 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 161 ++++++++++++++++++
 3 files changed, 163 insertions(+), 3 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index ff5f494c1..6f18408b7 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -88,7 +88,7 @@ export default {
     data() {
         return {
             selectedModel: [],
-            partsQuestionsData: store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions.filter((p) => {
+            partsQuestionsData: this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS)?.partsOrQuestions.filter((p) => {
                 if (Array.isArray(p.partQuestions) && p.partQuestions.length > 0) {
                     return {
                         glassName: p.glassName,
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index b46a2f9bc..608cf55cb 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -48,7 +48,6 @@ import { getCustomTransformValue } from "@/constants/dynamictext-mapper";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import store from "@/store";
 
 export default {
     name: "glass-part-question",
@@ -153,7 +152,7 @@ export default {
         },
 
         PartDataFromApi() {
-            return store.getters.pageData(this.$route.query.fmgPage) ?? {};
+            return this.$store.getters.pageData(this.$route.query.fmgPage) ?? {};
         },
     },
     methods: {
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index e69de29bb..01d41b9c8 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -0,0 +1,161 @@
+import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import { shallowMount } from "@vue/test-utils";
+import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
+
+describe("vehicle-questions-mixin", () => {
+    describe("hasPartQuestions", () => {
+        test("has no part questions => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasPartQuestions = wrapper.vm.hasPartQuestions([
+                {
+                    partQuestions: []
+                }
+            ])
+
+            // Assert
+            expect(hasPartQuestions).toBe(false);
+        });
+
+        test("has undefined part questions => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasPartQuestions = wrapper.vm.hasPartQuestions([])
+
+            // Assert
+            expect(hasPartQuestions).toBe(false);
+        });
+
+        test("has part questions => return true", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasPartQuestions = wrapper.vm.hasPartQuestions([
+                {
+                    partQuestions: [{
+                        testProperty: "some value"
+                    }]
+                }
+            ])
+
+            // Assert
+            expect(hasPartQuestions).toBe(true);
+        });
+    });
+
+    describe("hasGlassLocationWithMultipleParts", () => {
+        test("has one part for one glass location => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasGlassLocationWithMultipleParts = wrapper.vm.hasGlassLocationWithMultipleParts([
+                {
+                    glassName: "Something",
+                    glassLocation: "somewhere",
+                    parts: [{
+                        partNumber: "1234567"
+                    }]
+                }
+            ])
+
+            // Assert
+            expect(hasGlassLocationWithMultipleParts).toBe(false);
+        });
+
+        test("has one part for every glass location => return false", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasGlassLocationWithMultipleParts = wrapper.vm.hasGlassLocationWithMultipleParts([
+                {
+                    glassName: "Something",
+                    glassLocation: "somewhere",
+                    parts: [{
+                        partNumber: "1234567"
+                    }]
+                },
+                {
+                    glassName: "Another glass",
+                    glassLocation: "somewhere else",
+                    parts: [{
+                        partNumber: "1234568"
+                    }]
+                },
+                {
+                    glassName: "Special glass",
+                    glassLocation: "Another where",
+                    parts: [{
+                        partNumber: "1234569"
+                    }]
+                }
+            ])
+
+            // Assert
+            expect(hasGlassLocationWithMultipleParts).toBe(false);
+        });
+
+        test("has multiple parts for one glass location => return true", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            // Act
+            const hasGlassLocationWithMultipleParts = wrapper.vm.hasGlassLocationWithMultipleParts([
+                {
+                    glassName: "Something",
+                    glassLocation: "somewhere",
+                    parts: [{
+                        partNumber: "1234567"
+                    }]
+                },
+                {
+                    glassName: "Another glass",
+                    glassLocation: "somewhere else",
+                    parts: [{
+                        partNumber: "1234568"
+                    }]
+                },
+                {
+                    glassName: "Special glass",
+                    glassLocation: "Another where",
+                    parts: [
+                        {
+                            partNumber: "1234569"
+                        },
+                        {
+                            partNumber: "1234560"
+                        }
+                    ]
+                }
+            ])
+
+            // Assert
+            expect(hasGlassLocationWithMultipleParts).toBe(true);
+        });
+    });
+});
+
+function setupMocks({}) {
+    const baseMixin = setupMocksForJsFiles({});
+
+    const mocks = getMountOptions({
+        router: {
+            navigate: jest.fn()
+        },
+    });
+
+    const mockVehicleQuestionComponent = {
+        template: '<div></div>',
+        mixins: [vehicleQuestionsMixin, baseMixin.baseMixin]
+    };
+
+    const wrapper = shallowMount(mockVehicleQuestionComponent, mocks);
+
+    return { wrapper };
+}
\ No newline at end of file

From 149adc97929bd7b1f83c464c99f18aed876818bd Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 26 Jul 2022 16:21:13 -0400
Subject: [PATCH 23/44] CSR-110: restored navigation to go back to heritage
 funnel

---
 .../capability-questions/capability-questions.vue     |  3 +++
 src/layouts/molding-questions/molding-questions.vue   |  8 ++++++--
 src/layouts/part-questions/part-questions.vue         |  9 +++++++--
 src/layouts/vehicle-parts/vehicle-parts.vue           | 11 ++++++-----
 src/mixins/vin-pages-mixin.js                         |  3 +--
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 025e5aa20..69fc8aad5 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" />
@@ -49,6 +50,7 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -145,6 +147,7 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
+        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index a0fa5e96d..c489dc500 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -6,6 +6,7 @@
       v-slot="{ meta }"
     >
         <div class="page-container-grouped-styles molding-questions">
+            <loadingModal ref="loadingModal"/>
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
@@ -49,6 +50,7 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -159,8 +161,9 @@ export default {
                 const collectedGlassParts = this.reduceGlassPartsArray(glassNameAndPartsForStore);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-                // go to quote page
-                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
             }
         },
     },
@@ -180,6 +183,7 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
+        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index b22c30ba6..dcefad7c0 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -6,6 +6,7 @@
       v-slot="{ meta }"
     >
         <div class="page-container-grouped-styles part-questions">
+            <loadingModal ref="loadingModal"/>
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
@@ -49,6 +50,7 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -61,6 +63,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 loadingModal from '@/common-components/loading-modal/loading-modal.vue';
 
 // DEFINE VALIDATION RULES
 defineRule("questions-required", required(errorMessages.OPTION_REQUIRED));
@@ -166,8 +169,9 @@ export default {
                 const collectedGlassParts = this.reduceGlassPartsArray(glassNameAndPartsForStore);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
-                // go to quote page
-                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
             }
         },
         arePagePrerequisitesValid() {
@@ -190,6 +194,7 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
+        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 3cbc07e6f..832d4bb94 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -1,6 +1,7 @@
 <template>
   <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
     <div class="page-container-grouped-styles vehicle-parts">
+      <loadingModal ref="loadingModal"/>
       <funnelHeader ref="funnelHeader" cmsWidgetName="FunnelHeaderWidget" />
       <vehicleBanner
         ref="vehicleBanner"
@@ -64,6 +65,7 @@ import { Form } from "vee-validate";
 import store from "@/store";
 import { storeMutations } from "@/constants/store-mutations.js";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
 
 export default {
     name: "vehicle-parts",
@@ -218,11 +220,9 @@ export default {
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                // Navigate to the quote page
-                this.$router.navigate(
-                    this.navigationScenarios.SELECTED_PARTS,
-                    this.$route
-                );
+                // go to heritage quote page
+                this.$refs.loadingModal.showModal();
+                navigateToHeritageFunnel();
             }
         },
 
@@ -259,6 +259,7 @@ export default {
         funnelSubHeader,
         funnelFooter,
         alert,
+        loadingModal,
     },
 };
 </script>
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index b9d652223..7919779b2 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -36,8 +36,7 @@ export default {
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                // go to quote page
-                this.$router.navigate(this.navigationScenarios.ANSWERED_QUESTIONS_WITH_SINGLE_PART,this.$route);
+                // go to heritage quote page
                 this.$refs.loadingModal.showModal();
                 navigateToHeritageFunnel();
             }

From b53479dbf12520b140404bad85e3f3fcf760befa Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 26 Jul 2022 17:56:51 -0400
Subject: [PATCH 24/44] CSR-110: refactoring from PR comments

---
 .../molding-questions/molding-questions.vue    |  2 +-
 src/layouts/part-questions/part-questions.vue  |  2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue    |  2 +-
 src/mixins/vehicle-questions-mixin.js          | 18 +++++++++---------
 src/mixins/vin-pages-mixin.js                  |  4 +---
 src/mixins/vin-pages-mixin.spec.js             |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 0cbe8ed2b..d2b469a36 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -159,7 +159,7 @@ export default {
                 this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
             } else {
                 // if single parts only
-                const collectedGlassParts = this.reduceGlassPartsArray(glassNameAndPartsForStore);
+                const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
                 // go to heritage quote page
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 4fc2c58c2..db237ce2b 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -166,7 +166,7 @@ export default {
                 this.$router.navigate(this.navigationScenarios.HAS_CAPABILITY_QUESTIONS,this.$route,{},{},{partsOrQuestions: glassNameAndPartsForStore});
             } else {
                 // if single parts only
-                const collectedGlassParts = this.reduceGlassPartsArray(glassNameAndPartsForStore);
+                const collectedGlassParts = this.reducedGlassPartsArray(glassNameAndPartsForStore);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
                 // go to heritage quote page
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index c81364341..290910217 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -221,7 +221,7 @@ export default {
 
             } else {
                 // if single parts only
-                const collectedGlassParts = this.reduceGlassPartsArray(matchedParts);
+                const collectedGlassParts = this.reducedGlassPartsArray(matchedParts);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 5490ea7bf..7a86066a8 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -19,20 +19,20 @@ export default {
         },
         // method to only include keys listed for lineItems.glassParts in 
         // https://safelite.atlassian.net/wiki/spaces/DC/pages/17137665/Catalog+Front-End+State#glassParts
-        reduceGlassPartsArray(glassParts) {
+        reducedGlassPartsArray(glassParts) {
             const reducedGlassParts = [];
             glassParts.forEach((glass) => {
                 if (Array.isArray(glass.parts) && glass.parts.length === 1) {
                     const singlePart = glass.parts[0];
                     reducedGlassParts.push({
-                        "partNumber": singlePart.partNumber,
-                        "description": singlePart.description,
-                        "color": singlePart.color,
-                        "requiresRecalibration": singlePart.requiresRecalibration,
-                        "requiresCapabilityQuestions": singlePart.requiresCapabilityQuestions,
-                        "recalibrationType": singlePart.recalibrationType,
-                        "childParts": singlePart.childParts,
-                        "price": singlePart.price,
+                        partNumber: singlePart.partNumber,
+                        description: singlePart.description,
+                        color: singlePart.color,
+                        requiresRecalibration: singlePart.requiresRecalibration,
+                        requiresCapabilityQuestions: singlePart.requiresCapabilityQuestions,
+                        recalibrationType: singlePart.recalibrationType,
+                        childParts: singlePart.childParts,
+                        price: singlePart.price,
                     });
                 }
             });
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index b021e0297..a7ba799a2 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -16,8 +16,6 @@ export default {
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
 
-            // TODO - ADD CHECK FOR CAPABILITY QUESTIONS TO SEE IF NAVIGATE TO CAPABILITY-QUESTIONS
-
             if (hasPartsQuestions) {
                 this.$router.navigate(this.navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, this.$route, {}, {}, result.data);
             }
@@ -32,7 +30,7 @@ export default {
             }
             else {
                 // if single parts only
-                const collectedGlassParts = this.reduceGlassPartsArray(result.data.partsOrQuestions);
+                const collectedGlassParts = this.reducedGlassPartsArray(result.data.partsOrQuestions);
                 // save to store lineItems.glassParts
                 this.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 49503d9dc..c7a6b3ea2 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -866,7 +866,7 @@ describe("vin-pages-mixin", () => {
 
                 wrapper.vm.$store.commit = jest.fn();
 
-                const collectedGlassParts = wrapper.vm.reduceGlassPartsArray(partsOrQuestions);
+                const collectedGlassParts = wrapper.vm.reducedGlassPartsArray(partsOrQuestions);
 
                 // Act
                 await wrapper.vm.navigateForwardWithSingleCarMatch();

From 783b717f4ebdf49dd8be8fa7301617e05397ddf0 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.harris@safelite.com>
Date: Wed, 27 Jul 2022 09:42:43 -0400
Subject: [PATCH 25/44] removed unused field

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

diff --git a/src/store/index.js b/src/store/index.js
index f3e3cf96a..44dfccfcc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,8 +48,7 @@ const getDefaultState = () => {
         partQuestionAnswers: null,
       },
       lineItems: {
-        glassParts: null,
-        otherParts: null
+        glassParts: null
       },
       payment: {
         isInsurance: null,

From b41042cee8a0dece23fb2e3e29d319bc86f33eed Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 27 Jul 2022 09:59:39 -0400
Subject: [PATCH 26/44] CSR-110: increase code coverage in unit tests

---
 jest.config.js                     |   1 +
 src/mixins/vin-pages-mixin.spec.js | 168 ++++++++++++++++++++++-------
 2 files changed, 129 insertions(+), 40 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index f4c60e4f7..a2522e0ac 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -13,6 +13,7 @@ module.exports = {
     "!src/helpers/unit-test-helper.js",
     "!src/layouts/vehicle-damage/windshield-options/windshield-options.vue",
     "!src/layouts/molding-questions/**/*.vue",
+    "!src/layouts/capability-questions/**/*.vue",
     "!src/layouts/part-questions/**/*.vue",
     "!src/layouts/reveal/**/*.vue",
     "!src/ux-components/text-link/**/*.vue",
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index c7a6b3ea2..bfb1c4c06 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -94,7 +94,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, front",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -109,7 +109,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -147,7 +147,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, stationary",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -202,7 +202,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, front",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -217,7 +217,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -232,7 +232,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, body side, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -247,7 +247,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, stationary",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -302,7 +302,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, front",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -317,7 +317,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -325,7 +325,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, 1 hole",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -340,7 +340,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, body side, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -348,7 +348,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "driver side, body side, 1 hole",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -363,7 +363,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, stationary",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -371,7 +371,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, stationary",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -379,7 +379,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "stationary",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -387,7 +387,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, movable, 8 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -395,7 +395,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, movable, 8 hole",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -429,7 +429,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, antenna",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -437,7 +437,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, antenna, w/diversity antenna",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -469,7 +469,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, 3rd visor band",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": [
                                     {
                                         "partNumber": "MWF03647",
@@ -490,7 +490,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, rear, ex models and above",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -505,7 +505,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, front, ex models and above",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -520,7 +520,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, rear",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -535,7 +535,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, antenna",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -543,7 +543,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, antenna, w/diversity antenna",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -575,7 +575,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -590,7 +590,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, rear",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -598,7 +598,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, rear",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -613,7 +613,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, front",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -621,7 +621,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, front, laminated, soundproofing",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -636,7 +636,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, encap",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -644,7 +644,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, encap",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -652,7 +652,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, antenna, driver side, encap",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -660,7 +660,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, antenna, driver side, encap",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -668,7 +668,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, encap, chrome molding",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -676,7 +676,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, driver side, encap, chrome molding",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -684,7 +684,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, antenna, driver side, encap, chrome molding",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -692,7 +692,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "solar, antenna, driver side, encap, chrome molding",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -707,7 +707,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, 1 hole",
                                 "color": "Green Tint",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             },
                             {
@@ -715,7 +715,7 @@ describe("vin-pages-mixin", () => {
                                 "description": "heated glass, solar, 1 hole",
                                 "color": "Gray Tint Privacy",
                                 "requiresRecalibration": false,
-                                "requiresCapabilityQuestions": false,
+                                "requiresCapabilityQuestions": true,
                                 "childParts": null
                             }
                         ],
@@ -736,6 +736,94 @@ describe("vin-pages-mixin", () => {
             });
         });
 
+        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

From 4c20a977e6cb5bf54ffe3cfd60c0c17563617120 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 28 Jul 2022 10:52:52 -0400
Subject: [PATCH 27/44] CSR-702 Don't default page data to empty object

---
 src/router/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index e0c5d537b..26c884c59 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -163,7 +163,7 @@ router.navigateToExternalUrl = (url, optionalQuery = {}) => {
 // PRIVATE FUNCTIONS
 
 // Navigate to the next route, depending on the scenario.
-async function navigate(scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData = {}) {
+async function navigate(scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData) {
   if (!scenario) {
     console.error("No scenario provided. Please review the routing table.");
     return;
@@ -176,9 +176,8 @@ async function navigate(scenario, currentRoute, optionalQuery = {}, optionalPara
   if (destinationFmgPageValue !== undefined) {
     // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
 
-    // Update page data to the store for next page if provided. Otherwise, use existing page data or override with empty object
-    const existingPageData = store.getters.pageData(destinationFmgPageValue) ?? {};
-    if (Object.keys(optionalPageData).length > 0 && Object.keys(existingPageData).length === 0) {
+    // Update page data to the store for next page if provided. Otherwise, keep existing page data
+    if (optionalPageData !== undefined) {
       baseMixin.methods.savePageDataToStore(destinationFmgPageValue, optionalPageData);
     }
 

From afdcb4824280738a0fae454c7ecb11fc64bf01ae Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 28 Jul 2022 11:27:15 -0400
Subject: [PATCH 28/44] CSR-702 Remove default for optionalPageData in
 router.navigate

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

diff --git a/src/router/index.js b/src/router/index.js
index 26c884c59..767b9ab18 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -151,7 +151,7 @@ router.afterEach((to, from) => {
 
 });
 
-router.navigate = (scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData = {}) => {
+router.navigate = (scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData) => {
   navigate(scenario, currentRoute, optionalQuery, optionalParams, optionalPageData);
 }
 

From 2588ddc0668471ab226ea54a7288f3afca1c48bd Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 28 Jul 2022 15:57:49 -0400
Subject: [PATCH 29/44] CSR-756 Fix validation issue on vehicle-damage page

---
 .../replace-options-question.vue              | 10 +++-
 .../side-door-options/side-door-options.vue   |  5 +-
 src/router/index.js                           |  2 +
 src/ux-components/list-card/list-card.spec.js | 21 ++-----
 src/ux-components/list-card/list-card.vue     | 55 +++++++++++--------
 5 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 53ef1e2fa..bb164f1bc 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="fade" mode="out-in">
-        <div v-if="isAvailable && this.answersToDisplay.length > 0" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
+        <div v-if="shouldDisplayReplaceOptionsQuestion" class="replace-options-question" :class="this.answersToDisplay.length < 2 ? 'd-none' : ''" aria-live="polite">
             <buttonQuestion
                 isWide
                 :questionText="questionText"
@@ -80,11 +80,19 @@ export default ({
                 return ans;
             });
         },
+        shouldDisplayReplaceOptionsQuestion() {
+            return this.isAvailable && this.answersToDisplay.length > 0
+        }
     },
     watch: {
         isAvailable(val) {
             // CHECK TO UPDATE SELECTED VALUES WHEN ISAVAILABLE IS TRUE
             val && this.updateSelectedValues();
+        },
+        shouldDisplayReplaceOptionsQuestion(shouldDisplayReplaceOptionsQuestion) {
+            if (!shouldDisplayReplaceOptionsQuestion) {
+                this.selectedValues = [];
+            }
         }
     },
     components: {
diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index 284c3eee6..c1c9ba3b3 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -46,6 +46,7 @@ import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 
 // DEFINE VALIDATION RULES
 defineRule("damage-side-required", required(errorMessages.DAMAGE_SIDE_REQUIRED));
@@ -128,10 +129,10 @@ export default ({
             });
         },
         isDriverSideReplaceOptionsQuestionAvailable(){
-            return (Array.isArray(this.selectedDoorSidesValues) && this.selectedDoorSidesValues.includes("DriverSide") && (Array.isArray(this.selectedDamageLocations) && this.selectedDamageLocations.includes("SideDoor")));
+            return (Array.isArray(this.selectedDoorSidesValues) && this.selectedDoorSidesValues.includes(damageLocationsSelected.DRIVERSIDE) && (Array.isArray(this.selectedDamageLocations) && this.selectedDamageLocations.includes(damageLocationsSelected.SIDEDOOR)));
         },
         isPassengerSideReplaceOptionsQuestionAvailable(){
-            return (Array.isArray(this.selectedDoorSidesValues) && this.selectedDoorSidesValues.includes("PassengerSide") && (Array.isArray(this.selectedDamageLocations) && this.selectedDamageLocations.includes("SideDoor")));
+            return (Array.isArray(this.selectedDoorSidesValues) && this.selectedDoorSidesValues.includes(damageLocationsSelected.PASSENGERSIDE) && (Array.isArray(this.selectedDamageLocations) && this.selectedDamageLocations.includes(damageLocationsSelected.SIDEDOOR)));
         },
     },
     components: {
diff --git a/src/router/index.js b/src/router/index.js
index e0c5d537b..cda5fb043 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -224,6 +224,8 @@ function navigateToUrl(url, optionalQuery = {}) {
   for (const queryKey in optionalQuery) {
     externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
   }
+
+  externalUrl.searchParams.append("experiments", "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true");
   
   window.location.assign(externalUrl);
 }
diff --git a/src/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js
index 7db735ced..4e9edf5dc 100644
--- a/src/ux-components/list-card/list-card.spec.js
+++ b/src/ux-components/list-card/list-card.spec.js
@@ -14,7 +14,6 @@ describe("list-card.vue", () => {
         groupID: "checkbox-demo-1",
         groupName: "Checkbox 1",
         buttonImage: "windshield-damage.svg",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -33,7 +32,6 @@ describe("list-card.vue", () => {
         groupID: "radio-demo-1",
         groupName: "radio 1",
         buttonImage: "windshield-damage.svg",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -53,7 +51,6 @@ describe("list-card.vue", () => {
         groupName: "radio 1",
         buttonImage: "windshield-damage.svg",
         buttonLabelSubCopy: "Test",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -73,7 +70,6 @@ describe("list-card.vue", () => {
         groupName: "radio 1",
         buttonImage: "windshield-damage.svg",
         buttonLabelSubCopy: "Test",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -93,7 +89,6 @@ describe("list-card.vue", () => {
         groupName: "radio 1",
         buttonImage: "windshield-damage.svg",
         buttonLabelSubCopy: "Test",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -113,7 +108,6 @@ describe("list-card.vue", () => {
         groupName: "radio 1",
         buttonImage: "windshield-damage.svg",
         isRequired: true,
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -135,7 +129,6 @@ describe("list-card.vue", () => {
         isRequired: true,
         isWide: true,
         buttonLabelSubCopy: "",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -157,7 +150,6 @@ describe("list-card.vue", () => {
         isRequired: true,
         isWide: true,
         buttonLabelSubCopy: "Button Subcopy",
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -178,7 +170,6 @@ describe("list-card.vue", () => {
         buttonImage: "windshield-damage.svg",
         isRequired: true,
         isWide: false,
-        modelValue: ["List Card Checkbox"],
       },
     });
 
@@ -199,13 +190,13 @@ describe("list-card.vue", () => {
         buttonImage: "windshield-damage.svg",
         isRequired: true,
         isWide: false,
-        modelValue: ["List Card Checkbox"],
-        buttonID: 'list-card-id'
+        buttonID: 'list-card-id',
+        selectedValues: "List Card Checkbox"
       },
     });
     wrapper.vm.handleCheckChange();
     // Assert
-    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: "List Card Checkbox", buttonId: 'list-card-id'}]);
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: true, buttonId: 'list-card-id'}]);
   });
 
   it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {
@@ -220,12 +211,11 @@ describe("list-card.vue", () => {
         buttonImage: "windshield-damage.svg",
         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 set an initial value for validation if selectedValues include the value", async () => {
@@ -234,7 +224,6 @@ describe("list-card.vue", () => {
       propsData: {
         value: "Windshield",
         groupName: "radio 1",
-        modelValue: ["Windshield"],
         selectedValues: ["Windshield"],
       },
     });
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index a1c95157f..f368f95f4 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -63,7 +63,7 @@
 
 <script>
 import { useField } from "vee-validate";
-import { toRef } from "vue";
+import { toRef, computed } from "vue";
 import { queryStrings } from "@/constants/query-strings";
 
 export default {
@@ -87,7 +87,7 @@ export default {
     colLength: String,
     validationRules: String,
     selectedValues: [Array, String],
-    modelValue: Object,
+    // modelValue: Object,
     hasError: Boolean,
   },
   data() {
@@ -95,19 +95,18 @@ export default {
       checkValue: null,
     }
   },
-  created() {
-    if (Array.isArray(this.selectedValues)) {
-      this.checkValue = this.isMultiSelect
-        ? this.selectedValues.includes(this.value)
-        : this.selectedValues[0];
-    }
-    else if (Array.isArray(this.modelValue)) {
-      this.checkValue = this.isMultiSelect
-        ? this.modelValue.includes(this.value)
-        : this.modelValue[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 || this.modelValue == this.value;
+      this.checkValue = this.selectedValues == this.value;
     }
   },
   computed: {
@@ -124,10 +123,15 @@ export default {
     },
   },
   methods: {
+    isValueSelectedByArray(arr) {
+      return this.isMultiSelect
+        ? arr.includes(this.value)
+        : arr[0];
+    },
     handleInputChange() {
-        if(!this.selectingInitiatesLoad) {
-          this.handleCheckChange();
-        }
+      if(!this.selectingInitiatesLoad) {
+        this.handleCheckChange();
+      }
     },
     handleKeyupArrow() {
       if (this.isMultiSelect) {
@@ -155,20 +159,14 @@ export default {
       
       this.handleChange(this.value);
       this.$emit("isCheckedChanged", emitEvent);
-      this.$emit("update:modelValue", emitEvent);
     },
   },
   watch: {
     // Changing this will impact pre-selection data loads on vehicle-parts.
     // If changed, please regression test that vehicle-parts data still loads correctly with previous selections.
-    modelValue(newVal) {
-      if (newVal !== undefined) {
-        this.checkValue = newVal.value;
-      }
-    },
+    // model
     selectedValues(newVal) {
       if (typeof newVal === "string") {
-        this.handleChange(newVal);
         this.checkValue = newVal == this.value;
       }
       else if (newVal !== undefined) {
@@ -194,11 +192,20 @@ export default {
     const {
         handleChange,
         errors,
+        checked,
+        meta,
+        value
     } = useField(toRef(props, "groupName"), toRef(props, "validationRules"), fieldOptions); 
-    
+
+    // First land on the blank, unselected page, no handleChange
+    // Land on page with initial values, handleChange
+    const validateValue = value;
     return {
       handleChange,
       errors,
+      checked,
+      meta,
+      validateValue,
       fieldOptions, // only need to expose this for unit test purposes
     };
   },

From 7450840a36fe27d773002ded37e3ca702a838271 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 28 Jul 2022 16:11:31 -0400
Subject: [PATCH 30/44] CSR-756 Cleanup

---
 src/router/index.js                       | 2 --
 src/ux-components/list-card/list-card.vue | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ec4d86c0b..767b9ab18 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -223,8 +223,6 @@ function navigateToUrl(url, optionalQuery = {}) {
   for (const queryKey in optionalQuery) {
     externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
   }
-
-  externalUrl.searchParams.append("experiments", "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true");
   
   window.location.assign(externalUrl);
 }
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index f368f95f4..aa1044113 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -63,7 +63,7 @@
 
 <script>
 import { useField } from "vee-validate";
-import { toRef, computed } from "vue";
+import { toRef } from "vue";
 import { queryStrings } from "@/constants/query-strings";
 
 export default {
@@ -87,7 +87,6 @@ export default {
     colLength: String,
     validationRules: String,
     selectedValues: [Array, String],
-    // modelValue: Object,
     hasError: Boolean,
   },
   data() {
@@ -98,7 +97,6 @@ export default {
   mounted() {
     if (Array.isArray(this.validateValue)) {
       this.checkValue = this.isValueSelectedByArray(this.selectedValues);
-
       const isSelectedByValidator = this.isValueSelectedByArray(this.validateValue);
       
       if (this.checkValue != isSelectedByValidator) {
@@ -164,7 +162,6 @@ export default {
   watch: {
     // Changing this will impact pre-selection data loads on vehicle-parts.
     // If changed, please regression test that vehicle-parts data still loads correctly with previous selections.
-    // model
     selectedValues(newVal) {
       if (typeof newVal === "string") {
         this.checkValue = newVal == this.value;
@@ -192,8 +189,6 @@ export default {
     const {
         handleChange,
         errors,
-        checked,
-        meta,
         value
     } = useField(toRef(props, "groupName"), toRef(props, "validationRules"), fieldOptions); 
 
@@ -203,8 +198,6 @@ export default {
     return {
       handleChange,
       errors,
-      checked,
-      meta,
       validateValue,
       fieldOptions, // only need to expose this for unit test purposes
     };

From 1d6a36a79a6e34e58eaa6bf455b8966e35890f13 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Fri, 29 Jul 2022 11:53:54 -0400
Subject: [PATCH 31/44] CSR-467 Edit aria-labels and what screenreader reads

---
 src/common-components/button-question/button-question.vue       | 1 +
 .../list-button-horizontal/list-button-horizontal.vue           | 2 +-
 src/ux-components/list-button/list-button.vue                   | 2 +-
 src/ux-components/list-card/list-card.vue                       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 6848285b8..7fd3a4231 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -7,6 +7,7 @@
     <div class="w-100 d-flex justify-content-center">
       <fieldset class="w-100" :aria-required=isRequired :class="getFieldSetClasses" :role="isMultiSelect ? 'group' : 'radiogroup'" :aria-labelledby="formattedGroupName">
         <legend class="sr-only" :data-focus-target="formattedGroupName" :id="formattedGroupName" tabindex="-1">
+          {{ questionText }}
           {{(isMultiSelect && answers && answers.length > 1) ? 'Select one or more options below.' : 'Select an option below.' }}
         </legend>
         <div :class="getComponentLoopWrapperClasses" role="application">
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 4c9670097..4e0def451 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -20,7 +20,7 @@
     <label
       tabindex="-1"
       :for="buttonID"
-      :aria-labelledby="buttonID"
+      :aria-label="buttonLabel"
       class="d-flex flex-column justify-content-center py-3 px-4"
       @mouseup="triggerButton()"
     >
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index aabb06ae5..80e8c6043 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -20,7 +20,7 @@
     <label
       tabindex="-1"
       :for="buttonID"
-      :aria-labelledby="buttonID"
+      :aria-label="buttonLabel"
       class="d-flex flex-column justify-content-center py-3 px-4"
       @mouseup="triggerButton"
     >
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index a1c95157f..38cc08703 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -26,7 +26,7 @@
       <label
         tabindex="-1"
         :for="buttonID"
-        :aria-labelledby="buttonID"
+        :aria-label="buttonLabel"
         class="d-flex w-100 align-items-center px-2 h-100"
         :class="getLabelClasses"
         @mouseup="triggerButton"

From da7d72747458a665fc36caad866e41b3e617a58d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 1 Aug 2022 14:23:44 -0400
Subject: [PATCH 32/44] CSR-568 fix voiceover reading incorrect information

Added aria-label to the input.
---
 src/common-components/textbox-question/textbox-question.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 822548cc9..34fc614e7 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -13,6 +13,7 @@
 			:aria-disabled="isDisabled"
 			:disabled="isDisabled"
 			:aria-required="isRequired"
+			:aria-label="questionText"
 			:class="[hasIcon ? 'has-icon' : '', iconRight ? 'icon-right' : '']"
 			:validationRules="validationRules"
 			@change="handleChange"

From 8b94eb2772e66e824d2bf5b86d2a4ffb0481a70d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 1 Aug 2022 15:40:02 -0400
Subject: [PATCH 33/44] CSR-437 add aria-label to hamburger menu.

---
 src/common-components/funnel-header/menu-modal/menu-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.vue b/src/common-components/funnel-header/menu-modal/menu-modal.vue
index e275cc65a..c329f057d 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="menu-modal-container">
-    <button class="menu-button" type="button" :class="[isActive ? 'active' : '']" data-bs-toggle="modal" data-bs-target="#footerModal">
+    <button class="menu-button" type="button" :class="[isActive ? 'active' : '']" data-bs-toggle="modal" data-bs-target="#footerModal" aria-label="Hamburger Menu (modal window)">
       <div class="bar1"></div>
       <div class="bar2"></div>
       <div class="bar3"></div>

From b73649e490bf29ebbb1907a91c59d4ced95ed2b3 Mon Sep 17 00:00:00 2001
From: Matt Sykes <matthew.sykes@safelite.com>
Date: Mon, 1 Aug 2022 16:42:10 -0400
Subject: [PATCH 34/44] CSR-705 value logging masking type

- value logging masking type
- added to other components under button-questions
- added logging for radio as it was missing (only fires onchange of radio which is different than others although arguably more right...
---
 .../button-question/button-question.vue       |  2 +
 src/constants/analytics.js                    |  5 +-
 src/helpers/unit-test-helper.js               |  3 +-
 .../address-vehicles-question.vue             |  1 +
 src/mixins/analytics-mixin.js                 | 21 ++++++--
 src/mixins/analytics-mixin.spec.js            | 54 ++++++++++++++++++-
 .../list-button-horizontal.vue                |  3 +-
 src/ux-components/list-button/list-button.vue |  6 ++-
 src/ux-components/list-card/list-card.vue     |  3 +-
 src/ux-components/radio/radio.vue             |  7 ++-
 10 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 7fd3a4231..5fbe03ac6 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -36,6 +36,7 @@
               data-test="button"
               :validationRules="validationRules"
               :class="[suppressError ? 'alertError' : '']"
+              :valueToLogType="valueToLogType"
             />
             <!-- For nested questions --> 
             <transition name="fade" mode="out-in">
@@ -91,6 +92,7 @@ export default {
     validationRules: String,
     suppressError: Boolean,
     useTextForValue: Boolean,
+    valueToLogType: String,
   },
   computed: {
     formattedGroupName() {
diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index d4ac3d2ea..5400c7b7e 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -29,5 +29,8 @@ const GaLabels = {
   ADDRESS_LOOKUP: 'Address_Look_up', 
 };
 
+const ValueToLogTypes = {
+  LAST_5: "last_5",
+}
 
-export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents};
+export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes };
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 13436be78..368625e7b 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -7,7 +7,7 @@ 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 { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents } from "@/constants/analytics";
+import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, LabelToLogTypes } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
 import { routerParams } from "@/router/router-constants/router-params";
 
@@ -48,6 +48,7 @@ export function getMountOptions(mockData) {
   mocks.GaActions = GaActions;
   mocks.GaLabels = GaLabels;
   mocks.GaEvents = GaEvents;
+  mocks.ValueToLogTypes = ValueToLogTypes;
   mocks.queryStrings = queryStrings;
   mocks.routerParams = routerParams;
 
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 40ec2336b..a96de89e9 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -8,6 +8,7 @@
     v-model="selectedVehicleVinAsArray"
     isRequired
     :validation-rules="validationRules"
+    valueToLogType="last_5"
   />
   <alert ref="differentVehicleAlert"
     v-if="isCarIdDifferent"
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index ffe67735d..e24a55e36 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -2,7 +2,7 @@ import { storeActions } from "@/constants/store-actions";
 import { setCookieProperties, getDeviceIdValue, getSessionIdValue, getSessionKeyValue } from "@/helpers/heritage-integration/cookie-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { experimentSettings } from "@/constants/experiments";
-import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents } from "@/constants/analytics";
+import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 import { cookieNames } from "@/constants/cookie-names";
 
 import baseMixin from "@/mixins/base-mixin";
@@ -42,13 +42,14 @@ export default {
       baseMixin.methods.dispatchStoreAction(storeActions.LOG_CUSTOM_EVENT, payload, false);
     },
 
-    pushEventToGA(category, action, label, pushToLogApp = false) {
+    pushEventToGA(category, action, label, pushToLogApp = false, valueToLogType = null) {
       const currentPageName = getPageNameByQueryString();
+      const labelToLog = getValueToLog(label, valueToLogType);
       const eventToBePushed = {
         'event': GaEvents.GENERIC_EVENT,
         'category': category,
         'action': action,
-        'label': label,
+        'label': labelToLog,
         'value': undefined,
         'path': `/fmg/?${queryStrings.FMG_PAGE}=${currentPageName}`
       }
@@ -56,7 +57,7 @@ export default {
       pushToDataLayerIfDefined(eventToBePushed);
 
       if (pushToLogApp) {
-          this.logCustomEvent(category, action, label, undefined); 
+          this.logCustomEvent(category, action, labelToLog, undefined); 
       }
 
     },
@@ -97,7 +98,7 @@ export default {
         pushToDataLayerIfDefined(experimentWithDimension);
       });
     },
-    
+
     prependActionToMethod(object, method, actionToPrepend) {
       const baseMethodName = method.name.startsWith('bound ') ? method.name.substring(6) : method.name ; 
       const baseMethod = object[baseMethodName]; 
@@ -145,6 +146,9 @@ export default {
     },
     GaLabels() {
       return GaLabels;
+    },
+    ValueToLogTypes() {
+      return ValueToLogTypes;
     }
   },
 };
@@ -163,4 +167,11 @@ function getPageNameByQueryString() {
   } else {
     return '';
   }
+}
+
+function getValueToLog(value, valueToLogType) {
+  if (valueToLogType != null && valueToLogType === ValueToLogTypes.LAST_5 ) {
+    return value.slice(-5);
+  }
+  return value;
 }
\ No newline at end of file
diff --git a/src/mixins/analytics-mixin.spec.js b/src/mixins/analytics-mixin.spec.js
index f09dd0fc8..9eed99fa7 100644
--- a/src/mixins/analytics-mixin.spec.js
+++ b/src/mixins/analytics-mixin.spec.js
@@ -1,7 +1,7 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
 import { setupMocksForJsFiles, setupCookies } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
-import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents } from "@/constants/analytics";
+import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 
 describe("analyticsMixin.js", () => {
   test("logPageView: calls dispatch with type and payload", () => {
@@ -39,21 +39,71 @@ describe("analyticsMixin.js", () => {
     expect(mocks.baseMixin.methods.dispatchStoreAction).toBeCalled();
   });
 
-  test("pushEventToGA, should call logEvent too", () => {
+  test("pushEventToGA, should call dataLayer push and logCustomEvent too", () => {
     // Arrange
+    window.dataLayer = [];
     const mockData = {
       actionList: [{
         actionName: storeActions.LOG_CUSTOM_EVENT
       }],
     }
     const mocks = setupMocksForJsFiles(mockData);
+    var mockDataLayer = [];
+    mockDataLayer.push({
+      event: 'event',
+      category: 'category',
+      action: 'action',
+      label: 'label',
+      value: undefined,
+      path: '/fmg/?fmgPage='
+   });
 
     // Act
     analyticsMixin.methods.pushEventToGA('category', 'action', 'label', true);
 
     // Assert
+    expect(mockDataLayer).toEqual(expect.arrayContaining(window.dataLayer));
     expect(mocks.baseMixin.methods.dispatchStoreAction).toBeCalled();
+  });
 
+  test("pushEventToGA, should call dataLayer push and ValueToLogTypes.LAST_5 only logs last 5 of label", () => {
+    // Arrange
+    window.dataLayer = [];
+    var expectedDataLayer = [];
+    expectedDataLayer.push({
+      event: 'event',
+      category: 'category',
+      action: 'action',
+      label: '33333',
+      value: undefined,
+      path: '/fmg/?fmgPage='
+   });
+
+    // Act
+    analyticsMixin.methods.pushEventToGA('category', 'action', '1111122222333333', false, ValueToLogTypes.LAST_5);
+
+    // Assert
+    expect(expectedDataLayer).toEqual(expect.arrayContaining(window.dataLayer));
+  });
+
+  test("pushEventToGA, should call dataLayer push and ValueToLogTypes.LAST_5 logs only the last 3 characters for a 3 character string", () => {
+    // Arrange
+    window.dataLayer = [];
+    var expectedDataLayer = [];
+    expectedDataLayer.push({
+      event: 'event',
+      category: 'category',
+      action: 'action',
+      label: '111',
+      value: undefined,
+      path: '/fmg/?fmgPage='
+   });
+
+    // Act
+    analyticsMixin.methods.pushEventToGA('category', 'action', '111', false, ValueToLogTypes.LAST_5);
+
+    // Assert
+    expect(expectedDataLayer).toEqual(expect.arrayContaining(window.dataLayer));
   });
 
   test("Experiments, should push to dataLayer with default Google Custom Dimension Index", () => {
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 4e0def451..83c9b0fd1 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -78,6 +78,7 @@ export default {
     validationRules: String,
     selectedValues: [Array, String],
     hasError: Boolean,
+    valueToLogType: String,
   },
   data() {
     return {
@@ -116,7 +117,7 @@ export default {
           this.handleCheckChange();
       }
       
-      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
+      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
     },
     handleCheckChange() {
       const emitEvent = {
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 80e8c6043..b9f46dffa 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -74,10 +74,12 @@ export default {
     // Field initial value
       type: [String, Number],
       default: "",
-    },
+      },
+    
     validationRules: String,
     selectedValues: [Array, String],
     hasError: Boolean,
+    valueToLogType: String,
   },
   data() {
     return {
@@ -111,7 +113,7 @@ export default {
         this.displayLoader();
         this.handleCheckChange();
       }
-      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
+      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
     },
     handleCheckChange() {
       const emitEvent = {
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index b485b78b3..c0c2a71c9 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -88,6 +88,7 @@ export default {
     validationRules: String,
     selectedValues: [Array, String],
     hasError: Boolean,
+    valueToLogType: String,
   },
   data() {
     return {
@@ -146,7 +147,7 @@ export default {
         this.handleCheckChange();
       }
       
-      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
+      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
     },
     handleCheckChange() {
       const emitEvent = {
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 6daf6b972..78df075df 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -25,6 +25,8 @@
 
 <script>
 import { useField } from "vee-validate";
+import { queryStrings } from "@/constants/query-strings";
+
 export default {
   name: "radio",
   props: {
@@ -39,7 +41,8 @@ export default {
     screenReaderOnlyText: String,
     selectedValues: String,
     hasError: Boolean,
-    validationRules: String
+    validationRules: String,
+    valueToLogType: String,
   },
   data() {
     return {
@@ -63,6 +66,8 @@ export default {
         buttonID: this.buttonID && this.buttonID.toString(),
       };
 
+      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
+
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
     },

From 5006a2222106a8708179416624e84a16a7757ffc Mon Sep 17 00:00:00 2001
From: Matt Sykes <matthew.sykes@safelite.com>
Date: Mon, 1 Aug 2022 17:29:25 -0400
Subject: [PATCH 35/44] Fixed broken tests

---
 src/constants/analytics.js            |  2 +-
 src/helpers/unit-test-helper.js       |  2 +-
 src/ux-components/radio/radio.spec.js | 15 +++++++++++++++
 src/ux-components/radio/radio.vue     |  4 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index 5400c7b7e..7ba9ef78c 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -31,6 +31,6 @@ const GaLabels = {
 
 const ValueToLogTypes = {
   LAST_5: "last_5",
-}
+};
 
 export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes };
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 368625e7b..67a3dc8ae 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -7,7 +7,7 @@ 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 { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, LabelToLogTypes } from "@/constants/analytics";
+import { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
 import { routerParams } from "@/router/router-constants/router-params";
 
diff --git a/src/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
index f97700b0e..700a5cc82 100644
--- a/src/ux-components/radio/radio.spec.js
+++ b/src/ux-components/radio/radio.spec.js
@@ -1,6 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import radio from "./radio";
 import { nextTick } from "vue";
+import { GaActions } from "@/constants/analytics";
 
 describe("radio.vue", () => {
   it("Should return group name", async () => {
@@ -64,6 +65,13 @@ describe("radio.vue", () => {
   it("Should emit button value on click", async () => {
     // Act
     const wrapper = shallowMount(radio, {
+      global: {
+        mocks: {
+          '$route': { query: { fmgPage: 'page-name' } },
+          GaActions: GaActions,
+          pushEventToGA: jest.fn(),
+        }
+      },
       propsData: {
         buttonLabel: "Windshield",
         value: "List Card Checkbox",
@@ -83,6 +91,13 @@ describe("radio.vue", () => {
   it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {
     // Act
     const wrapper = shallowMount(radio, {
+      global: {
+        mocks: {
+          '$route': { query: { fmgPage: 'page-name' } },
+          GaActions: GaActions,
+          pushEventToGA: jest.fn(),
+        }
+      },
       propsData: {
         buttonLabel: "Windshield",
         buttonID: "List Card Checkbox",
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 78df075df..be8441415 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -66,10 +66,10 @@ export default {
         buttonID: this.buttonID && this.buttonID.toString(),
       };
 
-      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
-
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
+
+      this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true, this.valueToLogType);
     },
   },
   setup(props) {

From 50ac8482909864c731927b89710d193248e06ff7 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 2 Aug 2022 11:12:19 -0400
Subject: [PATCH 36/44] CSR-702 Fix going back from vehicle-parts when there
 were no part-questions

---
 src/layouts/vehicle-parts/vehicle-parts.vue | 2 +-
 src/mixins/vehicle-questions-mixin.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 290910217..27a92ddf4 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -159,7 +159,7 @@ export default {
             Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
         },
         backButtonAction() {
-            const hasPartQuestions = this.hasPartQuestions(this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions);
+            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(
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 7a86066a8..4331529d4 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -2,10 +2,10 @@ export default {
 
     methods: {
         hasPartQuestions(partsOrQuestions) {
-            return partsOrQuestions.some(pq => pq.partQuestions?.length > 0);
+            return partsOrQuestions?.some(pq => pq.partQuestions?.length > 0);
         },
         hasGlassLocationWithMultipleParts(partsOrQuestions) {
-            return partsOrQuestions.some(pq => pq.parts?.length > 1);
+            return partsOrQuestions?.some(pq => pq.parts?.length > 1);
         },
         hasChildPartQuestions(partsOrQuestions) {
             return partsOrQuestions.some(pq => {

From 6defc97a430e2c155f6e5c835b615ff8437e50c2 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 2 Aug 2022 12:20:12 -0400
Subject: [PATCH 37/44] CSR-530 Remove test pages and routes

---
 src/layouts/test-one.vue                     | 15 ---------------
 src/layouts/test-two.vue                     | 15 ---------------
 src/router/index.js                          | 17 -----------------
 src/router/router-constants/routing-table.js | 10 ----------
 4 files changed, 57 deletions(-)
 delete mode 100644 src/layouts/test-one.vue
 delete mode 100644 src/layouts/test-two.vue

diff --git a/src/layouts/test-one.vue b/src/layouts/test-one.vue
deleted file mode 100644
index 5ba269f2a..000000000
--- a/src/layouts/test-one.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    Test1
-</template>
-
-
-<script>
-export default {
-    name: "test1",
-    methods: {
-        arePagePrerequisitesValid() {
-            return true;
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/layouts/test-two.vue b/src/layouts/test-two.vue
deleted file mode 100644
index 2ea5fd624..000000000
--- a/src/layouts/test-two.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    Test2
-</template>
-
-
-<script>
-export default {
-    name: "test2",
-    methods: {
-        arePagePrerequisitesValid() {
-            return true;
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 767b9ab18..525664dd5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,24 +19,7 @@ import eventBus from "@/helpers/event-bus/event-bus";
 import store from "@/store";
 import analyticsMixin from "@/mixins/analytics-mixin";
 
-import TestOne from "@/layouts/test-one";
-import TestTwo from "@/layouts/test-two";
-
 const routes = [
-  {
-    path: "/test1",
-    name: "test1",
-    components: {
-      default: TestOne
-    } 
-  },
-  {
-    path: "/test2",
-    name: "test2",
-    components: {
-      default: TestTwo
-    } 
-  },
   {
     path: "/",
     name: "root",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 335e583c3..37fb1c13e 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -7,16 +7,6 @@ const routingTable = function(store) {
     {
       fmgPageValue: fmgPageValues.VEHICLE_YEAR,
       maps: [
-        {
-          scenario: navigationScenarios.SELECTED_YEAR,
-          destinationFmgPageValue: "test1",
-          filter: store.getters.vehicle.year === 2010
-        },
-        {
-          scenario: navigationScenarios.SELECTED_YEAR,
-          destinationFmgPageValue: "test2",
-          filter: store.getters.vehicle.year < 1954
-        },
         {
           scenario: navigationScenarios.SELECTED_YEAR,
           destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,

From 007c464e01829909227f5507485edaa6b7200605 Mon Sep 17 00:00:00 2001
From: Matt Sykes <matthew.sykes@safelite.com>
Date: Wed, 3 Aug 2022 10:08:41 -0400
Subject: [PATCH 38/44] Reference to const

---
 .../address-vehicles-question/address-vehicles-question.vue    | 2 +-
 src/ux-components/radio/radio.spec.js                          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index a96de89e9..4bdaa8887 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -8,7 +8,7 @@
     v-model="selectedVehicleVinAsArray"
     isRequired
     :validation-rules="validationRules"
-    valueToLogType="last_5"
+    :valueToLogType="ValueToLogTypes.LAST_5"
   />
   <alert ref="differentVehicleAlert"
     v-if="isCarIdDifferent"
diff --git a/src/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
index 700a5cc82..ebe3ef53a 100644
--- a/src/ux-components/radio/radio.spec.js
+++ b/src/ux-components/radio/radio.spec.js
@@ -85,7 +85,8 @@ describe("radio.vue", () => {
     });
     wrapper.vm.handleCheckChange();
     // Assert
-    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{"buttonID": "List Card Checkbox", value: "List Card Checkbox", checkValue: false}]);
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{"buttonID": "List Card Checkbox", value: "List Card Checkbox", checkValue: false}]);;
+    expect(wrapper.vm.pushEventToGA).toHaveBeenCalled();
   });
 
   it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {

From d98c3213ccdd9b85066e9e40fb9f91717bafd8d1 Mon Sep 17 00:00:00 2001
From: Matt Sykes <matthew.sykes@safelite.com>
Date: Wed, 3 Aug 2022 10:47:47 -0400
Subject: [PATCH 39/44] Set const value in mockMixin for reference needed at
 top of file

---
 .../address-vehicles-question.spec.js          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
index 04bcdb366..70f056e3b 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
@@ -1,5 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
+import { ValueToLogTypes } from "@/constants/analytics";
+ 
 
 describe("addressVehiclesQuestion.vue", () => {
 
@@ -54,9 +56,15 @@ const mockMixin = {
             return 'FoundWindshieldTestReturn';
           }
           return null;
-        }),
-        vehicles: jest.fn(() => {
-            return [{ vehicle: "test" }];
-          })
-    }
+      }),
+      vehicles: jest.fn(() => {
+          return [{ vehicle: "test" }];
+      })
+    },
+    computed: {
+      ValueToLogTypes() {
+        return ValueToLogTypes;
+      }
+    },
+
   }

From a48e2c1d0137de9f32b67f472e821a4d6b76c22a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 3 Aug 2022 13:19:23 -0400
Subject: [PATCH 40/44] CSR-460 Change copy and image from hard coded to CMS
 driven.

---
 .../vin-information/vin-information.vue       | 53 ++++++++++++++++---
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index 91cee616f..ad0ea566d 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="vin-information">
-    <div class="vin-toggle d-inline-flex" :class="[isActive ? 'active' : '']" @click="toggleClass()">
-      <textLink :text="HeadlineText" linkType="text" href="#!" />
+    <div class="vin-toggle d-inline-flex mt-2" :class="[isActive ? 'active' : '']" @click="toggleClass()">
+      <textLink
+        linkType="text"
+        href="#!"
+        :text="WhereCanIFindMyVINToggle"
+      />
     </div>
     <div class="vin-info">
-      <div class="mt-2" v-html="BodyText"></div>
-      <img :src="OptionalImage" alt="" />
+      <div class="mt-2" v-html="WhereCanIFindMyVINBodyCopy"></div>
+      <img :src="WhereCanIFindMyVINImage" alt="" />
     </div>
   </div>
 </template>
@@ -13,23 +17,53 @@
 <script>
 
 import textLink from "@/ux-components/text-link/text-link";
+//Supporting files
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
   name: "vinInformation",
+  async beforeRouteEnter(to, from, next) {
+    // Call APIs
+    const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+
+    // Settle promises and get results
+    const promiseResultMap = [
+      {
+        resultKey: "cmsContent",
+        promise: cmsContentPromise,
+      },
+    ];
+
+    const resultMap = await settleAllPromises(promiseResultMap);
+
+    // Call the "next" function to complete the transition to this page.
+    next((vm) => {
+      vm.setCmsContent(resultMap.cmsContent);
+    });
+  },
   components: {
     textLink,
   },
   data() {
     return {
       isActive: false,
-      HeadlineText: "Where can I find my VIN?",
-      BodyText: "<p class='mb-2'>You can find your VIN in a few places:</p> <ol> <li>Driver side windshield</li> <li>Driver side doorjamb</li> <li>Vehicle registration card</li> <li>Auto insurance card or app</li> </ol>",
-      OptionalImage: "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/vin_location.svg?sfvrsn=63a9a2cf_3",
     };
   },
   methods: {
     toggleClass: function(event){
        this.isActive = !this.isActive;
     }
+  },
+  computed: {
+    WhereCanIFindMyVINToggle(){
+      return this.getCmsContent("WhereCanIFindMyVINToggle", "HeaderText");
+    },
+    WhereCanIFindMyVINBodyCopy(){
+      return this.getCmsContent("WhereCanIFindMyVINToggle", "BodyText");
+    },
+    WhereCanIFindMyVINImage(){
+      return this.getCmsContent("WhereCanIFindMyVINToggle", "Image");
+    },
   }
 }
 
@@ -72,8 +106,11 @@ export default {
     transition: all 250ms ease-out;
     overflow: hidden;
     opacity: 0;
+    p {
+      margin-bottom: .5rem;
+    }
     img {
-      max-width: 420px;
+      max-width: 100%;
       width: 117%;
       height: auto;
     }

From c61e83695a572176ed5388ac9f1fb2b5aad34364 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 3 Aug 2022 13:24:23 -0400
Subject: [PATCH 41/44] Change variable name to something more descriptive.

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

diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index ad0ea566d..a4c2fcdb1 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -4,7 +4,7 @@
       <textLink
         linkType="text"
         href="#!"
-        :text="WhereCanIFindMyVINToggle"
+        :text="WhereCanIFindMyVINHeadline"
       />
     </div>
     <div class="vin-info">
@@ -55,7 +55,7 @@ export default {
     }
   },
   computed: {
-    WhereCanIFindMyVINToggle(){
+    WhereCanIFindMyVINHeadline(){
       return this.getCmsContent("WhereCanIFindMyVINToggle", "HeaderText");
     },
     WhereCanIFindMyVINBodyCopy(){

From 62550ab6a07510377e9c88277b1b5d2c3f9be682 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 4 Aug 2022 13:23:34 -0400
Subject: [PATCH 42/44] Update unit test.

---
 .../vin-information/vin-information.spec.js   | 10 ++++-
 .../vin-information/vin-information.vue       | 20 ----------
 src/layouts/vin-lookup/vin-lookup.vue         | 38 +++++++++----------
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-information/vin-information.spec.js b/src/layouts/vin-lookup/vin-information/vin-information.spec.js
index b80daf9ef..7ffdeedf8 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.spec.js
+++ b/src/layouts/vin-lookup/vin-information/vin-information.spec.js
@@ -4,7 +4,9 @@ import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information
 describe("vinInformation.vue", () => {
   it("Should return input class active if isActive is true", async () => {
     // Act
-    const wrapper = shallowMount(vinInformation);
+    const wrapper = shallowMount(vinInformation, {
+      mixins: [mockMixin]
+    });
 
     await wrapper.setData({
       isActive: true,
@@ -16,3 +18,9 @@ describe("vinInformation.vue", () => {
     expect(wrapper.vm.isActive).toEqual(false);
   });
 });
+
+const mockMixin = {
+  methods: {
+    getCmsContent: jest.fn()
+  }
+}
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index a4c2fcdb1..50194ee7b 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -18,29 +18,9 @@
 
 import textLink from "@/ux-components/text-link/text-link";
 //Supporting files
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
   name: "vinInformation",
-  async beforeRouteEnter(to, from, next) {
-    // Call APIs
-    const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-
-    // Settle promises and get results
-    const promiseResultMap = [
-      {
-        resultKey: "cmsContent",
-        promise: cmsContentPromise,
-      },
-    ];
-
-    const resultMap = await settleAllPromises(promiseResultMap);
-
-    // Call the "next" function to complete the transition to this page.
-    next((vm) => {
-      vm.setCmsContent(resultMap.cmsContent);
-    });
-  },
   components: {
     textLink,
   },
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 4ba6a9fe9..84c17cfd9 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -56,19 +56,19 @@
             />
           </div>
         </div>
-        <alert ref="alertInvalidZip" 
-          v-if="displayInvalidZipAlert" 
-          class="my-4" 
-          cmsWidgetName="AlertInvalidZipWidget" 
-          alertClass="alert-danger" 
-          v-bind:isDismissible="false" 
-        />        
+        <alert ref="alertInvalidZip"
+          v-if="displayInvalidZipAlert"
+          class="my-4"
+          cmsWidgetName="AlertInvalidZipWidget"
+          alertClass="alert-danger"
+          v-bind:isDismissible="false"
+        />
         <alert
           class="my-4"
           :manualHeadline="AlertPerfectMatchInsuranceVerifiedHeader"
           :manualCopy="AlertPerfectMatchInsuranceVerifiedBody"
           v-model="customAlertData"
-          v-if="vinPopulatedOnPageLoad && isInsuranceVerified" 
+          v-if="vinPopulatedOnPageLoad && isInsuranceVerified"
           alertClass="alert-success"
         />
         <alert
@@ -173,7 +173,7 @@ export default {
     return {
       vin: this.getVinFromStore(),
       serviceZipCode: this.getZipFromStore(),
-      emailAddress: this.getEmailFromStore(),      
+      emailAddress: this.getEmailFromStore(),
       isCarIdDifferent: false,
       customAlertData: {},
       previouslyEnteredCarId: '',
@@ -198,7 +198,7 @@ export default {
     getZipFromStore(){
       return this.$store.getters.order.serviceLocation.zipCode;
     },
-    attachCustomEvents() { 
+    attachCustomEvents() {
       this.prependActionToMethod(this, this.forwardButtonAction, () => {
         this.pushEventToGA(
           this.$route.query[this.queryStrings.FMG_PAGE],
@@ -243,9 +243,9 @@ export default {
         if (this.serviceZipCode && !isZipValid) {
           this.displayInvalidZipAlert = true;
           return this.$refs.funnelFooter.removeLoader();
-        } 
+        }
         this.displayInvalidZipAlert = false;
-        
+
         // If either lookup fails, remove the loader and stop processing the page.
         if (!resultMap.vehicleLookupResponse || !resultMap.serviceZipValidationResponse.isServiceable) {
           // If the vehicle result is undefined, the vin entered was invalid.
@@ -270,7 +270,7 @@ export default {
           this.previouslyEnteredCarId = resultMap.vehicleLookupResponse.carId;
           this.customAlertData.vehicleInfo = resultMap.vehicleLookupResponse;
           this.displayMatchedDifferentVehicleAlert = true;
-          
+
           this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(resultMap.vehicleLookupResponse.carId);
 
           // Update button "Continue with..."
@@ -292,12 +292,12 @@ export default {
           }, false);
 
         return await this.navigateForward();
-        
+
       }
 
       // If a VIN has already been found. Validate the Service Zip (in case of changes)
       const zipValidationResponse = await this.dispatchStoreAction(storeActions.VALIDATE_ZIP, {zip: this.serviceZipCode});
-      
+
       // Check if Service Zip entered is serviceable
       if (zipValidationResponse.data.isServiceable) {
         // If the Service Zip entered is serviceable then save the Zip Info and Email Address and navigate forward
@@ -379,8 +379,8 @@ export default {
       }
       else {
         return 'XXXXXXXXXXXXXXXXX';
-      }    
-    }, 
+      }
+    },
   },
   watch: {
     vin() {
@@ -397,10 +397,10 @@ export default {
     vehicleBanner,
     funnelSubHeader,
     textboxQuestion,
-    alert,   
+    alert,
     vinInformation,
     loadingModal,
-    Form,    
+    Form,
   },
 };
 </script>

From 7f81ce08247677ae0f3e6c5550f16a01e7755aaa Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 5 Aug 2022 10:39:17 -0400
Subject: [PATCH 43/44] CSR-437 accessibility fix

Add tabindex to span so that screenreader reads copy.
Add aria-label to list-button so that screenreader reads proper information.
---
 src/common-components/button-question/button-question.vue | 4 ++--
 src/ux-components/list-button/list-button.vue             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 5fbe03ac6..4d4519c44 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -2,7 +2,7 @@
 <template>
   <div :class="isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question'">
     <div v-if="questionText && answers && answers.length > 0" class="question-text d-flex">
-      <span class="fw-bold w-100">{{ questionText }}</span>
+      <span class="fw-bold w-100" tabindex="0">{{ questionText }}</span>
     </div>
     <div class="w-100 d-flex justify-content-center">
       <fieldset class="w-100" :aria-required=isRequired :class="getFieldSetClasses" :role="isMultiSelect ? 'group' : 'radiogroup'" :aria-labelledby="formattedGroupName">
@@ -38,7 +38,7 @@
               :class="[suppressError ? 'alertError' : '']"
               :valueToLogType="valueToLogType"
             />
-            <!-- For nested questions --> 
+            <!-- For nested questions -->
             <transition name="fade" mode="out-in">
               <div v-if="typeof selectedValues == 'string' && selectedValues == answer.Name">
                 <slot></slot>
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index b9f46dffa..b82559812 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -16,6 +16,7 @@
       :aria-required="isRequired"
       v-model="checkValue"
       @change="handleInputChange"
+      :aria-label="value"
     >
     <label
       tabindex="-1"

From b7c1e4726b664a3bf7a6073fc261a804690dbaaa Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 5 Aug 2022 11:18:08 -0400
Subject: [PATCH 44/44] Remove tab index.

---
 src/common-components/button-question/button-question.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 4d4519c44..a4ee6b330 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -2,7 +2,7 @@
 <template>
   <div :class="isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question'">
     <div v-if="questionText && answers && answers.length > 0" class="question-text d-flex">
-      <span class="fw-bold w-100" tabindex="0">{{ questionText }}</span>
+      <span class="fw-bold w-100">{{ questionText }}</span>
     </div>
     <div class="w-100 d-flex justify-content-center">
       <fieldset class="w-100" :aria-required=isRequired :class="getFieldSetClasses" :role="isMultiSelect ? 'group' : 'radiogroup'" :aria-labelledby="formattedGroupName">