use regex to be more precise in href matching than just startsWith

Author: sarahs

middleware/contextualizers/current-product-tree.js

@@ -4,7 +4,11 @@ module.exports = function currentProductTree (req, res, next) {
 
   const currentSiteTree = req.context.siteTree[req.context.currentLanguage][req.context.currentVersion]
 
-  req.context.currentProductTree = currentSiteTree.childPages.find(page => req.context.currentPath.startsWith(page.href))
+  req.context.currentProductTree = currentSiteTree.childPages.find(page => {
+    // Find a product path that matches at least an initial part of the current path
+    const regex = new RegExp(`^${page.href}($|\/)`, 'm')
+    return regex.test(req.context.currentPath)
+  })
 
   return next()
 }

middleware/contextualizers/early-access-breadcrumbs.js

@@ -1,6 +1,6 @@
 module.exports = async function breadcrumbs (req, res, next) {
   if (!req.context.page) return next()
-  if (!req.context.page.hidden) return next()
+  if (!req.context.page.relativePath.startsWith('early-access')) return next()
 
   req.context.breadcrumbs = []
 

middleware/contextualizers/generic-toc.js

@@ -22,7 +22,11 @@ module.exports = async function genericToc (req, res, next) {
 // Recursively loop through the siteTree until we reach the point where the
 // current siteTree page is the same as the requested page. Then stop.
 function findPageInSiteTree (pageArray, currentPath) {
-  const childPage = pageArray.find(page => currentPath.startsWith(page.href))
+  const childPage = pageArray.find(page => {
+    // Find a page that matches at least an initial part of the current path
+    const regex = new RegExp(`^${page.href}($|\/)`, 'm')
+    return regex.test(currentPath)
+  })
 
   if (childPage.href === currentPath) {
     return childPage