From a233f571d8e580e95c746191674c7cc70b104046 Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 12:38:21 +0530 Subject: [PATCH 01/12] Added new page TPA-Submit SSR-429 --- src/layouts/tpa-submit/tpa-submit.vue | 86 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 3 +- .../router-constants/navigation-scenarios.js | 2 + src/router/router-constants/routing-table.js | 13 +++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/layouts/tpa-submit/tpa-submit.vue diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue new file mode 100644 index 00000000..4b3cc68d --- /dev/null +++ b/src/layouts/tpa-submit/tpa-submit.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index f4bc54c1..23a2b763 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -24,6 +24,7 @@ export const issPageValues = { VEHICLE_PARTS: 'vehicle-parts', VEHICLE_STYLE: 'vehicle-style', VEHICLE_YEAR: 'vehicle-year', - VIN_LOOKUP: 'vin-lookup' + VIN_LOOKUP: 'vin-lookup', + TPA_SUBMIT: 'tpa-submit' }; \ No newline at end of file diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 50ce575d..f0fd3010 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -46,6 +46,8 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", + + CLICKED_FORWARD_WITH_TPA_SUBMIT:"CLICKED_FORWARD_WITH_TPA_SUBMIT", }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 8581612b..20b86e52 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -507,6 +507,19 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.REVIEW_PAGE } ] + }, + { + issPageValue: issPageValues.TPA_SUBMIT, + maps: [ + { + scenario: navigationScenarios.CLICKED_BACK, + destinationIssPageValue: issPageValues.TPA_SEARCH + }, + { + scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_SUBMIT, + destinationIssPageValue: issPageValues.TPA_CONFIRMATION, + }, + ] } ]; }; From bae00307333a9ace3377690491b67dad347d81ff Mon Sep 17 00:00:00 2001 From: sheena Date: Mon, 24 Apr 2023 15:49:32 +0530 Subject: [PATCH 02/12] SSR-428 Created TPA-confirmation shell page --- .../tpa-confirmation/tpa-confirmation.vue | 80 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 1 + .../router-constants/navigation-scenarios.js | 2 + src/router/router-constants/routing-table.js | 19 ++++- 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 src/layouts/tpa-confirmation/tpa-confirmation.vue diff --git a/src/layouts/tpa-confirmation/tpa-confirmation.vue b/src/layouts/tpa-confirmation/tpa-confirmation.vue new file mode 100644 index 00000000..53f273ee --- /dev/null +++ b/src/layouts/tpa-confirmation/tpa-confirmation.vue @@ -0,0 +1,80 @@ + + + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index f4bc54c1..327d33b0 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -17,6 +17,7 @@ export const issPageValues = { REVIEW_ORDER: 'review-order', SERVICE_LOCATION: 'service-location', SERVICE_PACKAGE: 'service-package', + TPA_CONFIRMATION:'tpa-confirmation', VEHICLE_DAMAGE: 'vehicle-damage', VEHICLE_LOOKUP: 'vehicle-lookup', VEHICLE_MAKE: 'vehicle-make', diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 50ce575d..e144083f 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -46,6 +46,8 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", + + CLICKED_FORWARD_TPA_CONFIRMATION:"CLICKED_FORWARD_TPA_CONFIRMATION", }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 8581612b..39c512b4 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -489,11 +489,11 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_PACKAGE, + destinationIssPageValue: issPageValues.SERVICE_PACKAGE }, { scenario: navigationScenarios.CLICKED_FORWARD_WITH_REVIEW, - destinationIssPageValue: issPageValues.PAYMENT_PAGE, + destinationIssPageValue: issPageValues.PAYMENT_PAGE }, ], @@ -507,7 +507,20 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.REVIEW_PAGE } ] - } + }, + + { + issPageValue: issPageValues.TPA_CONFIRMATION, + maps: [ + + { + scenario: navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + destinationIssPageValue: issPageValues.WELCOME_PAGE + }, + + ], + }, + ]; }; From ebc5ca2fa34d4cfee88f0022845f301d21961443 Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 19:08:54 +0530 Subject: [PATCH 03/12] SSR-429 SSR-429 --- src/router/router-constants/navigation-scenarios.js | 2 +- src/router/router-constants/routing-table.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index f0fd3010..0eb49b5d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -47,7 +47,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - CLICKED_FORWARD_WITH_TPA_SUBMIT:"CLICKED_FORWARD_WITH_TPA_SUBMIT", + CLICKED_FORWARD_WITH_TPA_SUBMIT:"CLICKED_FORWARD_TPA_SUBMIT", }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 20b86e52..7f9bd729 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -516,7 +516,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.TPA_SEARCH }, { - scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_SUBMIT, + scenario: navigationScenarios.CLICKED_FORWARD_TPA_SUBMIT, destinationIssPageValue: issPageValues.TPA_CONFIRMATION, }, ] From 6e0337cba3e6f4858829cb682731dc0ade44410d Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 19:09:42 +0530 Subject: [PATCH 04/12] SSR-429 SSR-429 --- src/layouts/tpa-submit/tpa-submit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue index 4b3cc68d..58cc789a 100644 --- a/src/layouts/tpa-submit/tpa-submit.vue +++ b/src/layouts/tpa-submit/tpa-submit.vue @@ -70,7 +70,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_WITH_TPA_SUBMIT, + this.navigationScenarios.CLICKED_FORWARD_TPA_SUBMIT, this.$route ); }, From 70ed7fcdbcb0b615c17d07a794be45069fd7d158 Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 19:13:23 +0530 Subject: [PATCH 05/12] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 0eb49b5d..6d2acd0d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -47,7 +47,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - CLICKED_FORWARD_WITH_TPA_SUBMIT:"CLICKED_FORWARD_TPA_SUBMIT", + CLICKED_FORWARD_TPA_SUBMIT:"CLICKED_FORWARD_TPA_SUBMIT", }; From 7b94cb86b949745234fd969590c6268d19675918 Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 20:15:13 +0530 Subject: [PATCH 06/12] Requested changes for forward action Requested changes for forward action --- src/layouts/tpa-submit/tpa-submit.vue | 2 +- src/router/router-constants/navigation-scenarios.js | 1 - src/router/router-constants/routing-table.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue index 58cc789a..54f4c571 100644 --- a/src/layouts/tpa-submit/tpa-submit.vue +++ b/src/layouts/tpa-submit/tpa-submit.vue @@ -70,7 +70,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_TPA_SUBMIT, + this.navigationScenarios.CLICKED_FORWARD, this.$route ); }, diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 6d2acd0d..e2a8d452 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -47,7 +47,6 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - CLICKED_FORWARD_TPA_SUBMIT:"CLICKED_FORWARD_TPA_SUBMIT", }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index d7b494c8..5c21f8ce 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -524,7 +524,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.TPA_SEARCH }, { - scenario: navigationScenarios.CLICKED_FORWARD_TPA_SUBMIT, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.TPA_CONFIRMATION, }, ] From 645e7294e3254074ac774c7d30814ba9deb32bec Mon Sep 17 00:00:00 2001 From: Jethe Date: Mon, 24 Apr 2023 21:00:33 +0530 Subject: [PATCH 07/12] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index e2a8d452..61978b87 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -44,9 +44,6 @@ const navigationScenarios = { CLICKED_FORWARD_COVERAGE_STATEMENT: "CLICKED_FORWARD_COVERAGE_STATEMENT", CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", - - CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - }; From 6d38d231e5d9d6a491a3eeb9f69871e0258f52d1 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:18:26 +0530 Subject: [PATCH 08/12] SSR-428 Removed the CLICKED_FORWARD_TPA_CONFIRMATION --- src/layouts/tpa-confirmation/tpa-confirmation.vue | 2 +- src/router/router-constants/navigation-scenarios.js | 2 +- src/router/router-constants/routing-table.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/tpa-confirmation/tpa-confirmation.vue b/src/layouts/tpa-confirmation/tpa-confirmation.vue index 53f273ee..d3157c9f 100644 --- a/src/layouts/tpa-confirmation/tpa-confirmation.vue +++ b/src/layouts/tpa-confirmation/tpa-confirmation.vue @@ -64,7 +64,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + this.navigationScenarios.CLICKED_FORWARD, this.$route ); }, diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index e144083f..d6737d06 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -47,7 +47,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - CLICKED_FORWARD_TPA_CONFIRMATION:"CLICKED_FORWARD_TPA_CONFIRMATION", + }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 39c512b4..0c821883 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -514,7 +514,7 @@ const routingTable = function(store) { maps: [ { - scenario: navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.WELCOME_PAGE }, From 26f51fb24a8cff03a88afa878ff3268b07f075b1 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:20:14 +0530 Subject: [PATCH 09/12] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index d6737d06..d0a34081 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -45,9 +45,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", - CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - - + CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", }; From 698296d72f47f129aa0e3cceab47a59ca2c95aca Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:21:02 +0530 Subject: [PATCH 10/12] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index d0a34081..50ce575d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -45,7 +45,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", - CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", + CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", }; From dfbda3b9d7056f21e52541e21f1116c71989c090 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 20:07:53 +0530 Subject: [PATCH 11/12] Update routing-table.js --- src/router/router-constants/routing-table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 87e792a9..bd6de4c7 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -500,7 +500,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.SERVICE_PACKAGE }, { - scenario: navigationScenarios.CLICKED_FORWARD_WITH_REVIEW, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.PAYMENT_PAGE }, From 3bedee41db3f762bebf9cf865687a17c5d10372e Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Tue, 25 Apr 2023 11:05:16 -0400 Subject: [PATCH 12/12] Fixed some routing issues caused by bad merges --- .../coverage-statement/coverage-statement.vue | 2 +- src/layouts/payment-page/payment-page.vue | 1 + src/router/router-constants/navigation-scenarios.js | 6 ++++-- src/router/router-constants/routing-table.js | 12 ++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 6a52f045..d6aa5d42 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -145,7 +145,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_COVERAGE_STATEMENT, + this.navigationScenarios.CLICKED_FORWARD, this.$route ); }, diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue index 682aa32b..6982d394 100644 --- a/src/layouts/payment-page/payment-page.vue +++ b/src/layouts/payment-page/payment-page.vue @@ -65,6 +65,7 @@ export default { }, forwardButtonAction() { + this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route); }, navigateForward() { diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 61978b87..7767781d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -41,9 +41,11 @@ const navigationScenarios = { 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_FORWARD_COVERAGE_STATEMENT: "CLICKED_FORWARD_COVERAGE_STATEMENT", - + //Provider Preference CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", + CLICKED_FORWARD_WITH_TPA: "CLICKED_FORWARD_WITH_TPA" + + }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index bd6de4c7..1376ed00 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -421,7 +421,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS }, { - scenario: navigationScenarios.CLICKED_FORWARD_COVERAGE_STATEMENT, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE } ] @@ -483,11 +483,11 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_LOCATION + destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE }, { scenario: navigationScenarios.CLICKED_FORWARD, - destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE + destinationIssPageValue: issPageValues.SERVICE_LOCATION } ] }, @@ -497,7 +497,7 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_PACKAGE + destinationIssPageValue: issPageValues.CONTACT_DETAILS }, { scenario: navigationScenarios.CLICKED_FORWARD, @@ -513,6 +513,10 @@ const routingTable = function(store) { { scenario: navigationScenarios.CLICKED_BACK, destinationIssPageValue: issPageValues.REVIEW_PAGE + }, + { + scenario: navigationScenarios.CLICKED_FORWARD, + destinationIssPageValue: issPageValues.WELCOME_PAGE } ] },