From c65b3a8cd07e71f0fb2712e542b9f777af54df78 Mon Sep 17 00:00:00 2001 From: David Vail Date: Fri, 17 Mar 2023 09:50:25 -0400 Subject: [PATCH] PR feedback --- .../WorkloadCves/ImageSingleVulnerabilities.tsx | 2 +- .../SummaryCards/CvesByStatusSummaryCard.tsx | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/ImageSingleVulnerabilities.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/ImageSingleVulnerabilities.tsx index 5f80cd836a37..46adcc9d6b6e 100644 --- a/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/ImageSingleVulnerabilities.tsx +++ b/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/ImageSingleVulnerabilities.tsx @@ -70,7 +70,7 @@ function ImageSingleVulnerabilities({ imageId, imageData }: ImageSingleVulnerabi let mainContent: ReactNode | null = null; - const vulnerabilityData = data || previousData; + const vulnerabilityData = data ?? previousData; if (error) { mainContent = ( diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/SummaryCards/CvesByStatusSummaryCard.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/SummaryCards/CvesByStatusSummaryCard.tsx index 7e8277a906a9..ab8b8c9ac84d 100644 --- a/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/SummaryCards/CvesByStatusSummaryCard.tsx +++ b/ui/apps/platform/src/Containers/Vulnerabilities/WorkloadCves/SummaryCards/CvesByStatusSummaryCard.tsx @@ -1,5 +1,14 @@ import React from 'react'; -import { Card, CardTitle, CardBody, Flex, Text, Grid, GridItem } from '@patternfly/react-core'; +import { + Card, + CardTitle, + CardBody, + Flex, + Grid, + GridItem, + pluralize, + Text, +} from '@patternfly/react-core'; import { CheckCircleIcon, ExclamationCircleIcon } from '@patternfly/react-icons'; import { FixableStatus } from '../types'; @@ -23,7 +32,7 @@ const statusDisplays = [ imageVulnerabilityCounterKeys.forEach((key) => { count += counts[key].fixable; }); - return `${count} vulnerabilities with available fixes`; + return `${pluralize(count, 'vulnerability', 'vulnerabilities')} with available fixes`; }, }, {