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