diff --git a/src/router/index.js b/src/router/index.js index 2a80032f6..79894066e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,7 @@ const routes = [ }, { path: "/", + name: "root", async beforeEnter(to, from, next) { // If we have no query string, or we don't have the FmgPage query string. if (to.query.fmgPage === undefined) { @@ -44,7 +45,7 @@ const routes = [ try { // If we already have our route, go to it. if (router.hasRoute(to.query.fmgPage)) { - return next({ name: to.query.fmgPage, query: to.query }); + return next({ name: to.query.fmgPage, query: to.query, params: to.params }); } // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms. @@ -58,7 +59,7 @@ const routes = [ }); // Assign current query string parameters, as well as our fmgPage one. - next({ name: routeData[0].name, query: Object.assign(to.query, { fmgPage: routeData[0].name }) }); + next({ name: routeData[0].name, query: Object.assign(to.query, { fmgPage: routeData[0].name }), params: to.params }); } catch (error) { console.log(error); @@ -97,7 +98,7 @@ router.navigate = ( if (matchingScenarioMap.destinationFmgPageValue !== undefined) { // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one. router.push({ - path: "/", + name: "root", query: Object.assign(optionalQuery, { fmgPage: matchingScenarioMap.destinationFmgPageValue, }),