Support GHAE internal-only semantic versioning (github#29178)

Co-authored-by: Peter Bengtsson <[email protected]>
Co-authored-by: Matt Pollard <[email protected]>

Author: 3 people

components/context/ProductLandingContext.tsx

@@ -54,7 +54,7 @@ export type ProductLandingContextT = {
   whatsNewChangelog?: Array<{ href: string; title: string; date: string }>
   tocItems: Array<TocItem>
   hasGuidesPage: boolean
-  releases: Array<{
+  ghesReleases: Array<{
     version: string
     firstPreviousRelease: string
     secondPreviousRelease: string
@@ -115,7 +115,7 @@ export const getProductLandingContextFromRequest = (req: any): ProductLandingCon
     changelogUrl: req.context.changelogUrl || [],
     productCodeExamples: req.context.productCodeExamples || [],
     productCommunityExamples: req.context.productCommunityExamples || [],
-    releases: req.context.releases || [],
+    ghesReleases: req.context.ghesReleases || [],
 
     productUserExamples: (req.context.productUserExamples || []).map(
       ({ user, description }: any) => ({

components/landing/ProductReleases.tsx

@@ -9,12 +9,12 @@ export function ProductReleases() {
   const { t } = useTranslation('product_landing')
   const router = useRouter()
   const { enterpriseServerReleases, allVersions } = useMainContext()
-  const { releases, shortTitle } = useProductLandingContext()
+  const { ghesReleases, shortTitle } = useProductLandingContext()
   const currentPath = router.asPath.split('?')[0]
   return (
     <div>
       <div className="d-lg-flex gutter-lg flex-items-stretch">
-        {releases.map((release) => {
+        {ghesReleases.map((release) => {
           const releaseNumber = release.version
           if (!enterpriseServerReleases.supported.includes(releaseNumber)) {
             return null

components/release-notes/GHAEReleaseNotePatch.tsx

@@ -1,15 +1,16 @@
 import { useRef, useEffect } from 'react'
+import dayjs from 'dayjs'
 import cx from 'classnames'
 
 import { useTranslation } from 'components/hooks/useTranslation'
 import { useOnScreen } from 'components/hooks/useOnScreen'
 import { PatchNotes } from './PatchNotes'
-import { ReleaseNotePatch } from './types'
+import { CurrentVersion, ReleaseNotePatch } from './types'
 
 import styles from './PatchNotes.module.scss'
 
-type Props = { patch: ReleaseNotePatch; didEnterView: () => void }
-export function GHAEReleaseNotePatch({ patch, didEnterView }: Props) {
+type Props = { patch: ReleaseNotePatch; currentVersion: CurrentVersion; didEnterView: () => void }
+export function GHAEReleaseNotePatch({ patch, currentVersion, didEnterView }: Props) {
   const { t } = useTranslation('release_notes')
   const containerRef = useRef<HTMLDivElement>(null)
   const onScreen = useOnScreen(containerRef, { rootMargin: '-40% 0px -50%' })
@@ -25,11 +26,13 @@ export function GHAEReleaseNotePatch({ patch, didEnterView }: Props) {
     <div
       ref={containerRef}
       className={cx(styles.sectionHeading, 'mb-10 pb-6 border-bottom border-top')}
-      id={patch.date}
+      id={patch.release}
     >
       <header style={{ zIndex: 1 }} className="container-xl border-bottom px-3 pt-4 pb-2">
         <div className="d-flex flex-items-center">
-          <h2 className="border-bottom-0 m-0 p-0">{patch.title}</h2>
+          <h2 className="border-bottom-0 m-0 p-0">
+            {currentVersion.versionTitle} {patch.release}
+          </h2>
 
           {patch.release_candidate && (
             <span
@@ -41,7 +44,7 @@ export function GHAEReleaseNotePatch({ patch, didEnterView }: Props) {
           )}
         </div>
         <p className="color-fg-muted mt-1">
-          {bannerText} {patch.friendlyDate}.
+          {bannerText} {dayjs(patch.date).format('MMMM DD, YYYY')}.
         </p>
       </header>
 

components/release-notes/GHAEReleaseNotes.tsx

@@ -1,6 +1,6 @@
-import { SyntheticEvent, useState } from 'react'
+import { useState } from 'react'
 import cx from 'classnames'
-import { ChevronDownIcon } from '@primer/octicons-react'
+import dayjs from 'dayjs'
 import { GHAEReleaseNotePatch } from './GHAEReleaseNotePatch'
 import { GHAEReleaseNotesContextT } from './types'
 import { MarkdownContent } from 'components/ui/MarkdownContent'
@@ -29,6 +29,7 @@ export function GHAEReleaseNotes({ context }: GitHubAEProps) {
               <GHAEReleaseNotePatch
                 key={patch.version}
                 patch={patch}
+                currentVersion={currentVersion}
                 didEnterView={() => setFocusedPatch(patch.version)}
               />
             )
@@ -69,50 +70,26 @@ const CollapsibleReleaseSection = ({
   release: GHAEReleaseNotesContextT['releases'][0]
   focusedPatch: string
 }) => {
-  const defaultIsOpen = true
-  const [isOpen, setIsOpen] = useState(defaultIsOpen)
-
-  const onToggle = (e: SyntheticEvent) => {
-    const newIsOpen = (e.target as HTMLDetailsElement).open
-    setIsOpen(newIsOpen)
-  }
-
   return (
     <li key={release.version} className="border-bottom">
-      <details
-        className="my-0 details-reset release-notes-version-picker"
-        aria-current="page"
-        open={defaultIsOpen}
-        onToggle={onToggle}
-      >
-        <summary className="px-3 py-4 my-0 d-flex flex-items-center flex-justify-between outline-none">
-          {release.version}
-          <div className="d-flex">
-            <span className="color-fg-muted text-small text-normal mr-1">
-              {release.patches.length} {release.patches.length === 1 ? 'release' : 'releases'}
-            </span>
-            <ChevronDownIcon className={isOpen ? 'rotate-180' : ''} />
-          </div>
-        </summary>
-        <ul className="color-bg-subtle border-top list-style-none py-4 px-0 my-0">
-          {release.patches.map((patch) => {
-            const isActive = patch.version === focusedPatch
-            return (
-              <li
-                key={patch.version}
-                className={cx('px-3 my-0 py-1', isActive && 'color-bg-accent')}
+      <ul className="list-style-none py-4 px-0 my-0">
+        {release.patches.map((patch) => {
+          const isActive = patch.release === focusedPatch
+          return (
+            <li key={patch.release} className={cx('px-3 my-0', isActive && 'color-bg-accent')}>
+              <a
+                href={`#${patch.release}`}
+                className="d-flex flex-items-center flex-justify-between"
               >
-                <a
-                  href={`#${patch.date}`}
-                  className="d-flex flex-items-center flex-justify-between"
-                >
-                  {patch.friendlyDate}
-                </a>
-              </li>
-            )
-          })}
-        </ul>
-      </details>
+                {patch.release}
+                <span className="color-fg-muted text-mono text-small text-normal">
+                  {dayjs(patch.date).format('MMMM DD, YYYY')}
+                </span>
+              </a>
+            </li>
+          )
+        })}
+      </ul>
     </li>
   )
 }

components/release-notes/GHESReleaseNotes.tsx

@@ -92,7 +92,8 @@ export function GHESReleaseNotes({ context }: Props) {
                     >
                       {release.version}
                       <span className="color-fg-muted text-small text-normal mr-1">
-                        {release.patches.length} releases
+                        {release.patches.length}{' '}
+                        {release.patches.length === 1 ? 'release' : 'releases'}
                       </span>
                     </Link>
                   </li>

components/release-notes/types.ts

@@ -22,6 +22,7 @@ export type ReleaseNotePatch = {
   patchVersion: string
   version: string
   downloadVersion: string
+  release: string
   intro: string
   date: string
   friendlyDate: string
@@ -39,8 +40,6 @@ export type GHAEReleaseNotesContextT = {
 
 export type GHESReleaseNotesContextT = {
   latestPatch: string
-  prevRelease?: string
-  nextRelease?: string
   latestRelease: string
   currentVersion: CurrentVersion
   releaseNotes: Array<ReleaseNotePatch>

content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/managing-your-subscriptions.md

@@ -72,7 +72,7 @@ When you unwatch a repository, you unsubscribe from future updates from that rep
    - Ignore all notifications for a repository
    - If enabled, customize the types of event you receive notifications for ({% data reusables.notifications-v2.custom-notification-types %})
 
-{%- ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5819 %}
+{%- ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
 1. Optionally, to unsubscribe from all repositories owned by a given user or organization, select the **Unwatch all** dropdown and click the organization whose repositories you'd like to unsubscribe from. The button to unwatch all repositories is only available if you are watching all activity or custom notifications on over 10 repositories.
 
    ![Screenshot of the Unwatch All button.](/assets/images/help/notifications-v2/unsubscribe-from-all-repos.png)

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

@@ -141,7 +141,7 @@ Email notifications from {% data variables.product.product_location %} contain t
     - There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
     - You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."
     - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)."  {% ifversion fpt or ghec %}
-    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %}
+    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
     - There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."{% endif %}
 
 ## Automatic watching
@@ -206,7 +206,7 @@ Choose how you want to receive workflow run updates for repositories that you ar
 
 {% endif %}
 
-{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5668 %}
+{% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
 ## Organization alerts notification options 
 
 If you're an organization owner, you'll receive email notifications by default when organization members add new deploy keys to repositories within the organization. You can unsubscribe from these notifications. On the notification settings page, under "Organization alerts", unselect **Email**. 

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/inviting-collaborators-to-a-personal-repository.md

@@ -38,7 +38,7 @@ If you're a member of an {% data variables.product.prodname_emu_enterprise %}, y
 1. Ask for the username of the person you're inviting as a collaborator.{% ifversion fpt or ghec %} If they don't have a username yet, they can sign up for {% data variables.product.prodname_dotcom %} For more information, see "[Signing up for a new {% data variables.product.prodname_dotcom %} account](/articles/signing-up-for-a-new-github-account)".{% endif %}
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658%}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4%}
 {% data reusables.repositories.click-collaborators-teams %}
 1. Click **Invite a collaborator**.
   !["Invite a collaborator" button](/assets/images/help/repository/invite-a-collaborator-button.png)

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-access-to-your-personal-repositories/removing-a-collaborator-from-a-personal-repository.md

@@ -30,7 +30,7 @@ While forks of private repositories are deleted when a collaborator is removed,
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-{% ifversion fpt or ghec or ghes > 3.4 or ghae-issue-5658 %}
+{% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}
 {% data reusables.repositories.click-collaborators-teams %}
 4. To the right of the collaborator you want to remove, click {% octicon "trash" aria-label="The trash icon" %}.
   ![Button to remove collaborator](/assets/images/help/repository/collaborator-remove.png)