Merge branch 'develop' into feature/CSR-110

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",

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 };

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(),

src/layouts/test-one.vue

@@ -0,0 +1,15 @@
+<template>
+    Test1
+</template>
+
+
+<script>
+export default {
+    name: "test1",
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+        }
+    }
+}
+</script>

src/layouts/test-two.vue

@@ -0,0 +1,15 @@
+<template>
+    Test2
+</template>
+
+
+<script>
+export default {
+    name: "test2",
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+        }
+    }
+}
+</script>

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",
@@ -43,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);
 
@@ -53,7 +73,6 @@ const routes = [
             return next(false);
           }
 
-
           // Assign our fmgPage so it will load normally like the other pages.
           to.query.fmgPage = pageToRedirectTo;
         }
@@ -180,15 +199,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
+  const 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 ----------------------------------------------------------

src/router/router-constants/routing-table.js

@@ -1,10 +1,22 @@
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
-const routingTable = [
+// 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 < 1954
+        },
         {
           scenario: navigationScenarios.SELECTED_YEAR,
           destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
@@ -79,8 +91,8 @@ const routingTable = [
           destinationFmgPageValue: fmgPageValues.QUOTE,
         },
         {
-        scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
+          scenario: navigationScenarios.CLICKED_FORWARD,
-        destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS
+          destinationFmgPageValue: fmgPageValues.REVEAL,
         },
       ],
     },
@@ -257,5 +269,6 @@ const routingTable = [
       ]
     },
   ];
+}
 
 export { routingTable };

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,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;
     });