account for paths with or without version (#17443)

Author: sarahs

lib/liquid-tags/link.js

@@ -4,7 +4,7 @@ const Liquid = require('liquid')
 const liquid = new Liquid.Engine()
 const LiquidTag = require('./liquid-tag')
 const findPage = require('../find-page')
-const { getPathWithoutLanguage } = require('../path-utils')
+const { getPathWithoutLanguage, getPathWithoutVersion } = require('../path-utils')
 const getApplicableVersions = require('../get-applicable-versions')
 const removeFPTFromPath = require('../remove-fpt-from-path')
 
@@ -74,7 +74,7 @@ module.exports = class Link extends LiquidTag {
     }
 
     // add language code and version
-    fullPath = removeFPTFromPath(path.posix.join('/', ctx.currentLanguage, ctx.currentVersion, getPathWithoutLanguage(fullPath)))
+    fullPath = removeFPTFromPath(path.posix.join('/', ctx.currentLanguage, ctx.currentVersion, getPathWithoutLanguage(getPathWithoutVersion(fullPath))))
 
     // find the page based on the full path
     const page = findPage(fullPath, ctx.pages, ctx.redirects)

lib/path-utils.js

@@ -22,7 +22,12 @@ function getPathWithoutLanguage (href) {
 
 // Remove the version segment from the path
 function getPathWithoutVersion (href) {
-  return href.replace(`/${getVersionStringFromPath(href)}`, '')
+  const versionFromPath = getVersionStringFromPath(href)
+
+  // If the derived version is not found in the list of all versions, just return the HREF
+  return allVersions[versionFromPath]
+    ? href.replace(`/${getVersionStringFromPath(href)}`, '')
+    : href
 }
 
 // Return the version segment in a path

tests/browser/browser.js

@@ -1,6 +1,7 @@
 /* global page, browser */
 const sleep = require('await-sleep')
 const querystring = require('querystring')
+const { latest } = require('../../lib/enterprise-server-releases')
 
 describe('homepage', () => {
   jest.setTimeout(60 * 1000)
@@ -235,6 +236,17 @@ describe('card filters', () => {
     expect(shownCards.length).toBeGreaterThan(0)
   })
 
+  it('works with select input on an Enterprise version', async () => {
+    await page.goto(`http://localhost:4001/en/enterprise-server@${latest}/actions/guides`)
+    await page.select('.js-filter-card-filter-dropdown[name="type"]', 'overview')
+    const shownCards = await page.$$('.js-filter-card:not(.d-none)')
+    const shownCardsAttrib = await page.$$eval('.js-filter-card:not(.d-none)', cards =>
+      cards.map(card => card.dataset.type)
+    )
+    shownCardsAttrib.map(attrib => expect(attrib).toBe('overview'))
+    expect(shownCards.length).toBeGreaterThan(0)
+  })
+
   it('shows more cards', async () => {
     await page.goto('http://localhost:4001/en/actions')
     const maxCards = await page.$eval('.js-filter-card-show-more', btn => parseInt(btn.dataset.jsFilterCardMax))