use article layout for TOCs instead of new separate generic-toc layout that has to be maintained

Author: sarahs

includes/article.html

@@ -68,6 +68,14 @@ <h2 id="in-this-article" class="f5 mb-2"><a class="Link--primary" href="#in-this
       {% include featured-links %}
       {% endif %}
       {{ renderedPage }}
+
+      {% if tocItems and tocItems.length %}
+        {% if page.documentType == "category" or page.relativePath == "github/index.md" %}
+          {% include generic-toc-list %}
+        {% else %}
+          {% include generic-toc-items %}
+        {% endif %}
+      {% endif %}
     </div>
     </div>
 

layouts/generic-toc.html

@@ -3,7 +3,8 @@ const { sortBy } = require('lodash')
 module.exports = async function genericToc (req, res, next) {
   if (!req.context.page) return next()
   if (req.context.page.hidden) return next()
-  if (req.context.currentLayoutName !== 'generic-toc') return next()
+  if (req.context.currentLayoutName !== 'default') return next()
+  if (req.context.page.documentType === 'homepage' || req.context.page.documentType === 'article') return next()
 
   const currentSiteTree = req.context.siteTree[req.context.currentLanguage][req.context.currentVersion]
 

middleware/contextualizers/generic-toc.js

@@ -3,29 +3,18 @@ const layouts = require('../../lib/layouts')
 module.exports = function layoutContext (req, res, next) {
   if (!req.context.page) return next()
 
-  let layoutName
-
-  // If this is an index.md that is not the homepage and does not have a defined layout, use `generic-toc`.
-  const usesGenericToc = req.context.page.relativePath.endsWith('index.md') &&
-    req.context.page.documentType !== 'homepage' &&
-    !req.context.page.hidden
-
-  if (req.context.page.layout) {
+  const layoutOptsByType = {
     // Layouts can be specified with a `layout` frontmatter value.
     // Any invalid layout values will be caught by frontmatter schema validation.
-    layoutName = req.context.page.layout
-  } else if (req.context.page.layout === false) {
+    string: req.context.page.layout,
     // A `layout: false` value means use no layout.
-    layoutName = ''
-  } else if (req.context.page.layout === undefined) {
+    boolean: '',
     // For all other files (like articles and the homepage), use the `default` layout.
-    if (process.env.FEATURE_NEW_SITETREE) {
-      layoutName = usesGenericToc ? 'generic-toc' : 'default'
-    } else {
-      layoutName = 'default'
-    }
+    undefined: 'default'
   }
 
+  const layoutName = layoutOptsByType[typeof (req.context.page.layout)]
+
   // Attach to the context object
   req.context.currentLayoutName = layoutName
   req.context.currentLayout = layouts[layoutName]