github · Octomerger · Mar 1, 2022 · Feb 25, 2022 · Feb 25, 2022 · Feb 28, 2022
diff --git a/.github/workflows/browser-test.yml b/.github/workflows/browser-test.yml
@@ -59,11 +59,5 @@ jobs:
           path: .next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
 
-      - name: Cache lib/redirects/.redirects-cache_en_ja.json
-        uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
-        with:
-          path: lib/redirects/.redirects-cache_en_ja.json
-          key: ${{ runner.os }}-redirects-cache-${{ hashFiles('.github/workflows/browser-test.yml') }}
-
       - name: Run browser-test
         run: npm run browser-test
diff --git a/Dockerfile b/Dockerfile
@@ -46,7 +46,6 @@ COPY stylesheets ./stylesheets
 COPY pages ./pages
 COPY components ./components
 COPY lib ./lib
-
 # One part of the build relies on this content file to pull all-products
 COPY content/index.md ./content/index.md
 

diff --git a/assets/images/enterprise/stafftools/recreate-organization.png b/assets/images/enterprise/stafftools/recreate-organization.png
diff --git a/assets/images/enterprise/stafftools/search-field.png b/assets/images/enterprise/stafftools/search-field.png
diff --git a/assets/images/help/commits/commit-branch-indicator.png b/assets/images/help/commits/commit-branch-indicator.png
diff --git a/assets/images/help/commits/commit-message-link.png b/assets/images/help/commits/commit-message-link.png
diff --git a/assets/images/help/commits/commit-tag-label.png b/assets/images/help/commits/commit-tag-label.png
diff --git a/assets/images/help/commits/commits-page.png b/assets/images/help/commits/commits-page.png
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
@@ -24,8 +24,9 @@ export const DefaultLayout = (props: Props) => {
     fullUrl,
     status,
   } = useMainContext()
-  const { t } = useTranslation(['errors', 'scroll_button'])
+  const { t } = useTranslation(['errors', 'meta', 'scroll_button'])
   const router = useRouter()
+  const metaDescription = page.introPlainText ? page.introPlainText : t('default_description')
   return (
     <div className="d-lg-flex">
       <Head>
@@ -37,7 +38,7 @@ export const DefaultLayout = (props: Props) => {
         ) : null}
 
         {/* For Google and Bots */}
-        {page.introPlainText && <meta name="description" content={page.introPlainText} />}
+        <meta name="description" content={metaDescription} />
         {page.hidden && <meta name="robots" content="noindex" />}
         {page.languageVariants.map((languageVariant) => {
           return (

diff --git a/components/article/ArticlePage.tsx b/components/article/ArticlePage.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, ReactNode } from 'react'
 import { useRouter } from 'next/router'
 import dynamic from 'next/dynamic'
 import cx from 'classnames'
@@ -50,7 +50,11 @@ const interactiveAlternatives: Record<string, { href: string }> = {
     },
 }
 
-export const ArticlePage = () => {
+export type StructuredContentT = {
+  structuredContent?: ReactNode
+}
+
+export const ArticlePage = ({ structuredContent }: StructuredContentT) => {
   const { asPath } = useRouter()
   const {
     title,
@@ -65,6 +69,7 @@ export const ArticlePage = () => {
     miniTocItems,
     currentLearningTrack,
   } = useArticleContext()
+  const renderedContent = structuredContent || renderedPage
   const { t } = useTranslation('pages')
   const currentPath = asPath.split('?')[0]
 
@@ -236,7 +241,7 @@ export const ArticlePage = () => {
           }
         >
           <div id="article-contents">
-            <MarkdownContent>{renderedPage}</MarkdownContent>
+            <MarkdownContent>{renderedContent}</MarkdownContent>
             {effectiveDate && (
               <div className="mt-4" id="effectiveDate">
                 Effective as of:{' '}

diff --git a/components/context/ArticleContext.tsx b/components/context/ArticleContext.tsx
@@ -17,7 +17,7 @@ export type ArticleContextT = {
   title: string
   intro: string
   effectiveDate: string
-  renderedPage: string
+  renderedPage: string | JSX.Element[]
   miniTocItems: Array<MiniTocItem>
   contributor: { name: string; URL: string } | null
   permissions?: string

diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx
@@ -21,11 +21,16 @@ export type ProductGroupT = {
 }
 
 type VersionItem = {
+  // free-pro-team@latest, enterprise-cloud@latest, enterprise-server@3.3 ...
   version: string
   versionTitle: string
   currentRelease: string
   latestVersion: string
   shortName: string
+  // api.github.com, ghes-3.3, github.ae
+  openApiVersionName: string
+  // api.github.com, ghes-, github.ae
+  openApiBaseName: string
 }
 
 export type ProductTreeNode = {

diff --git a/components/page-header/RestBanner.tsx b/components/page-header/RestBanner.tsx
@@ -4,17 +4,17 @@ import { useRouter } from 'next/router'
 import { Link } from 'components/Link'
 
 const restRepoDisplayPages = [
-  '/rest/reference/branches',
-  '/rest/reference/collaborators',
-  '/rest/reference/commits',
-  '/rest/reference/deployments',
-  '/rest/reference/pages',
-  '/rest/reference/releases',
-  '/rest/reference/repos',
-  '/rest/reference/metrics',
-  '/rest/reference/webhooks',
+  'branches',
+  'collaborators',
+  'commits',
+  'deployments',
+  'pages',
+  'releases',
+  'repos',
+  'metrics',
+  'webhooks',
 ]
-const restEnterpriseDisplayPages = ['/rest/reference/enterprise-admin']
+const restEnterpriseDisplayPages = ['enterprise-admin']
 const restRepoCategoryExceptionsTitles = {
   branches: 'Branches',
   collaborators: 'Collaborators',
@@ -28,18 +28,14 @@ const restRepoCategoryExceptionsTitles = {
 
 export const RestBanner = () => {
   const router = useRouter()
-  const restPage = (router.query.restPage as string[]) || []
-  const asPathRoot = `/${router.query.productId}/${restPage.join('/')}`
-  if (
-    !restRepoDisplayPages.includes(asPathRoot) &&
-    !restEnterpriseDisplayPages.includes(asPathRoot)
-  ) {
+  const restPage = router.query.category as string
+  if (!restRepoDisplayPages.includes(restPage) && !restEnterpriseDisplayPages.includes(restPage)) {
     return null
   }
 
   let noticeString
 
-  if (restRepoDisplayPages.includes(asPathRoot)) {
+  if (restRepoDisplayPages.includes(restPage)) {
     const pages = Object.keys(restRepoCategoryExceptionsTitles) as Array<
       keyof typeof restRepoCategoryExceptionsTitles
     >
@@ -58,7 +54,7 @@ export const RestBanner = () => {
         pages.
       </React.Fragment>
     )
-  } else if (restEnterpriseDisplayPages.includes(asPathRoot)) {
+  } else if (restEnterpriseDisplayPages.includes(restPage)) {
     noticeString = (
       <React.Fragment>
         If you can't find what you're looking for, you might try the{' '}

diff --git a/components/rest/CodeBlock.module.scss b/components/rest/CodeBlock.module.scss
@@ -0,0 +1,8 @@
+.codeBlock {
+  pre {
+    margin-bottom: 0;
+    border: 1px solid var(--color-border-default);
+    max-height: 32rem;
+    overflow: auto;
+  }
+}
diff --git a/components/rest/CodeBlock.tsx b/components/rest/CodeBlock.tsx
@@ -0,0 +1,29 @@
+import cx from 'classnames'
+
+import styles from './CodeBlock.module.scss'
+
+type Props = {
+  verb?: string
+  codeBlock: string
+  setHTML?: boolean
+}
+
+export function CodeBlock({ verb, codeBlock, setHTML = false }: Props) {
+  return setHTML ? (
+    <div
+      className={cx(styles.codeBlock, 'rounded')}
+      dangerouslySetInnerHTML={{ __html: codeBlock }}
+    />
+  ) : (
+    <pre className={cx(styles.methodCodeBlock, 'mb-3 rounded-1 border')}>
+      <code>
+        {verb && (
+          <span className="color-bg-accent-emphasis color-fg-on-emphasis rounded-1 px-2 py-1 text-uppercase">
+            {verb}
+          </span>
+        )}{' '}
+        {codeBlock}
+      </code>
+    </pre>
+  )
+}
diff --git a/components/rest/RestCodeSamples.tsx b/components/rest/RestCodeSamples.tsx
@@ -0,0 +1,48 @@
+import { xCodeSample } from './types'
+import { useTranslation } from 'components/hooks/useTranslation'
+import { CodeBlock } from './CodeBlock'
+
+type Props = {
+  slug: string
+  xCodeSamples: Array<xCodeSample>
+}
+
+export function RestCodeSamples({ slug, xCodeSamples }: Props) {
+  const { t } = useTranslation('products')
+
+  return (
+    <>
+      <h4 className="pt-3 my-4" id={`${slug}--code-samples`}>
+        <a href={`#${slug}--code-samples`}>{`${t('rest.reference.code_samples')}`}</a>
+      </h4>
+      {xCodeSamples.map((sample: xCodeSample, index: number) => {
+        const sampleElements: JSX.Element[] = []
+        if (sample.lang !== 'Ruby') {
+          sampleElements.push(
+            sample.lang === 'JavaScript' ? (
+              <h5 key={`${sample.lang}-${index}`} className="pt-3">
+                {sample.lang} (
+                <a className="text-underline" href="https://github.com/octokit/core.js#readme">
+                  @octokit/core.js
+                </a>
+                )
+              </h5>
+            ) : (
+              <h5 key={`${sample.lang}-${index}`} className="pt-3">
+                {sample.lang}
+              </h5>
+            )
+          )
+          sampleElements.push(
+            <CodeBlock
+              key={sample.lang + index}
+              codeBlock={sample.sourceHTML}
+              setHTML={true}
+            ></CodeBlock>
+          )
+        }
+        return sampleElements
+      })}
+    </>
+  )
+}
diff --git a/components/rest/RestHTTPMethod.tsx b/components/rest/RestHTTPMethod.tsx
@@ -0,0 +1,10 @@
+import { CodeBlock } from './CodeBlock'
+
+type Props = {
+  verb: string
+  requestPath: string
+}
+
+export function RestHTTPMethod({ verb, requestPath }: Props) {
+  return <CodeBlock verb={verb} codeBlock={requestPath}></CodeBlock>
+}
diff --git a/components/rest/RestNotes.tsx b/components/rest/RestNotes.tsx
@@ -0,0 +1,26 @@
+import { useTranslation } from 'components/hooks/useTranslation'
+
+type Props = {
+  notes: Array<string>
+  enabledForGitHubApps: boolean
+}
+
+export function RestNotes({ notes, enabledForGitHubApps }: Props) {
+  const { t } = useTranslation('products')
+
+  return (
+    <>
+      <h4 className="pt-4">{t('rest.reference.notes')}</h4>
+      <ul className="mt-2 pl-3 pb-2">
+        {enabledForGitHubApps && (
+          <li>
+            <a href="/developers/apps">Works with GitHub Apps</a>
+          </li>
+        )}
+        {notes.map((note: string) => {
+          return <li>{note}</li>
+        })}
+      </ul>
+    </>
+  )
+}
diff --git a/components/rest/RestOperation.tsx b/components/rest/RestOperation.tsx
@@ -0,0 +1,53 @@
+import { RestOperationHeading } from './RestOperationHeading'
+import { RestHTTPMethod } from './RestHTTPMethod'
+import { RestParameterTable } from './RestParameterTable'
+import { RestCodeSamples } from './RestCodeSamples'
+import { RestResponse } from './RestResponse'
+import { Operation } from './types'
+import { RestNotes } from './RestNotes'
+import { RestPreviewNotice } from './RestPreviewNotice'
+
+type Props = {
+  operation: Operation
+  index: number
+}
+
+export function RestOperation({ operation }: Props) {
+  const previews = operation['x-github'].previews
+  const hasRequiredPreviews = previews
+    ? previews.filter((preview) => preview.required).length > 0
+    : false
+
+  return (
+    <div>
+      <RestOperationHeading
+        slug={operation.slug}
+        summary={operation.summary}
+        descriptionHTML={operation.descriptionHTML}
+      />
+      <RestHTTPMethod verb={operation.verb} requestPath={operation.requestPath} />
+      {operation.parameters && (
+        <RestParameterTable
+          slug={operation.slug}
+          hasRequiredPreviews={hasRequiredPreviews}
+          xGitHub={operation['x-github']}
+          parameters={operation.parameters}
+          bodyParameters={operation.bodyParameters}
+        />
+      )}
+      {operation['x-codeSamples'] && operation['x-codeSamples'].length > 0 && (
+        <RestCodeSamples slug={operation.slug} xCodeSamples={operation['x-codeSamples']} />
+      )}
+      <RestResponse responses={operation.responses} />
+      {(operation.notes.length > 0 || operation['x-github'].enabledForGitHubApps) && (
+        <RestNotes
+          notes={operation.notes}
+          enabledForGitHubApps={operation['x-github'].enabledForGitHubApps}
+        />
+      )}
+      {previews && (
+        <RestPreviewNotice slug={operation.slug} previews={operation['x-github'].previews} />
+      )}
+    </div>
+  )
+}
diff --git a/components/rest/RestOperationHeading.tsx b/components/rest/RestOperationHeading.tsx
@@ -0,0 +1,21 @@
+import { LinkIcon } from '@primer/octicons-react'
+
+type Props = {
+  slug: string
+  summary: string
+  descriptionHTML: string
+}
+
+export function RestOperationHeading({ slug, summary, descriptionHTML }: Props) {
+  return (
+    <>
+      <h3 id={slug}>
+        <a href={`#${slug}`}>
+          <LinkIcon size={16} className="m-1" />
+        </a>
+        {summary}
+      </h3>
+      <div dangerouslySetInnerHTML={{ __html: descriptionHTML }} />
+    </>
+  )
+}