Skip to content

Commit 540e7b0

Browse files
fix: replace "CVE" wording by "Vulnerability" (#285)
1 parent 53ede26 commit 540e7b0

File tree

11 files changed

+24
-100
lines changed

11 files changed

+24
-100
lines changed

client/src/app/layout/sidebar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const SidebarApp: React.FC = () => {
5151
return css(LINK_CLASS, isActive ? ACTIVE_LINK_CLASS : "");
5252
}}
5353
>
54-
CVEs
54+
Vulnerabilities
5555
</NavLink>
5656
</li>
5757
<li className="pf-v5-c-nav__item">

client/src/app/pages/advisory-details/overview.tsx

-76
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from "react";
22

33
import prettyBytes from "pretty-bytes";
44

5-
import { ChartDonut } from "@patternfly/react-charts";
65
import {
76
Card,
87
CardBody,
@@ -15,7 +14,6 @@ import {
1514
GridItem,
1615
} from "@patternfly/react-core";
1716

18-
import { compareBySeverityFn, severityList } from "@app/api/model-utils";
1917
import { AdvisorySummary, Severity } from "@app/client";
2018
import { SeverityShieldAndText } from "@app/components/SeverityShieldAndText";
2119
import { formatDate } from "@app/utils/utils";
@@ -115,77 +113,3 @@ export const Overview: React.FC<InfoProps> = ({ advisory }) => {
115113
</Grid>
116114
);
117115
};
118-
119-
//
120-
121-
interface ChartData {
122-
severity: Severity;
123-
legend: string;
124-
count: number;
125-
color: string;
126-
}
127-
128-
interface CVEsChartProps {
129-
data: { [key in Severity]: number };
130-
}
131-
132-
export const CVEsChart: React.FC<CVEsChartProps> = ({ data }) => {
133-
const enrichedData = Object.entries(data)
134-
.map(([severity, count]) => {
135-
const severityProps = severityList[severity as Severity];
136-
137-
const result: ChartData = {
138-
severity: severity as Severity,
139-
legend: severityProps.name,
140-
color: severityProps.color.value,
141-
count: count,
142-
};
143-
144-
return result;
145-
})
146-
.sort(compareBySeverityFn((item) => item.severity));
147-
148-
const chartData = enrichedData.map((e) => {
149-
return {
150-
x: e.legend,
151-
y: e.count,
152-
};
153-
});
154-
155-
const chartLegendData = enrichedData.map((e) => ({
156-
name: `${e.count} ${e.legend}`,
157-
}));
158-
159-
const chartColorData = enrichedData.map((e) => e.color);
160-
161-
return (
162-
<>
163-
<div style={{ height: "230px", width: "350px" }}>
164-
<ChartDonut
165-
ariaDesc="CVEs"
166-
ariaTitle="CVEs"
167-
constrainToVisibleArea
168-
data={chartData}
169-
labels={({ datum }) => `${datum.x}: ${datum.y}`}
170-
legendData={chartLegendData}
171-
colorScale={chartColorData}
172-
legendOrientation="vertical"
173-
legendPosition="right"
174-
name="CVEs"
175-
padding={{
176-
bottom: 20,
177-
left: 20,
178-
right: 140, // Adjusted to accommodate legend
179-
top: 20,
180-
}}
181-
subTitle="CVEs"
182-
title={enrichedData
183-
.map((e) => e.count)
184-
.reduce((prev, current) => prev + current, 0)
185-
.toString()}
186-
width={350}
187-
/>
188-
</div>
189-
</>
190-
);
191-
};

client/src/app/pages/advisory-details/vulnerabilities-by-advisory.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const VulnerabilitiesByAdvisory: React.FC<
3333
items: vulnerabilities,
3434
isLoading: isFetching,
3535
columnNames: {
36-
identifier: "CVE ID",
36+
identifier: "ID",
3737
title: "Title",
3838
discovery: "Discovery",
3939
release: "Release",

client/src/app/pages/home/components/MonitoringSection.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ export const MonitoringSection: React.FC = () => {
114114
<Stack hasGutter>
115115
<StackItem>
116116
<TextContent>
117-
Below is a summary of CVE status for your last 10 ingested
118-
SBOMs. You can click on the SBOM name or CVE severity number
119-
below to be taken to their respective details page.
117+
Below is a summary of Vulnerability status for your last 10
118+
ingested SBOMs. You can click on the SBOM name to be taken
119+
to their respective details page.
120120
</TextContent>
121121
</StackItem>
122122
<StackItem>

client/src/app/pages/importer-list/importer-list.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ export const ImporterList: React.FC = () => {
274274
</ToolbarContent>
275275
</Toolbar>
276276

277-
<Table {...tableProps} aria-label="CVEs table">
277+
<Table {...tableProps} aria-label="Importer table">
278278
<Thead>
279279
<Tr>
280280
<TableHeaderContentWithControls {...tableControls}>

client/src/app/pages/search/components/SearchMenu.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import React from "react";
1+
import { HubRequestParams } from "@app/api/models";
2+
import { FILTER_TEXT_CATEGORY_KEY } from "@app/Constants";
3+
import { useFetchAdvisories } from "@app/queries/advisories";
4+
import { useFetchPackages } from "@app/queries/packages";
5+
import { useFetchSBOMs } from "@app/queries/sboms";
6+
import { useFetchVulnerabilities } from "@app/queries/vulnerabilities";
27
import {
8+
Label,
39
Menu,
410
MenuContent,
511
MenuItem,
612
MenuList,
713
Popper,
814
SearchInput,
915
} from "@patternfly/react-core";
10-
import { FILTER_TEXT_CATEGORY_KEY } from "@app/Constants";
11-
import { Label } from "@patternfly/react-core";
12-
import { useFetchAdvisories } from "@app/queries/advisories";
13-
import { HubRequestParams } from "@app/api/models";
14-
import { useFetchPackages } from "@app/queries/packages";
15-
import { useFetchSBOMs } from "@app/queries/sboms";
16-
import { useFetchVulnerabilities } from "@app/queries/vulnerabilities";
16+
import React from "react";
1717
import { Link } from "react-router-dom";
1818

1919
export interface IEntity {
@@ -137,7 +137,7 @@ function useAllEntities(filterText: string) {
137137
title: item.identifier,
138138
description: item.description?.substring(0, 75),
139139
navLink: `/vulnerabilities/${item.identifier}`,
140-
type: "CVE",
140+
type: "Vulnerability",
141141
typeColor: "orange",
142142
}));
143143

client/src/app/pages/search/components/SearchTabs.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export const SearchTabs: React.FC<SearchTabsProps> = ({
153153
eventKey={2}
154154
title={
155155
<TabTitleText>
156-
CVEs{" "}
156+
Vulnerabilities{" "}
157157
<Badge screenReaderText="Search Result Count">
158158
{vulnerabilityTotalCount}
159159
</Badge>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { CveDetails as default } from "./vulnerability-details";
1+
export { VulnerabilityDetails as default } from "./vulnerability-details";

client/src/app/pages/vulnerability-details/vulnerability-details.stories.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import type { Meta, StoryObj } from "@storybook/react";
22
import React from "react";
3-
import { CveDetails } from "./vulnerability-details";
3+
import { VulnerabilityDetails } from "./vulnerability-details";
44

55
const meta = {
66
title: "Components/VulnerabilityDetails",
7-
component: CveDetails,
7+
component: VulnerabilityDetails,
88
parameters: {
99
query: {
1010
vulnerabilityId: "CVE-2023-1664",
1111
},
1212
},
1313
tags: ["autodocs"],
14-
} satisfies Meta<typeof CveDetails>;
14+
} satisfies Meta<typeof VulnerabilityDetails>;
1515

1616
export default meta;
1717
type Story = StoryObj<typeof meta>;

client/src/app/pages/vulnerability-details/vulnerability-details.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { AdvisoriesByVulnerability } from "./advisories-by-vulnerability";
2222
import { Overview } from "./overview";
2323
import { SbomsByVulnerability } from "./sboms-by-vulnerability";
2424

25-
export const CveDetails: React.FC = () => {
25+
export const VulnerabilityDetails: React.FC = () => {
2626
const vulnerabilityId = useRouteParams(PathParam.VULNERABILITY_ID);
2727

2828
const { vulnerability, isFetching, fetchError } =
@@ -69,15 +69,15 @@ export const CveDetails: React.FC = () => {
6969
mountOnEnter
7070
activeKey={activeTabKey}
7171
onSelect={handleTabClick}
72-
aria-label="CVE detail tabs"
72+
aria-label="Vulnerability detail tabs"
7373
role="region"
7474
>
7575
<Tab
7676
eventKey={0}
7777
title={<TabTitleText>Related SBOMs</TabTitleText>}
7878
tabContentId="refTabSbomsSection"
7979
tabContentRef={sbomsTabRef}
80-
aria-label="Related SBOMs for this CVE"
80+
aria-label="Related SBOMs for this Vulnerability"
8181
/>
8282
<Tab
8383
eventKey={1}

client/src/app/pages/vulnerability-list/vulnerability-list.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const VulnerabilityList: React.FC = () => {
1616
<>
1717
<PageSection variant={PageSectionVariants.light}>
1818
<TextContent>
19-
<Text component="h1">CVEs</Text>
19+
<Text component="h1">Vulnerabilities</Text>
2020
</TextContent>
2121
</PageSection>
2222
<PageSection>

0 commit comments

Comments
 (0)