From e2998b997ea149352dcb2818aaf2588be6d2ab2d Mon Sep 17 00:00:00 2001 From: Katie Date: Tue, 27 Dec 2022 08:56:10 -0500 Subject: [PATCH] CSR-1002 Fix back issue on quote for repair --- src/mixins/vehicle-questions-mixin.js | 10 +++++----- .../router-constants/navigation-scenarios.js | 1 - src/router/router-constants/routing-table.js | 16 ---------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index 3a8fd4657..b28bf647f 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -498,9 +498,11 @@ export default { const hasCapabilityQuestions = this.hasCapabilityQuestions(currentPartsOrQuestions); const skipVinLookup = await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE); - let backNavigationScenario = self.$store.getters.vehicle.vin - ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS - : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS; + const vin = self.$store.getters.vehicle.vin; + let backNavigationScenario = + !vin || vin !== "" || skipVinLookup + ? navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS + : navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS; if ( hasCapabilityQuestions && @@ -523,8 +525,6 @@ export default { this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS) ) { backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS; - } else if (skipVinLookup) { - backNavigationScenario = navigationScenarios.CLICKED_BACK_TO_GO_TO_ESTIMATE; } self.$router.navigateWithoutSaving(backNavigationScenario, self.$route); diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index a29678b28..cea67f73a 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -44,7 +44,6 @@ const navigationScenarios = { CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS", CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS", CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS", - CLICKED_BACK_TO_GO_TO_ESTIMATE: "CLICKED_BACK_TO_GO_TO_ESTIMATE", }; export { navigationScenarios }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 9e086804e..5bc959d6a 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -296,10 +296,6 @@ const routingTable = function (store) { scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS, destinationFmgPageValue: fmgPageValues.QUOTE, }, - { - scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_ESTIMATE, - destinationFmgPageValue: fmgPageValues.ESTIMATE, - }, ], }, { @@ -333,10 +329,6 @@ const routingTable = function (store) { scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS, destinationFmgPageValue: fmgPageValues.QUOTE, }, - { - scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_ESTIMATE, - destinationFmgPageValue: fmgPageValues.ESTIMATE, - }, ], }, { @@ -366,10 +358,6 @@ const routingTable = function (store) { scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS, destinationFmgPageValue: fmgPageValues.QUOTE, }, - { - scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_ESTIMATE, - destinationFmgPageValue: fmgPageValues.ESTIMATE, - }, ], }, { @@ -399,10 +387,6 @@ const routingTable = function (store) { scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS, destinationFmgPageValue: fmgPageValues.QUOTE, }, - { - scenario: navigationScenarios.CLICKED_BACK_TO_GO_TO_ESTIMATE, - destinationFmgPageValue: fmgPageValues.ESTIMATE, - }, ], }, {