fix for service semver dropdown

Author: blakeandrewwood

layouts/partials/sidebar.pug

@@ -3,29 +3,29 @@
 - var items = hierarchy
 - var service = null
 - var versionTitle = ''
-- var semanticVersion = /^[0-9]+\.[0-9]+/
-- var semanticVersionService = /^v[0-9]+/
+- var semver = /^[0-9]+\.[0-9]+/
+- var semverService = /^(v|)[0-9](.*)/
 - var dropdown = []
 
 // Service Docs
 if paths[0] === 'services' && paths[1]
   - items = hierarchy.findByPath('/' + paths[0] + '/' + paths[1])
-  - var servicesDropdown = items.children.filter(x => x.id.startsWith('v'))
+  - var servicesDropdown = items.children.filter(x => semverService.test(x.id))
   - dropdown = servicesDropdown
   - service = hierarchy.findByPath('/' + paths[0] + '/' + paths[1])
-  if paths[2] && paths[2].startsWith('v')
+  if paths[2] && semverService.test(paths[2])
     - versionTitle = paths[2]
     - items = hierarchy.findByPath('/' + paths[0] + '/' + paths[1] + '/' + paths[2])
 
 // DC/OS Docs
-if semanticVersion.test(paths[0])
-  - dropdown = hierarchy.children.filter(item => semanticVersion.test(item.id))
+if semver.test(paths[0])
+  - dropdown = hierarchy.children.filter(item => semver.test(item.id))
   - items = hierarchy.findByPath('/' + paths[0])
   - versionTitle = paths[0]
 
 mixin renderSidebarHeader()
   - var showDropdown = true
-  if !dropdown.length || (dropdown.length == 1 && semanticVersionService.test(dropdown[0].id))
+  if !dropdown.length || (dropdown.length == 1 && semverService.test(dropdown[0].id))
     - showDropdown = false
   header(class='sidebar__header')
     div(class='sidebar__dropdown')

layouts/service-docs-landing.pug

@@ -2,14 +2,15 @@
 - var currentPath = '/' + path
 - var items = hierarchy.children.find(child => child.id === paths[0])
 - var headerItems = hierarchy.find('menus').filter(page => page.menus.indexOf('header') != -1)
+- var semverService = /^(v|)[0-9](.*)/
 
 mixin renderGridToc()
   div(class='grid-toc')
     each val, index in items.children
       if val.menuWeight != -1
         if val.children
           each childVal, childIndex in val.children
-            if /^v[0-9]+/.test(childVal.id)
+            if semverService.test(childVal.id)
               - versioned = true
               - childVal.title = val.title
               - val = childVal

plugins/metalsmith-algolia.js

@@ -153,10 +153,10 @@ const buildSemverMap = (files) => {
   // Filter
   for(let file in files) {
     const pathParts = file.split('/');
-    if(pathParts[0] == 'services' && pathParts[2] && /v[0-9].[0-9](.*)/.test(pathParts[2]) && versions.indexOf(pathParts[2]) == -1) {
+    if(pathParts[0] == 'services' && pathParts[2] && /^(v|)[0-9].[0-9](.*)/.test(pathParts[2]) && versions.indexOf(pathParts[2]) == -1) {
       versions.push(pathParts[2]);
     }
-    else if (/[0-9]\.[0-9](.*)/.test(pathParts[0]) && versions.indexOf(pathParts[0]) == -1) {
+    else if (/^[0-9]\.[0-9](.*)/.test(pathParts[0]) && versions.indexOf(pathParts[0]) == -1) {
       versions.push(pathParts[0]);
     }
   }
@@ -206,7 +206,7 @@ const getSharedAttributes = (fileData, hierarchy, semverMap) => {
     }
     // If in /services/product/version/**
     if (pathParts[2]) {
-      let regex = /v[0-9].[0-9](.*)/g;
+      let regex = /^(v|)[0-9].[0-9](.*)/g;
       let isVersion = regex.test(pathParts[2]);
       if (isVersion) {
         record.version = product + ' ' + pathParts[2].substr(1);
@@ -217,7 +217,7 @@ const getSharedAttributes = (fileData, hierarchy, semverMap) => {
   }
 
   // Docs version
-  else if (/[0-9]\.[0-9](.*)/.test(pathParts[0])) {
+  else if (/^[0-9]\.[0-9](.*)/.test(pathParts[0])) {
     product = 'DC/OS';
     record.section = 'DC/OS Docs';
     record.product = product;

scripts/reduce-pages.sh

@@ -11,4 +11,4 @@ rm -rf ./pages/1.10/!(index.md)
 rm -rf ./pages/1.9/!(index.md)
 rm -rf ./pages/1.8/!(index.md)
 rm -rf ./pages/1.7/!(index.md)
-rm -rf ./pages/services/!(index.md|beta-cassandra|jenkins)
+rm -rf ./pages/services/!(index.md|cassandra|jenkins)