Merge pull request #683 from Safelite/develop

Merge develop to quote page MVP release
2022-08-19 14:34:18 -04:00 · 2022-08-19 14:34:18 -04:00 · ccdd391bbf
commit ccdd391bbf
parent 0b8c454da5 fd16394857
6 changed files with 42 additions and 109 deletions
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@ -207,9 +207,7 @@ export default {
                                    const thisAnsweredPartQuestion = glassPart.partQuestions[pqIndex];

                                    // remove answerData from this glass part
-                                    // delete glassPart.answerData;
                                    glassPart.answerData = null;
-                                    // delete glassPart.isSuppressedPart;
                                    glassPart.isSuppressedPart = null;

                                    // Update the key to re-render this part's question-chain component
@ -440,55 +438,6 @@ export default {
                return part;
            });

-            // this block is purely for handling duplicate questions
-            alreadyAnsweredQuestions?.forEach((savedPart, partIndex) => {
-                savedPart.answeredQuestions.forEach((aq) => {
-                    if (aq.isDuplicateQuestion) {
-                        // find this one in partsQuestionData
-                        const dupedPartsQuestion = this.partsQuestionsData[partIndex].partQuestions[aq.questionNum - 1];
-                        dupedPartsQuestion.suppressDuplicateQuestion = true;
-
-                        const dupedPartsQuestionAnswer = dupedPartsQuestion.answers.filter((ans) => {
-                            return ans.answerText.toUpperCase() === aq.selectedAnswerText.toUpperCase();
-                        })[0];
-
-                        let isDupedPartsQuestionFirst;
-                        if (aq.questionNum === 1) { isDupedPartsQuestionFirst = true }
-
-                        this.partsQuestionsData.forEach((glassPart, i) => {
-
-                            // loop through this glass part's part questions, looking for a questionText match
-                            glassPart.partQuestions.forEach((pq, pqIndex) => {
-                                // if this dupedQ is the first in the array then 
-                                //     suppress all questions for this part up until the answer's nextQuestionSequence
-                                if (isDupedPartsQuestionFirst && 
-                                    dupedPartsQuestionAnswer.nextQuestionSequence &&
-                                    pq.questionSequence < dupedPartsQuestionAnswer.nextQuestionSequence) {
-                                        pq.suppressDuplicateQuestion = true;
-                                    }
-                                pq.answers.forEach((thisAns) => {
-                                    if (thisAns.nextQuestionSequence === aq.questionNum) {
-                                        // update either the nextQuestionSequence or the answerResult
-                                        if (dupedPartsQuestionAnswer.nextQuestionSequence) {
-                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
-                                            thisAns.nextQuestionSequence = dupedPartsQuestionAnswer.nextQuestionSequence;
-                                            // update this change to answerSelected
-                                            pq.answerSelected = `${pq.questionSequence}|nextQuestion|${thisAns.nextQuestionSequence}|${thisAns.answerText}`;
-                                        } else {
-                                            thisAns.originalNextQuestionSequence = thisAns.nextQuestionSequence;
-                                            thisAns.nextQuestionSequence = null;
-                                            thisAns.originalAnswerResult = thisAns.originalAnswerResult || thisAns.answerResult;
-                                            thisAns.answerResult = dupedPartsQuestionAnswer.answerResult;
-                                        }
-                                    }
-                                })
-                            });
-                            
-                        });
-
-                    }
-                })
-            });
        },
    },
    components: {
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@ -114,7 +114,7 @@ export default {
                navigateToHeritageFunnel();
               
                // For quote pages MVP release
-                // self.$router.navigate(self.navigationScenarios.ANSWERED_ALL_QUESTIONS, self.$route);
+                // self.$router.navigate(self.navigationScenarios.HAS_NO_MORE_QUESTIONS, self.$route);
            }
        },
        backButtonAction() {
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@ -193,7 +193,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });

            test("multiple glass locations have part questions => go to parts-questions", async () => {
@ -301,7 +301,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });

            test("multiple glass locations selected, one has part question => go to parts-questions", async () => {
@ -401,7 +401,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });

            test("a selected glass location has part questions and multiple parts => go to parts-questions", async () => {
@ -549,7 +549,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_PART_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });
        });

@ -591,7 +591,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });

            test("multiple glass locations selected, one of them has multiple parts => go to vehicle parts", async () => {
@ -697,7 +697,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });

            test("multiple glass locations selected, multiple have multiple parts => go to vehicle-parts", async () => {
@ -869,7 +869,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });
        });

@ -922,7 +922,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_MOLDING_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions });
            });
        });

@ -957,7 +957,7 @@ describe("vehicle-questions-mixin", () => {

                // Assert
                expect(wrapper.vm.$router.navigate).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith(navigationScenarios.HAS_CAPABILITY_QUESTIONS, wrapper.vm.$route, {}, {}, { partsOrQuestions, capabilityQuestions: [] });
            });
        });

--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@ -1,34 +1,30 @@
 const navigationScenarios = {
+  // General
+  CLICKED_BACK: "CLICKED_BACK",
+  CLICKED_FORWARD: "CLICKED_FORWARD",
+
+  // YMMS
  SELECTED_YEAR: "SELECTED_YEAR",
  SELECTED_MODEL: "SELECTED_MODEL",
  SELECTED_MAKE: "SELECTED_MAKE",
  SELECTED_STYLE: "SELECTED_STYLE",
-  CLICKED_BACK: "CLICKED_BACK",
+  
+  // Vin pages
  CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-  CLICKED_FORWARD: "CLICKED_FORWARD",
  CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-  SELECTED_PARTS: "SELECTED_PARTS",
-  SELECTED_VIN_WITH_PART_QUESTIONS: "HAS_PART_QUESTIONS",
-  SELECTED_VIN_WITH_MULTIPLE_PARTS: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
-  SELECTED_VIN_WITH_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
-  SELECTED_VIN_WITH_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
-  CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
+  CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN", 
  CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
  SELECTED_VIN_HAS_MISMATCHED_GLASS: "SELECTED_VIN_HAS_MISMATCHED_GLASS",
-  CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN", 
  SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN", 
  SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE", 
  SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-  ANSWERED_QUESTIONS_WITH_SINGLE_PART: "ANSWERED_QUESTIONS_WITH_SINGLE_PART",
-  ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS: "ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS",
-  SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY",
-  CLICKED_BACK_WITH_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITH_PART_QUESTION_ANSWERS",
-  CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS: "CLICKED_BACK_WITHOUT_PART_QUESTION_ANSWERS",
-  ANSWERED_ALL_QUESTIONS: "ANSWERED_ALL_QUESTIONS",
+
+  // Question pages
  HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
  HAS_MULTIPLE_PARTS_TO_CHOOSE: "HAS_MULTIPLE_PARTS_TO_CHOOSE",
  HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
  HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
+  HAS_NO_MORE_QUESTIONS: "HAS_NO_MORE_QUESTIONS",
  CLICKED_BACK_TO_GO_TO_VIN_LOOKUP: "CLICKED_BACK_TO_GO_TO_VIN_LOOKUP",
  CLICKED_BACK_TO_GO_TO_PART_QUESTIONS: "CLICKED_BACK_TO_GO_TO_PART_QUESTIONS",
  CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS: "CLICKED_BACK_TO_GO_TO_VEHICLE_PARTS",
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@ -76,10 +76,6 @@ const routingTable = function(store) {
          scenario: navigationScenarios.CLICKED_BACK,
          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
        },
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-        },
      ],
    },
    {
@ -98,19 +94,19 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
        }
      ],
@ -127,19 +123,19 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
        }
      ],
@ -160,19 +156,19 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
        }
      ],
@ -189,25 +185,21 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
        },   
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
+          scenario: navigationScenarios.HAS_PART_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
+          scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
          destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
        },
        {
-          scenario: navigationScenarios.SELECTED_VIN_WITH_CAPABILITY_QUESTIONS,
+          scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS
        },
-        {
-          scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
-          destinationFmgPageValue: fmgPageValues.ESTIMATE
-        }
      ],
    },
    {
@ -251,7 +243,7 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
        },
        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.QUOTE,
        },
      ]
@ -259,10 +251,6 @@ const routingTable = function(store) {
    {
      fmgPageValue: fmgPageValues.VEHICLE_PARTS,
      maps: [
-        {
-          scenario: navigationScenarios.SELECTED_PARTS,
-          destinationFmgPageValue: fmgPageValues.QUOTE,
-        },
        {
          scenario: navigationScenarios.CLICKED_FORWARD,
          destinationFmgPageValue: fmgPageValues.REVEAL,
@ -284,7 +272,7 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
        },
        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.QUOTE,
        },
      ],
@ -309,7 +297,7 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
        },
        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.QUOTE,
        }
      ]
@ -334,7 +322,7 @@ const routingTable = function(store) {
          destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
        },
        {
-          scenario: navigationScenarios.ANSWERED_ALL_QUESTIONS,
+          scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
          destinationFmgPageValue: fmgPageValues.QUOTE
        },
      ]
--- a/src/store/index.js
+++ b/src/store/index.js
@ -997,7 +997,7 @@ export const actions = {
  savePartQuestionAnswers(context, partQuestionAnswersArray) {
    // if part question answers have changed, reset subsequent question answers
    const previousResultsArray = context.getters.damage.partQuestionAnswers;
-    const havePartQuestionAnswersChanged = previousResultsArray.length !== partQuestionAnswersArray.length ||
+    const havePartQuestionAnswersChanged = previousResultsArray?.length !== partQuestionAnswersArray.length ||
      !previousResultsArray.every((x, i) => x.result === partQuestionAnswersArray[i].result);

    if (havePartQuestionAnswersChanged) {