tighten up UnknownSeverity types

Author: bmuenzenmeyer

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

@@ -9,7 +9,7 @@ import type { ModalProps } from '#site/types';
 import type {
   EOLModalData,
   KnownVulnerability,
-  Vulnerability,
+  UnknownSeverityVulnerability,
 } from '#site/types/vulnerabilities';
 
 const EOLModal: FC<ModalProps> = ({ open, closeModal, data }) => {
@@ -26,21 +26,25 @@ const EOLModal: FC<ModalProps> = ({ open, closeModal, data }) => {
     }
   );
 
-  const [knownVulns, unknownVulns] = vulnerabilities.reduce(
-    (acc, vuln) => {
-      acc[vuln.severity === 'unknown' ? 1 : 0].push(vuln as KnownVulnerability);
+  const [knownVulnerabilities, unknownVulnerabilities] = vulnerabilities.reduce(
+    (acc, vulnerability) => {
+      if (vulnerability.severity === 'unknown') {
+        acc[1].push(vulnerability as UnknownSeverityVulnerability);
+      } else {
+        acc[0].push(vulnerability as KnownVulnerability);
+      }
       return acc;
     },
-    [[], []] as [Array<KnownVulnerability>, Array<Vulnerability>]
+    [[], []] as [Array<KnownVulnerability>, Array<UnknownSeverityVulnerability>]
   );
 
-  knownVulns.sort(
+  knownVulnerabilities.sort(
     (a, b) =>
       SEVERITY_ORDER.indexOf(a.severity) - SEVERITY_ORDER.indexOf(b.severity)
   );
 
-  const hasKnownVulns = knownVulns.length > 0;
-  const hasAnyVulns = hasKnownVulns || unknownVulns.length > 0;
+  const hasKnownVulnerabilities = knownVulnerabilities.length > 0;
+  const hasAnyVulnerabilities = hasKnownVulnerabilities || unknownVulnerabilities.length > 0;
 
   return (
     <Modal open={open} onOpenChange={closeModal}>
@@ -54,14 +58,14 @@ const EOLModal: FC<ModalProps> = ({ open, closeModal, data }) => {
           </p>
         )}
 
-        {hasKnownVulns && <VulnerabilitiesTable vulnerabilities={knownVulns} />}
+        {hasKnownVulnerabilities && <VulnerabilitiesTable vulnerabilities={knownVulnerabilities} />}
 
         <UnknownSeveritySection
-          vulnerabilities={unknownVulns}
-          hasKnownVulns={hasKnownVulns}
+          vulnerabilities={unknownVulnerabilities}
+          hasKnownVulnerabilities={hasKnownVulnerabilities}
         />
 
-        {!hasAnyVulns && (
+        {!hasAnyVulnerabilities && (
           <p className="m-1">
             {t('components.eolModal.noVulnerabilitiesMessage')}
           </p>

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

@@ -2,20 +2,20 @@ import { useTranslations } from 'next-intl';
 import type { FC } from 'react';
 
 import VulnerabilitiesTable from '#site/components/EOL/VulnerabilitiesTable';
-import type { Vulnerability } from '#site/types/vulnerabilities';
+import type { UnknownSeverityVulnerability } from '#site/types/vulnerabilities';
 
 const UnknownSeveritySection: FC<{
-  vulnerabilities: Array<Vulnerability>;
-  hasKnownVulns: boolean;
-}> = ({ vulnerabilities, hasKnownVulns }) => {
+  vulnerabilities: Array<UnknownSeverityVulnerability>;
+  hasKnownVulnerabilities: boolean;
+}> = ({ vulnerabilities, hasKnownVulnerabilities }) => {
   const t = useTranslations();
 
   if (!vulnerabilities.length) {
     return null;
   }
 
   return (
-    <details open={!hasKnownVulns}>
+    <details open={!hasKnownVulnerabilities}>
       <summary className="cursor-pointer font-semibold">
         {t('components.eolModal.showUnknownSeverities')} (
         {vulnerabilities.length})

apps/site/types/vulnerabilities.ts

@@ -34,3 +34,5 @@ export type EOLModalData = {
 export type KnownVulnerability = Vulnerability & {
   severity: (typeof SEVERITY_ORDER)[number];
 };
+
+export type UnknownSeverityVulnerability = Vulnerability & { severity: 'unknown' };