repo sync

Octomerger · web-flow · commit a3b36255a859 · 2020-11-20T10:41:06.000-08:00
diff --git a/content/admin/release-notes.md b/content/admin/release-notes.md
@@ -0,0 +1,7 @@
+---
+title: Release notes
+intro: The release notes for {{ allVersions[currentVersion].versionTitle }}.
+layout: release-notes
+versions:
+  enterprise-server: '*'
+---
diff --git a/data/release-notes/.gitkeep b/data/release-notes/.gitkeep
diff --git a/includes/release-notes-category-label.html b/includes/release-notes-category-label.html
@@ -0,0 +1,12 @@
+{% assign sectionTitle = section.title | default: 'Misc' %}
+
+{% case sectionTitle %}
+  {% when "New Feature" %}
+    {% assign colors = "bg-orange text-white" %}
+  {% when "Bugs" %}
+    {% assign colors = "bg-purple text-white" %}
+  {% else %}
+    {% assign colors = "bg-blue text-white" %}
+{% endcase %}
+
+<span class="{{ colors }} px-3 py-2 f5 text-uppercase text-mono">{{ sectionTitle }}</span>
diff --git a/layouts/release-notes.html b/layouts/release-notes.html
@@ -0,0 +1,93 @@
+{% assign product = siteTree[currentLanguage][currentVersion].products[currentProduct] %}
+
+<!doctype html>
+<html lang="{{currentLanguage}}">
+  {% include head %}
+
+  <body class="d-lg-flex">
+    {% include sidebar %}
+
+    <main class="width-full">
+      {% include header %}
+      {% include deprecation-banner %}
+
+      <div class="container-xl px-3 px-md-6 my-4 my-lg-4 markdown-body">
+        <div class="d-lg-flex flex-justify-between">
+          <div class="d-block d-lg-none">{% include article-version-switcher %}</div>
+          <div class="d-flex flex-items-center" style="height: 39px;">
+            {% include breadcrumbs %}
+          </div>
+          <div class="d-none d-lg-block">{% include article-version-switcher %}</div>
+        </div>
+
+        <article class="mt-2 d-flex gutter">
+          <div class="col-12 col-md-10">
+            <header>
+              <h1>{{ allVersions[currentVersion].versionTitle }}</h1>
+            </header>
+
+            {% for patch in releaseNotes %}
+              <details id="{{ patch.version }}" class="details-reset mb-3" {% if forloop.first %}open{% endif %}>
+                <summary class="position-sticky top-0 bg-white pb-2 d-flex flex-items-center flex-justify-between border-bottom">
+                  <h2 class="d-flex flex-items-center border-bottom-0">
+                    {{ patch.version }}
+
+                    {% if patch.release_candidate %}
+                      <span class="IssueLabel bg-orange text-white mx-2">Release Candidate</span>
+                    {% endif %}
+                  </h2>
+
+                  <div>
+                    <span class="text-gray-light text-mono text-small" style="margin-left: auto">{{ patch.date | date: "%B %d, %Y" }}</span>
+
+                    <div class="mt-1 d-flex flex-items-center f5">
+                      <a href="https://enterprise.github.com/releases/{{ patch.version }}/download">
+                        Download GHES {{ patch.version }}
+                      </a>
+
+                      <button class="js-print btn-link ml-6">
+                        Print
+                      </button>
+                    </div>
+                  </div>
+                </summary>
+
+                <p>{{ patch.intro }}</p>
+
+                {% for section in patch.sortedNotes %}
+                  <div class="py-6 border-bottom d-block d-md-flex flex-items-baseline">
+                    <div class="mr-2 flex-shrink-0 mb-3">
+                      {% include 'release-notes-category-label' %}
+                    </div>
+
+                    <ul class="flex-auto container-xl">
+                      {% for note in section.notes %}
+                        {% if note.note and note.note != '<p>n/a</p>' %}
+                          <li>
+                            {{ note.note }}
+                          </li>
+                        {% endif %}
+                      {% endfor %}
+                    </ul>
+                  </div>
+                {% endfor %}
+              </details>
+            {% endfor %}
+          </div>
+
+          <aside class="col-2 d-none d-md-block no-print">
+            <h3 class="f5">Patch versions</h3>
+            <ul>
+              {% for patch in releaseNotes %}
+                <li><a href="#{{ patch.version }}">{{ patch.version }}</a></li>
+              {% endfor %}
+            </ul>
+          </aside>
+        </article>
+      </div>
+
+      {% include support %}
+      {% include small-footer %}
+    </main>
+  </body>
+</html>
diff --git a/lib/liquid-tags/extended-markdown.js b/lib/liquid-tags/extended-markdown.js
@@ -11,7 +11,7 @@ const tags = {
   danger: 'border rounded-1 mb-4 p-3 border-red bg-red-light f5'
 }
 
-const template = '<div class="extended-markdown {{ tagName }} {{ classes }}">{{ output }}</div>'
+const template = '<div class="extended-markdown {{ tagName }} {{ classes }}">\n{{ output }}\n</div>'
 
 class ExtendedMarkdown extends Liquid.Block {
   async render (context) {
diff --git a/lib/release-notes-schema.js b/lib/release-notes-schema.js
@@ -0,0 +1,34 @@
+module.exports = {
+  properties: {
+    intro: {
+      type: 'string',
+      required: true
+    },
+    date: {
+      type: 'string',
+      format: 'date',
+      required: true
+    },
+    release_candidate: {
+      type: 'boolean',
+      default: false
+    },
+    notes: {
+      required: true,
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          note: {
+            type: 'string',
+            required: true
+          },
+          type: {
+            type: 'string',
+            required: true
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/render-content.js b/lib/render-content.js
@@ -26,6 +26,13 @@ renderContent.liquid.registerFilters({
   obj_size: (input) => {
     if (!input) return 0
     return Object.keys(input).length
+  },
+  /**
+   * Returns the version number of a GHES version string
+   * ex: enterprise-server@2.22 => 2.22
+   */
+  version_num: (input) => {
+    return input.split('@')[1]
   }
 })
 
diff --git a/lib/warm-server.js b/lib/warm-server.js
@@ -1,7 +1,8 @@
+const statsd = require('./statsd')
 const fetchEarlyAccessPaths = require('./fetch-early-access-paths')
 let pages, site, redirects, siteTree, earlyAccessPaths
 
-module.exports = async function warmServer () {
+async function warmServer () {
   if (!pages) {
     if (process.env.NODE_ENV !== 'test') {
       console.log('Priming context information')
@@ -22,3 +23,7 @@ module.exports = async function warmServer () {
     pages, site, redirects, siteTree, earlyAccessPaths
   }
 }
+
+// Instrument the `warmServer` function so that
+// it's wrapped in a timer that reports to Datadog
+module.exports = statsd.asyncTimer(warmServer, 'warm_server')
diff --git a/middleware/contextualizers/enterprise-release-notes.js b/middleware/contextualizers/enterprise-release-notes.js
@@ -0,0 +1,65 @@
+const renderContent = require('../../lib/render-content')
+const patterns = require('../../lib/patterns')
+
+module.exports = async (req, res, next) => {
+  // The `/release-notes` sub-path
+  if (!req.path.endsWith('/release-notes')) return next()
+
+  // ignore paths that don't have an enterprise version number
+  if (!patterns.getEnterpriseServerNumber.test(req.path)) return next()
+
+  // extract enterprise version from path, e.g. 2.16
+  const requestedVersion = req.path.match(patterns.getEnterpriseServerNumber)[1]
+
+  const versionString = `${requestedVersion.replace(/\./g, '-')}`
+
+  const allReleaseNotes = req.context.site.data['release-notes']
+
+  // This version doesn't have any release notes - let's be helpful and redirect
+  // to the notes on `enterprise.github.com`
+  if (!allReleaseNotes || !allReleaseNotes[versionString]) {
+    return res.redirect(`https://enterprise.github.com/releases/${requestedVersion}.0/notes`)
+  }
+
+  const releaseNotes = allReleaseNotes[versionString]
+  const keys = Object.keys(releaseNotes)
+  // Turn { [key]: { notes, intro, date } }
+  // into [{ version, notes, intro, date }]
+  const patches = keys
+    .sort((a, b) => {
+      if (a > b) return -1
+      if (a < b) return 1
+      return 0
+    })
+    .map(key => ({ version: `${requestedVersion}.${key}`, ...releaseNotes[key] }))
+
+  const renderedPatches = await Promise.all(patches.map(async patch => {
+    // Render the intro block, it might contain markdown formatting
+    patch.intro = await renderContent(patch.intro, req.context)
+
+    // Run the notes through the markdown rendering pipeline
+    patch.notes = await Promise.all(patch.notes.map(async note => {
+      if (note.note) note.note = await renderContent(note.note, req.context)
+      return note
+    }))
+
+    // Sort the notes into sections
+    // Takes an array of notes: Array<{ note, type }>
+    // Turns it into { [type]: [{ note }] }
+    patch.sortedNotes = patch.notes.reduce((prev, curr) => {
+      const existingObj = prev.find(o => o.title === curr.type)
+      if (!existingObj) {
+        prev.push({ title: curr.type, notes: [curr] })
+      } else {
+        existingObj.notes.push(curr)
+      }
+      return prev
+    }, [])
+
+    return patch
+  }))
+
+  req.context.releaseNotes = renderedPatches
+
+  return next()
+}
diff --git a/middleware/index.js b/middleware/index.js
@@ -69,6 +69,7 @@ module.exports = function (app) {
   app.get('/_500', asyncMiddleware(require('./trigger-error')))
 
   // *** Preparation for render-page ***
+  app.use(asyncMiddleware(require('./contextualizers/enterprise-release-notes')))
   app.use(require('./contextualizers/graphql'))
   app.use(require('./contextualizers/rest'))
   app.use(require('./contextualizers/webhooks'))
diff --git a/tests/content/lint-files.js b/tests/content/lint-files.js
@@ -7,6 +7,8 @@ const { zip } = require('lodash')
 const yaml = require('js-yaml')
 const languages = require('../../lib/languages')
 const { tags } = require('../../lib/liquid-tags/extended-markdown')
+const ghesReleaseNotesSchema = require('../../lib/release-notes-schema')
+const revalidator = require('revalidator')
 
 const rootDir = path.join(__dirname, '../..')
 const contentDir = path.join(rootDir, 'content')
@@ -373,6 +375,32 @@ describe('lint-files', () => {
       })
     }
   )
+
+  // GHES release notes
+  const ghesReleaseNotesDir = path.join(__dirname, '../../data/release-notes')
+  const ghesReleaseNotesYamlAbsPaths = walk(ghesReleaseNotesDir, yamlWalkOptions).sort()
+  const ghesReleaseNotesYamlRelPaths = ghesReleaseNotesYamlAbsPaths.map(p => path.relative(rootDir, p))
+  const ghesReleaseNotesYamlTuples = zip(ghesReleaseNotesYamlRelPaths, ghesReleaseNotesYamlAbsPaths)
+
+  if (ghesReleaseNotesYamlTuples.length > 0) {
+    describe.each(ghesReleaseNotesYamlTuples)(
+      'in "%s"',
+      (yamlRelPath, yamlAbsPath) => {
+        let dictionary
+
+        beforeAll(async () => {
+          const fileContents = await fs.promises.readFile(yamlAbsPath, 'utf8')
+          dictionary = yaml.safeLoad(fileContents, { filename: yamlRelPath })
+        })
+
+        it('matches the schema', () => {
+          const { errors } = revalidator.validate(dictionary, ghesReleaseNotesSchema)
+          const errorMessage = errors.map(error => `- [${error.property}]: ${error.attribute}, ${error.message}`).join('\n')
+          expect(errors.length, errorMessage).toBe(0)
+        })
+      }
+    )
+  }
 })
 
 function formatLinkError (message, links) {
diff --git a/tests/routing/enterprise-release-notes.js b/tests/routing/enterprise-release-notes.js
@@ -0,0 +1,21 @@
+const { get } = require('../helpers')
+
+describe('enterprise release notes', () => {
+  jest.setTimeout(60 * 1000)
+
+  beforeAll(async () => {
+    // The first page load takes a long time so let's get it out of the way in
+    // advance to call out that problem specifically rather than misleadingly
+    // attributing it to the first test
+    await get('/')
+  })
+
+  it('redirects to the release notes on enterprise.github.com if none are present for this version here', async () => {
+    const res = await get('/en/enterprise-server@2.21/admin/release-notes')
+    expect(res.statusCode).toBe(302)
+    expect(res.headers.location).toBe('https://enterprise.github.com/releases/2.21.0/notes')
+  })
+
+  // We can't write this test until we have real release notes
+  it.todo('renders the release-notes layout if this version\'s release notes are in this repo')
+})

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const tags = {`
`11`	`11`	`danger: 'border rounded-1 mb-4 p-3 border-red bg-red-light f5'`
`12`	`12`	`}`
`13`	`13`
`14`		`-const template = '<div class="extended-markdown {{ tagName }} {{ classes }}">{{ output }}</div>'`
	`14`	`+const template = '<div class="extended-markdown {{ tagName }} {{ classes }}">\n{{ output }}\n</div>'`
`15`	`15`
`16`	`16`	`class ExtendedMarkdown extends Liquid.Block {`
`17`	`17`	`async render (context) {`