Merge pull request #5 from neo4j-documentation/propagate-page-cdn-attr

Author: ggrossetie

lib/generate-site.js

@@ -23,8 +23,8 @@ async function generateSite (args, env) {
   ])
   const pages = convertDocuments(contentCatalog, asciidocConfig)
   knowledgeBase.generateKnowledgeBasePageDescription(pages)
-  knowledgeBase.addCategoryPages(pages, contentCatalog)
-  knowledgeBase.addTagPages(pages, contentCatalog)
+  knowledgeBase.addCategoryPages(pages, contentCatalog, asciidocConfig)
+  knowledgeBase.addTagPages(pages, contentCatalog, asciidocConfig)
   const navigationCatalog = buildNavigation(contentCatalog, asciidocConfig)
   training.attachNavigationSlug(contentCatalog, navigationCatalog)
   const composePage = createPageComposer(playbook, contentCatalog, uiCatalog, env)

lib/knowledge-base.js

@@ -3,7 +3,7 @@
 const cheerio = require('cheerio')
 
 // tag::add-category-pages[]
-function addKnowledgeBaseCategoryPages (pages, contentCatalog) {
+function addKnowledgeBaseCategoryPages (pages, contentCatalog, asciidocConfig) {
   const pagesPerCategory = pages
     .filter((page) => {
       return page.src.component === 'kb' &&
@@ -25,22 +25,23 @@ function addKnowledgeBaseCategoryPages (pages, contentCatalog) {
       return acc
     }, {})
   for (const [category, associatedPages] of Object.entries(pagesPerCategory)) {
-    pages.push(contentCatalog.addFile(createKnowledgeBaseCategoryPage(category, associatedPages)))
+    pages.push(contentCatalog.addFile(createKnowledgeBaseCategoryPage(category, associatedPages, asciidocConfig)))
   }
 }
 // end::add-category-pages[]
 
-function createKnowledgeBaseCategoryPage (category, pages) {
+function createKnowledgeBaseCategoryPage (category, pages, asciidocConfig) {
+  const asciidocAttributes = {
+    ...asciidocConfig.attributes,
+    'page-layout': 'kb-category',
+    'page-category': category,
+    'page-category-pages': pages,
+    'page-breadcrumb': category
+  }
   return {
     title: `Category ${category}`,
     asciidoc: {
-      attributes: {
-        'page-layout': 'kb-category',
-        'page-category': category,
-        'page-category-pages': pages,
-        'page-theme': 'kb',
-        'page-breadcrumb': category
-      }
+      attributes: asciidocAttributes
     },
     src: {
       component: 'kb',
@@ -55,7 +56,7 @@ function createKnowledgeBaseCategoryPage (category, pages) {
 }
 
 // tag::generate-tag-pages[]
-function addKnowledgeBaseTagPages (pages, contentCatalog) {
+function addKnowledgeBaseTagPages (pages, contentCatalog, asciidocConfig) {
   const pagesPerTag = pages
     .filter((page) => {
       return page.src.component === 'kb' &&
@@ -79,22 +80,24 @@ function addKnowledgeBaseTagPages (pages, contentCatalog) {
       return acc
     }, {})
   for (const [tag, associatedPages] of Object.entries(pagesPerTag)) {
-    pages.push(contentCatalog.addFile(createKnowledgeBaseTagPage(tag, associatedPages)))
+    pages.push(contentCatalog.addFile(createKnowledgeBaseTagPage(tag, associatedPages, asciidocConfig)))
   }
 }
 // end::generate-tag-pages[]
 
-function createKnowledgeBaseTagPage (tag, pages) {
+function createKnowledgeBaseTagPage (tag, pages, asciidocConfig) {
+  console.log({asciidocConfig})
+  const asciidocAttributes = {
+    ...asciidocConfig.attributes,
+    'page-layout': 'kb-tag',
+    'page-tag': tag,
+    'page-tag-pages': pages,
+    'page-breadcrumb': tag,
+  }
   return {
     title: `Tag ${tag}`,
     asciidoc: {
-      attributes: {
-        'page-layout': 'kb-tag',
-        'page-tag': tag,
-        'page-tag-pages': pages,
-        'page-theme': 'kb',
-        'page-breadcrumb': tag
-      }
+      attributes: asciidocAttributes
     },
     src: {
       component: 'kb',