Consistently use EOL identifier

Author: MattIPv4

apps/site/components/Downloads/Release/VersionDropdown.tsx

@@ -5,37 +5,14 @@ import { useLocale, useTranslations } from 'next-intl';
 import { use } from 'react';
 
 import { redirect, usePathname } from '#site/navigation';
+import { STATUS_KIND_MAP } from '#site/next.constants.mjs';
 import {
   ReleaseContext,
   ReleasesContext,
 } from '#site/providers/releaseProvider';
 
-import type { NodeReleaseStatus } from '#site/types/releases.js';
 import type { FC } from 'react';
 
-const getDropDownStatus = (status: NodeReleaseStatus) => {
-  if (status === 'LTS') {
-    return {
-      label: 'LTS',
-      kind: 'info' as const,
-    };
-  }
-
-  if (status === 'Current') {
-    return {
-      label: 'Current',
-      kind: 'default' as const,
-    };
-  }
-
-  if (status === 'End-of-life') {
-    return {
-      label: 'EoL',
-      kind: 'warning' as const,
-    };
-  }
-};
-
 const VersionDropdown: FC = () => {
   const { releases } = use(ReleasesContext);
   const { release, setVersion } = use(ReleaseContext);
@@ -69,7 +46,10 @@ const VersionDropdown: FC = () => {
       values={releases.map(({ status, versionWithPrefix }) => ({
         value: versionWithPrefix,
         label: versionWithPrefix,
-        badge: getDropDownStatus(status),
+        badge: {
+          label: status,
+          kind: STATUS_KIND_MAP[status],
+        },
       }))}
       defaultValue={release.versionWithPrefix}
       onChange={setVersionOrNavigate}

apps/site/components/EOL/EOLReleaseTable/index.tsx

@@ -3,7 +3,6 @@ import { getTranslations } from 'next-intl/server';
 
 import provideReleaseData from '#site/next-data/providers/releaseData';
 import provideVulnerabilities from '#site/next-data/providers/vulnerabilities';
-import { EOL_VERSION_IDENTIFIER } from '#site/next.constants.mjs';
 
 import type { FC } from 'react';
 
@@ -15,9 +14,7 @@ const EOLReleaseTable: FC = async () => {
   const releaseData = await provideReleaseData();
   const vulnerabilities = await provideVulnerabilities();
 
-  const eolReleases = releaseData.filter(
-    release => release.status === EOL_VERSION_IDENTIFIER
-  );
+  const eolReleases = releaseData.filter(release => release.status === 'EOL');
 
   const t = await getTranslations();
 

apps/site/components/Releases/PreviousReleasesTable/TableBody.tsx

@@ -7,18 +7,13 @@ import { Fragment, useState } from 'react';
 import FormattedTime from '#site/components/Common/FormattedTime';
 import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import Link from '#site/components/Link';
+import { STATUS_KIND_MAP } from '#site/next.constants.mjs';
 
 import type { NodeRelease } from '#site/types';
 import type { FC } from 'react';
 
 import ReleaseModal from '../ReleaseModal';
 
-const BADGE_KIND_MAP = {
-  'End-of-life': 'warning',
-  LTS: 'info',
-  Current: 'default',
-} as const;
-
 type PreviousReleasesTableBodyProps = {
   releaseData: Array<NodeRelease>;
 };
@@ -56,9 +51,8 @@ const PreviousReleasesTableBody: FC<PreviousReleasesTableBodyProps> = ({
             </td>
 
             <td data-label={t('components.downloadReleasesTable.status')}>
-              <Badge kind={BADGE_KIND_MAP[release.status]} size="small">
+              <Badge kind={STATUS_KIND_MAP[release.status]} size="small">
                 {release.status}
-                {release.status === 'End-of-life' ? ' (EoL)' : ''}
               </Badge>
             </td>
 

apps/site/components/withReleaseAlertBox.tsx

@@ -14,7 +14,7 @@ const WithReleaseAlertBox: FC<WithReleaseAlertBoxProps> = ({ status }) => {
   const t = useTranslations();
 
   switch (status) {
-    case 'End-of-life':
+    case 'EOL':
       return (
         <AlertBox
           title={t('components.common.alertBox.warning')}

apps/site/next-data/generators/__tests__/releaseData.test.mjs

@@ -19,7 +19,7 @@ describe('generateReleaseData', () => {
     return generateReleaseData();
   };
 
-  it('returns End-of-life when release is on or past EOL date', async t => {
+  it('returns EOL when release is on or past EOL date', async t => {
     const result = await runWithNodevuData(t, '2024-10-18', {
       14: {
         releases: {
@@ -54,7 +54,7 @@ describe('generateReleaseData', () => {
       releaseDate: '2021-04-20',
       initialDate: '2021-04-20',
       modules: '83',
-      status: 'End-of-life',
+      status: 'EOL',
     });
   });
 

apps/site/next-data/generators/releaseData.mjs

@@ -7,7 +7,7 @@ const getNodeReleaseStatus = (latest, eol) => {
   const now = new Date();
 
   if (eol && now >= new Date(eol)) {
-    return 'End-of-life';
+    return 'EOL';
   }
 
   if (latest.lts.isLts) {

apps/site/next.constants.mjs

@@ -205,9 +205,15 @@ export const SEVERITY_KIND_MAP = {
 };
 
 /**
- * Which Node.js versions do we want to display vulnerabilities for?
+ * Maps Node.js version status to UI Badge kinds
+ *
+ * @type {Record<import('./types/releases').NodeReleaseStatus, import('@node-core/ui-components/Common/Badge').BadgeKind>}
  */
-export const EOL_VERSION_IDENTIFIER = 'End-of-life';
+export const STATUS_KIND_MAP = {
+  EOL: 'warning',
+  LTS: 'info',
+  Current: 'default',
+};
 
 /**
  * The location of the Node.js Security Working Group Vulnerabilities data.

apps/site/types/releases.ts

@@ -1,4 +1,4 @@
-export type NodeReleaseStatus = 'LTS' | 'Current' | 'End-of-life';
+export type NodeReleaseStatus = 'LTS' | 'Current' | 'EOL';
 
 export type NodeReleaseSource = {
   major: number;

apps/site/util/download/constants.json

@@ -213,5 +213,5 @@
     "bitness": ["64", "32"],
     "architecture": ["arm", "x86"]
   },
-  "statusOrder": ["Current", "LTS", "End-of-life"]
+  "statusOrder": ["Current", "LTS", "EOL"]
 }